Merge lp://qastaging/~thisfred/desktopcouch/fix-fieldmappings into lp://qastaging/desktopcouch
Proposed by
Eric Casteleijn
Status: | Merged |
---|---|
Approved by: | Eric Casteleijn |
Approved revision: | 206 |
Merged at revision: | 205 |
Proposed branch: | lp://qastaging/~thisfred/desktopcouch/fix-fieldmappings |
Merge into: | lp://qastaging/desktopcouch |
Diff against target: |
1532 lines (+273/-188) 13 files modified
.bzrignore (+2/-0) bin/desktopcouch-pair (+41/-41) data/source_desktopcouch.py (+1/-1) desktopcouch/pair/couchdb_pairing/couchdb_io.py (+5/-5) desktopcouch/pair/tests/test_couchdb_io.py (+3/-3) desktopcouch/records/doc/field_registry.txt (+21/-16) desktopcouch/records/field_registry.py (+16/-9) desktopcouch/records/server.py (+16/-14) desktopcouch/records/server_base.py (+53/-32) desktopcouch/records/tests/test_field_registry.py (+50/-15) desktopcouch/records/tests/test_record.py (+20/-20) desktopcouch/records/tests/test_server.py (+44/-31) utilities/lint.sh (+1/-1) |
To merge this branch: | bzr merge lp://qastaging/~thisfred/desktopcouch/fix-fieldmappings |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chad Miller (community) | Approve | ||
Vincenzo Di Somma (community) | Approve | ||
dobey (community) | Approve | ||
Review via email: mp+40573@code.qastaging.launchpad.net |
Commit message
Fixes bug #416963: fieldregistry transformers now return results, and don't need a record or dictionary like object passed in.
Description of the change
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.)
To post a comment you must log in.
90% of the diff comes from delinting, you'll be happy to know.