From f17634ea638853bc7405f8c104edcb03fa0ac413 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 9 Dec 2010 22:18:59 +0000 Subject: [PATCH] Drop pkutil and simply use pkg_resources. --- deluge/__init__.py | 8 ++------ deluge/plugins/AutoAdd/deluge/__init__.py | 8 ++------ deluge/plugins/AutoAdd/deluge/plugins/__init__.py | 8 ++------ deluge/plugins/__init__.py | 9 ++------- 4 files changed, 8 insertions(+), 25 deletions(-) diff --git a/deluge/__init__.py b/deluge/__init__.py index bb62714ce..fe92cd136 100644 --- a/deluge/__init__.py +++ b/deluge/__init__.py @@ -1,8 +1,4 @@ """Deluge""" # this is a namespace package -try: - import pkg_resources - pkg_resources.declare_namespace(__name__) -except ImportError: - import pkgutil - __path__ = pkgutil.extend_path(__path__, __name__) +import pkg_resources +pkg_resources.declare_namespace(__name__) diff --git a/deluge/plugins/AutoAdd/deluge/__init__.py b/deluge/plugins/AutoAdd/deluge/__init__.py index 2e2033b3c..94033e829 100644 --- a/deluge/plugins/AutoAdd/deluge/__init__.py +++ b/deluge/plugins/AutoAdd/deluge/__init__.py @@ -1,7 +1,3 @@ # this is a namespace package -try: - import pkg_resources - pkg_resources.declare_namespace(__name__) -except ImportError: - import pkgutil - __path__ = pkgutil.extend_path(__path__, __name__) +import pkg_resources +pkg_resources.declare_namespace(__name__) diff --git a/deluge/plugins/AutoAdd/deluge/plugins/__init__.py b/deluge/plugins/AutoAdd/deluge/plugins/__init__.py index 2e2033b3c..94033e829 100644 --- a/deluge/plugins/AutoAdd/deluge/plugins/__init__.py +++ b/deluge/plugins/AutoAdd/deluge/plugins/__init__.py @@ -1,7 +1,3 @@ # this is a namespace package -try: - import pkg_resources - pkg_resources.declare_namespace(__name__) -except ImportError: - import pkgutil - __path__ = pkgutil.extend_path(__path__, __name__) +import pkg_resources +pkg_resources.declare_namespace(__name__) diff --git a/deluge/plugins/__init__.py b/deluge/plugins/__init__.py index bf99a9da0..94033e829 100644 --- a/deluge/plugins/__init__.py +++ b/deluge/plugins/__init__.py @@ -1,8 +1,3 @@ # this is a namespace package -try: - import pkg_resources - pkg_resources.declare_namespace(__name__) -except ImportError: - import pkgutil - __path__ = pkgutil.extend_path(__path__, __name__) - +import pkg_resources +pkg_resources.declare_namespace(__name__)