Compatibility with ydiff>=1.3 (patroni#3042)

PatchStream class was removed as it was effectively doing nothing useful.
EnterpriseDB · Apr 2, 2024 · 3fd7c98 · 3fd7c98
1 parent d7454f7
commit 3fd7c98
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/patroni/ctl.py b/patroni/ctl.py
@@ -41,8 +41,12 @@
     from psycopg import Cursor
     from psycopg2 import cursor
 
-try:
-    from ydiff import markup_to_pager, PatchStream  # pyright: ignore [reportMissingModuleSource]
+try:  # pragma: no cover
+    from ydiff import markup_to_pager  # pyright: ignore [reportMissingModuleSource]
+    try:
+        from ydiff import PatchStream  # pyright: ignore [reportMissingModuleSource]
+    except ImportError:
+        PatchStream = iter
 except ImportError:  # pragma: no cover
     from cdiff import markup_to_pager, PatchStream  # pyright: ignore [reportMissingModuleSource]