summaryrefslogtreecommitdiffstats
path: root/Lib/modulefinder.py
diff options
context:
space:
mode:
authorBrett Cannon <brett@python.org>2012-12-23 00:38:32 (GMT)
committerBrett Cannon <brett@python.org>2012-12-23 00:38:32 (GMT)
commit2909d6b47c5a96b38099d5e00fd68e6b5c3ef4da (patch)
treef9353ef041ed41113fce0c3eec3f6bfac83b537f /Lib/modulefinder.py
parenta81ef640f1fcc4b8378bc6887b4ba989a1eae4c5 (diff)
parent73b969ec70ff4d422bff34d63cfb220cfac96779 (diff)
downloadcpython-2909d6b47c5a96b38099d5e00fd68e6b5c3ef4da.zip
cpython-2909d6b47c5a96b38099d5e00fd68e6b5c3ef4da.tar.gz
cpython-2909d6b47c5a96b38099d5e00fd68e6b5c3ef4da.tar.bz2
merge with 3.3
Diffstat (limited to 'Lib/modulefinder.py')
-rw-r--r--Lib/modulefinder.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/Lib/modulefinder.py b/Lib/modulefinder.py
index 7418a9ce6..4996d7a 100644
--- a/Lib/modulefinder.py
+++ b/Lib/modulefinder.py
@@ -2,6 +2,7 @@
import dis
import imp
+import importlib.machinery
import marshal
import os
import sys