Merge lp:~thisfred/desktopcouch/fix-fieldmappings into lp:desktopcouch

[Eric Casteleijn]

Fixes bug #416963: fieldregistry transformers now return results, and don't need a record or dictionary like object passed in.

Fixes bug #416963: fieldregistry transformers now return results, and don't need a record or dictionary like object passed in. (They will still accept one, to preserve backward compatibility, and to make it possible to initialize some date before the transformation.)

[Eric Casteleijn (thisfred)]

90% of the diff comes from delinting, you'll be happy to know.

[Eric Casteleijn (thisfred)]

The meat of the real changes is in field_registry.py and its tests

[dobey (dobey)]

review: Approve

[Vincenzo Di Somma (vds)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:desktopcouch failed due to conflicts:

text conflict in desktopcouch/records/tests/test_field_registry.py
text conflict in desktopcouch/records/tests/test_record.py
text conflict in utilities/lint.sh

[Chad Miller (cmiller)]

Approve revno 204.

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2010-11-12 14:40:00 +0000
@@ -0,0 +1,2 @@
+_trial_temp
+.coverage

=== modified file 'bin/desktopcouch-pair'
--- bin/desktopcouch-pair	2010-04-05 21:17:42 +0000
+++ bin/desktopcouch-pair	2010-11-12 14:40:00 +0000
@@ -22,7 +22,7 @@
 
 A tool to set two local machines to replicate their couchdb instances to each
 other, or to set this machine to replicate to-and-from Ubuntu One (and perhaps
-other cloud services).  
+other cloud services).
 
 Local-Pairing Authentication
 ----------------------------
@@ -37,7 +37,7 @@
 
 Alice then computes the SHA512 digest of Bob's secret and compares it to be
 sure that the other machine is indeed the user's.  Alice then concatenates
-Bob's secret and the public seed, and sends the resulting hex digest back to 
+Bob's secret and the public seed, and sends the resulting hex digest back to
 Bob to prove that she received the secret from the user.  Alice sets herself to
 replicate to Bob.
 
@@ -50,7 +50,7 @@
 import logging
 import getpass
 import gettext
-# gettext implements "_" function.  pylint: disable-msg=E0602
+# gettext implements "_" function.  pylint: disable=E0602
 import random
 import cgi
 
@@ -122,13 +122,13 @@
 
     We see listeners on the network and send invitations to pair with us.
     We generate a secret message and a public seed.  We get the SHA512 hex
-    digest of the secret message, append the public seed and send it to 
-    Alice.  We also display the cleartext of the secret message to the 
+    digest of the secret message, append the public seed and send it to
+    Alice.  We also display the cleartext of the secret message to the
     screen, so that the user can take it to the machine he thinks is Alice.
 
-    Eventually, we receive a message back from Alice.  We compute the 
-    secret message we started with concatenated with the public seed, and 
-    if that matches Alice's message, then Alice must know the secret we 
+    Eventually, we receive a message back from Alice.  We compute the
+    secret message we started with concatenated with the public seed, and
+    if that matches Alice's message, then Alice must know the secret we
     displayed to the user.  We then set outselves to replicate to Alice."""
 
     def delete_event(self, widget, event, data=None):
@@ -167,7 +167,7 @@
         self.secret_message = secret_message
         self.public_seed = generate_secret()
 
-        self.inviter = network_io.start_send_invitation(hostname, port, 
+        self.inviter = network_io.start_send_invitation(hostname, port,
                 self.auth_completed, self.secret_message, self.public_seed,
                 self.on_close, couchdb_io.get_my_host_unique_id(create=True)[0],
                 local_files.get_oauth_tokens())
@@ -180,7 +180,7 @@
                 """us, and to prove veracity of the invitation we\n""" +
                 """sent, it is waiting for you to tell it this secret:\n""" +
                 """<span font-size="xx-large" color="blue" weight="bold">""" +
-                """<tt>%s</tt></span> .""") % 
+                """<tt>%s</tt></span> .""") %
                         (cgi.escape(service), cgi.escape(self.secret_message)))
         text.set_justify(gtk.JUSTIFY_CENTER)
         top_vbox.pack_start(text, False, False, 10)
@@ -197,7 +197,7 @@
 
 class AcceptInvitation:
     """We're part of 'Alice' in this module's story.
-    
+
     We've received an invitation.  We now send the other end a secret key.  The
     secret should make its way back to us via meatspace.  We open a dialog
     asking for that secret here, which we validate.
@@ -258,7 +258,7 @@
 
         self.result = gtk.Label("")
         self.result.show()
