Move 2.0 changes collected in branches/pending back to trunk for further

development.  Note that this set of changes is NOT backward-compatible;
the trunk no longer works with Python 1.5.2, 2.0, or 2.1.

1 files changed, 3 insertions, 3 deletions

diff --git a/bench/lvars-gvars.py b/bench/lvars-gvars.py
index 724b7a2e..bdb09ef8 100644
--- a/bench/lvars-gvars.py
+++ b/bench/lvars-gvars.py
@@ -19,7 +19,7 @@ def Func1(var, gvars, lvars):
 def Func2(var, gvars, lvars):
     """lvars has_key(), gvars try:-except:"""
     for i in IterationList:
-        if lvars.has_key(var):
+        if var in lvars:
             x = lvars[var]
         else:
             try:
@@ -30,9 +30,9 @@ def Func2(var, gvars, lvars):
 def Func3(var, gvars, lvars):
     """lvars has_key(), gvars has_key()"""
     for i in IterationList:
-        if lvars.has_key(var):
+        if var in lvars:
             x = lvars[var]
-        elif gvars.has_key(var):
+        elif var in gvars:
             x = gvars[var]
         else:
             x = ''