From 00fda063ffc6d70556ae7662e195e8bcb3a3f174 Mon Sep 17 00:00:00 2001 From: Jason Madden Date: Thu, 20 Apr 2017 12:12:51 -0500 Subject: [PATCH] We have a hard dep on setuptools so we don't need to dance around with pkg_resources not being available --- src/zope/__init__.py | 8 +------- src/zope/app/__init__.py | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/src/zope/__init__.py b/src/zope/__init__.py index 2e2033b..2cdb0e4 100644 --- a/src/zope/__init__.py +++ b/src/zope/__init__.py @@ -1,7 +1 @@ -# 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').declare_namespace(__name__) # pragma: no cover diff --git a/src/zope/app/__init__.py b/src/zope/app/__init__.py index 2e2033b..2cdb0e4 100644 --- a/src/zope/app/__init__.py +++ b/src/zope/app/__init__.py @@ -1,7 +1 @@ -# 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').declare_namespace(__name__) # pragma: no cover