From 4eeb5997adf882bb56afac76a2217b9bbb7bb8b2 Mon Sep 17 00:00:00 2001 From: Robert James Hernandez Date: Tue, 9 Jul 2024 00:22:02 +0000 Subject: [PATCH] pyinotify: patch to skip asyncore for python 3.12+ asyncore was removed from the python 3.12 standard library: https://peps.python.org/pep-0594/ This patch was original sourced from: https://github.com/seb-m/pyinotify/pull/205 (cherry picked from commit 7ea81e03624a5d28ddab807d1c145de241762911) --- .../python-modules/pyinotify/default.nix | 2 + .../pyinotify/skip-asyncore-python-3.12.patch | 84 +++++++++++++++++++ 2 files changed, 86 insertions(+) create mode 100644 pkgs/development/python-modules/pyinotify/skip-asyncore-python-3.12.patch diff --git a/pkgs/development/python-modules/pyinotify/default.nix b/pkgs/development/python-modules/pyinotify/default.nix index 5d0b22bfe31f2..8232ab456719f 100644 --- a/pkgs/development/python-modules/pyinotify/default.nix +++ b/pkgs/development/python-modules/pyinotify/default.nix @@ -14,6 +14,8 @@ buildPythonPackage rec { sha256 = "1x3i9wmzw33fpkis203alygfnrkcmq9w1aydcm887jh6frfqm6cw"; }; + patches = [ ./skip-asyncore-python-3.12.patch ]; + # No tests distributed doCheck = false; diff --git a/pkgs/development/python-modules/pyinotify/skip-asyncore-python-3.12.patch b/pkgs/development/python-modules/pyinotify/skip-asyncore-python-3.12.patch new file mode 100644 index 0000000000000..6f8f65545b8c3 --- /dev/null +++ b/pkgs/development/python-modules/pyinotify/skip-asyncore-python-3.12.patch @@ -0,0 +1,84 @@ +From 478d595a7d086423733e9f5da5edfe9f1df48682 Mon Sep 17 00:00:00 2001 +From: Troy Curtis Jr +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):