Merge lp:~thisfred/desktopcouch/kill-the-monkey into lp:desktopcouch

[Eric Casteleijn]

Remove an unnecessary monkey patch to python-couchdb.

Remove an unnecessary monkey patch.

BAD MONKEY! MONKEY SEE? MONKEY DO! MONKEY WILL DESTROY YOU!

[Chad Miller (cmiller)]

59 + """This method is used to monkey patch the database to provide a
60 + get_changes method"""

review: Needs Fixing

[Eric Casteleijn (thisfred)]

Ah, oops yes :) fix pushed.

[Chad Miller (cmiller)]

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/server_base.py

[lp:~thisfred/desktopcouch/kill-the-monkey]

213. By Eric Casteleijn on 2010-11-18

remerged trunk and resolved conflict

=== modified file 'desktopcouch/records/server_base.py'
--- desktopcouch/records/server_base.py	2010-11-17 17:49:54 +0000
+++ desktopcouch/records/server_base.py	2010-11-18 18:35:08 +0000
@@ -32,20 +32,10 @@
 
 # please keep desktopcouch python 2.5 compatible for now
 
-# pylint can't deal with failing imports even when they're handled
-# pylint: disable=F0401
-try:
-    # Python 2.5
-    import simplejson as json
-except ImportError:
-    # Python 2.6+
-    import json
-# pylint: enable=F0401
-
 from oauth import oauth
 
 from couchdb import Server
-from couchdb.client import ResourceNotFound, ResourceConflict, uri as couchdburi
+from couchdb.client import ResourceNotFound, ResourceConflict
 from couchdb.design import ViewDefinition
 from desktopcouch.records.record import Record
 import logging
@@ -72,17 +62,6 @@
     div, mod = divmod(num, base)
     return baseN(div, base).lstrip("0") + numerals[mod]
 
-def get_changes(self, changes_since):
-    """This method is used to monkey patch the database to provide a
-    get_changes method"""
-    # Can't use self._server.resource.get() directly because
-    # it encodes "/".
-    uri = couchdburi(
-        self.resource.uri, "_changes",
-        since=changes_since)
-    resp, data = self.resource.http.request(uri, "GET", "", {})
-    return resp, data
-
 
 def transform_to_records(view_results):
     """Transform view resulst into Record objects."""
@@ -227,8 +206,6 @@
                 raise NoSuchDatabase(self._database_name)
         if self.db is None:
             self.db = self._server[self._database_name]
-            if not hasattr(self.db, 'get_changes'):
-                setattr(self.db.__class__, 'get_changes', get_changes)
         else:
             # Monkey-patch the object the user already uses.  Oook!
             new_db = self._server[self._database_name]
@@ -613,6 +590,14 @@
         self.report_changes(lambda **k: l.append(k), niceness=niceness)
         return l
 
+    def _get_changes(self, changes_since=None):
+        """Get changes feed from couchdb."""
+        # Can't use self._server.resource.get() directly because
+        # it encodes "/".
+        if not changes_since is None:
+            return self.db.resource.get('_changes', since=changes_since)
+        return self.db.resource.get('_changes')
+
     def report_changes(self, function_to_send_changes_to, niceness=10):
         """Check to see if there are any changes on this database since last
         call (or since this object was instantiated), call a function for each,
@@ -641,11 +626,7 @@
         now = time()
         call_count = 0
         if not niceness or now > self._changes_last_used + niceness:
-            resp, data = self.db.get_changes(self._changes_since)
-            if resp["status"] != '200':
-                raise IOError(
-                    "HTTP response code %s.\n%s" % (resp["status"], data))
-            structure = json.loads(data)
+            structure = self._get_changes(self._changes_since)[1]
             for change in structure.get("results"):  # pylint: disable=E1103
                 # kw-args can't have unicode keys
                 change_encoded_keys = dict(