-        self.entry_box.connect("changed", 
+        self.entry_box.connect("changed",
                 lambda widget: self.result.set_text(""))
         top_vbox.pack_start(self.result, False, False, 0)
 
@@ -300,7 +300,7 @@
 
 class Listening:
     """We're part of 'Alice' in this module's story.
-    
+
     Window that starts listening for other machines to pick *us* to pair
     with.  There must be at least one of these on the network for pairing to
     happen.  We listen for a finite amount of time, and then stop."""
@@ -337,7 +337,7 @@
         we're listening."""
 
         self.listener = network_io.ListenForInvitations(
-                self.receive_invitation_challenge, 
+                self.receive_invitation_challenge,
                 lambda: self.window.destroy(),
                 couchdb_io.get_my_host_unique_id(create=True)[0],
                 local_files.get_oauth_tokens())
@@ -407,16 +407,16 @@
         text = gtk.Label()
         text.set_markup(
                 _("""We're listening for invitations!  From another\n""" +
-                    """machine on this local network, run this\n""" + 
-                    """same tool and find the machine called\n""" + 
-                    """<span font-size="xx-large" weight="bold"><tt>""" + 
-                    """%s-%s-%d</tt></span> .""") % 
-                            (cgi.escape(hostid), cgi.escape(userid), 
+                    """machine on this local network, run this\n""" +
+                    """same tool and find the machine called\n""" +
+                    """<span font-size="xx-large" weight="bold"><tt>""" +
+                    """%s-%s-%d</tt></span> .""") %
+                            (cgi.escape(hostid), cgi.escape(userid),
                             listen_port))
         text.set_justify(gtk.JUSTIFY_CENTER)
         top_vbox.pack_start(text, False, False, 10)
         text.show()
-    
+
         self.update_counter_view()
         self.window.show_all()
 
@@ -444,7 +444,7 @@
 
         self.update_counter_view()
         return True
-        
+
 
 class PickOrListen:
     """Main top-level window that represents the life of the application."""
@@ -459,7 +459,7 @@
 
     def create_pick_pane(self, container):
         """Set up the pane that contains what's necessary to choose an
-        already-listening tool instance.  This sets up a "Bob" in the 
+        already-listening tool instance.  This sets up a "Bob" in the
         module's story."""
 
         # positions:                 host id, descr, host, port, cloud_name
@@ -473,15 +473,15 @@
             srv = getattr(services, srv_name)
             try:
                 if srv.is_active():
-                    all_paired_cloud_servers = [x.key for x in 
+                    all_paired_cloud_servers = [x.key for x in
                         couchdb_io.get_pairings()]
                     if not srv_name in all_paired_cloud_servers:
-                        self.listening_hosts.append(None, 
+                        self.listening_hosts.append(None,
                                 [srv.name, srv.description, "", 0, srv_name])
             except Exception, e:
                 self.logging.exception("service %r has errors", srv_name)
 
-        self.inviting = None  # pylint: disable-msg=W0201
+        self.inviting = None  # pylint: disable=W0201
 
         hostname_col = gtk.TreeViewColumn(_("hostname"))
         hostid_col = gtk.TreeViewColumn(_("service name"))
@@ -500,7 +500,7 @@
         tv.show()
 
         def clicked(selection):
-            """An item in the list of services was clicked, so now we go 
+            """An item in the list of services was clicked, so now we go
             about inviting it to pair with us."""
 
             model, iter = selection.get_selected()
@@ -511,7 +511,7 @@
             hostname = model.get_value(iter, 2)
             port = model.get_value(iter, 3)
             service_name = model.get_value(iter, 4)
-            
+
             if service_name:
                 # Pairing with a cloud service, which doesn't do key exchange
                 pair_with_cloud_service(service_name, self.window)
@@ -519,7 +519,7 @@
                 self.listening_hosts.remove(iter)
                 # add to already-paired list
                 srv = getattr(services, service_name)
-                self.already_paired_hosts.append(None, 
+                self.already_paired_hosts.append(None,
                         [service, _("paired just now"), hostname, port, service_name, None])
                 return
 
@@ -548,7 +548,7 @@
             self.listening_hosts.append(None, [name, description, host, port, None])
 
         def remove_service_from_list(name):
-            """When a zeroconf service disappears, this finds it in the 
+            """When a zeroconf service disappears, this finds it in the
             listing and removes it as an option for picking."""
 
             it = self.listening_hosts.get_iter_first()
@@ -604,7 +604,7 @@
                         already_paired_record.value.get("ctime",
                                 _("unknown date"))
                 try:
-                    self.already_paired_hosts.append(None, 
+                    self.already_paired_hosts.append(None,
                             [srv.name, nice_description, "", 0, srv_name, pid])
                 except Exception, e:
                     logging.error("Service %s had an error", srv_name, e)
@@ -613,7 +613,7 @@
                 nice_description = _("paired ") + \
                         already_paired_record.value.get("ctime",
                                 _("unknown date"))
-                self.already_paired_hosts.append(None, 
+                self.already_paired_hosts.append(None,
                         [hostname, nice_description, None, 0, None, pid])
             else:
                 logging.error("unknown pairing record %s",
@@ -635,7 +635,7 @@
         tv.show()
 
         def clicked(selection):
-            """An item in the list of services was clicked, so now we go 
+            """An item in the list of services was clicked, so now we go
             about inviting it to pair with us."""
 
             model, iter = selection.get_selected()
@@ -646,17 +646,17 @@
             port = model.get_value(iter, 3)
             service_name = model.get_value(iter, 4)
             pid = model.get_value(iter, 5)
-            
+
             if service_name:
                 # delete record
                 for record in couchdb_io.get_pairings():
                     couchdb_io.remove_pairing(record.id, True)
-                    
+
                 # remove from already-paired list
                 self.already_paired_hosts.remove(iter)
                 # add to listening list
                 srv = getattr(services, service_name)
-                self.listening_hosts.append(None, [service, srv.description, 
+                self.listening_hosts.append(None, [service, srv.description,
                         hostname, port, service_name])
                 return
 
@@ -665,7 +665,7 @@
                 if record.value["pairing_identifier"] == pid:
                     couchdb_io.remove_pairing(record.id, False)
                     break
-                
+
             # remove from already-paired list
             self.already_paired_hosts.remove(iter)
             # do not add to listening list -- if it's listening then zeroconf
@@ -699,7 +699,7 @@
 
     def create_single_listen_pane(self, container):
         """This sets up an "Alice" from the module's story.
-        
+
         This assumes we're pairing a single, known local CouchDB instance,
         instead of generic instances that we'd need more information to talk
         about.  Instead of using this function, one might use another that
@@ -749,7 +749,7 @@
         #some_row_in_list.connect("clicked", self.listen, target_db_info)
 
     def __init__(self):
-        
+
 
         self.logging = logging.getLogger(self.__class__.__name__)
 
@@ -802,8 +802,8 @@
         fail_note.run()
         fail_note.destroy()
         return
-    
-    success_note = gtk.Dialog(title=_("Paired with %(hostname)s") % locals(), 
+
+    success_note = gtk.Dialog(title=_("Paired with %(hostname)s") % locals(),
             parent=parent,
             flags=gtk.DIALOG_DESTROY_WITH_PARENT,
             buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,))
@@ -838,7 +838,7 @@
         fail_note.run()
         fail_note.destroy()
         return
-    
+
     success_note = gtk.MessageDialog(
             parent=parent,
             flags=gtk.DIALOG_DESTROY_WITH_PARENT,

=== modified file 'data/source_desktopcouch.py'
--- data/source_desktopcouch.py	2010-02-03 19:39:17 +0000
+++ data/source_desktopcouch.py	2010-11-12 14:40:00 +0000
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 """Stub for Apport"""
-# pylint: disable-msg=F0401,C0103
+# pylint: disable=F0401,C0103
 # shut up about apport. We know. We aren't going to backport it for pqm
 import apport
 from apport.hookutils import attach_file_if_exists, packaging

=== modified file 'desktopcouch/pair/couchdb_pairing/couchdb_io.py'
--- desktopcouch/pair/couchdb_pairing/couchdb_io.py	2010-11-09 17:37:32 +0000
+++ desktopcouch/pair/couchdb_pairing/couchdb_io.py	2010-11-12 14:40:00 +0000
@@ -55,7 +55,7 @@
     protocol = "https" if has_ssl else "http"
     if auth_pair:
         auth = (":".join(
-            map(urllib.quote, auth_pair)) + "@")  # pylint: disable-msg=W0141
+            map(urllib.quote, auth_pair)) + "@")  # pylint: disable=W0141
     else:
         auth = ""
     if (protocol, port) in (("http", 80), ("https", 443)):
@@ -108,7 +108,7 @@
             push_to_server=True, server=hostname, ctx=ctx)
 
 
-def get_static_paired_hosts(uri=None,  # pylint: disable-msg=R0914
+def get_static_paired_hosts(uri=None,  # pylint: disable=R0914
                             ctx=local_files.DEFAULT_CONTEXT, port=None):
     """Retreive a list of static hosts' information in the form of
     (ID, service name, to_push, to_pull) ."""
@@ -251,7 +251,7 @@
             oauth_tokens=oauth_tokens)
 
 
-def replicate(source_database, target_database,   # pylint: disable-msg=R0914
+def replicate(source_database, target_database,   # pylint: disable=R0914
               target_host=None, target_port=None, source_host=None,
               source_port=None, source_ssl=False, target_ssl=False,
               source_oauth=None, target_oauth=None, local_uri=None):
@@ -268,7 +268,7 @@
         else:
             server.CouchDatabase(target_database, create=True, uri=local_uri)
         logging.debug("db exists, and we're ready to replicate")
-    except:                             # pylint: disable-msg=W0702
+    except:                             # pylint: disable=W0702
         logging.exception(
             "can't create/verify %r %s:%d  oauth=%s", target_database,
             target_host, target_port, obsfuscate(target_oauth))
@@ -309,7 +309,7 @@
                 content=record)
         logging.debug(
             "replicate result:  %r  %r", obsfuscate(resp), obsfuscate(data))
-    except:                             # pylint: disable-msg=W0702
+    except:                             # pylint: disable=W0702
         logging.exception("can't replicate %r  %r <== %r", source_database,
                 local_uri, obsfuscate(record))
 

=== modified file 'desktopcouch/pair/tests/test_couchdb_io.py'
--- desktopcouch/pair/tests/test_couchdb_io.py	2010-11-09 17:37:32 +0000
+++ desktopcouch/pair/tests/test_couchdb_io.py	2010-11-12 14:40:00 +0000
@@ -67,8 +67,8 @@
 
     def tearDown(self):
         """tear down each test"""
-        del self.mgt_database._server['management']  # pylint: disable-msg=W0212
-        del self.mgt_database._server['foo']         # pylint: disable-msg=W0212
+        del self.mgt_database._server['management']  # pylint: disable=W0212
+        del self.mgt_database._server['foo']         # pylint: disable=W0212
 
     def test_obsfuscation(self):
         """Test the obfuscation of sensitive data."""
@@ -98,7 +98,7 @@
         self.assertEqual(couchdb_io.obsfuscate({1: {}}), {1: {}})
         self.assertEqual(couchdb_io.obsfuscate({1: 1}), {1: 1})
 
-    def test_put_static_paired_service(self):  # pylint: disable-msg=R0201
+    def test_put_static_paired_service(self):  # pylint: disable=R0201
         """Test putting a static paired service."""
         service_name = "dummyfortest"
         oauth_data = {

=== modified file 'desktopcouch/records/doc/field_registry.txt'
--- desktopcouch/records/doc/field_registry.txt	2009-10-05 13:36:43 +0000
+++ desktopcouch/records/doc/field_registry.txt	2010-11-12 14:40:00 +0000
@@ -9,7 +9,16 @@
 >>> from desktopcouch.records.record import Record
 
 Say we have a very simple audiofile record type that defines 'artist'
-and 'title' string fields. Now also say we have an application that
+and 'title' string fields.
+
+>>> class AudioFile(Record):
+...     """An audio file desktopcouch record."""
+...
+...     def __init__(self, data=None):
+...         super(AudioFile, self).__init__(
+...             record_type='http://example.org/record_types/audio_file', data=data)
+
+Now also say we have an application that
 wants to interact with records of this type called 'My Awesome Music
 Player' or MAMP. The developers of MAMP use a data structure that has
 the same fields, but uses slightly different names for them:
@@ -23,7 +32,8 @@
 
 and instantiate a Transformer object:
 
->>> my_transformer = Transformer('My Awesome Music Player', my_registry)
+>>> my_transformer = Transformer(
+...     'My Awesome Music Player', my_registry, record_class=AudioFile)
 
 If MAMP has the following song object (a plain dictionary):
 
@@ -36,8 +46,7 @@
 object:
 
 >>> AUDIO_FILE_RECORD_TYPE = 'http://example.org/record_types/audio_file'
->>> new_record = Record(record_type=AUDIO_FILE_RECORD_TYPE)
->>> my_transformer.from_app(my_song, new_record)
+>>> new_record = my_transformer.from_app(my_song)
 
 Now we can look at the underlying data:
 
@@ -63,8 +72,7 @@
 this data. Let's see what happens if we run the transformation with
 this field present, but undefined in the field registry:
 
->>> new_record = Record(record_type=AUDIO_FILE_RECORD_TYPE)
->>> my_transformer.from_app(my_song, new_record)
+>>> new_record = my_transformer.from_app(my_song)
 
 >>> new_record._data #doctest: +NORMALIZE_WHITESPACE
 {'record_type': 'http://example.org/record_types/audio_file',
@@ -111,9 +119,9 @@
 ...         default_values={'description': 'subject'}),
 ...     }
 
->>> my_transformer = Transformer('My Awesome Music Player', my_registry)
->>> new_record = Record(record_type=AUDIO_FILE_RECORD_TYPE)
->>> my_transformer.from_app(my_song, new_record)
+>>> my_transformer = Transformer(
+...     'My Awesome Music Player', my_registry, record_class=AudioFile)
+>>> new_record = my_transformer.from_app(my_song)
 
 Since _data will now contain lots of uuids to keep references intact,
 it's less readable, and a less clear example, so I'll show you what
@@ -141,8 +149,7 @@
 
 and now look at transforming in the other direction:
 
->>> new_song = {}
->>> my_transformer.to_app(new_record, new_song)
+>>> new_song = my_transformer.to_app(new_record)
 >>> new_song  #doctest: +NORMALIZE_WHITESPACE
 {'tag_title': 'shaking it',
  'tag_subject': 'talking',
@@ -193,7 +200,8 @@
 ...     'songtitle': SimpleFieldMapping('title'),
 ...     'stars': StarIntMapping('score'),
 ...     }
->>> my_transformer = Transformer('My Awesome Music Player', my_registry)
+>>> my_transformer = Transformer(
+...     'My Awesome Music Player', my_registry, record_class=AudioFile)
 
 Create a song with a rating:
 
@@ -204,10 +212,7 @@
 ...     'number_of_times_played_in_mamp': 23
 ...     }
 
->>> new_record = Record(record_type=AUDIO_FILE_RECORD_TYPE)
->>> my_transformer.from_app(my_song, new_record)
+>>> new_record = my_transformer.from_app(my_song)
 >>> new_record['score']
 100
 
-And, I don't know if you've ever heard the song in question, but that
-is in fact correct! ;)

=== modified file 'desktopcouch/records/field_registry.py'
--- desktopcouch/records/field_registry.py	2010-11-02 23:10:39 +0000
+++ desktopcouch/records/field_registry.py	2010-11-12 14:40:00 +0000
@@ -21,7 +21,7 @@
 
 import copy
 
-from desktopcouch.records.record import MergeableList 
+from desktopcouch.records.record import MergeableList
 ANNOTATION_NAMESPACE = 'application_annotations'
 
 
@@ -30,12 +30,15 @@
     data.
     """
 
-    def __init__(self, app_name, field_registry):
+    def __init__(self, app_name, field_registry, record_class=None):
         self.app_name = app_name
         self.field_registry = field_registry
+        self.record_class = record_class
 
-    def from_app(self, data, record):
+    def from_app(self, data, record=None):
         """Transform from application data to record data."""
+        if record is None:
+            record = self.record_class()
         for key, val in data.items():
             if key in self.field_registry:
                 self.field_registry[key].setValue(record, val)
@@ -43,15 +46,19 @@
                 record.application_annotations.setdefault(
                     self.app_name, {}).setdefault(
                     'application_fields', {})[key] = val
+        return record
 
-    def to_app(self, record, data):
+    def to_app(self, record, data=None):
         """Transform from record data to application data."""
+        if data is None:
+            data = {}
         annotations = record.application_annotations.get(self.app_name, {}).get(
             'application_fields', {})
         for key, value in annotations.items():
             data[key] = value
         for key in self.field_registry:
             data[key] = self.field_registry[key].getValue(record)
+        return data
 
 
 class SimpleFieldMapping(object):
@@ -81,8 +88,8 @@
 class MergeableListFieldMapping(object):
     """Mapping between MergeableLists and application fields."""
 
-    def __init__(
-        self, app_name, uuid_field, root_list, field_name, default_values=None):
+    def __init__(self, app_name, uuid_field, root_list, field_name,
+                 default_values=None):
         """initialize the default values"""
         self._app_name = app_name
         self._uuid_field = uuid_field
@@ -119,8 +126,10 @@
         uuid_key = self._uuidLookup(record)
         if not uuid_key:
             return
+        # pylint: disable=W0212
         if self._field_name in root_list._data.get(uuid_key, []):
-             del root_list._data[uuid_key][self._field_name]
+            del root_list._data[uuid_key][self._field_name]
+        # pylint: enable=W0212
 
     def setValue(self, record, value):
         """set the value for the registered field"""
@@ -155,5 +164,3 @@
             application_annotations[self._uuid_field] = uuid_key
             return
         record_dict[self._field_name] = value
-
-

=== modified file 'desktopcouch/records/server.py'
--- desktopcouch/records/server.py	2010-11-04 11:01:31 +0000
+++ desktopcouch/records/server.py	2010-11-12 14:40:00 +0000
@@ -18,10 +18,11 @@
 #          Mark G. Saye <[e-mail]>
 #          Stuart Langridge <[e-mail]>
 #          Chad Miller <[e-mail]>
- 
+
 """The Desktop Couch Records API."""
 
-import copy, uuid
+import copy
+import uuid
 
 from couchdb import Server
 from couchdb.client import Resource
@@ -32,9 +33,10 @@
 
 DCTRASH = 'dctrash'
 
+
 class OAuthCapableServer(Server):
     """Subclass Server to provide oauth magic"""
-    # pylint: disable-msg=W0231
+    # pylint: disable=W0231
     # __init__ method from base class is not called
     def __init__(self, uri, oauth_tokens=None, ctx=None):
         """Subclass of couchdb.client.Server which creates a custom
@@ -47,17 +49,17 @@
         if oauth_tokens is None:
             oauth_tokens = desktopcouch.local_files.get_oauth_tokens(ctx)
         (consumer_key, consumer_secret, token, token_secret) = (
-            oauth_tokens["consumer_key"], oauth_tokens["consumer_secret"], 
+            oauth_tokens["consumer_key"], oauth_tokens["consumer_secret"],
             oauth_tokens["token"], oauth_tokens["token_secret"])
         http.add_oauth_tokens(
             consumer_key, consumer_secret, token, token_secret)
         self.resource = Resource(http, uri)
-    # pylint: enable-msg=W0231
-
-    
+    # pylint: enable=W0231
+
+
 class CouchDatabase(server_base.CouchDatabaseBase):
     """An small records specific abstraction over a couch db database."""
- 
+
     def __init__(self, database, uri=None, record_factory=None, create=False,
                  server_class=OAuthCapableServer, oauth_tokens=None,
                  ctx=desktopcouch.local_files.DEFAULT_CONTEXT):
@@ -67,7 +69,7 @@
                 database, uri, record_factory=record_factory, create=create,
                 server_class=server_class, oauth_tokens=oauth_tokens, ctx=ctx)
 
-    # pylint: disable-msg=W0212
+    # pylint: disable=W0212
     #Access to a protected member
     def delete_record(self, record_id):
         """Delete record with given id"""
@@ -79,9 +81,9 @@
             create=True,
             **self._server_class_extras)
         new_record.record_id = str(uuid.uuid4())
-        del new_record._data['_rev'] 
+        del new_record._data['_rev']
         try:
-            del new_record._data['_attachments'] 
+            del new_record._data['_attachments']
         except KeyError:
             pass
         new_record.application_annotations['desktopcouch'] = {
@@ -90,9 +92,9 @@
              'original_id': record_id}}
         del self.db[record_id]
         return dctrash.put_record(new_record)
-    # pylint: enable-msg=W0212
+    # pylint: enable=W0212
 
-    # pylint: disable-msg=W0221
+    # pylint: disable=W0221
     # Arguments number differs from overridden method
     def _reconnect(self):
         if not self.server_uri:
@@ -101,4 +103,4 @@
         else:
             uri = self.server_uri
         super(CouchDatabase, self)._reconnect(uri=uri)
-    # pylint: enable-msg=W0221
+    # pylint: enable=W0221

=== modified file 'desktopcouch/records/server_base.py'
--- desktopcouch/records/server_base.py	2010-11-03 22:57:06 +0000
+++ desktopcouch/records/server_base.py	2010-11-12 14:40:00 +0000
@@ -22,31 +22,37 @@
 
 """The Desktop Couch Records API."""
 
-import httplib2, urlparse, cgi, copy, warnings
+import cgi
+import copy
+import httplib2
+import urlparse
+import warnings
+
 from time import time
 
 # please keep desktopcouch python 2.5 compatible for now
 
 # pylint can't deal with failing imports even when they're handled
-# pylint: disable-msg=F0401
+# pylint: disable=F0401
 try:
     # Python 2.5
     import simplejson as json
 except ImportError:
     # Python 2.6+
     import json
-# pylint: enable-msg=F0401
+# pylint: enable=F0401
 
 from oauth import oauth
 
 from couchdb import Server
 from couchdb.client import ResourceNotFound, ResourceConflict, uri as couchdburi
 from couchdb.design import ViewDefinition
-from record import Record
+from desktopcouch.records.record import Record
 import logging
 
 DEFAULT_DESIGN_DOCUMENT = None  # each view in its own eponymous design doc.
 
+
 def get_changes(self, changes_since):
     """This method is used to monkey patch the database to provide a
     get_changes method"""
@@ -58,6 +64,7 @@
     resp, data = self.resource.http.request(uri, "GET", "", {})
     return resp, data
 
+
 def transform_to_records(view_results):
     """Transform view resulst into Record objects."""
     for result in view_results:
@@ -67,10 +74,10 @@
 class FieldsConflict(Exception):
     """Raised in case of an unrecoverable couchdb conflict."""
 
-    #pylint: disable-msg=W0231
+    #pylint: disable=W0231
     def __init__(self, conflicts):
         self.conflicts = conflicts
-    #pylint: enable-msg=W0231
+    #pylint: enable=W0231
 
     def __str__(self):
         return "<CouchDB Conflict Error: %s>" % self.conflicts
@@ -97,6 +104,7 @@
         httplib2.Authentication.__init__(self, None, host, request_uri,
               headers, response, content, http)
 
+    # pylint: disable=R0914
     def request(self, method, request_uri, headers, content):
         """Modify the request headers to add the appropriate
         Authorization header."""
@@ -106,35 +114,43 @@
            self.oauth_data['token_secret'])
         sig_method = oauth.OAuthSignatureMethod_HMAC_SHA1
         full_http_url = "%s://%s%s" % (self.scheme, self.host, request_uri)
-        schema, netloc, path, params, query, fragment = \
-                urlparse.urlparse(full_http_url)
+        # pylint: disable=W0612
+        # better than using dummy variables, in case we want to use
+        # any of them later on
+        schema, netloc, path, params, query, fragment = urlparse.urlparse(
+            full_http_url)
+        # pylint: enable=W0612
         querystr_as_dict = dict(cgi.parse_qsl(query))
         req = oauth.OAuthRequest.from_consumer_and_token(
             consumer,
             access_token,
-            http_method = method,
-            http_url = full_http_url,
-            parameters = querystr_as_dict
-        )
+            http_method=method,
+            http_url=full_http_url,
+            parameters=querystr_as_dict)
         req.sign_request(sig_method(), consumer, access_token)
