Merge lp:~cmiller/desktopcouch/recorddict_more_dictly into lp:desktopcouch

[Chad Miller]

desktopcouch.record.RecordDict needs .has_key() to be more like the dict that we emulate. This sucks because dict.has_key is going away in Py 3, but let's be extra nice for another year or so.

[John O'Brien (jdobrien)]

review: Approve

[Eric Casteleijn (thisfred)]

Looks good. When the server goes to lucid, we can use an ABC, and we won't have to worry about missing API anymore.

review: Approve

[Eric Casteleijn (thisfred)]

(because then the server will have python 2.6)

[Stuart Langridge (sil)]

review: Approve

=== modified file 'desktopcouch/records/record.py'
--- desktopcouch/records/record.py	2009-12-10 20:41:13 +0000
+++ desktopcouch/records/record.py	2010-01-25 15:17:11 +0000
@@ -226,6 +226,10 @@
             self[key] = default
         return self[key]
 
+    def has_key(self, key):
+        return key in self
+        
+
 
 class MergeableList(RecordData):
     """An object that represents a list of complex values."""

=== modified file 'desktopcouch/records/tests/test_record.py'
--- desktopcouch/records/tests/test_record.py	2009-12-10 15:36:11 +0000
+++ desktopcouch/records/tests/test_record.py	2010-01-25 15:17:11 +0000
@@ -111,6 +111,8 @@
             ['a', 'b', 'record_type', 'subfield', 'subfield_uuid'],
             sorted(self.record.keys()))
         self.assertIn("a", self.record)
+        self.assertTrue(self.record.has_key("a"))
+        self.assertFalse(self.record.has_key("f"))
         self.assertNotIn("_id", self.record)  # is internal.  play dumb.
 
     def test_application_annotations(self):