lazr.restful

Merge lp:~leonardr/lazr.restful/remove-26ism into lp:lazr.restful

  1. remove-26ism
  2. Merge into trunk
Proposed by Leonard Richardson
Status: Merged
Approved by: Paul Hummer
Approved revision: 147
Merged at revision: 147
Proposed branch: lp:~leonardr/lazr.restful/remove-26ism
Merge into: lp:lazr.restful
Diff against target: 37 lines (+8/-3)
3 files modified
src/lazr/restful/NEWS.txt (+5/-0)
src/lazr/restful/_resource.py (+2/-2)
src/lazr/restful/version.txt (+1/-1)
To merge this branch: bzr merge lp:~leonardr/lazr.restful/remove-26ism
Reviewer Review Type Date Requested Status
Paul Hummer (community) Approve
Review via email: mp+36493@code.launchpad.net

Description of the change

This branch simply removes an idiom specific to Python 2.6. Since lazr.restful is part of Launchpad, we need to keep the code compatible with 2.5.

To post a comment you must log in.
Revision history for this message
Leonard Richardson (leonardr) wrote :

I should mention that this is lifeless's code, not mine. I think it looks good (and it solves the problem, since lifeless has already 'released' this version of lazr.restful and put it into Launchpad), but since it's trivial there's no harm in having someone else look at it.

Revision history for this message
Paul Hummer (rockstar) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/lazr/restful/NEWS.txt'
2--- src/lazr/restful/NEWS.txt 2010-09-06 20:16:02 +0000
3+++ src/lazr/restful/NEWS.txt 2010-09-23 19:25:55 +0000
4@@ -2,6 +2,11 @@
5 NEWS for lazr.restful
6 =====================
7
8+0.13.1 (2010-09-23)
9+===================
10+
11+Removed a Python 2.6-ism to restore compatibility with Python 2.5.
12+
13 0.13.0 (2010-09-06)
14 ===================
15
16
17=== modified file 'src/lazr/restful/_resource.py'
18--- src/lazr/restful/_resource.py 2010-09-06 19:25:17 +0000
19+++ src/lazr/restful/_resource.py 2010-09-23 19:25:55 +0000
20@@ -921,8 +921,8 @@
21 allow_string += " DELETE"
22 self.request.response.setStatus(405)
23 self.request.response.setHeader("Allow", allow_string)
24- except Exception as e:
25- # If the execption was decorated in such a way to indicate that
26+ except Exception, e:
27+ # If the exception was decorated in such a way to indicate that
28 # the error is the client's fault (i.e., not a bug in the web
29 # service), then the error should be communicated to the client
30 # without the publisher framework treating the response as an
31
32=== modified file 'src/lazr/restful/version.txt'
33--- src/lazr/restful/version.txt 2010-09-06 20:16:02 +0000
34+++ src/lazr/restful/version.txt 2010-09-23 19:25:55 +0000
35@@ -1,1 +1,1 @@
36-0.13.0
37+0.13.1

Subscribers

People subscribed via source and target branches