Merge lp:~brian.curtin/ubuntuone-dev-tools/py3-exception into lp:ubuntuone-dev-tools

Proposed by Brian Curtin
Status: Merged
Approved by: Roberto Alsina
Approved revision: 81
Merged at revision: 85
Proposed branch: lp:~brian.curtin/ubuntuone-dev-tools/py3-exception
Merge into: lp:ubuntuone-dev-tools
Diff against target: 12 lines (+1/-1)
1 file modified
ubuntuone/devtools/testcases/dbus.py (+1/-1)
To merge this branch: bzr merge lp:~brian.curtin/ubuntuone-dev-tools/py3-exception
Reviewer Review Type Date Requested Status
Alejandro J. Cura (community) Approve
Review via email: mp+120480@code.launchpad.net

Commit message

- Adjust exception handling to work on Python 3

Description of the change

One usage of exception handling syntax doesn't conform with Python 3's way of handling exceptions. Change an ImportError to use the "as" way instead of the old comma separated way.

To post a comment you must log in.
Revision history for this message
Alejandro J. Cura (alecu) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone/devtools/testcases/dbus.py'
2--- ubuntuone/devtools/testcases/dbus.py 2012-07-27 19:02:53 +0000
3+++ ubuntuone/devtools/testcases/dbus.py 2012-08-20 22:32:23 +0000
4@@ -45,7 +45,7 @@
5 # pylint: disable=F0401,C0103,W0406,E0611
6 try:
7 import dbus
8-except ImportError, e:
9+except ImportError as e:
10 dbus = None
11
12 try:

Subscribers

People subscribed via source and target branches

to all changes: