diff options
| author | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2013-06-19 12:19:32 +0100 |
|---|---|---|
| committer | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2013-06-19 12:19:32 +0100 |
| commit | f91bf3924a2f4e3d4c7f075b792002dae97d46b4 (patch) | |
| tree | b70c55d5687cd362faf7af71000096ee4f6e2810 | |
| parent | 7161829fd5e4515903ce56b711e551bc75c35ba7 (diff) | |
| download | external_python_setuptools-f91bf3924a2f4e3d4c7f075b792002dae97d46b4.tar.gz external_python_setuptools-f91bf3924a2f4e3d4c7f075b792002dae97d46b4.tar.bz2 external_python_setuptools-f91bf3924a2f4e3d4c7f075b792002dae97d46b4.zip | |
Add back accidentally deleted import.
--HG--
branch : single-codebase
| -rw-r--r-- | setuptools.egg-info/requires.txt | 10 | ||||
| -rwxr-xr-x | setuptools/command/easy_install.py | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt index e4fb4954..221040f8 100644 --- a/setuptools.egg-info/requires.txt +++ b/setuptools.egg-info/requires.txt @@ -1,13 +1,13 @@ +[ssl:python_version in '2.4, 2.5'] +ssl==1.16 + [ssl:sys_platform=='win32' and python_version=='2.4'] ctypes==1.0.2 -[ssl:sys_platform=='win32'] -wincertstore==0.1 - [certs] certifi==0.0.8 -[ssl:python_version in '2.4, 2.5'] -ssl==1.16
\ No newline at end of file +[ssl:sys_platform=='win32'] +wincertstore==0.1
\ No newline at end of file diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py index 000fefa0..3194644e 100755 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -1491,6 +1491,7 @@ def extract_wininst_cfg(dist_filename): f.seek(prepended-12) from setuptools.compat import StringIO, ConfigParser + import struct tag, cfglen, bmlen = struct.unpack("<iii",f.read(12)) if tag not in (0x1234567A, 0x1234567B): return None # not a valid tag |