fix for incorrect except: syntax, issue2550661

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/roundup/trunk@4514 57a73879-2fb5-44c3-a270-3262357dd7e2

diff --git a/doc/acknowledgements.txt b/doc/acknowledgements.txt
index ddeec33d88068ad000aa356ee0bfb9e3eaac886b..34ab5d332d9e804f802eda79420b444a112bb137 100644 (file)
--- a/doc/acknowledgements.txt
+++ b/doc/acknowledgements.txt
@@ -133,6 +133,7 @@ Martin Uzak,
 Darryl VanDorp,
 J Vickroy,
 Timothy J. Warren,
+Jakub Wilk,
 William (Wilk),
 Tue Wennerberg,
 Matt Wilbert,

diff --git a/roundup/anypy/sets_.py b/roundup/anypy/sets_.py
index e1f2f309e685423528041f3b4f24d5835ae8a61a..b3e7c451a8d9c5ae6a385969434899f20f98cd9e 100644 (file)
--- a/roundup/anypy/sets_.py
+++ b/roundup/anypy/sets_.py
@@ -24,7 +24,7 @@ http://docs.python.org/library/sets.html#comparison-to-the-built-in-set-types
 
 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

diff --git a/roundup/hyperdb.py b/roundup/hyperdb.py
index 8825eb7fe5e08b3b58da806e3158c8df9046c12b..93f93b8c315738f1384ac329c81482f82cd3e085 100644 (file)
--- a/roundup/hyperdb.py
+++ b/roundup/hyperdb.py
@@ -1101,7 +1101,7 @@ class Class:
         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