Merge "Move location of HTTPException in swift_testing"

test/functionalnosetests/swift_testing.py

@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from httplib import HTTPException
 import os
 import socket
 import sys
@@ -20,7 +21,7 @@ from time import sleep
 
 from test import get_config
 
-from swiftclient import get_auth, http_connection, HTTPException
+from swiftclient import get_auth, http_connection
 
 conf = get_config('func_test')
 web_front_end = conf.get('web_front_end', 'integral')