From 3601a8a83ce537c54f0aa62fcf8b13559d14487e Mon Sep 17 00:00:00 2001 From: Elizaveta Shashkova Date: Mon, 23 Apr 2018 15:16:31 +0300 Subject: [PATCH] Use pkgutil in case of any error with pkg_resources (PY-29671) Problems with `pkg_resources` module shouldn't break working with extensions in debugger. --- python/helpers/pydev/_pydevd_bundle/pydevd_extension_utils.py | 2 -- python/helpers/pydev/pydevd_plugins/__init__.py | 2 +- python/helpers/pydev/pydevd_plugins/extensions/__init__.py | 2 +- .../helpers/pydev/pydevd_plugins/extensions/types/__init__.py | 2 +- .../my_extensions/pydevd_plugins/__init__.py | 2 +- .../my_extensions/pydevd_plugins/extensions/__init__.py | 2 +- 6 files changed, 5 insertions(+), 7 deletions(-) diff --git a/python/helpers/pydev/_pydevd_bundle/pydevd_extension_utils.py b/python/helpers/pydev/_pydevd_bundle/pydevd_extension_utils.py index 9ece650dc511..3e23a11d39d8 100644 --- a/python/helpers/pydev/_pydevd_bundle/pydevd_extension_utils.py +++ b/python/helpers/pydev/_pydevd_bundle/pydevd_extension_utils.py @@ -1,11 +1,9 @@ import pkgutil import sys -import traceback from _pydev_bundle import pydev_log try: import pydevd_plugins.extensions as extensions except: - traceback.print_exc() extensions = None diff --git a/python/helpers/pydev/pydevd_plugins/__init__.py b/python/helpers/pydev/pydevd_plugins/__init__.py index afff0c07ddeb..867169c5cb95 100644 --- a/python/helpers/pydev/pydevd_plugins/__init__.py +++ b/python/helpers/pydev/pydevd_plugins/__init__.py @@ -1,5 +1,5 @@ try: __import__('pkg_resources').declare_namespace(__name__) -except ImportError: +except: import pkgutil __path__ = pkgutil.extend_path(__path__, __name__) diff --git a/python/helpers/pydev/pydevd_plugins/extensions/__init__.py b/python/helpers/pydev/pydevd_plugins/extensions/__init__.py index afff0c07ddeb..867169c5cb95 100644 --- a/python/helpers/pydev/pydevd_plugins/extensions/__init__.py +++ b/python/helpers/pydev/pydevd_plugins/extensions/__init__.py @@ -1,5 +1,5 @@ try: __import__('pkg_resources').declare_namespace(__name__) -except ImportError: +except: import pkgutil __path__ = pkgutil.extend_path(__path__, __name__) diff --git a/python/helpers/pydev/pydevd_plugins/extensions/types/__init__.py b/python/helpers/pydev/pydevd_plugins/extensions/types/__init__.py index afff0c07ddeb..867169c5cb95 100644 --- a/python/helpers/pydev/pydevd_plugins/extensions/types/__init__.py +++ b/python/helpers/pydev/pydevd_plugins/extensions/types/__init__.py @@ -1,5 +1,5 @@ try: __import__('pkg_resources').declare_namespace(__name__) -except ImportError: +except: import pkgutil __path__ = pkgutil.extend_path(__path__, __name__) diff --git a/python/helpers/pydev/tests_pydevd_python/my_extensions/pydevd_plugins/__init__.py b/python/helpers/pydev/tests_pydevd_python/my_extensions/pydevd_plugins/__init__.py index afff0c07ddeb..867169c5cb95 100644 --- a/python/helpers/pydev/tests_pydevd_python/my_extensions/pydevd_plugins/__init__.py +++ b/python/helpers/pydev/tests_pydevd_python/my_extensions/pydevd_plugins/__init__.py @@ -1,5 +1,5 @@ try: __import__('pkg_resources').declare_namespace(__name__) -except ImportError: +except: import pkgutil __path__ = pkgutil.extend_path(__path__, __name__) diff --git a/python/helpers/pydev/tests_pydevd_python/my_extensions/pydevd_plugins/extensions/__init__.py b/python/helpers/pydev/tests_pydevd_python/my_extensions/pydevd_plugins/extensions/__init__.py index afff0c07ddeb..867169c5cb95 100644 --- a/python/helpers/pydev/tests_pydevd_python/my_extensions/pydevd_plugins/extensions/__init__.py +++ b/python/helpers/pydev/tests_pydevd_python/my_extensions/pydevd_plugins/extensions/__init__.py @@ -1,5 +1,5 @@ try: __import__('pkg_resources').declare_namespace(__name__) -except ImportError: +except: import pkgutil __path__ = pkgutil.extend_path(__path__, __name__)