+        # pylint: disable=W0212
         headers.update(httplib2._normalize_headers(req.to_header()))
+        # pylint: enable=W0212
+    # pylint: enable=R0914
 
 
 class OAuthCapableHttp(httplib2.Http):
     """Subclass of httplib2.Http which specifically uses our OAuth
        Authentication subclass (because httplib2 doesn't know about it)"""
-    def __init__(self, scheme="http", cache=None, timeout=None, proxy_info=None):
+    def __init__(self, scheme="http", cache=None, timeout=None,
+                 proxy_info=None):
         self.__scheme = scheme
+        self.oauth_data = None
         super(OAuthCapableHttp, self).__init__(cache, timeout, proxy_info)
 
     def add_oauth_tokens(self, consumer_key, consumer_secret,
                          token, token_secret):
+        """Add the OAuth tokens to the Http object."""
         self.oauth_data = {
             "consumer_key": consumer_key,
             "consumer_secret": consumer_secret,
             "token": token,
-            "token_secret": token_secret
-        }
+            "token_secret": token_secret}
 
     def _auth_from_challenge(self, host, request_uri, headers, response,
             content):
@@ -144,6 +160,7 @@
         yield OAuthAuthentication(self.oauth_data, host, request_uri, headers,
                 response, content, self, self.__scheme)
 
+
 def row_is_deleted(row):
     """Test if a row is marked as deleted.  Smart views 'maps' should not
     return rows that are marked as deleted, so this function is not often
@@ -174,10 +191,12 @@
 
     @staticmethod
     def _is_reconnection_fail(ex):
+        """Check whether this is the bug in httplib."""
         return isinstance(ex, AttributeError) and \
                 ex.args == ("'NoneType' object has no attribute 'makefile'",)
 
     def _reconnect(self, uri=None):
+        """Reconnect after losing connection."""
         logging.info("Connecting to %s.",
                      self.server_uri or "discovered local port")
         self._server = self._server_class(uri or self.server_uri,
@@ -211,8 +230,9 @@
             """Closure storing the database for lower levels to use when needed.
             """
             def getter():
-                return source_db.get_attachment(document_id, attachment_name), \
-                        content_type
+                """Get the attachment and content type."""
+                return source_db.get_attachment(
+                    document_id, attachment_name), content_type
             return getter
 
         try:
@@ -240,7 +260,7 @@
             from uuid import uuid4
             record.record_id = uuid4().hex
         try:
-            self.db[record.record_id] = record._data
+            self.db[record.record_id] = record._data  # pylint: disable=W0212
         except ResourceConflict:
             if record.record_revision is None and not row_is_deleted(record):
                 old_record = self.db[record.record_id]
@@ -249,14 +269,16 @@
                     # but we have marked deleted internally.  Instead of
                     # complaining, pull up the previous revision ID and
                     # add that to the user's record, and re-send it.
+                    # pylint: disable=W0212
                     record._set_record_revision(old_record.rev)
-
                     self.db[record.record_id] = record._data
+                    # pylint: enable=W0212
                 else:
                     raise
             else:
                 raise
 
+        # pylint: disable=W0212
         for attachment_name in getattr(record, "_detached", []):
             self.db.delete_attachment(record._data, attachment_name)
 
@@ -266,6 +288,7 @@
                                    data,
                                    attachment_name,
                                    content_type)
+        # pylint: enable=W0212
 
         return record.record_id
 
@@ -282,6 +305,7 @@
         # although with a single record we need to test for the
         # revisison, with a batch we do not, but we have to make sure
         # that we did not get an error
+        # pylint: disable=W0212
         batch_put_result = self.db.update([record._data for record in batch])
         for current_tuple in batch_put_result:
             success, docid, rev_or_exc = current_tuple
@@ -289,15 +313,14 @@
                 record = records_hash[docid]
                 # set the new rev
                 record._data["_rev"] = rev_or_exc
-
                 for attachment_name in getattr(record, "_detached", []):
                     self.db.delete_attachment(record._data, attachment_name)
-
                 for attachment_name in record.list_attachments():
                     data, content_type = record.attachment_data(attachment_name)
                     self.db.put_attachment(
-                        {"_id":record.record_id, "_rev":record["_rev"]},
+                        {"_id": record.record_id, "_rev": record["_rev"]},
                         data, attachment_name, content_type)
+        # pylint: enable=W0212
         # all success record have the blobs added we return result of
         # update
         return batch_put_result
@@ -322,7 +345,7 @@
         if cached_record is None:
             cached_record = self.db[record_id]
         if isinstance(cached_record, Record):
-            cached_record = cached_record._data
+            cached_record = cached_record._data  # pylint: disable=W0212
         record = copy.deepcopy(cached_record)
         # Loop until either failure or success has been determined
         while True:
@@ -404,7 +427,7 @@
         # No atomic updates.  Only read & mutate & write.  Le sigh.
         # First, get current contents.
         try:
-            view_container =  self.db[doc_id]["views"]
+            view_container = self.db[doc_id]["views"]
         except (KeyError, ResourceNotFound):
             raise KeyError
 
@@ -414,9 +437,7 @@
             # Construct a new list of objects representing all views to have.
             views = [
                     ViewDefinition(design_doc, k, v.get("map"), v.get("reduce"))
-                    for k, v
-                    in view_container.iteritems()
-                    ]
+                    for k, v in view_container.iteritems()]
             # Push back a new batch of view.  Pray to Eris that this doesn't
             # clobber anything we want.
 
@@ -446,9 +467,8 @@
         view_id_fmt = "_design/%(design_doc)s/_view/%(view_name)s"
         return self.db.view(view_id_fmt % locals(), **params)
 
-
     def add_view(self, view_name, map_js, reduce_js,
-            design_doc=DEFAULT_DESIGN_DOCUMENT):
+                 design_doc=DEFAULT_DESIGN_DOCUMENT):
         """Create a view, given a name and the two parts (map and reduce).
         Return the document id."""
         if design_doc is None:
@@ -476,7 +496,7 @@
         """Return a list of view names for a given design document.  There is
         no error if the design document does not exist or if there are no views
         in it."""
-        doc_id = "_design/%(design_doc)s" % locals()
+        doc_id = "_design/%s" % design_doc
         try:
             return list(self.db[doc_id]["views"])
         except (KeyError, ResourceNotFound):
@@ -542,12 +562,14 @@
             return viewdata[record_type]
 
     def get_view_results_as_records(self, view_name, record_type=None):
+        """Get the results of a view as a list of Record objects."""
         view_results = self.execute_view(view_name, view_name)
         if record_type:
             view_results = view_results[record_type]
         return [record for record in transform_to_records(view_results)]
 
     def get_all_records(self, record_type=None):
+        """Get all records from the database, optionally by record type."""
         view_name = "get_records_and_type"
         try:
             return self.get_view_results_as_records(
@@ -568,7 +590,6 @@
             return self.get_view_results_as_records(
                 view_name, record_type=record_type)
 
-
     def get_changes(self, niceness=10):
         """Get a list of database changes.  This is the sister function of
         report_changes that returns a list instead of calling a function for
@@ -610,7 +631,7 @@
                 raise IOError(
                     "HTTP response code %s.\n%s" % (resp["status"], data))
             structure = json.loads(data)
-            for change in structure.get("results"):
+            for change in structure.get("results"):  # pylint: disable=E1103
                 # kw-args can't have unicode keys
                 change_encoded_keys = dict(
                     (k.encode("utf8"), v) for k, v in change.iteritems())

=== modified file 'desktopcouch/records/tests/test_field_registry.py'
--- desktopcouch/records/tests/test_field_registry.py	2010-11-11 19:01:41 +0000
+++ desktopcouch/records/tests/test_field_registry.py	2010-11-12 14:40:00 +0000
@@ -17,7 +17,10 @@
 
 """Test cases for field mapping"""
 
-import copy, doctest, os
+import copy
+import doctest
+import os
+
 from testtools import TestCase
 
 import desktopcouch
@@ -34,25 +37,35 @@
              'not_the_field': 'different value'},
         'd6d2c23b-279c-45c8-afb2-ec84ee7c81c3': {
             'the field': 'another value'}},
-    'application_annotations': {'Test App': {'private_application_annotations':{
-        'test_field': 'e47455fb-da05-481e-a2c7-88f14d5cc163'}}}}
+    'application_annotations': {'Test App': {
+        'private_application_annotations': {
+            'test_field': 'e47455fb-da05-481e-a2c7-88f14d5cc163'}}}}
 
 APP_RECORD = {
     'record_type': 'http://example.com/test',
     'simpleField': 23,
-    'strawberryField': 'the value',}
+    'strawberryField': 'the value'}
 
 FIELD_REGISTRY = {
     'simpleField': SimpleFieldMapping('simple_field'),
     'strawberryField': MergeableListFieldMapping(
-        'Test App', 'test_field', 'test_fields', 'the_field'),}
+        'Test App', 'test_field', 'test_fields', 'the_field')}
+
+
+class TestRecord(Record):
+    """A test record type."""
+
+    def __init__(self, data=None):
+        super(TestRecord, self).__init__(
+            data=data, record_type='http://example.com/test')
 
 
 class AppTransformer(Transformer):
     """A test transformer class."""
 
     def __init__(self):
-        super(AppTransformer, self).__init__('Test App', FIELD_REGISTRY)
+        super(AppTransformer, self).__init__(
+            'Test App', FIELD_REGISTRY, record_class=TestRecord)
 
 
 class TestFieldMapping(TestCase):
@@ -83,16 +96,16 @@
 
     def test_mergeable_list_field_mapping1(self):
         """Test the MergeableListFieldMapping object."""
-        # pylint: disable-msg=W0212
+        # pylint: disable=W0212
         record = Record(self.test_record)
         mapping = MergeableListFieldMapping(
             'Test App', 'test_field', 'test_fields', 'the_field')
         self.assertEqual('the value', mapping.getValue(record))
-        del record._data['test_fields'][
+        del record._data['test_fields'][  # pylint: disable=W0212
             'e47455fb-da05-481e-a2c7-88f14d5cc163']
         mapping.deleteValue(record)
         self.assertEqual(None, mapping.getValue(record))
-        # pylint: enable-msg=W0212
+        # pylint: enable=W0212
 
     def test_mergeable_list_field_mapping_empty_field(self):
         """Test setting empty values in the MergeableListFieldMapping object."""
@@ -112,21 +125,44 @@
         self.transformer = AppTransformer()
 
     def test_from_app(self):
-        """Test transformation from app to Ubuntu One."""
-        # pylint: disable-msg=W0212
+        """Test transformation from app to desktopcouch."""
+        record = self.transformer.from_app(APP_RECORD)
+        underlying = record._data  # pylint: disable=W0212
+        self.assertEqual(23, record['simple_field'])
+        the_uuid = record.application_annotations['Test App']\
+                   ['private_application_annotations']['test_field']
+        self.assertEqual(
+            {'the_field': 'the value'},
+            underlying['test_fields'][the_uuid])
+
+    def test_from_app_with_record(self):
+        """Test transformation from app to desktopcouch when passing in
+        an existing record.
+
+        """
         record = Record(record_type="http://example.com/test")
         self.transformer.from_app(APP_RECORD, record)
-        underlying = record._data
+        underlying = record._data  # pylint: disable=W0212
         self.assertEqual(23, record['simple_field'])
         the_uuid = record.application_annotations['Test App']\
                    ['private_application_annotations']['test_field']
         self.assertEqual(
             {'the_field': 'the value'},
             underlying['test_fields'][the_uuid])
-        # pylint: enable-msg=W0212
+        # pylint: enable=W0212
 
     def test_to_app(self):
-        """Test transformation to app from Ubuntu One."""
+        """Test transformation to app from desktopcouch."""
+        record = Record(TEST_RECORD)
+        data = self.transformer.to_app(record)
+        self.assertEqual(
+            {'simpleField': 23, 'strawberryField': 'the value'}, data)
+
+    def test_to_app_with_dictionary(self):
+        """Test transformation to app from desktopcouch when passing
+        in an existing dictionary.
+
+        """
         record = Record(TEST_RECORD)
         data = {}
         self.transformer.to_app(record, data)
@@ -145,5 +181,4 @@
                 '../desktopcouch/records/doc/field_registry.txt'
             results = doctest.testfile(field_registry_tests_path,
                                        module_relative=False)
-            
         self.assertEqual(0, results.failed)

=== modified file 'desktopcouch/records/tests/test_record.py'
--- desktopcouch/records/tests/test_record.py	2010-11-11 19:01:41 +0000
+++ desktopcouch/records/tests/test_record.py	2010-11-12 14:40:00 +0000
@@ -19,11 +19,12 @@
 
 """Tests for the RecordDict object on which the Contacts API is built."""
 
-import doctest, os
+import doctest
+import os
 from testtools import TestCase
 
 # pylint does not like relative imports from containing packages
-# pylint: disable-msg=F0401
+# pylint: disable=F0401
 import desktopcouch
 from desktopcouch.records.server import CouchDatabase
 from desktopcouch.records.record import (Record, RecordDict, MergeableList,
@@ -34,7 +35,7 @@
 class TestRecords(TestCase):
     """Test the record functionality"""
 
-    # pylint: disable-msg=C0103
+    # pylint: disable=C0103
     def setUp(self):
         """Test setup."""
         super(TestRecords, self).setUp()
@@ -47,7 +48,7 @@
             "subfield_uuid": {
                     "e47455fb-da05-481e-a2c7-88f14d5cc163": {
                         "field11": "value11",
-                        "field12": "value12",},
+                        "field12": "value12"},
                     "d6d2c23b-279c-45c8-afb2-ec84ee7c81c3": {
                         "field21": "value21",
                         "field22": "value22"}},
@@ -56,12 +57,13 @@
             "record_type": "http://fnord.org/smorgasbord",
         }
         self.record = Record(self.dict)
-    # pylint: enable-msg=C0103
+    # pylint: enable=C0103
 
     def test_revision(self):
         """Test document always has a revision field and that the revision
         changes when the document is updated"""
         self.assertEquals(self.record.record_revision, None)
