[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#986158: marked as done (unblock: python-oslo.serialization/4.0.2-1)

Your message dated Mon, 05 Apr 2021 18:39:16 +0000
with message-id <E1lTU84-0000JP-Gz@respighi.debian.org>
and subject line unblock python-oslo.serialization
has caused the Debian Bug report #986158,
regarding unblock: python-oslo.serialization/4.0.2-1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
986158: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=986158
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package python-oslo.serialization

This is a bugfix point release from uptream. Debdiff
looks reasonable to me. Your thoughts?

Please unblock python-oslo.serialization/4.0.2-1

diff -Nru python-oslo.serialization-4.0.1/debian/changelog python-oslo.serialization-4.0.2/debian/changelog
--- python-oslo.serialization-4.0.1/debian/changelog	2020-10-16 10:09:28.000000000 +0200
+++ python-oslo.serialization-4.0.2/debian/changelog	2021-03-30 16:51:52.000000000 +0200
@@ -1,3 +1,9 @@
+python-oslo.serialization (4.0.2-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Thomas Goirand <zigo@debian.org>  Tue, 30 Mar 2021 16:51:52 +0200
+
 python-oslo.serialization (4.0.1-2) unstable; urgency=medium
 
   * Uploading to unstable.
diff -Nru python-oslo.serialization-4.0.1/.gitreview python-oslo.serialization-4.0.2/.gitreview
--- python-oslo.serialization-4.0.1/.gitreview	2020-07-24 17:36:23.000000000 +0200
+++ python-oslo.serialization-4.0.2/.gitreview	2021-02-02 14:45:37.000000000 +0100
@@ -1,4 +1,5 @@
 [gerrit]
 host=review.opendev.org
 port=29418
-project=openstack/oslo.serialization.git
\ No newline at end of file
+project=openstack/oslo.serialization.git
+defaultbranch=stable/victoria
diff -Nru python-oslo.serialization-4.0.1/lower-constraints.txt python-oslo.serialization-4.0.2/lower-constraints.txt
--- python-oslo.serialization-4.0.1/lower-constraints.txt	2020-07-24 17:36:23.000000000 +0200
+++ python-oslo.serialization-4.0.2/lower-constraints.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,35 +0,0 @@
-appdirs==1.3.0
-Babel==2.3.4
-bandit==1.4.0
-coverage==4.0
-debtcollector==1.2.0
-extras==1.0.0
-fixtures==3.0.0
-gitdb==0.6.4
-GitPython==1.0.1
-ipaddress===1.0.17
-iso8601==0.1.11
-keystoneauth1==3.4.0
-linecache2==1.0.0
-mox3==0.20.0
-msgpack==0.5.2
-netaddr==0.7.18
-netifaces==0.10.4
-os-client-config==1.28.0
-oslo.i18n==3.15.3
-oslo.utils==3.33.0
-oslotest==3.2.0
-pbr==2.0.0
-pyparsing==2.1.0
-python-mimeparse==1.6.0
-python-subunit==1.0.0
-pytz==2013.6
-requests==2.14.2
-requestsexceptions==1.2.0
-smmap==0.9.0
-stestr==2.0.0
-stevedore==1.20.0
-testtools==2.2.0
-traceback2==1.4.0
-unittest2==1.1.0
-wrapt==1.7.0
diff -Nru python-oslo.serialization-4.0.1/oslo_serialization/jsonutils.py python-oslo.serialization-4.0.2/oslo_serialization/jsonutils.py
--- python-oslo.serialization-4.0.1/oslo_serialization/jsonutils.py	2020-07-24 17:36:23.000000000 +0200
+++ python-oslo.serialization-4.0.2/oslo_serialization/jsonutils.py	2021-02-02 14:45:37.000000000 +0100
@@ -33,6 +33,7 @@
 import datetime
 import functools
 import inspect
+import io
 import itertools
 import json
 import uuid
@@ -161,7 +162,7 @@
         # Python 3 does not have iteritems
         elif hasattr(value, 'items'):
             return recursive(dict(value.items()), level=level + 1)
-        elif hasattr(value, '__iter__'):
+        elif hasattr(value, '__iter__') and not isinstance(value, io.IOBase):
             return list(map(recursive, value))
         elif convert_instances and hasattr(value, '__dict__'):
             # Likely an instance of something. Watch for cycles.
diff -Nru python-oslo.serialization-4.0.1/oslo_serialization/tests/test_jsonutils.py python-oslo.serialization-4.0.2/oslo_serialization/tests/test_jsonutils.py
--- python-oslo.serialization-4.0.1/oslo_serialization/tests/test_jsonutils.py	2020-07-24 17:36:23.000000000 +0200
+++ python-oslo.serialization-4.0.2/oslo_serialization/tests/test_jsonutils.py	2021-02-02 14:45:37.000000000 +0100
@@ -401,6 +401,16 @@
         ret = jsonutils.to_primitive(obj, fallback=lambda _: 'fallback')
         self.assertEqual('fallback', ret)
 
+    def test_fallback_typeerror_IO_object(self):
+        # IO Objects are not callable, cause a TypeError in to_primitive()
+        obj = io.IOBase
+
+        ret = jsonutils.to_primitive(obj)
+        self.assertEqual(str(obj), ret)
+
+        ret = jsonutils.to_primitive(obj, fallback=lambda _: 'fallback')
+        self.assertEqual('fallback', ret)
+
     def test_exception(self):
         self.assertIn(jsonutils.to_primitive(ValueError("an exception")),
                       ["ValueError('an exception',)",
diff -Nru python-oslo.serialization-4.0.1/releasenotes/notes/bug-1908607-fix-json-to_primitive-IO-OBjects-04faff4a1b5cf48f.yaml python-oslo.serialization-4.0.2/releasenotes/notes/bug-1908607-fix-json-to_primitive-IO-OBjects-04faff4a1b5cf48f.yaml
--- python-oslo.serialization-4.0.1/releasenotes/notes/bug-1908607-fix-json-to_primitive-IO-OBjects-04faff4a1b5cf48f.yaml	1970-01-01 01:00:00.000000000 +0100
+++ python-oslo.serialization-4.0.2/releasenotes/notes/bug-1908607-fix-json-to_primitive-IO-OBjects-04faff4a1b5cf48f.yaml	2021-02-02 14:45:37.000000000 +0100
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    `Bug #1908607 <https://bugs.launchpad.net/cinder/+bug/1908607>`_: Fix
+    json to_primitive when using IO OBjects.
diff -Nru python-oslo.serialization-4.0.1/tox.ini python-oslo.serialization-4.0.2/tox.ini
--- python-oslo.serialization-4.0.1/tox.ini	2020-07-24 17:36:23.000000000 +0200
+++ python-oslo.serialization-4.0.2/tox.ini	2021-02-02 14:45:37.000000000 +0100
@@ -6,7 +6,7 @@
 
 [testenv]
 deps =
-  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/victoria}
   -r{toxinidir}/test-requirements.txt
   -r{toxinidir}/requirements.txt
 commands = stestr run --slowest {posargs}
@@ -26,7 +26,7 @@
 [testenv:docs]
 whitelist_externals = rm
 deps =
-  -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/victoria}
   -r{toxinidir}/doc/requirements.txt
 commands =
   rm -fr doc/build
@@ -39,12 +39,6 @@
   rm -rf releasenotes/build
   sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html
 
-[testenv:lower-constraints]
-deps =
-  -c{toxinidir}/lower-constraints.txt
-  -r{toxinidir}/test-requirements.txt
-  -r{toxinidir}/requirements.txt
-
 [flake8]
 # E123, E125 skipped as they are invalid PEP-8.
 # W504 line break after binary operator
diff -Nru python-oslo.serialization-4.0.1/.zuul.yaml python-oslo.serialization-4.0.2/.zuul.yaml
--- python-oslo.serialization-4.0.1/.zuul.yaml	2020-07-24 17:36:23.000000000 +0200
+++ python-oslo.serialization-4.0.2/.zuul.yaml	2021-02-02 14:45:37.000000000 +0100
@@ -2,7 +2,6 @@
     templates:
       - check-requirements
       - lib-forward-testing-python3
-      - openstack-lower-constraints-jobs
       - openstack-python3-victoria-jobs
       - periodic-stable-jobs
       - publish-openstack-docs-pti

--- End Message ---
--- Begin Message --- 
Unblocked.

--- End Message ---
Reply to: