diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2012-07-21 17:28:56 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2012-07-21 17:28:56 -0400 |
| commit | d94d073c9bb4fa13c835a9b46350f1bb52265ff3 (patch) | |
| tree | 6cbd7faeb57bedd20e8cc2bdbaa9eed73a762e7a /setuptools/command/bdist_egg.py | |
| parent | 834b8b7521dbbd2bd25e66e428ba56d2ec78ce83 (diff) | |
| parent | 0a5180da06efb1d3e854cbdfec458968790c3a5e (diff) | |
| download | external_python_setuptools-d94d073c9bb4fa13c835a9b46350f1bb52265ff3.tar.gz external_python_setuptools-d94d073c9bb4fa13c835a9b46350f1bb52265ff3.tar.bz2 external_python_setuptools-d94d073c9bb4fa13c835a9b46350f1bb52265ff3.zip | |
Merged in msabramo/distribute_msabramo_py33 (pull request #10)
--HG--
branch : distribute
extra : rebase_source : 8293d555a44b136a77e31caeb8ec27becf19d462
Diffstat (limited to 'setuptools/command/bdist_egg.py')
| -rw-r--r-- | setuptools/command/bdist_egg.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py index a9d98d3b..cf2d75e4 100644 --- a/setuptools/command/bdist_egg.py +++ b/setuptools/command/bdist_egg.py @@ -426,7 +426,11 @@ def scan_module(egg_dir, base, name, stubs): pkg = base[len(egg_dir)+1:].replace(os.sep,'.') module = pkg+(pkg and '.' or '')+os.path.splitext(name)[0] f = open(filename,'rb'); f.read(8) # skip magic & date - code = marshal.load(f); f.close() + try: + code = marshal.load(f); f.close() + except ValueError: + f.seek(0); f.read(12) # skip magic & date & file size; file size added in Python 3.3 + code = marshal.load(f); f.close() safe = True symbols = dict.fromkeys(iter_symbols(code)) for bad in ['__file__', '__path__']: |