add patches for ZODB.broken and zope.intid (provide _uid_int as object property)
This commit is contained in:
parent
72d7fdd05f
commit
678ed53ab5
1 changed files with 42 additions and 7 deletions
|
@ -3,20 +3,42 @@
|
||||||
# monkey patches, activate with: <module module="loops.patch" />
|
# monkey patches, activate with: <module module="loops.patch" />
|
||||||
# in some .zcml file, e.g. application.zcml
|
# 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
|
import zope.index.text.widcode
|
||||||
from zope.index.text.widcode import _prog, _decode, _decoding
|
from zope.index.text.widcode import _prog, _decode, _decoding
|
||||||
def patched_decode(code):
|
def patched_decode(code):
|
||||||
"""_prog pattern is now a string, but after updating from Python2
|
"""`_prog` pattern is now a string, but after updating from Python2
|
||||||
code is still a bytes array."""
|
code we may still get a bytes array from ZODB."""
|
||||||
get = _decoding.get
|
get = _decoding.get
|
||||||
if isinstance(code, bytes):
|
if isinstance(code, bytes):
|
||||||
# byte-wise conversion to str:
|
# byte-wise conversion to str:
|
||||||
code = ''.join(chr(b) for b in code)
|
code = ''.join(chr(b) for b in code)
|
||||||
return [get(p) or _decode(p) for p in _prog.findall(code)]
|
return [get(p) or _decode(p) for p in _prog.findall(code)]
|
||||||
|
|
||||||
zope.index.text.widcode.decode = patched_decode
|
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.interfaces import IMailer
|
||||||
from zope.sendmail.mailer import SMTPMailer
|
from zope.sendmail.mailer import SMTPMailer
|
||||||
def patched_smtpMailer(_context, name, hostname="localhost", port="25",
|
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),
|
discriminator=('utility', IMailer, name),
|
||||||
callable=handler,
|
callable=handler,
|
||||||
args=('registerUtility',
|
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,
|
SMTPMailer(hostname, port, username, password,
|
||||||
implicit_tls=implicit_tls),
|
implicit_tls=implicit_tls),
|
||||||
IMailer, name)
|
IMailer, name)
|
||||||
)
|
)
|
||||||
import zope.sendmail.zcml
|
|
||||||
zope.sendmail.zcml.smtpMailer = patched_smtpMailer
|
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")
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue