Run 2to3's fix_has_key over distutils.
authorCollin Winter <collinw@gmail.com>
Sat, 1 Sep 2007 20:37:22 +0000 (20:37 +0000)
committerCollin Winter <collinw@gmail.com>
Sat, 1 Sep 2007 20:37:22 +0000 (20:37 +0000)
Lib/distutils/command/install.py
Lib/distutils/command/register.py
Lib/distutils/command/upload.py

index ffd68db269466a2ab99a437f511637913ae88f9a..f1ebcbf05255ba8aaef219d483eefe2f9fab658a 100644 (file)
@@ -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:
index 91081ddb1bc1d8c177f1432f0627b723a5e9c6ef..d123d327deab088b17a291020437f77f6d81c54b 100644 (file)
@@ -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)
index b49acd123ac18dcdfe6d503e945ff8113f3b4fa0..34b6692d047fbb72c5998576d39c8bea3df271a4 100644 (file)
@@ -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)