From 678ed53ab587e0903392e2f4413f8babd4c1289b Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Tue, 7 Jan 2025 08:45:17 +0100
Subject: [PATCH] add patches for ZODB.broken and zope.intid (provide _uid_int
 as object property)

---
 loops/patch.py | 49 ++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 42 insertions(+), 7 deletions(-)

diff --git a/loops/patch.py b/loops/patch.py
index 03fd809..c723e6b 100644
--- a/loops/patch.py
+++ b/loops/patch.py
@@ -3,20 +3,42 @@
 # monkey patches, activate with: <module module="loops.patch" />
 # in some .zcml file, e.g. application.zcml
 
+
+from zope.intid import IntIds
+base_getId = IntIds.getId
+base_register = IntIds.register
+
+def patched_getId(self, ob):
+    uid = getattr(ob, '_uid_int', None)
+    #print('*** patched_getId, found:', uid)
+    if uid is None:
+        uid = base_getId(self, ob)
+        ob._uid_int = uid
+    return uid
+
+def patched_register(self, ob):
+    uid = base_register(self, ob)
+    ob._uid_int = uid
+    return uid
+
+IntIds.getId = patched_getId
+IntIds.register = patched_register
+
+
 import zope.index.text.widcode
 from zope.index.text.widcode import _prog, _decode, _decoding
 def patched_decode(code):
-    """_prog pattern is now a string, but after updating from Python2
-       code is still a bytes array."""
+    """`_prog` pattern is now a string, but after updating from Python2
+       code we may still get a bytes array from ZODB."""
     get = _decoding.get
     if isinstance(code, bytes):
         # byte-wise conversion to str:
         code = ''.join(chr(b) for b in code)
     return [get(p) or _decode(p) for p in _prog.findall(code)]
-
 zope.index.text.widcode.decode = patched_decode
-print("loops.patch: monkey patch for 'zope.index.text.widcode.decode()' installed.")
 
+
+import zope.sendmail.zcml
 from zope.sendmail.interfaces import IMailer
 from zope.sendmail.mailer import SMTPMailer
 def patched_smtpMailer(_context, name, hostname="localhost", port="25",
@@ -25,12 +47,25 @@ def patched_smtpMailer(_context, name, hostname="localhost", port="25",
         discriminator=('utility', IMailer, name),
         callable=handler,
         args=('registerUtility',
-              # fix error: set 'implicit_tls' as a keyword parameter
+              # fix error: set `implicit_tls` as a keyword parameter
               SMTPMailer(hostname, port, username, password, 
                          implicit_tls=implicit_tls),
               IMailer, name)
     )
-import zope.sendmail.zcml
 zope.sendmail.zcml.smtpMailer = patched_smtpMailer
-print("loops patch: monkey patch  for 'zope.sendmail.zcml.smtpMailer()' installed")
+
+
+import ZODB.broken
+from ZODB.broken import find_global
+def patched_rebuild(modulename, globalname, *args):
+    class_ = find_global(modulename, globalname)
+    #print('***loops.patch -> ZODB.broken.rebuild', modulename, globalname, args, class_)
+    if globalname == 'unpickleMethod':
+        # some spurious `twisted` relict in ZODB: a function, not a real class 
+        return class_(*args)
+    return class_.__new__(class_, *args)
+ZODB.broken.rebuild = patched_rebuild
+
+
+print("loops.patch: 4 monkey patches installed")