Merge lp:~leonardr/lazr.restful/474522-oops-backport into lp:~lazr-developers/lazr.restful/oops-fix

[Leonard Richardson]

[Leonard Richardson (leonardr)]

This branch backports my fix to bug 474522 to lazr.restful 0.9.13, so that it can be cherry-picked into production. It will be merged into a master "oops fix" branch that takes 0.9.13 as its base.

[Brad Crittenden (bac)]

review: Approve (code)

=== modified file 'src/lazr/restful/NEWS.txt'
--- src/lazr/restful/NEWS.txt	2009-10-19 17:27:37 +0000
+++ src/lazr/restful/NEWS.txt	2009-11-10 15:55:20 +0000
@@ -2,6 +2,12 @@
 NEWS for lazr.restful
 =====================
 
+0.9.13.1 (2009-11-16)
+=====================
+
+Fixed a bug that raised an unhandled exception when a client tried to
+set a URL field to a non-string value.
+
 0.9.13 (2009-10-19)
 ===================
 

=== modified file 'src/lazr/restful/docs/webservice-marshallers.txt'
--- src/lazr/restful/docs/webservice-marshallers.txt	2009-09-01 12:07:59 +0000
+++ src/lazr/restful/docs/webservice-marshallers.txt	2009-11-10 15:55:20 +0000
@@ -17,7 +17,6 @@
     >>> request.setPublication(WebServiceTestPublication(application))
     >>> request.processInputs()
 
-==========================================
 IFieldMarshaller and SimpleFieldMarshaller
 ==========================================
 
@@ -63,7 +62,6 @@
     >>> print marshaller.marshall_from_json_data(None)
     None
 
-=======================
 marshall_from_request()
 =======================
 
@@ -107,7 +105,6 @@
     >>> marshaller.marshall_from_request(['value1', 'value2'])
     ['value1', 'value2']
 
-
 unmarshall() and variants
 =========================
 
@@ -132,12 +129,11 @@
     'foo'
 
 
-================================
 Marshallers for basic data types
 ================================
 
 Bool
-====
+----
 
 The marshaller for a Bool field checks that the JSON value is either
 True or False. A ValueError is raised when its not the case.
@@ -188,7 +184,7 @@
     ValueError: got 'str', expected bool: 'True'
 
 Int
-===
+---
 
 The marshaller for an Int field checks that the JSON value is an
 integer. A ValueError is raised when its not the case.
@@ -245,7 +241,7 @@
     ValueError: got 'unicode', expected int: u'0x04'
 
 Float
-=====
+-----
 
 The marshaller for a Float field checks that the JSON value is indeed a
 float.  A ValueError is raised when it's not the case.
@@ -290,7 +286,7 @@
     ValueError: got 'str', expected float, int: 'True'
 
 Datetime
-========
+--------
 
 The marshaller for a Datetime field checks that the JSON value is indeed a
 parsable datetime stamp.
@@ -346,7 +342,7 @@
     ValueError: Value doesn't look like a date.
 
 Date
-====
+----
 
 The marshaller for a Date field checks that the JSON value is indeed a
 parsable date.
@@ -367,7 +363,7 @@
     datetime.date(2009, 7, 7)
 
 Text
-====
+----
 
 The marshaller for IText field checks that the value is a unicode
 string. A ValueError is raised when that's not the case.
@@ -412,7 +408,7 @@
     None
 
 Bytes
-=====
+-----
 
 Since there is no way to represent a bytes string in JSON, all strings
 are converted to a byte string using UTF-8 encoding. If the value isn't
@@ -480,7 +476,6 @@
     >>> marshaller.unmarshall(entry_resource, None)
     'http://.../cookbooks/Everyday%20Greens/data'
 
----------
 ASCIILine
 ---------
 
@@ -502,7 +497,7 @@
     >>> marshaller.marshall_from_json_data(u'int\xe9ressant')
     u'int\xe9ressant'
 
-Non-string alues like floats are rejected.
+Non-string values like floats are rejected.
 
     >>> marshaller.marshall_from_json_data(1.0)
     Traceback (most recent call last):
@@ -542,7 +537,6 @@
     >>> marshaller.representation_name
     'field'
 
-==================
 Choice marshallers
 ==================
 
@@ -552,7 +546,7 @@
     >>> from zope.schema import Choice
 
 Choice for IVocabularyTokenized
-===============================
+-------------------------------
 
 The default marshaller will use the vocabulary getTermByToken to
 retrieve the value to use. It raises an error if the value isn't in the
@@ -595,9 +589,8 @@
     [('title', None), ('token', 'a value')]
     [('title', None), ('token', 'True')]
 
-
 Choice of EnumeratedTypes
-=========================
+-------------------------
 
 The JSON representation of the enumerated value is its title.  A string
 that corresponds to one of the values is marshalled to the appropriate
@@ -641,9 +634,8 @@
     [('title', 'Vegetarian'), ('token', 'VEGETARIAN')]
 
 
-=======
 Objects
-=======
+-------
 
 An object is marshalled to its URL.
 
@@ -667,9 +659,21 @@
     >>> cookbook.name
     u'Mastering the Art of French Cooking'
 
-===========
+    >>> reference_marshaller.marshall_from_json_data("not a url")
+    Traceback (most recent call last):
+    ...
+    ValueError: "not a url" is not a valid URI.
+
+    >>> reference_marshaller.marshall_from_json_data(4)
+    Traceback (most recent call last):
+    ...
+    ValueError: got 'int', expected string: 4
+
+    >>> print reference_marshaller.marshall_from_json_data(None)
+    None
+
 Collections
-===========
+-----------
 
 The most complicated kind of marshaller is one that manages a
 collection of objects associated with some other object. The generic
@@ -787,9 +791,8 @@
     >>> sorted(set_marshaller.unmarshall(None, marshalled_set))
     ['Dessert', 'Vegetarian']
 
-===============
 CollectionField
-===============
+---------------
 
 Since CollectionField are really a list of references to other
 objects, and they are exposed using a dedicated CollectionResource,

=== modified file 'src/lazr/restful/marshallers.py'
--- src/lazr/restful/marshallers.py	2009-07-14 20:54:06 +0000
+++ src/lazr/restful/marshallers.py	2009-11-10 15:55:20 +0000
@@ -71,6 +71,9 @@
         else:
             request_port = default_port
 
+        if not isinstance(url, basestring):
+            raise ValueError("got '%s', expected string: %r" % (
+                type(url).__name__, url))
         uri = URI(url)
         protocol = uri.scheme
         host = uri.host

=== modified file 'src/lazr/restful/version.txt'
--- src/lazr/restful/version.txt	2009-10-15 15:32:57 +0000
+++ src/lazr/restful/version.txt	2009-11-10 15:55:20 +0000
@@ -1,1 +1,1 @@
-0.9.13
+0.9.13.1