diff options
| author | Doug Hellmann <doug@doughellmann.com> | 2014-09-07 14:59:41 -0400 |
|---|---|---|
| committer | Doug Hellmann <doug@doughellmann.com> | 2014-09-07 14:59:41 -0400 |
| commit | bdcfb4a4df4346e7e05473a7579b1da40212bf9b (patch) | |
| tree | 042d8967940b9011ebd12cae0b2ff3fc457078a0 | |
| parent | be6f9a0ff7da10bd272c369d97058bf3546fc508 (diff) | |
| download | oslo-db-bdcfb4a4df4346e7e05473a7579b1da40212bf9b.tar.gz | |
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
| -rw-r--r-- | oslo/db/openstack/common/__init__.py | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/oslo/db/openstack/common/__init__.py b/oslo/db/openstack/common/__init__.py index d1223ea..9dd8c3a 100644 --- a/oslo/db/openstack/common/__init__.py +++ b/oslo/db/openstack/common/__init__.py @@ -10,8 +10,3 @@ # 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')) |