From ae6ebd7837573c7f86b07b14725937b3f9d43d1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= Date: Thu, 17 Mar 2016 01:10:15 +0000 Subject: Remove the import hook when unloading the old pkg_resources modules --HG-- branch : agronholm/remove-the-import-hook-when-unloading-th-1458177009332 --- ez_setup.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ez_setup.py b/ez_setup.py index 9715bdc7..4faa5218 100644 --- a/ez_setup.py +++ b/ez_setup.py @@ -192,6 +192,11 @@ def _conflict_bail(VC_err, version): def _unload_pkg_resources(): + from pkg_resources.extern import VendorImporter + sys.meta_path = [importer for importer in sys.meta_path if + not isinstance(importer, VendorImporter)] + del VendorImporter + del_modules = [ name for name in sys.modules if name.startswith('pkg_resources') -- cgit v1.2.3 From 071e0ed8fea0ab719a9b4a7d1f71c27a5754b819 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= Date: Thu, 17 Mar 2016 05:56:44 +0000 Subject: Safer way to remove the import hook --HG-- branch : agronholm/remove-the-import-hook-when-unloading-th-1458177009332 --- ez_setup.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ez_setup.py b/ez_setup.py index 4faa5218..d6f4b78c 100644 --- a/ez_setup.py +++ b/ez_setup.py @@ -192,11 +192,8 @@ def _conflict_bail(VC_err, version): def _unload_pkg_resources(): - from pkg_resources.extern import VendorImporter sys.meta_path = [importer for importer in sys.meta_path if - not isinstance(importer, VendorImporter)] - del VendorImporter - + importer.__class__.__module__ != 'pkg_resources.extern'] del_modules = [ name for name in sys.modules if name.startswith('pkg_resources') -- cgit v1.2.3