diff options
| author | Collin Winter <collinw@gmail.com> | 2007-09-01 20:37:22 (GMT) |
|---|---|---|
| committer | Collin Winter <collinw@gmail.com> | 2007-09-01 20:37:22 (GMT) |
| commit | 2ac012130549b1ef51ebce11148d01eaca1a7033 (patch) | |
| tree | f559a7e433637a02c80bf954b268afbb5ebc1f14 /Lib | |
| parent | 0470689215bb10e6dc3be169bc2fac6e15b659fc (diff) | |
| download | cpython-2ac012130549b1ef51ebce11148d01eaca1a7033.zip cpython-2ac012130549b1ef51ebce11148d01eaca1a7033.tar.gz cpython-2ac012130549b1ef51ebce11148d01eaca1a7033.tar.bz2 | |
Run 2to3's fix_has_key over distutils.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/distutils/command/install.py | 2 | ||||
| -rw-r--r-- | Lib/distutils/command/register.py | 4 | ||||
| -rw-r--r-- | Lib/distutils/command/upload.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py index ffd68db..f1ebcbf 100644 --- a/Lib/distutils/command/install.py +++ b/Lib/distutils/command/install.py @@ -347,7 +347,7 @@ class install (Command): 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: diff --git a/Lib/distutils/command/register.py b/Lib/distutils/command/register.py index 91081dd..d123d32 100644 --- a/Lib/distutils/command/register.py +++ b/Lib/distutils/command/register.py @@ -125,7 +125,7 @@ class register(Command): # 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 @@ Your selection [default 1]: ''', end=' ') 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) diff --git a/Lib/distutils/command/upload.py b/Lib/distutils/command/upload.py index b49acd1..34b6692 100644 --- a/Lib/distutils/command/upload.py +++ b/Lib/distutils/command/upload.py @@ -45,7 +45,7 @@ class upload(Command): 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) |