Storm

Merge lp://staging/~cjwatson/storm/py3-scoping into lp://staging/storm

  1. py3-scoping
  2. Merge into trunk
Proposed by Colin Watson
Status: Merged
Merged at revision: 522
Proposed branch: lp://staging/~cjwatson/storm/py3-scoping
Merge into: lp://staging/storm
Diff against target: 72 lines (+13/-13)
3 files modified
tests/expr.py (+6/-8)
tests/sqlobject.py (+1/-1)
tests/variables.py (+6/-4)
To merge this branch: bzr merge lp://staging/~cjwatson/storm/py3-scoping
Reviewer Review Type Date Requested Status
Kristian Glass (community) Approve
Storm Developers Pending
Review via email: mp+371164@code.staging.launchpad.net

Commit message

Adjust tests to cope with tighter scoping rules in Python 3.

To post a comment you must log in.
Revision history for this message
Kristian Glass (doismellburning) wrote :

LGTM - yay for less `exec`ing - though I have two instances of one question about using assertRaises for potentially-better legibility

Revision history for this message
Colin Watson (cjwatson) wrote :

Formally Storm still supports Python 2.6 (that is, we've specifically dropped support for earlier versions but not yet for 2.6). The form of assertRaises that's usable as a context manager to allow performing additional checks on the exception raised was only introduced in 2.7. Although I don't particularly care about 2.6, it felt less invasive to fix this up within the existing version constraints.

Revision history for this message
Kristian Glass (doismellburning) wrote :

Right ok, makes sense, thanks!

Revision history for this message
Kristian Glass (doismellburning) :
review: Approve

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: