NotificationsYou must be signed in to change notification settings
Fork957
Star6.4k

Commitb49b7c5

committed

Multiple fixes and enhancements for monkey pluggability

1. `_check_repatching` now merges kwargs into state2. `_get_patch_all_state` allows to retrieve the patch_all configuration state3.a `_patch_module` now allows to specific `_package_prefix` parameter that defaults to 'gevent.'3.b `import_module` is now used in `_patch_module` to allow handling of package names of any depth.4. `patch_item` and both `patch_modules` now accept argument `_patch_module` for item's `__module__` override.fixes#1447

1 parent9fbb971 commitb49b7c5Copy full SHA for b49b7c5

File tree

1 file changed

+26

-7

lines changed

src/gevent
- monkey.py

1 file changed

+26

-7

lines changed

`‎src/gevent/monkey.py`

Lines changed: 26 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,7 @@ def patch_psycopg(event):`
`119`	`119`	`from __future__importabsolute_import`
`120`	`120`	`from __future__importprint_function`
`121`	`121`	`importsys`
	`122`	`+fromimportlibimportimport_module`
`122`	`123`
`123`	`124`	`__all__= [`
`124`	`125`	`'patch_all',`
`@@ -255,11 +256,18 @@ def get_original(mod_name, item_name):`
`255`	`256`	`_NONE=object()`
`256`	`257`
`257`	`258`
`258`		`-defpatch_item(module,attr,newitem):`
	`259`	`+defpatch_item(module,attr,newitem,_patch_module=False):`
`259`	`260`	`olditem=getattr(module,attr,_NONE)`
`260`	`261`	`ifolditemisnot_NONE:`
`261`	`262`	`saved.setdefault(module.__name__, {}).setdefault(attr,olditem)`
`262`	`263`	`setattr(module,attr,newitem)`
	`264`	`+if_patch_module:`
	`265`	`+ifolditemisnotNoneandnewitemisnotNone:`
	`266`	`+try:`
	`267`	`+newitem.__module__=olditem.__module__`
	`268`	`+except (TypeError,AttributeError):`
	`269`	`+# We will let this fail quietly`
	`270`	`+pass`
`263`	`271`
`264`	`272`
`265`	`273`	`defremove_item(module,attr):`
`@@ -290,7 +298,8 @@ def patch_module(target_module, source_module, items=None,`
`290`	`298`	`_warnings=None,`
`291`	`299`	`_notify_will_subscribers=True,`
`292`	`300`	`_notify_did_subscribers=True,`
`293`		`-_call_hooks=True):`
	`301`	`+_call_hooks=True,`
	`302`	`+_patch_module=False):`
`294`	`303`	`"""`
`295`	`304`	`patch_module(target_module, source_module, items=None)`
`296`	`305`
`@@ -336,7 +345,8 @@ def patch_module(target_module, source_module, items=None,`
`336`	`345`	`returnFalse`
`337`	`346`
`338`	`347`	`forattrinitems:`
`339`		`-patch_item(target_module,attr,getattr(source_module,attr))`
	`348`	`+patch_item(target_module,attr,getattr(source_module,attr),`
	`349`	`+_patch_module=_patch_module)`
`340`	`350`
`341`	`351`	`if_call_hooks:`
`342`	`352`	`__call_module_hook(source_module,'did',target_module,items,_warnings)`
`@@ -357,11 +367,13 @@ def _patch_module(name,`
`357`	`367`	`_warnings=None,`
`358`	`368`	`_notify_will_subscribers=True,`
`359`	`369`	`_notify_did_subscribers=True,`
`360`		`-_call_hooks=True):`
	`370`	`+_call_hooks=True,`
	`371`	`+_patch_module=False,`
	`372`	`+_package_prefix='gevent.'):`
`361`	`373`
`362`		`-gevent_module=getattr(__import__('gevent.'+name),name)`
	`374`	`+gevent_module=import_module(_package_prefix+name)`
`363`	`375`	`module_name=getattr(gevent_module,'__target__',name)`
`364`		`-target_module=__import__(module_name)`
	`376`	`+target_module=import_module(module_name)`
`365`	`377`
`366`	`378`	`patch_module(target_module,gevent_module,items=items,`
`367`	`379`	`_warnings=_warnings,`
`@@ -386,7 +398,8 @@ def _patch_module(name,`
`386`	`398`	`_warnings=_warnings,`
`387`	`399`	`_notify_will_subscribers=False,`
`388`	`400`	`_notify_did_subscribers=False,`
`389`		`-_call_hooks=False)`
	`401`	`+_call_hooks=False,`
	`402`	`+_patch_module=_patch_module)`
`390`	`403`	`saved[alternate_name]=saved[module_name]`
`391`	`404`
`392`	`405`	`returngevent_module,target_module`
`@@ -951,9 +964,15 @@ def patch_signal():`
`951`	`964`	`_patch_module("signal")`
`952`	`965`
`953`	`966`
	`967`	`+def_get_patch_all_state():`
	`968`	`+key='_gevent_saved_patch_all'`
	`969`	`+returnsaved.get(key)`
	`970`	`+`
	`971`	`+`
`954`	`972`	`def_check_repatching(**module_settings):`
`955`	`973`	`_warnings= []`
`956`	`974`	`key='_gevent_saved_patch_all'`
	`975`	`+module_settings.update(module_settings['kwargs'])`
`957`	`976`	`delmodule_settings['kwargs']`
`958`	`977`	`ifsaved.get(key,module_settings)!=module_settings:`
`959`	`978`	`_queue_warning("Patching more than once will result in the union of all True"`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitb49b7c5

File tree

1 file changed

1 file changed

`‎src/gevent/monkey.py`

0 commit comments