Removed all patches (all applied upstream).

This commit is contained in:
Thomas Goirand
2016-03-24 00:30:20 +01:00
parent a6053525be
commit abf65d2264
4 changed files with 1 additions and 70 deletions

1
debian/changelog vendored
View File

@@ -6,6 +6,7 @@ python-magnumclient (2.0.0-1) experimental; urgency=medium
[ Thomas Goirand ]
* New upstream release.
* Fixed (buid-)depends for this release.
* Removed all patches (all applied upstream).
-- Thomas Goirand <zigo@debian.org> Thu, 24 Mar 2016 00:10:01 +0100

View File

@@ -1,43 +0,0 @@
Description: Fix the assert of dictionary equality in
test_keys_and_vals_to_strs as the dictionary order can cause the
test to fail.
Author: Corey Bryant <corey.bryant@canonical.com>
Forwarded: https://review.openstack.org/#/c/265880/
---
magnumclient/tests/test_utils.py | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/magnumclient/tests/test_utils.py b/magnumclient/tests/test_utils.py
index 886577f..90a9b4f 100644
--- a/magnumclient/tests/test_utils.py
+++ b/magnumclient/tests/test_utils.py
@@ -15,6 +15,7 @@
# License for the specific language governing permissions and limitations
# under the License.
+import collections
import six
from magnumclient.common import utils
@@ -181,6 +182,16 @@ class CliUtilsTest(test_utils.BaseTestCase):
def test_keys_and_vals_to_strs(self):
dict_in = {u'a': u'1', u'b': {u'x': 1, 'y': u'2', u'z': u'3'}, 'c': 7}
- dict_exp = {'a': '1', 'b': {'x': 1, 'y': '2', 'z': '3'}, 'c': 7}
+
+ dict_exp = collections.OrderedDict(
+ {'a': '1',
+ 'b': collections.OrderedDict({'x': 1, 'y': '2', 'z': '3'}),
+ 'c': 7})
+
dict_out = cliutils.keys_and_vals_to_strs(dict_in)
- self.assertEqual(six.text_type(dict_exp), six.text_type(dict_out))
+ dict_act = collections.OrderedDict(
+ {'a': dict_out['a'],
+ 'b': collections.OrderedDict(dict_out['b']),
+ 'c': dict_out['c']})
+
+ self.assertEqual(six.text_type(dict_exp), six.text_type(dict_act))
--
2.7.0.rc3

View File

@@ -1,25 +0,0 @@
Description: Add py3 compatibility for unicode builtin
Author: Corey Bryant <corey.bryant@canonical.com>
Origin: https://review.openstack.org/258759
Forwarded: yes
---
magnumclient/openstack/common/cliutils.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/magnumclient/openstack/common/cliutils.py b/magnumclient/openstack/common/cliutils.py
index afc81bb..10bd021 100644
--- a/magnumclient/openstack/common/cliutils.py
+++ b/magnumclient/openstack/common/cliutils.py
@@ -194,7 +194,7 @@ def keys_and_vals_to_strs(dictionary):
def to_str(k_or_v):
if isinstance(k_or_v, dict):
return keys_and_vals_to_strs(k_or_v)
- elif isinstance(k_or_v, unicode):
+ elif isinstance(k_or_v, six.text_type):
return str(k_or_v)
else:
return k_or_v
--
2.6.2

View File

@@ -1,2 +0,0 @@
fix-dict-assert.patch
py3-unicode-compat.patch