Merge lp://staging/~stub/launchpad/update-storm into lp://staging/launchpad/db-devel

Proposed by Stuart Bishop
Status: Merged
Approved by: Stuart Bishop
Approved revision: no longer in the source branch.
Merged at revision: 9959
Proposed branch: lp://staging/~stub/launchpad/update-storm
Merge into: lp://staging/launchpad/db-devel
Diff against target: 2644 lines (+362/-446)
44 files modified
lib/canonical/launchpad/database/account.py (+7/-7)
lib/canonical/launchpad/database/stormsugar.py (+1/-19)
lib/canonical/launchpad/database/tests/test_stormextensions.py (+0/-101)
lib/canonical/launchpad/helpers.py (+45/-0)
lib/canonical/launchpad/vocabularies/dbobjects.py (+7/-2)
lib/canonical/launchpad/webapp/pgsession.py (+16/-14)
lib/canonical/launchpad/webapp/vocabulary.py (+5/-4)
lib/lp/archivepublisher/ftparchive.py (+15/-9)
lib/lp/bugs/model/bug.py (+25/-17)
lib/lp/bugs/model/bugtask.py (+13/-8)
lib/lp/bugs/model/bugwatch.py (+20/-24)
lib/lp/code/model/branch.py (+2/-2)
lib/lp/hardwaredb/model/hwdb.py (+17/-13)
lib/lp/registry/browser/distributionsourcepackage.py (+2/-1)
lib/lp/registry/doc/vocabularies.txt (+1/-1)
lib/lp/registry/model/distribution.py (+9/-8)
lib/lp/registry/model/distributionsourcepackage.py (+2/-4)
lib/lp/registry/model/person.py (+18/-33)
lib/lp/registry/model/pillar.py (+4/-1)
lib/lp/registry/model/projectgroup.py (+2/-3)
lib/lp/registry/model/sourcepackage.py (+2/-3)
lib/lp/registry/model/sourcepackagename.py (+3/-1)
lib/lp/registry/vocabularies.py (+15/-16)
lib/lp/scripts/garbo.py (+5/-5)
lib/lp/scripts/utilities/sanitizedb.py (+1/-1)
lib/lp/services/database/bulk.py (+1/-2)
lib/lp/services/worlddata/model/language.py (+5/-4)
lib/lp/soyuz/doc/gina.txt (+1/-1)
lib/lp/soyuz/doc/packageset.txt (+2/-2)
lib/lp/soyuz/model/archivepermission.py (+12/-13)
lib/lp/soyuz/model/binarypackagebuild.py (+2/-3)
lib/lp/soyuz/model/binarypackagename.py (+9/-5)
lib/lp/soyuz/model/distroarchseriesbinarypackage.py (+4/-10)
lib/lp/soyuz/model/packagediff.py (+5/-6)
lib/lp/soyuz/model/packageset.py (+17/-17)
lib/lp/soyuz/model/publishing.py (+22/-30)
lib/lp/soyuz/model/queue.py (+28/-40)
lib/lp/soyuz/scripts/initialise_distroseries.py (+3/-1)
lib/lp/translations/model/pofile.py (+1/-2)
lib/lp/translations/model/potemplate.py (+1/-2)
lib/lp/translations/model/translationimportqueue.py (+1/-2)
lib/lp/translations/scripts/migrate_variants.py (+9/-9)
setup.py (+1/-0)
versions.cfg (+1/-0)
To merge this branch: bzr merge lp://staging/~stub/launchpad/update-storm
Reviewer Review Type Date Requested Status
Launchpad code reviewers Pending
Review via email: mp+40264@code.staging.launchpad.net

Commit message

Update to psycopg2 2.2.2

Description of the change

Code changes to migrate us to modern psycopg2, such as the one packaged in Lucid. And delinting.

Rather than change the tests, I elected to cast to Unicode in the main code - fixing the tests might not be enough as other call sites might still be sending str on untested code paths.

To post a comment you must log in.

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

to status/vote changes: