diff Lib/distutils/core.py @ 39575:63237fcefd99

Get rid of dict.has_key(). Boy this has a lot of repercussions! Not all code has been fixed yet; this is just a checkpoint... The C API still has PyDict_HasKey() and _HasKeyString(); not sure if I want to change those just yet.
author Guido van Rossum <guido@python.org>
date Fri, 18 Aug 2006 22:13:04 +0000
parents dc6f315f1f7f
children 6b18a095c2e7
line wrap: on
line diff
--- a/Lib/distutils/core.py	Fri Aug 18 16:29:54 2006 +0000
+++ b/Lib/distutils/core.py	Fri Aug 18 22:13:04 2006 +0000
@@ -101,9 +101,9 @@
     else:
         klass = Distribution
 
-    if not attrs.has_key('script_name'):
+    if 'script_name' not in attrs:
         attrs['script_name'] = os.path.basename(sys.argv[0])
-    if not attrs.has_key('script_args'):
+    if 'script_args'  not in attrs:
         attrs['script_args'] = sys.argv[1:]
 
     # Create the Distribution instance, using the remaining arguments
@@ -111,7 +111,7 @@
     try:
         _setup_distribution = dist = klass(attrs)
     except DistutilsSetupError, msg:
-        if attrs.has_key('name'):
+        if 'name' not in attrs:
             raise SystemExit, "error in %s setup command: %s" % \
                   (attrs['name'], msg)
         else: