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

[Leonard Richardson]

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.

[Leonard Richardson (leonardr)]

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.

[Paul Hummer (rockstar)]

review: Approve

=== 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 @@
 NEWS for lazr.restful
 =====================
 
+0.13.1 (2010-09-23)
+===================
+
+Removed a Python 2.6-ism to restore compatibility with Python 2.5.
+
 0.13.0 (2010-09-06)
 ===================
 

=== 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 @@
                     allow_string += " DELETE"
                 self.request.response.setStatus(405)
                 self.request.response.setHeader("Allow", allow_string)
-        except Exception as e:
-            # If the execption was decorated in such a way to indicate that
+        except Exception, e:
+            # If the exception was decorated in such a way to indicate that
             # the error is the client's fault (i.e., not a bug in the web
             # service), then the error should be communicated to the client
             # without the publisher framework treating the response as an

=== 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 @@
-0.13.0
+0.13.1