diff -r 6040015cb439 -r 238133fcb3c4 Tools/pybench/CommandLine.py --- a/Tools/pybench/CommandLine.py Thu Jan 11 17:43:23 2007 -0800 +++ b/Tools/pybench/CommandLine.py Fri Jan 12 18:28:39 2007 -0800 @@ -165,7 +165,7 @@ class Option: def __init__(self,name,help=None): if not name[:1] == '-': - raise TypeError,'option names must start with "-"' + raise TypeError('option names must start with "-"') if name[1:2] == '-': self.prefix = '--' self.name = name[2:] @@ -324,30 +324,32 @@ class Application: # Append preset options for option in self.preset_options: - if not self.option_map.has_key(option.name): + if not option.name in self.option_map: self.add_option(option) # Init .files list self.files = [] # Start Application + rc = 0 try: # Process startup rc = self.startup() if rc is not None: - raise SystemExit,rc + raise SystemExit(rc) # Parse command line rc = self.parse() if rc is not None: - raise SystemExit,rc + raise SystemExit(rc) # Start application rc = self.main() if rc is None: rc = 0 - except SystemExit as rc: + except SystemExit as rcException: + rc = rcException pass except KeyboardInterrupt: @@ -367,7 +369,7 @@ class Application: print rc = 1 - raise SystemExit,rc + raise SystemExit(rc) def add_option(self, option): @@ -398,7 +400,7 @@ class Application: program. It defaults to 0 which usually means: OK. """ - raise SystemExit, rc + raise SystemExit(rc) def parse(self): @@ -459,7 +461,7 @@ class Application: except AttributeError: if value == '': # count the number of occurances - if values.has_key(optionname): + if optionname in values: values[optionname] = values[optionname] + 1 else: values[optionname] = 1 @@ -468,7 +470,7 @@ class Application: else: rc = handler(value) if rc is not None: - raise SystemExit, rc + raise SystemExit(rc) # Apply final file check (for backward compatibility) rc = self.check_files(self.files) diff -r 6040015cb439 -r 238133fcb3c4 Tools/pybench/Dict.py --- a/Tools/pybench/Dict.py Thu Jan 11 17:43:23 2007 -0800 +++ b/Tools/pybench/Dict.py Fri Jan 12 18:28:39 2007 -0800 @@ -351,7 +351,7 @@ class SimpleDictManipulation(Test): def test(self): d = {} - has_key = d.has_key + has_key = lambda key: key in d for i in xrange(self.rounds): @@ -498,7 +498,7 @@ class SimpleDictManipulation(Test): def calibrate(self): d = {} - has_key = d.has_key + has_key = lambda key: key in d for i in xrange(self.rounds): pass diff -r 6040015cb439 -r 238133fcb3c4 Tools/pybench/Exceptions.py --- a/Tools/pybench/Exceptions.py Thu Jan 11 17:43:23 2007 -0800 +++ b/Tools/pybench/Exceptions.py Fri Jan 12 18:28:39 2007 -0800 @@ -20,15 +20,15 @@ class TryRaiseExcept(Test): except: pass try: - raise error,"something" - except: - pass - try: - raise error,"something" - except: - pass - try: - raise error,"something" + raise error("something") + except: + pass + try: + raise error("something") + except: + pass + try: + raise error("something") except: pass try: diff -r 6040015cb439 -r 238133fcb3c4 Tools/pybench/Lookups.py --- a/Tools/pybench/Lookups.py Thu Jan 11 17:43:23 2007 -0800 +++ b/Tools/pybench/Lookups.py Fri Jan 12 18:28:39 2007 -0800 @@ -774,155 +774,155 @@ class BuiltinMethodLookup(Test): l.sort l.sort - d.has_key - d.has_key - d.has_key - d.has_key - d.has_key - - d.items - d.items - d.items - d.items - d.items - - d.get - d.get - d.get - d.get - d.get - - l.append - l.append - l.append - l.append - l.append - - l.insert - l.insert - l.insert - l.insert - l.insert - - l.sort - l.sort - l.sort - l.sort - l.sort - - d.has_key - d.has_key - d.has_key - d.has_key - d.has_key - - d.items - d.items - d.items - d.items - d.items - - d.get - d.get - d.get - d.get - d.get - - l.append - l.append - l.append - l.append - l.append - - l.insert - l.insert - l.insert - l.insert - l.insert - - l.sort - l.sort - l.sort - l.sort - l.sort - - d.has_key - d.has_key - d.has_key - d.has_key - d.has_key - - d.items - d.items - d.items - d.items - d.items - - d.get - d.get - d.get - d.get - d.get - - l.append - l.append - l.append - l.append - l.append - - l.insert - l.insert - l.insert - l.insert - l.insert - - l.sort - l.sort - l.sort - l.sort - l.sort - - d.has_key - d.has_key - d.has_key - d.has_key - d.has_key - - d.items - d.items - d.items - d.items - d.items - - d.get - d.get - d.get - d.get - d.get - - l.append - l.append - l.append - l.append - l.append - - l.insert - l.insert - l.insert - l.insert - l.insert - - l.sort - l.sort - l.sort - l.sort - l.sort - - d.has_key - d.has_key - d.has_key - d.has_key - d.has_key + # d.has_key + # d.has_key + # d.has_key + # d.has_key + # d.has_key + + d.items + d.items + d.items + d.items + d.items + + d.get + d.get + d.get + d.get + d.get + + l.append + l.append + l.append + l.append + l.append + + l.insert + l.insert + l.insert + l.insert + l.insert + + l.sort + l.sort + l.sort + l.sort + l.sort + + # d.has_key + # d.has_key + # d.has_key + # d.has_key + # d.has_key + + d.items + d.items + d.items + d.items + d.items + + d.get + d.get + d.get + d.get + d.get + + l.append + l.append + l.append + l.append + l.append + + l.insert + l.insert + l.insert + l.insert + l.insert + + l.sort + l.sort + l.sort + l.sort + l.sort + + # d.has_key + # d.has_key + # d.has_key + # d.has_key + # d.has_key + + d.items + d.items + d.items + d.items + d.items + + d.get + d.get + d.get + d.get + d.get + + l.append + l.append + l.append + l.append + l.append + + l.insert + l.insert + l.insert + l.insert + l.insert + + l.sort + l.sort + l.sort + l.sort + l.sort + + # d.has_key + # d.has_key + # d.has_key + # d.has_key + # d.has_key + + d.items + d.items + d.items + d.items + d.items + + d.get + d.get + d.get + d.get + d.get + + l.append + l.append + l.append + l.append + l.append + + l.insert + l.insert + l.insert + l.insert + l.insert + + l.sort + l.sort + l.sort + l.sort + l.sort + + # d.has_key + # d.has_key + # d.has_key + # d.has_key + # d.has_key d.items d.items