diff options
author | Jason R. Coombs <jaraco@jaraco.com> | 2013-09-02 14:23:39 -0400 |
---|---|---|
committer | Jason R. Coombs <jaraco@jaraco.com> | 2013-09-02 14:23:39 -0400 |
commit | b1dfe6c40f83f5b1efab707c356aa08fdeb1b62b (patch) | |
tree | 3b00261af0a53b68187fb31c28241d102fb3a38f /setuptools/command/easy_install.py | |
parent | 3860484b6cc33cc499b56c96a6332263be562bfe (diff) | |
download | external_python_setuptools-b1dfe6c40f83f5b1efab707c356aa08fdeb1b62b.tar.gz external_python_setuptools-b1dfe6c40f83f5b1efab707c356aa08fdeb1b62b.tar.bz2 external_python_setuptools-b1dfe6c40f83f5b1efab707c356aa08fdeb1b62b.zip |
Rename variable to avoid conflation with global
Diffstat (limited to 'setuptools/command/easy_install.py')
-rwxr-xr-x | setuptools/command/easy_install.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py index 755b15d6..78d96696 100755 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -882,10 +882,10 @@ Please make the appropriate changes for your system and try again. # Convert the .exe to an unpacked egg egg_path = dist.location = os.path.join(tmpdir, dist.egg_name()+'.egg') egg_tmp = egg_path + '.tmp' - egg_info = os.path.join(egg_tmp, 'EGG-INFO') - pkg_inf = os.path.join(egg_info, 'PKG-INFO') + _egg_info = os.path.join(egg_tmp, 'EGG-INFO') + pkg_inf = os.path.join(_egg_info, 'PKG-INFO') ensure_directory(pkg_inf) # make sure EGG-INFO dir exists - dist._provider = PathMetadata(egg_tmp, egg_info) # XXX + dist._provider = PathMetadata(egg_tmp, _egg_info) # XXX self.exe_to_egg(dist_filename, egg_tmp) # Write EGG-INFO/PKG-INFO @@ -896,7 +896,7 @@ Please make the appropriate changes for your system and try again. if k != 'target_version': f.write('%s: %s\n' % (k.replace('_','-').title(), v)) f.close() - script_dir = os.path.join(egg_info,'scripts') + script_dir = os.path.join(_egg_info,'scripts') self.delete_blockers( # delete entry-point scripts to avoid duping [os.path.join(script_dir,args[0]) for args in get_script_args(dist)] ) |