Merge lp://qastaging/~thisfred/desktopcouch/split-attempt-2 into lp://qastaging/desktopcouch
Proposed by
Eric Casteleijn
Status: | Merged |
---|---|
Approved by: | Eric Casteleijn |
Approved revision: | 226 |
Merged at revision: | 216 |
Proposed branch: | lp://qastaging/~thisfred/desktopcouch/split-attempt-2 |
Merge into: | lp://qastaging/desktopcouch |
Diff against target: |
4040 lines (+1093/-878) 78 files modified
bin/desktopcouch-pair (+1/-1) desktopcouch/__init__.py (+1/-0) desktopcouch/application/local_files.py (+67/-53) desktopcouch/application/migration/__init__.py (+3/-3) desktopcouch/application/migration/tests/test_migration.py (+6/-6) desktopcouch/application/pair/couchdb_pairing/couchdb_io.py (+5/-5) desktopcouch/application/pair/couchdb_pairing/dbus_io.py (+65/-40) desktopcouch/application/pair/couchdb_pairing/network_io.py (+68/-58) desktopcouch/application/pair/couchdb_pairing/ubuntuone_pairing.py (+1/-1) desktopcouch/application/pair/tests/test_couchdb_io.py (+4/-4) desktopcouch/application/pair/tests/test_network_io.py (+47/-125) desktopcouch/application/pair/tests/test_ubuntuone_pairing.py (+2/-2) desktopcouch/application/platform/__init__.py (+17/-9) desktopcouch/application/platform/linux/ipc.py (+11/-5) desktopcouch/application/platform/linux/keyring.py (+24/-19) desktopcouch/application/replication.py (+48/-31) desktopcouch/application/replication_services/ubuntuone.py (+20/-10) desktopcouch/application/service.py (+34/-31) desktopcouch/application/start_local_couchdb.py (+2/-2) desktopcouch/application/stop_local_couchdb.py (+6/-2) desktopcouch/application/tests/__init__.py (+53/-31) desktopcouch/application/tests/test_local_files.py (+34/-19) desktopcouch/application/tests/test_replication.py (+17/-10) desktopcouch/application/tests/test_service.py (+20/-16) desktopcouch/application/tests/test_start_local_couchdb.py (+7/-3) desktopcouch/bookmarks/__init__.py (+0/-20) desktopcouch/bookmarks/record.py (+9/-0) desktopcouch/contacts/__init__.py (+0/-20) desktopcouch/contacts/record.py (+9/-0) desktopcouch/contacts/view.py (+9/-0) desktopcouch/local_files.py (+9/-0) desktopcouch/notes/__init__.py (+0/-19) desktopcouch/notes/record.py (+9/-0) desktopcouch/notes/tests/__init__.py (+0/-18) desktopcouch/pair/__init__.py (+9/-0) desktopcouch/pair/couchdb_pairing/__init__.py (+1/-0) desktopcouch/pair/couchdb_pairing/couchdb_io.py (+10/-0) desktopcouch/pair/couchdb_pairing/dbus_io.py (+10/-0) desktopcouch/pair/couchdb_pairing/network_io.py (+10/-0) desktopcouch/pair/couchdb_pairing/ubuntuone_pairing.py (+10/-0) desktopcouch/records/__init__.py (+0/-23) desktopcouch/records/doc/an_example_application.txt (+3/-3) desktopcouch/records/doc/field_registry.txt (+1/-1) desktopcouch/records/doc/records.txt (+1/-1) desktopcouch/records/field_registry.py (+1/-1) desktopcouch/records/server.py (+5/-4) desktopcouch/records/server_base.py (+11/-6) desktopcouch/records/tests/test_field_registry.py (+1/-1) desktopcouch/records/tests/test_record.py (+4/-4) desktopcouch/records/tests/test_server.py (+4/-4) desktopcouch/recordtypes/__init__.py (+1/-0) desktopcouch/recordtypes/bookmarks.py (+14/-6) desktopcouch/recordtypes/contacts/__init__.py (+2/-2) desktopcouch/recordtypes/contacts/testing/create.py (+23/-9) desktopcouch/recordtypes/contacts/tests/__init__.py (+2/-3) desktopcouch/recordtypes/contacts/tests/test_create.py (+15/-13) desktopcouch/recordtypes/contacts/tests/test_record.py (+1/-1) desktopcouch/recordtypes/contacts/tests/test_view.py (+220/-62) desktopcouch/recordtypes/contacts/view.py (+1/-1) desktopcouch/recordtypes/notes.py (+1/-1) desktopcouch/recordtypes/tasks.py (+1/-1) desktopcouch/recordtypes/tests/__init__.py (+1/-0) desktopcouch/recordtypes/tests/test_bookmarks.py (+1/-2) desktopcouch/recordtypes/tests/test_notes.py (+1/-1) desktopcouch/recordtypes/tests/test_tasks.py (+1/-1) desktopcouch/replication.py (+9/-0) desktopcouch/replication_services/__init__.py (+10/-0) desktopcouch/replication_services/example.py (+10/-0) desktopcouch/replication_services/ubuntuone.py (+10/-0) desktopcouch/service.py (+9/-0) desktopcouch/start_local_couchdb.py (+16/-0) desktopcouch/stop_local_couchdb.py (+15/-0) desktopcouch/tasks/__init__.py (+0/-19) desktopcouch/tasks/record.py (+9/-0) desktopcouch/tests/__init__.py (+9/-0) desktopcouch/util.py (+9/-0) po/desktopcouch.pot (+0/-137) runtests.py (+13/-8) |
To merge this branch: | bzr merge lp://qastaging/~thisfred/desktopcouch/split-attempt-2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
dobey (community) | Abstain | ||
Vincenzo Di Somma (community) | Approve | ||
Manuel de la Peña (community) | Approve | ||
Chad Miller (community) | Approve | ||
Review via email:
|
Commit message
This reorganizes the code in preparation for the actual split into two or more packages. All the old import paths should still work.
Description of the change
This reorganizes the code in preparation for the actual split into two or more packages. All the old import paths should still work.
This had so much lint that it wasn't funny, and I'm not doing that again, so be prepared to be shouted at, or at least passive aggressively leered at when creating new lint issues. Shit looked like Perl.
To post a comment you must log in.
I escaped a *lot* of lint issues that will need looking at at some point, because I wasn't really able whether judge if pylint was full of it, or these were really problems/bugs. Please look at the parts of the code you are most familiar with.
I left all XXX/FIXME/TODO issues unescaped (and even added a few), so that we'll keep seeing them, and hopefully fix them.
The other issues left are refactoring hints, which I think will be useful, but I didn't fell like fixem them now. We went from something like 600 issues to something like 20, though.