Skip to content

Commit f1dea6b

Browse files
author
avandras
committed
Update ydiff/cdiff import based on the main fork
1 parent bd69436 commit f1dea6b

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

patroni/ctl.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,12 @@
4141
from psycopg import Cursor
4242
from psycopg2 import cursor
4343

44-
try:
45-
from ydiff import markup_to_pager, PatchStream # pyright: ignore [reportMissingModuleSource]
44+
try: # pragma: no cover
45+
from ydiff import markup_to_pager # pyright: ignore [reportMissingModuleSource]
46+
try:
47+
from ydiff import PatchStream # pyright: ignore [reportMissingModuleSource]
48+
except ImportError:
49+
PatchStream = iter
4650
except ImportError: # pragma: no cover
4751
from cdiff import markup_to_pager, PatchStream # pyright: ignore [reportMissingModuleSource]
4852

0 commit comments

Comments
 (0)