diff options
| author |   Brett Cannon <brett@python.org> | 2012-12-22 19:38:32 -0500 |
|---|---|---|
| committer | Brett Cannon <brett@python.org> | 2012-12-22 19:38:32 -0500 |
| commit | 2909d6b47c5a96b38099d5e00fd68e6b5c3ef4da (patch) | |
| tree | f9353ef041ed41113fce0c3eec3f6bfac83b537f /Lib/modulefinder.py | |
| parent | Merge 3.3. (diff) | |
| parent | Issue #16752: Add a missing import to modulefinder. (diff) | |
| download | cpython-2909d6b47c5a96b38099d5e00fd68e6b5c3ef4da.tar.gz cpython-2909d6b47c5a96b38099d5e00fd68e6b5c3ef4da.tar.bz2 cpython-2909d6b47c5a96b38099d5e00fd68e6b5c3ef4da.zip | |
merge with 3.3
Diffstat (limited to 'Lib/modulefinder.py')
| -rw-r--r-- | Lib/modulefinder.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Lib/modulefinder.py b/Lib/modulefinder.py index 7418a9ce6d4..4996d7a20b6 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 |