Merge lp:~maxb/bzr-svn/preserve-tb into lp:bzr-svn/1.0

Proposed by Max Bowsher
Status: Merged
Merged at revision: 3497
Proposed branch: lp:~maxb/bzr-svn/preserve-tb
Merge into: lp:bzr-svn/1.0
Diff against target: 18 lines (+7/-1)
1 file modified
errors.py (+7/-1)
To merge this branch: bzr merge lp:~maxb/bzr-svn/preserve-tb
Reviewer Review Type Date Requested Status
Jelmer Vernooij (community) Approve
Review via email: mp+45943@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

I'd prefer renaming e to svn_error and e2 to bzr_error. Otherwise, happy to land this.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'errors.py'
2--- errors.py 2010-08-01 03:55:05 +0000
3+++ errors.py 2011-01-12 00:31:30 +0000
4@@ -143,7 +143,13 @@
5 try:
6 return unbound(*args, **kwargs)
7 except subvertpy.SubversionException, e:
8- raise convert_error(e)
9+ e2 = convert_error(e)
10+ if e is e2:
11+ # Bare 'raise' preserves the original traceback, whereas
12+ # 'raise e' would not.
13+ raise
14+ else:
15+ raise e2
16
17 convert.__doc__ = unbound.__doc__
18 convert.__name__ = unbound.__name__

Subscribers

People subscribed via source and target branches