Switch to mox3

mox is outdated and unmaintained. Switch to using mox3 instead.

Change-Id: I05ba92da6cbbf97c6a572c46e8d625c56b3a4db9

contrib/rackspace/heat_keystoneclient_v2/__init__.py

@@ -1,7 +0,0 @@
-import six
-
-
-if six.PY3:
-    from mox3 import mox
-    import sys
-    sys.modules['mox'] = mox

contrib/rackspace/heat_keystoneclient_v2/tests/__init__.py

@@ -0,0 +1,5 @@
+import sys
+
+from mox3 import mox
+
+sys.modules['mox'] = mox

contrib/rackspace/rackspace/tests/__init__.py

@@ -1,7 +1,5 @@
-import six
+import sys
 
+from mox3 import mox
 
-if six.PY3:
-    from mox3 import mox
-    import sys
-    sys.modules['mox'] = mox
+sys.modules['mox'] = mox

heat/tests/__init__.py

@@ -11,14 +11,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+
+import sys
+
+from mox3 import mox
 import oslo_i18n as i18n
-import six
 
-
-if six.PY3:
-    from mox3 import mox
-    import sys
-    sys.modules['mox'] = mox
+sys.modules['mox'] = mox
 
 
 def fake_translate_msgid(msgid, domain, desired_locale=None):

heat/tests/test_rpc_client.py

@@ -20,8 +20,8 @@ Unit Tests for heat.rpc.client
 import copy
 
 import mock
+from mox import stubout
 from oslo_messaging._drivers import common as rpc_common
-import stubout
 
 from heat.common import exception
 from heat.common import identifier

test-requirements.txt

@@ -7,7 +7,6 @@ hacking<0.11,>=0.10.0
 bandit>=0.13.2
 coverage>=3.6
 mock>=1.2
-mox>=0.5.3
 mox3>=0.7.0
 PyMySQL>=0.6.2 # MIT License
 oslosphinx>=2.5.0 # Apache-2.0