Merge "python3: Transition to mox3 instead of mox"

test-requirements.txt

@@ -6,7 +6,7 @@ fixtures>=0.3.12
 httpretty>=0.6.3
 keyring>=1.6.1
 mock>=0.8.0
-mox>=0.5.3
+mox3>=0.7.0
 pycrypto>=2.6
 sphinx>=1.1.2
 testrepository>=0.0.17

tests/utils.py

@@ -15,7 +15,7 @@
 import time
 
 import mock
-import mox
+from mox3 import mox
 import requests
 import testtools
 

tests/v2_0/test_shell.py

@@ -14,9 +14,9 @@
 
 import cStringIO
 import os
-import stubout
 import sys
 
+from mox3 import stubout
 from testtools import matchers
 
 from keystoneclient import httpclient

tests/v3/utils.py

@@ -19,7 +19,7 @@ import urlparse
 import uuid
 
 import mock
-import mox
+from mox3 import mox
 import requests
 import testtools