+
         def set_rev(rec):
             """Set revision."""
             rec.record_revision = "1"
@@ -126,8 +128,7 @@
             ['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('f', self.record)
         self.assertNotIn("_id", self.record)  # is internal.  play dumb.
 
     def test_application_annotations(self):
@@ -249,7 +250,7 @@
         value = [1, 2, 3, 4, 5]
         self.record["subfield_uuid"] = value
         self.assertRaises(IndexError, self.record["subfield_uuid"].pop,
-            len(value)*2)
+            len(value) * 2)
 
     def test_mergeable_list_pop_last(self):
         """Test that exception is raised when poping last item"""
@@ -272,9 +273,9 @@
 
     def test_dictionary_access_to_mergeable_list(self):
         """Test that appropriate errors are raised."""
-        # pylint: disable-msg=W0212
+        # pylint: disable=W0212
         keys = self.record["subfield_uuid"]._data.keys()
-        # pylint: enable-msg=W0212
+        # pylint: enable=W0212
         self.assertRaises(
             TypeError,
             self.record["subfield_uuid"].__getitem__, keys[0])
@@ -298,9 +299,9 @@
 
     def test_uuid_like_keys(self):
         """Test that appropriate errors are raised."""
-        # pylint: disable-msg=W0212
+        # pylint: disable=W0212
         keys = self.record["subfield_uuid"]._data.keys()
-        # pylint: enable-msg=W0212
+        # pylint: enable=W0212
         self.assertRaises(
             IllegalKeyException,
             self.record["subfield"].__setitem__, keys[0], 'stuff')
@@ -313,7 +314,7 @@
     def test_run_doctests(self):
         """Run all doc tests from here to set the proper context (ctx)"""
         ctx = test_environment.test_context
-        globs = { "db": CouchDatabase('testing', create=True, ctx=ctx) }
+        globs = {"db": CouchDatabase('testing', create=True, ctx=ctx)}
 
         records_tests_path = os.path.dirname(
             desktopcouch.__file__) + '/records/doc/records.txt'
@@ -333,25 +334,24 @@
             results = doctest.testfile(
                 '../desktopcouch/records/doc/an_example_application.txt',
                 module_relative=False)
-            
         self.assertEqual(0, results.failed)
 
     def test_record_id(self):
         """Test all passible way to assign a record id"""
-        data = {"_id":"recordid"}
+        data = {"_id": "recordid"}
         record = Record(data, record_type="url")
         self.assertEqual(data["_id"], record.record_id)
         data = {}
         record_id = "recordid"
         record = Record(data, record_type="url", record_id=record_id)
         self.assertEqual(record_id, record.record_id)
-        data = {"_id":"differentid"}
+        data = {"_id": "differentid"}
         self.assertRaises(ValueError,
             Record, data, record_id=record_id, record_type="url")
 
     def test_record_type_version(self):
         """Test record type version support"""
-        data = {"_id":"recordid"}
+        data = {"_id": "recordid"}
         record1 = Record(data, record_type="url")
         self.assertIs(None, record1.record_type_version)
         record2 = Record(data, record_type="url", record_type_version=1)
@@ -361,7 +361,7 @@
 class TestRecordFactory(TestCase):
     """Test Record/Mergeable List factories."""
 
-    # pylint: disable-msg=C0103
+    # pylint: disable=C0103
     def setUp(self):
         """Test setup."""
         super(TestRecordFactory, self).setUp()
@@ -370,7 +370,7 @@
             "b": "B",
             "subfield": {
                 "field11s": "value11s",
-                "field12s": "value12s",},
+                "field12s": "value12s"},
             "subfield_uuid":
                 [
                 {"field11": "value11",
@@ -379,7 +379,7 @@
                  "field22": "value22"}],
             "record_type": "http://fnord.org/smorgasbord",
         }
-    # pylint: enable-msg=C0103
+    # pylint: enable=C0103
 
     def test_build(self):
         """Test RecordDict/MergeableList factory method."""

=== modified file 'desktopcouch/records/tests/test_server.py'
--- desktopcouch/records/tests/test_server.py	2010-11-03 22:57:06 +0000
+++ desktopcouch/records/tests/test_server.py	2010-11-12 14:40:00 +0000
@@ -32,27 +32,23 @@
 from desktopcouch.platform import find_pid
 
 # pylint can't deal with failing imports even when they're handled
-# pylint: disable-msg=F0401
+# pylint: disable=F0401
 try:
     from io import StringIO
 except ImportError:
     from cStringIO import StringIO as StringIO
-# pylint: enable-msg=F0401
+# pylint: enable=F0401
 
 DCTRASH = 'dctrash'
 
-FAKE_RECORD_TYPE = "http://example.org/test"
-
-js = """
-function(doc) {
-    if (doc.record_type == '%s') {
-        emit(doc._id, null);
-    }
-}""" % FAKE_RECORD_TYPE
-
 
 def get_test_context():
-        return test_environment.test_context
+    """Return test context."""
+    return test_environment.test_context
+
+# pylint: disable=W0212
+# I don't care about private members in tests.
+
 
 class TestCouchDatabaseDeprecated(testtools.TestCase):
     """Test specific for CouchDatabase"""
@@ -84,9 +80,11 @@
         super(TestCouchDatabaseDeprecated, self).tearDown()
 
     def maybe_die(self):
+        """Method that could kill couchdb. Or could it? Or COULD it?"""
         pass
 
-    def wait_until_server_dead(self, pid=None):
+    def wait_until_server_dead(self, pid=None):  # pylint: disable=R0201
+        """Wait until the server is no longer breathing."""
         if pid is not None:
             pid = find_pid(
                 start_if_not_running=False, ctx=get_test_context())
@@ -102,11 +100,12 @@
     def test_get_records_by_record_type_save_view(self):
         """Test getting mutliple records by type"""
         records = self.database.get_records(
-            record_type="test.com",create_view=True)
+            record_type="test.com", create_view=True)
         self.maybe_die()  # should be able to survive couchdb death
         self.assertEqual(3, len(records))
 
     def test_func_get_records(self):
+        """Functional test of get_records."""
         record_ids_we_care_about = set()
         good_record_type = "http://example.com/unittest/good"
         other_record_type = "http://example.com/unittest/bad"
@@ -145,18 +144,19 @@
                 design_doc="mustNotExist", create_view=False)
 
     def test_get_view_by_type_new_but_already(self):
+        """Test calling the view."""
         self.database.get_records(create_view=True)
         self.maybe_die()  # should be able to survive couchdb death
         self.database.get_records(create_view=True)
         # No exceptions on second run?  Yay.
 
     def test_get_view_by_type_createxcl_fail(self):
+        """Test that calling the view without creating it fails."""
         self.database.get_records(create_view=True)
         self.maybe_die()  # should be able to survive couchdb death
         self.assertRaises(KeyError, self.database.get_records, create_view=None)
 
 
-
 class TestCouchDatabase(testtools.TestCase):
     """tests specific for CouchDatabase"""
 
@@ -187,9 +187,11 @@
         super(TestCouchDatabase, self).tearDown()
 
     def maybe_die(self):
+        """Method that could kill couchdb. Or could it? Or COULD it?"""
         pass
 
