From 41fbe410aadb64cc14d5886fc2a582953bb4325d Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Sun, 7 Sep 2014 17:24:02 -0400 Subject: [PATCH] Let oslotest manage the six.move setting for mox This instruction to set up a move in six for the mox module conflicts with the one in oslotest. We are trying to use mox3 everywhere, so remove this instruction and let oslotest handle it. Imported from the incubator change with the same ID. Change-Id: I59d5799283233f8411044ddb15c8abfc8850014c --- oslo/messaging/openstack/common/__init__.py | 17 ----------------- tests/test_transport.py | 2 +- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/oslo/messaging/openstack/common/__init__.py b/oslo/messaging/openstack/common/__init__.py index d1223eaf7..e69de29bb 100644 --- a/oslo/messaging/openstack/common/__init__.py +++ b/oslo/messaging/openstack/common/__init__.py @@ -1,17 +0,0 @@ -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -import six - - -six.add_move(six.MovedModule('mox', 'mox', 'mox3.mox')) diff --git a/tests/test_transport.py b/tests/test_transport.py index 34a72e5b0..6e700e88a 100644 --- a/tests/test_transport.py +++ b/tests/test_transport.py @@ -14,8 +14,8 @@ # under the License. import fixtures -from mox3 import mox import six +from six.moves import mox from stevedore import driver import testscenarios