Run 2to3's fix_has_key over distutils.

collinw · collinw · commit 2ac012130549 · 2007-09-01T20:37:22.000Z
diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
@@ -347,7 +347,7 @@ def dump_dirs(self, msg):
                 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
@@ -125,7 +125,7 @@ def send_metadata(self):
         # 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 @@ def send_metadata(self):
             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
@@ -45,7 +45,7 @@ def finalize_options(self):
             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)

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ def finalize_options(self):`
`45`	`45`	`raise DistutilsOptionError(`
`46`	`46`	`"Must use --sign for --identity to have meaning"`
`47`	`47`	`)`
`48`		`- if os.environ.has_key('HOME'):`
	`48`	`+ if 'HOME' in os.environ:`
`49`	`49`	`rc = os.path.join(os.environ['HOME'], '.pypirc')`
`50`	`50`	`if os.path.exists(rc):`
`51`	`51`	`self.announce('Using PyPI login from %s' % rc)`