traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Run 2to3's fix_has_key over distutils.

This commit is contained in:
Collin Winter 2007-09-01 20:37:22 +00:00
parent 0470689215
commit 2ac0121305
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/distutils/command/install.py
View File

@ -347,7 +347,7 @@ class install (Command):
opt_name = opt[0] opt_name = opt[0]
if opt_name[-1] == "=": if opt_name[-1] == "=":
opt_name = opt_name[0:-1] opt_name = opt_name[0:-1]
if self.negative_opt.has_key(opt_name): if opt_name in self.negative_opt:
opt_name = longopt_xlate(self.negative_opt[opt_name]) opt_name = longopt_xlate(self.negative_opt[opt_name])
val = not getattr(self, opt_name) val = not getattr(self, opt_name)
else: else:

4
Lib/distutils/command/register.py
View File

@ -125,7 +125,7 @@ class register(Command):
# see if we can short-cut and get the username/password from the # see if we can short-cut and get the username/password from the
# config # config
config = None config = None
if os.environ.has_key('HOME'): if 'HOME' in os.environ:
rc = os.path.join(os.environ['HOME'], '.pypirc') rc = os.path.join(os.environ['HOME'], '.pypirc')
if os.path.exists(rc): if os.path.exists(rc):
print('Using PyPI login from %s'%rc) print('Using PyPI login from %s'%rc)
@ -168,7 +168,7 @@ Your selection [default 1]: ''', end=' ')
print('Server response (%s): %s'%(code, result)) print('Server response (%s): %s'%(code, result))
# possibly save the login # possibly save the login
if os.environ.has_key('HOME') and config is None and code == 200: if 'HOME' in os.environ and config is None and code == 200:
rc = os.path.join(os.environ['HOME'], '.pypirc') rc = os.path.join(os.environ['HOME'], '.pypirc')
print('I can store your PyPI login so future submissions will be faster.') print('I can store your PyPI login so future submissions will be faster.')
print('(the login will be stored in %s)'%rc) print('(the login will be stored in %s)'%rc)

2
Lib/distutils/command/upload.py
View File

@ -45,7 +45,7 @@ class upload(Command):
raise DistutilsOptionError( raise DistutilsOptionError(
"Must use --sign for --identity to have meaning" "Must use --sign for --identity to have meaning"
) )
if os.environ.has_key('HOME'): if 'HOME' in os.environ:
rc = os.path.join(os.environ['HOME'], '.pypirc') rc = os.path.join(os.environ['HOME'], '.pypirc')
if os.path.exists(rc): if os.path.exists(rc):
self.announce('Using PyPI login from %s' % rc) self.announce('Using PyPI login from %s' % rc)