Merge lp:~stevenk/lazr.restful/dict-unmarshaller-none into lp:lazr.restful

[Steve Kowalik]

The dict marshaller can now unmarshall None without de-praming its toys.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'src/lazr/restful/NEWS.txt'
--- src/lazr/restful/NEWS.txt	2012-09-26 08:05:24 +0000
+++ src/lazr/restful/NEWS.txt	2012-10-01 23:20:29 +0000
@@ -2,6 +2,11 @@
 NEWS for lazr.restful
 =====================
 
+0.19.8 (2012-10-02)
+===================
+
+Fixed bug 1020439: The dict marshaller will now correctly unmarshall None.
+
 0.19.7 (2012-09-26)
 ===================
 

=== modified file 'src/lazr/restful/docs/webservice-marshallers.txt'
--- src/lazr/restful/docs/webservice-marshallers.txt	2012-03-15 03:11:15 +0000
+++ src/lazr/restful/docs/webservice-marshallers.txt	2012-10-01 23:20:29 +0000
@@ -904,6 +904,11 @@
     >>> sorted(unmarshalled.iteritems())
     [(u'bar', 'General'), (u'foo', 'Vegetarian')]
 
+The unmarshall() method will return None when given None.
+
+    >>> dict_marshaller.unmarshall(None, None)
+    None
+
 CollectionField
 ---------------
 

=== modified file 'src/lazr/restful/marshallers.py'
--- src/lazr/restful/marshallers.py	2012-03-15 03:32:05 +0000
+++ src/lazr/restful/marshallers.py	2012-10-01 23:20:29 +0000
@@ -536,6 +536,8 @@
         The value is unmarshalled into a dict and all its items are
         unmarshalled using the appropriate FieldMarshaller.
         """
+        if value is None:
+            return value
         return dict(
             (self.key_marshaller.unmarshall(entry, key),
             self.value_marshaller.unmarshall(entry, val))

=== modified file 'src/lazr/restful/version.txt'
--- src/lazr/restful/version.txt	2012-09-26 08:05:24 +0000
+++ src/lazr/restful/version.txt	2012-10-01 23:20:29 +0000
@@ -1,1 +1,1 @@
-0.19.7
+0.19.8