Merge "Remove six.moves call"

oslotest/__init__.py

@@ -14,4 +14,3 @@ import six
 
 
 six.add_move(six.MovedModule('mock', 'mock', 'unittest.mock'))
-six.add_move(six.MovedModule('mox', 'mox3.mox', 'mox3.mox'))

oslotest/moxstubout.py

@@ -16,7 +16,7 @@
 # under the License.
 
 import fixtures
-from six.moves import mox
+from mox3 import mox
 
 
 class MoxStubout(fixtures.Fixture):

tox.ini

@@ -30,4 +30,3 @@ exclude = .tox,dist,doc,*.egg,build
 [hacking]
 import_exceptions =
     six.moves.mock
-    six.moves.mox