lp://qastaging/~mandel/desktopcouch/fix_pep8_from_windows

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/desktopcouch at revision 261

Roberto Alsina (community): Approve on 2011-01-26

Eric Casteleijn (community): Approve on 2011-01-25

Diff: 195 lines (+20/-19)

11 files modified

desktopcouch/application/migration/__init__.py (+2/-0)
desktopcouch/application/platform/windows/base_dirs.py (+6/-6)
desktopcouch/application/platform/windows/keyring.py (+2/-2)
desktopcouch/application/platform/windows/tests/test_base_dirs.py (+0/-1)
desktopcouch/application/replication_services/ubuntuone.py (+2/-2)
desktopcouch/application/service.py (+1/-1)
desktopcouch/application/start_local_couchdb.py (+1/-0)
desktopcouch/application/tests/test_service.py (+0/-1)
desktopcouch/records/tests/test_field_registry.py (+4/-4)
desktopcouch/records/tests/test_mocked_server.py (+1/-1)
run-tests.bat (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

261. By Manuel de la Peña on 2011-01-25

Fixed a number pep8 error I do not agree with...

260. By Chad Miller on 2011-01-24

Official python-couchdb replicate() function returns only one value, instead of two that our hack used to use. (LP: #705448)

259. By Chad Miller on 2011-01-14

If a record id is not in a database, desktopcouch would raise a strange exception when it was used to try to delete a record. Now, return normally, with value None as the deleted-record id. (LP: #702979)

258. By Chad Miller on 2011-01-12

Release 1.0.5.

257. By dobey on 2011-01-12

Fix a line too long from Manuel's Windows support branch

256. By Chad Miller on 2011-01-10

Change to the new system of initiating replication with python-couchdb. (LP: #700128)

255. By Manuel de la Peña on 2011-01-10

Added the correct import of the keyring on windows to fix lp:699766
Added implementation for the base dirs on windows to fix lp:699818

254. By Chad Miller on 2011-01-10

Move data migration to the service startup. (LP: #700129)

253. By Chad Miller on 2011-01-08

In the ubuntuone service module, where we request credentials from dbus, we get back a DBus structure that can't be encoded by some JSON libraries that python-couchdb uses. Manually decode now. (LP: #700132)

252. By Eric Casteleijn on 2011-01-07

Added __eq__ and __ne__ to MergeableList class so they can be compared to regular lists.