desktopcouch

Merge lp://qastaging/~vds/desktopcouch/desktopcouch_couchdb_0_7 into lp://qastaging/desktopcouch

  1. desktopcouch_couchdb_0_7
  2. Merge into trunk
Proposed by Vincenzo Di Somma
Status: Work in progress
Proposed branch: lp://qastaging/~vds/desktopcouch/desktopcouch_couchdb_0_7
Merge into: lp://qastaging/desktopcouch
Diff against target: 996 lines (+462/-178)
10 files modified
desktopcouch/contacts/testing/create.py (+1/-1)
desktopcouch/contacts/tests/test_view.py (+80/-28)
desktopcouch/local_files.py (+29/-14)
desktopcouch/pair/tests/test_couchdb_io.py (+40/-16)
desktopcouch/records/server.py (+23/-14)
desktopcouch/records/server_base.py (+267/-91)
desktopcouch/records/tests/test_server.py (+3/-2)
desktopcouch/replication_services/ubuntuone.py (+10/-6)
desktopcouch/tests/__init__.py (+7/-5)
desktopcouch/tests/test_replication.py (+2/-1)
To merge this branch: bzr merge lp://qastaging/~vds/desktopcouch/desktopcouch_couchdb_0_7
Reviewer Review Type Date Requested Status
Chad Miller (community) Approve
Eric Casteleijn (community) Approve
Review via email: mp+27875@code.qastaging.launchpad.net

Commit message

Remove dependencies from httplib and switch to the new python-couchdb lib.

Clean code conventions.

Description of the change

Remove dependencies from httplib and switch to the new python-couchdb lib. In order to test this branch you need the version of python-couchdb in the PYTHONPATH.

To post a comment you must log in.
Revision history for this message
Eric Casteleijn (thisfred) wrote :

Awesome job, thanks for cleaning up/delinting as well!

Tests run, but I see one deprecation warning:

 TestCreate
    test_create_many_contacts ... /home/eric/canonical/desktopcouch/r-vds/desktopcouch/contacts/testing/create.py:176: DeprecationWarning: Database.create is deprecated, please use Database.save instead [2010-04-13]

Not sure if that's easy to fix, but if so, we might as well, so that migration to the next version will potentially be easier.

review: Approve
Reply
lp://qastaging/~vds/desktopcouch/desktopcouch_couchdb_0_7 updated
165. By vincenzo di somma <vds@lucid>

getting rid of deprecated method

Revision history for this message
Eric Casteleijn (thisfred) wrote :

deprecation warning gone, I wish I could approve even more!

review: Approve
Reply
Revision history for this message
Chad Miller (cmiller) :
review: Approve
Reply
Revision history for this message
Eric Casteleijn (thisfred) wrote :

Setting to WIP, since we don't want it merged into trunk accidentally until we can make sure it's coordinated with python-couchdb 0.7 landing in Ubuntu.

Reply
Revision history for this message
Vincenzo Di Somma (vds) wrote :

We have python-couchdb in our sourcedeps.

Reply

Unmerged revisions

165. By vincenzo di somma <vds@lucid>

getting rid of deprecated method

164. By vincenzo di somma <vds@lucid>

some cleaning

163. By vincenzo di somma <vds@lucid>

removed all the httplib2 dependencies

162. By vincenzo di somma <vds@lucid>

new oauth class

161. By vincenzo di somma <vds@lucid>

new oauth class

160. By vincenzo di somma <vds@lucid>

removed most of the httplib2 dependencies

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches