From: richard <richard@57a73879-2fb5-44c3-a270-3262357dd7e2>
Date: Mon, 9 Aug 2010 04:45:28 +0000 (+0000)
Subject: fix for incorrect except: syntax, issue2550661
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=34e25899f48383af00cc01a9c4ca189d4125b424;p=roundup.git

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 ddeec33..34ab5d3 100644
--- 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 e1f2f30..b3e7c45 100644
--- 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 8825eb7..93f93b8 100644
--- 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