File 0001-Switch-over-to-mox3.patch of Package python-neutronclient
From 645d7cc567c3d843d3ae9884d940baa7a05c410e Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Thu, 13 Feb 2014 11:13:12 +0100
Subject: [PATCH] Switch over to mox3
mox3 is a Python 3.x compatible drop-in and allows
to continue with the porting effort to Python 3.x with
minimal code changes.
Change-Id: Ib052f1b87e312481e4c7c8d775ece94f53e7106b
---
neutronclient/tests/unit/fw/test_cli20_firewallpolicy.py | 2 +-
neutronclient/tests/unit/lb/test_cli20_healthmonitor.py | 2 +-
neutronclient/tests/unit/lb/test_cli20_pool.py | 2 +-
neutronclient/tests/unit/test_auth.py | 2 +-
neutronclient/tests/unit/test_cli20.py | 2 +-
neutronclient/tests/unit/test_cli20_network.py | 2 +-
neutronclient/tests/unit/test_cli20_port.py | 2 +-
neutronclient/tests/unit/test_cli20_securitygroup.py | 2 +-
neutronclient/tests/unit/test_http.py | 2 +-
neutronclient/tests/unit/test_name_or_id.py | 2 +-
neutronclient/tests/unit/test_shell.py | 2 +-
neutronclient/tests/unit/test_ssl.py | 2 +-
test-requirements.txt | 2 +-
13 files changed, 13 insertions(+), 13 deletions(-)
Index: python-neutronclient-2.3.4/neutronclient/tests/unit/fw/test_cli20_firewallpolicy.py
===================================================================
--- python-neutronclient-2.3.4.orig/neutronclient/tests/unit/fw/test_cli20_firewallpolicy.py
+++ python-neutronclient-2.3.4/neutronclient/tests/unit/fw/test_cli20_firewallpolicy.py
@@ -18,7 +18,7 @@
import sys
-import mox
+from mox3 import mox
from neutronclient.neutron.v2_0.fw import firewallpolicy
from neutronclient import shell
Index: python-neutronclient-2.3.4/neutronclient/tests/unit/lb/test_cli20_healthmonitor.py
===================================================================
--- python-neutronclient-2.3.4.orig/neutronclient/tests/unit/lb/test_cli20_healthmonitor.py
+++ python-neutronclient-2.3.4/neutronclient/tests/unit/lb/test_cli20_healthmonitor.py
@@ -18,7 +18,7 @@
import sys
-import mox
+from mox3 import mox
from neutronclient.neutron.v2_0.lb import healthmonitor
from neutronclient.tests.unit import test_cli20
Index: python-neutronclient-2.3.4/neutronclient/tests/unit/lb/test_cli20_pool.py
===================================================================
--- python-neutronclient-2.3.4.orig/neutronclient/tests/unit/lb/test_cli20_pool.py
+++ python-neutronclient-2.3.4/neutronclient/tests/unit/lb/test_cli20_pool.py
@@ -18,7 +18,7 @@
import sys
-import mox
+from mox3 import mox
from neutronclient.neutron.v2_0.lb import pool
from neutronclient.tests.unit import test_cli20
Index: python-neutronclient-2.3.4/neutronclient/tests/unit/test_auth.py
===================================================================
--- python-neutronclient-2.3.4.orig/neutronclient/tests/unit/test_auth.py
+++ python-neutronclient-2.3.4/neutronclient/tests/unit/test_auth.py
@@ -19,7 +19,7 @@ import httplib2
import json
import uuid
-import mox
+from mox3 import mox
import testtools
from neutronclient import client
Index: python-neutronclient-2.3.4/neutronclient/tests/unit/test_cli20.py
===================================================================
--- python-neutronclient-2.3.4.orig/neutronclient/tests/unit/test_cli20.py
+++ python-neutronclient-2.3.4/neutronclient/tests/unit/test_cli20.py
@@ -17,7 +17,7 @@
import urllib
import fixtures
-import mox
+from mox3 import mox
import testtools
from neutronclient.common import constants
Index: python-neutronclient-2.3.4/neutronclient/tests/unit/test_cli20_network.py
===================================================================
--- python-neutronclient-2.3.4.orig/neutronclient/tests/unit/test_cli20_network.py
+++ python-neutronclient-2.3.4/neutronclient/tests/unit/test_cli20_network.py
@@ -15,7 +15,7 @@
import sys
-import mox
+from mox3 import mox
from neutronclient.common import exceptions
from neutronclient.common import utils
Index: python-neutronclient-2.3.4/neutronclient/tests/unit/test_cli20_port.py
===================================================================
--- python-neutronclient-2.3.4.orig/neutronclient/tests/unit/test_cli20_port.py
+++ python-neutronclient-2.3.4/neutronclient/tests/unit/test_cli20_port.py
@@ -16,7 +16,7 @@
import sys
-import mox
+from mox3 import mox
from neutronclient.neutron.v2_0 import port
from neutronclient import shell
Index: python-neutronclient-2.3.4/neutronclient/tests/unit/test_cli20_securitygroup.py
===================================================================
--- python-neutronclient-2.3.4.orig/neutronclient/tests/unit/test_cli20_securitygroup.py
+++ python-neutronclient-2.3.4/neutronclient/tests/unit/test_cli20_securitygroup.py
@@ -16,7 +16,7 @@
import sys
-import mox
+from mox3 import mox
from neutronclient.neutron.v2_0 import securitygroup
from neutronclient.tests.unit import test_cli20
Index: python-neutronclient-2.3.4/neutronclient/tests/unit/test_http.py
===================================================================
--- python-neutronclient-2.3.4.orig/neutronclient/tests/unit/test_http.py
+++ python-neutronclient-2.3.4/neutronclient/tests/unit/test_http.py
@@ -14,7 +14,7 @@
# under the License.
import httplib2
-import mox
+from mox3 import mox
import testtools
from neutronclient.client import HTTPClient
Index: python-neutronclient-2.3.4/neutronclient/tests/unit/test_name_or_id.py
===================================================================
--- python-neutronclient-2.3.4.orig/neutronclient/tests/unit/test_name_or_id.py
+++ python-neutronclient-2.3.4/neutronclient/tests/unit/test_name_or_id.py
@@ -16,7 +16,7 @@
import uuid
-import mox
+from mox3 import mox
import testtools
from neutronclient.common import exceptions
Index: python-neutronclient-2.3.4/neutronclient/tests/unit/test_shell.py
===================================================================
--- python-neutronclient-2.3.4.orig/neutronclient/tests/unit/test_shell.py
+++ python-neutronclient-2.3.4/neutronclient/tests/unit/test_shell.py
@@ -20,7 +20,7 @@ import re
import sys
import fixtures
-import mox
+from mox3 import mox
import testtools
from testtools import matchers
Index: python-neutronclient-2.3.4/neutronclient/tests/unit/test_ssl.py
===================================================================
--- python-neutronclient-2.3.4.orig/neutronclient/tests/unit/test_ssl.py
+++ python-neutronclient-2.3.4/neutronclient/tests/unit/test_ssl.py
@@ -15,7 +15,7 @@
import fixtures
import httplib2
-import mox
+from mox3 import mox
import testtools
from neutronclient.client import HTTPClient
Index: python-neutronclient-2.3.4/test-requirements.txt
===================================================================
--- python-neutronclient-2.3.4.orig/test-requirements.txt
+++ python-neutronclient-2.3.4/test-requirements.txt
@@ -4,7 +4,7 @@ cliff-tablib>=1.0
coverage>=3.6
discover
fixtures>=0.3.14
-mox>=0.5.3
+mox3>=0.7.0
python-subunit
sphinx>=1.1.2,<1.2
testrepository>=0.0.17