From f948ebdd799b3612e4c1b96a60189f9ea7839b41927f2de6889e111c4467fcda Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sat, 1 Oct 2022 17:20:52 +0000 Subject: [PATCH 1/2] =?UTF-8?q?-=20update=20to=202.3.1:=20=20=20*=20Avoid?= =?UTF-8?q?=20operations=20on=20a=20closed=20stream=20file=20when=20detect?= =?UTF-8?q?ing=20a=20socket.=20=20=20*=20Correct=20use=20of=20names=20to?= =?UTF-8?q?=20allow=20`from=20daemon=20import=20*`.=20=20=20Changed:=20=20?= =?UTF-8?q?=20*=20Speed=20daemon=20start=20time=20by=20computing=20candida?= =?UTF-8?q?te=20file=20descriptors=20once.=20=20=20*=20Remove=20incorrect?= =?UTF-8?q?=20double-patch=20of=20objects=20in=20test=20cases.=20=20=20*?= =?UTF-8?q?=20Deprecate=20helper=20function=20`is=5Fsocket`.=20=20=20*=20D?= =?UTF-8?q?rop=20backward-compatible=20helpers=20that=20provided=20Python?= =?UTF-8?q?=202=20support.=20=20=20=20=20*=20declaration=20of=20source=20e?= =?UTF-8?q?ncoding=20=E2=80=98utf-8=E2=80=99=20=20=20=20=20*=20absolute=5F?= =?UTF-8?q?import=20=20=20=20=20*=20unicode=5Fliterals=20=20=20=20=20*=20m?= =?UTF-8?q?odule-level=20metaclass=20`type`=20=20=20=20=20*=20unification?= =?UTF-8?q?=20of=20str=20with=20unicode=20type=20=20=20=20=20*=20renamed?= =?UTF-8?q?=20standard=20library=20exceptions=20and=20modules=20=20=20=20?= =?UTF-8?q?=20*=20raise=20exception=20from=20context=20exception=20=20=20?= =?UTF-8?q?=20=20All=20these=20are=20default=20behaviour=20in=20Python=203?= =?UTF-8?q?=20and=20need=20no=20special=20=20=20=20=20handling.=20-=20drop?= =?UTF-8?q?=20remove=5Fsafe=5Fhasattr.patch,=20remove=5Fdouble=5Fpatch.pat?= =?UTF-8?q?ch=20(upstream)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-python-daemon?expand=0&rev=35 --- python-daemon-2.3.0.tar.gz | 3 --- python-daemon-2.3.1.tar.gz | 3 +++ python-python-daemon.changes | 22 ++++++++++++++++++++++ python-python-daemon.spec | 8 +------- 4 files changed, 26 insertions(+), 10 deletions(-) delete mode 100644 python-daemon-2.3.0.tar.gz create mode 100644 python-daemon-2.3.1.tar.gz diff --git a/python-daemon-2.3.0.tar.gz b/python-daemon-2.3.0.tar.gz deleted file mode 100644 index 45993c5..0000000 --- a/python-daemon-2.3.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bda993f1623b1197699716d68d983bb580043cf2b8a66a01274d9b8297b0aeaf -size 82831 diff --git a/python-daemon-2.3.1.tar.gz b/python-daemon-2.3.1.tar.gz new file mode 100644 index 0000000..6dec2be --- /dev/null +++ b/python-daemon-2.3.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15c2c5e2cef563e0a5f98d542b77ba59337380b472975d2b2fd6b8c4d5cf46ca +size 82856 diff --git a/python-python-daemon.changes b/python-python-daemon.changes index 2fb8aa4..fe24cde 100644 --- a/python-python-daemon.changes +++ b/python-python-daemon.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Sat Oct 1 17:17:04 UTC 2022 - Dirk Müller + +- update to 2.3.1: + * Avoid operations on a closed stream file when detecting a socket. + * Correct use of names to allow `from daemon import *`. + Changed: + * Speed daemon start time by computing candidate file descriptors once. + * Remove incorrect double-patch of objects in test cases. + * Deprecate helper function `is_socket`. + * Drop backward-compatible helpers that provided Python 2 support. + * declaration of source encoding ‘utf-8’ + * absolute_import + * unicode_literals + * module-level metaclass `type` + * unification of str with unicode type + * renamed standard library exceptions and modules + * raise exception from context exception + All these are default behaviour in Python 3 and need no special + handling. +- drop remove_safe_hasattr.patch, remove_double_patch.patch (upstream) + ------------------------------------------------------------------- Sat Mar 19 08:26:41 UTC 2022 - ecsos diff --git a/python-python-daemon.spec b/python-python-daemon.spec index 4893f8b..5faeaab 100644 --- a/python-python-daemon.spec +++ b/python-python-daemon.spec @@ -19,19 +19,13 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %global skip_python2 1 Name: python-python-daemon -Version: 2.3.0 +Version: 2.3.1 Release: 0 Summary: Library to implement a well-behaved Unix daemon process License: Apache-2.0 AND GPL-3.0-only Group: Development/Languages/Python URL: https://pagure.io/python-daemon/ Source: https://files.pythonhosted.org/packages/source/p/python-daemon/python-daemon-%{version}.tar.gz -# PATCH-FIX-UPSTREAM remove_safe_hasattr.patch https://pagure.io/python-daemon/issue/53 mcepl@suse.com -# testtools.helpers.safe_hasattr has been removed and should never be mentioned again -Patch0: remove_safe_hasattr.patch -# PATCH-FIX-UPSTREAM remove_double_patch.patch https://pagure.io/python-daemon/issue/62 mcepl@suse.com -# some objects were mocked twice -Patch1: remove_double_patch.patch BuildRequires: %{python_module docutils} BuildRequires: %{python_module importlib_resources} BuildRequires: %{python_module lockfile >= 0.10} From 2a2fe3ae0004d9c256eb895af545112828c08f705a2444acc55f52cc323d7d85 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sat, 1 Oct 2022 17:21:08 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-python-daemon?expand=0&rev=36 --- remove_double_patch.patch | 47 --------------------------------------- remove_safe_hasattr.patch | 15 ------------- 2 files changed, 62 deletions(-) delete mode 100644 remove_double_patch.patch delete mode 100644 remove_safe_hasattr.patch diff --git a/remove_double_patch.patch b/remove_double_patch.patch deleted file mode 100644 index 1c40bf3..0000000 --- a/remove_double_patch.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 0c67a3c6407fbf4483ccfc94a7a0d78cf3379296 Mon Sep 17 00:00:00 2001 -From: Miro Hrončok -Date: Sep 29 2021 10:05:27 +0000 -Subject: Remove incorrect double-patch of objects in test cases. - - -The specific test cases relying on the patches, already are decorated -to patch the specific attributes needed. We don't need a general patch -of the attributes in the test case setup. - -Signed-off-by: Ben Finney - ---- - ---- - ChangeLog | 4 ++++ - test/test_pidfile.py | 6 ------ - 2 files changed, 4 insertions(+), 6 deletions(-) - ---- a/ChangeLog -+++ b/ChangeLog -@@ -14,6 +14,10 @@ Version 2.3.0 - :Released: 2021-02-21 - :Maintainer: Ben Finney - -+* Remove incorrect double-patch of objects in test cases. -+ -+ Closes: Pagure #62. Thanks to Miro Hrončok for the report. -+ - Removed: - - * Remove support for Python versions older than Python 3. ---- a/test/test_pidfile.py -+++ b/test/test_pidfile.py -@@ -391,12 +391,6 @@ class TimeoutPIDLockFile_TestCase(scaffo - pidlockfile_scenarios = make_pidlockfile_scenarios() - self.pidlockfile_scenario = pidlockfile_scenarios['simple'] - -- for func_name in ['__init__', 'acquire']: -- func_patcher = unittest.mock.patch.object( -- lockfile.pidlockfile.PIDLockFile, func_name) -- func_patcher.start() -- self.addCleanup(func_patcher.stop) -- - self.scenario = { - 'pidfile_path': self.pidlockfile_scenario['pidfile_path'], - 'acquire_timeout': self.getUniqueInteger(), diff --git a/remove_safe_hasattr.patch b/remove_safe_hasattr.patch deleted file mode 100644 index 19ff367..0000000 --- a/remove_safe_hasattr.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- - test/test_metadata.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/test/test_metadata.py -+++ b/test/test_metadata.py -@@ -44,7 +44,7 @@ class HasAttribute(testtools.matchers.Ma - def match(self, instance): - """ Assert the object `instance` has an attribute named `name`. """ - result = None -- if not testtools.helpers.safe_hasattr(instance, self.attribute_name): -+ if not hasattr(instance, self.attribute_name): - result = AttributeNotFoundMismatch(instance, self.attribute_name) - return result -