forked from pool/python-pyinotify
Accepting request 1254968 from home:PSuarezHernandez:branches:devel:languages:python
- Make asyncore support optional to fix issue in Python 3.12 and 3.13 - Added: * make_asyncore_support_optional.patch OBS-URL: https://build.opensuse.org/request/show/1254968 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyinotify?expand=0&rev=35
This commit is contained in:
Git OBS Bridge
84
make_asyncore_support_optional.patch
Normal file
84
make_asyncore_support_optional.patch
Normal file
@@ -0,0 +1,84 @@
|
||||
From 478d595a7d086423733e9f5da5edfe9f1df48682 Mon Sep 17 00:00:00 2001
|
||||
From: Troy Curtis Jr <troy@troycurtisjr.com>
|
||||
Date: Thu, 10 Aug 2023 21:51:15 -0400
|
||||
Subject: [PATCH] Make asyncore support optional for Python 3.
|
||||
|
||||
Fixes #204.
|
||||
---
|
||||
python3/pyinotify.py | 50 +++++++++++++++++++++++++-------------------
|
||||
1 file changed, 28 insertions(+), 22 deletions(-)
|
||||
|
||||
diff --git a/python3/pyinotify.py b/python3/pyinotify.py
|
||||
index bc24313..f4a5a90 100755
|
||||
--- a/python3/pyinotify.py
|
||||
+++ b/python3/pyinotify.py
|
||||
@@ -68,7 +68,6 @@ def __init__(self, version):
|
||||
from datetime import datetime, timedelta
|
||||
import time
|
||||
import re
|
||||
-import asyncore
|
||||
import glob
|
||||
import locale
|
||||
import subprocess
|
||||
@@ -1494,33 +1493,40 @@ def run(self):
|
||||
self.loop()
|
||||
|
||||
|
||||
-class AsyncNotifier(asyncore.file_dispatcher, Notifier):
|
||||
- """
|
||||
- This notifier inherits from asyncore.file_dispatcher in order to be able to
|
||||
- use pyinotify along with the asyncore framework.
|
||||
+try:
|
||||
+ import asyncore
|
||||
|
||||
- """
|
||||
- def __init__(self, watch_manager, default_proc_fun=None, read_freq=0,
|
||||
- threshold=0, timeout=None, channel_map=None):
|
||||
+ class AsyncNotifier(asyncore.file_dispatcher, Notifier):
|
||||
"""
|
||||
- Initializes the async notifier. The only additional parameter is
|
||||
- 'channel_map' which is the optional asyncore private map. See
|
||||
- Notifier class for the meaning of the others parameters.
|
||||
+ This notifier inherits from asyncore.file_dispatcher in order to be able to
|
||||
+ use pyinotify along with the asyncore framework.
|
||||
|
||||
"""
|
||||
- Notifier.__init__(self, watch_manager, default_proc_fun, read_freq,
|
||||
- threshold, timeout)
|
||||
- asyncore.file_dispatcher.__init__(self, self._fd, channel_map)
|
||||
+ def __init__(self, watch_manager, default_proc_fun=None, read_freq=0,
|
||||
+ threshold=0, timeout=None, channel_map=None):
|
||||
+ """
|
||||
+ Initializes the async notifier. The only additional parameter is
|
||||
+ 'channel_map' which is the optional asyncore private map. See
|
||||
+ Notifier class for the meaning of the others parameters.
|
||||
|
||||
- def handle_read(self):
|
||||
- """
|
||||
- When asyncore tells us we can read from the fd, we proceed processing
|
||||
- events. This method can be overridden for handling a notification
|
||||
- differently.
|
||||
+ """
|
||||
+ Notifier.__init__(self, watch_manager, default_proc_fun, read_freq,
|
||||
+ threshold, timeout)
|
||||
+ asyncore.file_dispatcher.__init__(self, self._fd, channel_map)
|
||||
|
||||
- """
|
||||
- self.read_events()
|
||||
- self.process_events()
|
||||
+ def handle_read(self):
|
||||
+ """
|
||||
+ When asyncore tells us we can read from the fd, we proceed processing
|
||||
+ events. This method can be overridden for handling a notification
|
||||
+ differently.
|
||||
+
|
||||
+ """
|
||||
+ self.read_events()
|
||||
+ self.process_events()
|
||||
+except ImportError:
|
||||
+ # asyncore was removed in Python 3.12, but try the import instead of a
|
||||
+ # version check in case the compatibility package is installed.
|
||||
+ pass
|
||||
|
||||
|
||||
class TornadoAsyncNotifier(Notifier):
|
||||
@@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 21 10:42:17 UTC 2025 - Pablo Suárez Hernández <pablo.suarezhernandez@suse.com>
|
||||
|
||||
- Make asyncore support optional to fix issue in Python 3.12 and 3.13
|
||||
|
||||
- Added:
|
||||
* make_asyncore_support_optional.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 21 12:30:53 UTC 2023 - Dirk Müller <dmueller@suse.com>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package python-pyinotify
|
||||
#
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
# Copyright (c) 2025 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -27,10 +27,12 @@ Group: Development/Libraries/Python
|
||||
URL: https://github.com/seb-m/pyinotify
|
||||
Source: https://files.pythonhosted.org/packages/source/p/pyinotify/pyinotify-%{version}.tar.gz
|
||||
Source1: pyinotify
|
||||
# PATCH-FIX_UPSTREAM https://github.com/seb-m/pyinotify/pull/205
|
||||
Patch0: make_asyncore_support_optional.patch
|
||||
BuildRequires: %{python_module setuptools}
|
||||
BuildRequires: python-rpm-macros
|
||||
Requires(post): update-alternatives
|
||||
Requires(postun):update-alternatives
|
||||
Requires(postun): update-alternatives
|
||||
BuildArch: noarch
|
||||
%python_subpackages
|
||||
|
||||
@@ -51,7 +53,7 @@ to watch, the kind of events to monitor and the actions to execute on these
|
||||
notifications.
|
||||
|
||||
%prep
|
||||
%setup -q -n pyinotify-%{version}
|
||||
%autosetup -p1 -n pyinotify-%{version}
|
||||
# remove unwanted shebang
|
||||
sed -i '/^#!/ d' python2/pyinotify.py
|
||||
sed -i "s|#!%{_bindir}/env python|#!%__python2|" python2/examples/*py
|
||||
|
||||
Reference in New Issue
Block a user