summaryrefslogtreecommitdiff
path: root/pkg_resources.py
diff options
context:
space:
mode:
authorDirkjan Ochtman <djc.ochtman@kentyde.com>2012-12-17 13:03:16 +0100
committerDirkjan Ochtman <djc.ochtman@kentyde.com>2012-12-17 13:03:16 +0100
commit20e832ab13ec7544d5fb014b25cb733e515119c7 (patch)
treef7d6ce866b3e17a778e651a066a88e4081b16d3c /pkg_resources.py
parent6cc077d10b69b24307198f494675f7ab9418f180 (diff)
downloadpython-setuptools-git-20e832ab13ec7544d5fb014b25cb733e515119c7.tar.gz
Minimize impact of namespace package support for CPython 3.3.
This solves a regression with an admittedly obscure use case involving Mercurial's demandimport implementation, but it also seems like neater code. --HG-- branch : distribute extra : rebase_source : 10fb05d0391607140ced288a2c134f4463eddf5a
Diffstat (limited to 'pkg_resources.py')
-rw-r--r--pkg_resources.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/pkg_resources.py b/pkg_resources.py
index a5a10eb4..cf0ef7b4 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1325,12 +1325,8 @@ class DefaultProvider(EggProvider):
register_loader_type(type(None), DefaultProvider)
-try:
- # CPython >=3.3
+if sys.version_info[:2] >= 3.3:
import _frozen_importlib
-except ImportError:
- pass
-else:
register_loader_type(_frozen_importlib.SourceFileLoader, DefaultProvider)