Merge lp:~leonardr/lazr.restful/0.9.5.1 into lp:lazr.restful

[Leonard Richardson]

[Leonard Richardson (leonardr)]

This is branched from revision 64 of lazr.restful, which was the basis for version 0.9.5. It backports the fix for bug 387297 to version 0.9.5.

(The only difference between revision 64 and a tarball of 0.9.5 is that in revision 64's NEWS.txt, the name of the version is still "Development", not 0.9.5.)

[Leonard Richardson (leonardr)]

The original fix to this bug shows up as part of revision 80.

[Leonard Richardson (leonardr)]

=== modified file 'src/lazr/restful/_resource.py'
--- src/lazr/restful/_resource.py 2009-08-11 16:40:43 +0000
+++ src/lazr/restful/_resource.py 2009-10-23 17:17:29 +0000
@@ -882,7 +882,7 @@
             self.request.response.setStatus(415)
             return None, 'Expected a media type of %s.' % self.JSON_TYPE
         try:
- h = simplejson.loads(unicode(representation))
+ h = simplejson.loads(representation.decode('utf-8'))
         except ValueError:
             self.request.response.setStatus(400)
             return None, "Entity-body was not a well-formed JSON document."

=== modified file 'src/lazr/restful/docs/webservice.txt'
--- src/lazr/restful/docs/webservice.txt 2009-08-11 18:36:20 +0000
+++ src/lazr/restful/docs/webservice.txt 2009-10-23 17:17:29 +0000
@@ -1819,11 +1819,13 @@

 A PATCH request will automatically result in a modification event
 being sent out about the modified object, which means that
-modify_cookbook() will be run. Here, we modify the name of one of the
-cookbooks.
+modify_cookbook() will be run. Here, we modify the name and the
+cuisine of one of the cookbooks. Note that the cuisine contains
+non-ASCII characters.

     >>> headers = {'CONTENT_TYPE' : 'application/json'}
- >>> body = '{"name" : "The Joy of Cooking (revised)"}'
+ >>> body = '''{"name" : "The Joy of Cooking (revised)",
+ ... "cuisine" : "\xd7\x97\xd7\x95\xd7\x9e\xd7\x95\xd7\xa1"}'''

     >>> patch_request = create_web_service_request(
     ... '/beta/cookbooks/The%20Joy%20of%20Cooking', body=body,

[Gary Poster (gary)]

Thank you

Gary

review: Approve

[lp:~leonardr/lazr.restful/0.9.5.1]

66. By Leonard Richardson on 2009-10-23

Updated version and NEWS.

=== modified file 'src/lazr/restful/NEWS.txt'
--- src/lazr/restful/NEWS.txt	2009-10-21 14:42:43 +0000
+++ src/lazr/restful/NEWS.txt	2009-10-23 17:44:11 +0000
@@ -2,6 +2,7 @@
 NEWS for lazr.restful
 =====================
 
+<<<<<<< TREE
 0.9.15 (2009-10-21)
 ===================
 
@@ -70,6 +71,16 @@
 
 0.9.5 (2009-08-26)
 ==================
+=======
+0.9.5.1 (2009-10-23)
+====================
+
+Backported a fix for a bug that prevented some incoming strings from
+being loaded by simplejson.
+
+0.9.5 (2009-08-26)
+==================
+>>>>>>> MERGE-SOURCE
 
 Added a function that generates a basic WSGI application, given a
 service root class, a publication class, and a response class.

=== modified file 'src/lazr/restful/_resource.py'
=== modified file 'src/lazr/restful/docs/webservice.txt'
=== modified file 'src/lazr/restful/version.txt'
--- src/lazr/restful/version.txt	2009-10-21 14:42:43 +0000
+++ src/lazr/restful/version.txt	2009-10-23 17:44:11 +0000
@@ -1,1 +1,5 @@
+<<<<<<< TREE
 0.9.15
+=======
+0.9.5.1
+>>>>>>> MERGE-SOURCE