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
=== modified file 'src/lazr/restful/NEWS.txt'
--- src/lazr/restful/NEWS.txt 2010-09-06 20:16:02 +0000
+++ src/lazr/restful/NEWS.txt 2010-09-23 19:25:55 +0000
@@ -2,6 +2,11 @@
2NEWS for lazr.restful2NEWS for lazr.restful
3=====================3=====================
44
50.13.1 (2010-09-23)
6===================
7
8Removed a Python 2.6-ism to restore compatibility with Python 2.5.
9
50.13.0 (2010-09-06)100.13.0 (2010-09-06)
6===================11===================
712
813
=== modified file 'src/lazr/restful/_resource.py'
--- src/lazr/restful/_resource.py 2010-09-06 19:25:17 +0000
+++ src/lazr/restful/_resource.py 2010-09-23 19:25:55 +0000
@@ -921,8 +921,8 @@
921 allow_string += " DELETE"921 allow_string += " DELETE"
922 self.request.response.setStatus(405)922 self.request.response.setStatus(405)
923 self.request.response.setHeader("Allow", allow_string)923 self.request.response.setHeader("Allow", allow_string)
924 except Exception as e:924 except Exception, e:
925 # If the execption was decorated in such a way to indicate that925 # If the exception was decorated in such a way to indicate that
926 # the error is the client's fault (i.e., not a bug in the web926 # the error is the client's fault (i.e., not a bug in the web
927 # service), then the error should be communicated to the client927 # service), then the error should be communicated to the client
928 # without the publisher framework treating the response as an928 # without the publisher framework treating the response as an
929929
=== modified file 'src/lazr/restful/version.txt'
--- src/lazr/restful/version.txt 2010-09-06 20:16:02 +0000
+++ src/lazr/restful/version.txt 2010-09-23 19:25:55 +0000
@@ -1,1 +1,1 @@
10.13.010.13.1

Subscribers

People subscribed via source and target branches