Storm

Merge lp://staging/~cjwatson/storm/lp-psycopg-2.5 into lp://staging/~launchpad-committers/storm/lp

  1. lp-psycopg-2.5
  2. Merge into lp
Proposed by Colin Watson
Status: Merged
Merged at revision: 407
Proposed branch: lp://staging/~cjwatson/storm/lp-psycopg-2.5
Merge into: lp://staging/~launchpad-committers/storm/lp
Diff against target: 29 lines (+9/-3)
1 file modified
storm/exceptions.py (+9/-3)
To merge this branch: bzr merge lp://staging/~cjwatson/storm/lp-psycopg-2.5
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+278350@code.staging.launchpad.net

Commit message

Use ABCMeta for exception base class injection

This requires Python >= 2.6 (which is unlikely to be a problem these days!),
and adds compatibility with psycopg2 >= 2.5.

Description of the change

Cherry-pick https://code.launchpad.net/~cjwatson/storm/psycopg-2.5/+merge/278330, proposed to mainline. This will let us upgrade Launchpad to psycopg2 >= 2.5, adding support for the json column type.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve (code)

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