From 9e0c8ad2c251274128499a7fcfb591c488d27d2b Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Thu, 15 Jan 2015 11:22:23 +0100 Subject: [PATCH] Remove six.moves call This patches remove the six.move call as it's does not move anything since it relies always on mox3. Change-Id: Ic59c73abb9b09cb594bf7df4173d7f99f81d526c --- oslotest/__init__.py | 1 - oslotest/moxstubout.py | 2 +- tox.ini | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/oslotest/__init__.py b/oslotest/__init__.py index 3d49b6a..e3f05f9 100644 --- a/oslotest/__init__.py +++ b/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')) diff --git a/oslotest/moxstubout.py b/oslotest/moxstubout.py index 2f06dbf..ab4547b 100644 --- a/oslotest/moxstubout.py +++ b/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): diff --git a/tox.ini b/tox.ini index 431eb2b..bcc5d1b 100644 --- a/tox.ini +++ b/tox.ini @@ -30,4 +30,3 @@ exclude = .tox,dist,doc,*.egg,build [hacking] import_exceptions = six.moves.mock - six.moves.mox