--- a/roundup/anypy/sets_.py +++ b/roundup/anypy/sets_.py @@ -24,7 +24,7 @@ try: set = set # built-in since Python 2.4 -except NameError, TypeError: +except (NameError, TypeError): from sets import Set as set # deprecated as of Python 2.6 # vim: ts=8 sts=4 sw=4 si et --- a/roundup/hyperdb.py +++ b/roundup/hyperdb.py @@ -1101,7 +1101,7 @@ for k in propname_path.split('.'): try: prop = props[k] - except KeyError, TypeError: + except (KeyError, TypeError): return default cl = getattr(prop, 'classname', None) props = None