summaryrefslogtreecommitdiff
path: root/pkg_resources.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2012-12-17 15:15:53 -0500
committerJason R. Coombs <jaraco@jaraco.com>2012-12-17 15:15:53 -0500
commitcd1e33d5567d9f892f8145beb4b39eeeafa760b9 (patch)
tree47d7a09b6e988dcb2384f8e4f6596585a588b767 /pkg_resources.py
parent5854afbb1e30152e38dca1d9c70c1c4cb990e87d (diff)
downloadpython-setuptools-git-cd1e33d5567d9f892f8145beb4b39eeeafa760b9.tar.gz
Update changelog and add comment to registering of SourceFileLoader
--HG-- branch : distribute extra : rebase_source : 2701f50b3375f9c2f2378ff22f274aade0b03107
Diffstat (limited to 'pkg_resources.py')
-rw-r--r--pkg_resources.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkg_resources.py b/pkg_resources.py
index 53978086..717c1e6a 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1325,6 +1325,9 @@ class DefaultProvider(EggProvider):
register_loader_type(type(None), DefaultProvider)
+# Python 3.3 also supplies the SourceFileLoader.
+# Don't be tempted to do a try/except block here - it will break Mercurial
+# hooks due to the demandimport functionality.
if sys.version_info[:2] >= (3,3):
import _frozen_importlib
register_loader_type(_frozen_importlib.SourceFileLoader, DefaultProvider)