Author: collin.winter
Date: Sat Sep 1 22:37:22 2007
New Revision: 57891
Modified:
python/branches/py3k/Lib/distutils/command/install.py
python/branches/py3k/Lib/distutils/command/register.py
python/branches/py3k/Lib/distutils/command/upload.py
Log:
Run 2to3's fix_has_key over distutils.
Modified: python/branches/py3k/Lib/distutils/command/install.py
==============================================================================
--- python/branches/py3k/Lib/distutils/command/install.py (original)
+++ python/branches/py3k/Lib/distutils/command/install.py Sat Sep 1
22:37:22 2007
@@ -347,7 +347,7 @@
opt_name = opt[0]
if opt_name[-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])
val = not getattr(self, opt_name)
else:
Modified: python/branches/py3k/Lib/distutils/command/register.py
==============================================================================
--- python/branches/py3k/Lib/distutils/command/register.py (original)
+++ python/branches/py3k/Lib/distutils/command/register.py Sat Sep 1
22:37:22 2007
@@ -125,7 +125,7 @@
# see if we can short-cut and get the username/password from the
# config
config = None
- if os.environ.has_key('HOME'):
+ if 'HOME' in os.environ:
rc = os.path.join(os.environ['HOME'], '.pypirc')
if os.path.exists(rc):
print('Using PyPI login from %s'%rc)
@@ -168,7 +168,7 @@
print('Server response (%s): %s'%(code, result))
# 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')
print('I can store your PyPI login so future submissions will
be faster.')
print('(the login will be stored in %s)'%rc)
Modified: python/branches/py3k/Lib/distutils/command/upload.py
==============================================================================
--- python/branches/py3k/Lib/distutils/command/upload.py (original)
+++ python/branches/py3k/Lib/distutils/command/upload.py Sat Sep 1
22:37:22 2007
@@ -45,7 +45,7 @@
raise DistutilsOptionError(
"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')
if os.path.exists(rc):
self.announce('Using PyPI login from %s' % rc)
_______________________________________________
Python-3000-checkins mailing list
[email protected]
http://mail.python.org/mailman/listinfo/python-3000-checkins