-    def wait_until_server_dead(self, pid=None):
+    def wait_until_server_dead(self, pid=None):  # pylint: disable=R0201
+        """Wait until the server is no longer breathing."""
         if pid is not None:
             pid = find_pid(
                 start_if_not_running=False, ctx=get_test_context())
@@ -203,6 +205,7 @@
                 break
 
     def test_database_not_exists(self):
+        """Test that the database does not exist."""
         self.assertRaises(
             NoSuchDatabase, CouchDatabase, "this-must-not-exist", create=False)
 
@@ -251,7 +254,7 @@
         # put the batch and ensure that the records have been added
         batch_result = self.database.put_records_batch(batch)
         for current_tuple in batch_result:
-            success, docid, rev_or_exc = current_tuple
+            success, docid, rev_or_exc = current_tuple  # pylint: disable=W0612
             if success:
                 self.assertTrue(self.database._server[self.dbname][docid])
             else:
@@ -299,15 +302,6 @@
 
         self.database.delete_record(new_record_id)
 
-    def test_get_deleted_record(self):
-        """Test (not) getting a deleted record."""
-        record = Record({'record_number': 0}, record_type="http://example.com/")
-        record_id = self.database.put_record(record)
-        self.database.delete_record(record_id)
-        self.maybe_die()  # should be able to survive couchdb death
-        retrieved_record = self.database.get_record(record_id)
-        self.assertEqual(None, retrieved_record)
-
     def test_record_exists(self):
         """Test checking whether a record exists."""
         record = Record({'record_number': 0}, record_type="http://example.com/")
@@ -338,6 +332,7 @@
         self.assertEqual(3, working_copy['field3'])
 
     def test_view_add_and_delete(self):
+        """Test adding and deleting a view."""
         design_doc = "design"
         view1_name = "unit_tests_are_wonderful"
         view2_name = "unit_tests_are_marvelous"
@@ -365,6 +360,7 @@
             KeyError, self.database.delete_view, view2_name, design_doc)
 
     def test_func_get_all_records(self):
+        """Functional test of get_all_records."""
         record_ids_we_care_about = set()
         good_record_type = "http://example.com/unittest/good"
         other_record_type = "http://example.com/unittest/bad"
@@ -401,6 +397,7 @@
         self.assertTrue(len(record_ids_we_care_about) == 0, "expected zero")
 
     def test_list_views(self):
+        """Test the list views."""
         design_doc = "d"
         self.assertEqual(self.database.list_views(design_doc), [])
 
@@ -415,12 +412,14 @@
         self.assertEqual(self.database.list_views(design_doc), [])
 
     def test_get_view_by_type_new_but_already(self):
+        """Test calling the view."""
         self.database.get_all_records()
         self.maybe_die()  # should be able to survive couchdb death
         self.database.get_all_records()
         # No exceptions on second run?  Yay.
 
     def test_get_changes(self):
+        """Test get_changes."""
         self.test_put_record()
         self.test_update_fields()
         self.test_delete_record()
@@ -435,7 +434,10 @@
             self.failUnless("id" in change)
 
     def test_report_changes_polite(self):
+        """Test reporting changes."""
+
         def rep(**kwargs):
+            """Check the keyword arguments for changes and id."""
             self.failUnless("changes" in kwargs)
             self.failUnless("id" in kwargs)
 
@@ -453,7 +455,10 @@
         self.assertEqual(0, count)
 
     def test_report_changes_exceptions(self):
+        """Test reporting changes in the face of exceptions."""
+
         def rep(**kwargs):
+            """Check the keyword arguments for changes and id."""
             self.failUnless("changes" in kwargs)
             self.failUnless("id" in kwargs)
 
@@ -470,7 +475,7 @@
 
         # Exceptions in our callbacks do not consume an event.
         self.assertRaises(
-            ZeroDivisionError, self.database.report_changes, lambda **kw: 1/0)
+            ZeroDivisionError, self.database.report_changes, lambda **kw: 1 / 0)
 
         # Ensure pos'n is same.
         self.assertEqual(saved_position, self.database._changes_since)
@@ -488,7 +493,10 @@
         self.assertEqual(saved_position + 1, self.database._changes_since)
 
     def test_report_changes_all_ops_give_known_keys(self):
+        """Test reporting changes results have the right keys."""
+
         def rep(**kwargs):
+            """Check the keyword arguments for changes and id."""
             self.failUnless("changes" in kwargs)
             self.failUnless("id" in kwargs)
 
@@ -498,7 +506,10 @@
         self.database.report_changes(rep)
 
     def test_report_changes_nochanges(self):
+        """Test report changes when there are none."""
+
         def rep(**kwargs):
+            """Check the keyword arguments for changes and id."""
             self.failUnless("changes" in kwargs)
             self.failUnless("id" in kwargs)
 
@@ -515,6 +526,7 @@
         self.assertEqual(saved_position, self.database._changes_since)
 
     def test_attachments(self):
+        """Test attachments."""
         content = StringIO("0123456789\n==========\n\n" * 5)
 
         constructed_record = Record(
@@ -529,12 +541,12 @@
         constructed_record.attach("string", "another document", "text/plain")
 
         self.maybe_die()  # should be able to survive couchdb death
-        constructed_record.attach("XXXXXXXXX", "never used", "text/plain")
+        constructed_record.attach(
+            "SOMETHINGSOMETHING", "never used", "text/plain")
         constructed_record.detach("never used")  # detach works before commit.
 
         # We can read from a document that we constructed.
-        out_file, out_content_type = \
-                constructed_record.attachment_data("nu/mbe/rs")
+        _, out_content_type = constructed_record.attachment_data("nu/mbe/rs")
         self.assertEqual(out_content_type, "text/plain")
 
         # One can not put another document of the same name.
@@ -604,6 +616,7 @@
         self.database.delete_record(record_id)
 
     def test_view_fetch(self):
+        """Test view fetch."""
         design_doc = "test_view_fetch"
         view1_name = "unit_tests_are_great_yeah"
 
@@ -641,7 +654,7 @@
         non_working_copy['field3'] = 3
         self.database.put_record(non_working_copy)
         self.database.update_fields(
-            record_id, {'field1': 11,('nested', 'sub2'): 's2-changed'},
+            record_id, {'field1': 11, ('nested', 'sub2'): 's2-changed'},
             cached_record=record)
         working_copy = self.database.get_record(record_id)
         self.assertEqual(0, working_copy['record_number'])

=== modified file 'utilities/lint.sh'
--- utilities/lint.sh	2010-11-11 19:01:41 +0000
+++ utilities/lint.sh	2010-11-12 14:40:00 +0000
@@ -37,7 +37,7 @@
 fi
 
 export PYTHONPATH="/usr/share/pycentral/pylint/site-packages:desktopcouch:$PYTHONPATH"
-pylint="`which pylint` -r n -i y --variable-rgx=[a-z_][a-z0-9_]{0,30} --method-rgx=[a-z_][a-z0-9_]{2,} -d I0011,R0904,R0913"
+pylint="`which pylint` -r n -i y --variable-rgx=[a-z_][a-z0-9_]{0,30} --attr-rgx=[a-z_][a-z0-9_]{1,30} --method-rgx=[a-z_][a-z0-9_]{2,} -d I0011,R0902,R0904,R0913,W0142"
 
 pylint_notices=`$pylint $pyfiles`