Storm

Merge lp:~cjwatson/storm/py3-exec into lp:storm

  1. py3-exec
  2. Merge into trunk
Proposed by Colin Watson
Status: Merged
Merged at revision: 506
Proposed branch: lp:~cjwatson/storm/py3-exec
Merge into: lp:storm
Diff against target: 59 lines (+6/-6)
3 files modified
storm/exceptions.py (+1/-1)
storm/expr.py (+1/-1)
tests/expr.py (+4/-4)
To merge this branch: bzr merge lp:~cjwatson/storm/py3-exec
Reviewer Review Type Date Requested Status
Colin Watson Approve
Review via email: mp+368560@code.launchpad.net

Commit message

Use Python 3-compatible exec functions.

Description of the change

I extracted this from https://bazaar.launchpad.net/~bellini666/storm/py3/revision/485, and a tab-to-space change from https://bazaar.launchpad.net/~bellini666/storm/py3/revision/489 that wasn't worth a separate branch.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

I'll review this myself since I just extracted it from somebody else's MP.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'storm/exceptions.py'
2--- storm/exceptions.py 2019-06-05 11:41:07 +0000
3+++ storm/exceptions.py 2019-06-07 16:47:40 +0000
4@@ -130,7 +130,7 @@
5 self.message = message
6
7 def __str__(self):
8- return ', '.join(
9+ return ', '.join(
10 [repr(element) for element in
11 (self.message, self.statement, self.params)
12 if element is not None])
13
14=== modified file 'storm/expr.py'
15--- storm/expr.py 2019-06-05 11:41:07 +0000
16+++ storm/expr.py 2019-06-07 16:47:40 +0000
17@@ -220,7 +220,7 @@
18 " return match" %
19 (",".join("_%d" % i for i in range(len(state.parameters))),
20 source))
21- exec code in namespace
22+ exec(code, namespace)
23 return namespace['closure'](state.parameters, bool)
24
25
26
27=== modified file 'tests/expr.py'
28--- tests/expr.py 2019-06-05 11:41:07 +0000
29+++ tests/expr.py 2019-06-07 16:47:40 +0000
30@@ -40,9 +40,9 @@
31 # Create columnN, tableN, and elemN variables.
32 for i in range(10):
33 for name in ["column", "elem"]:
34- exec "%s%d = SQLToken('%s%d')" % (name, i, name, i)
35+ exec("%s%d = SQLToken('%s%d')" % (name, i, name, i))
36 for name in ["table"]:
37- exec "%s%d = '%s %d'" % (name, i, name, i)
38+ exec("%s%d = '%s %d'" % (name, i, name, i))
39
40
41 class TrackContext(FromExpr):
42@@ -500,7 +500,7 @@
43
44 def test_precedence(self):
45 for i in range(10):
46- exec "e%d = SQLRaw('%d')" % (i, i)
47+ exec("e%d = SQLRaw('%d')" % (i, i))
48 expr = And(e1, Or(e2, e3),
49 Add(e4, Mul(e5, Sub(e6, Div(e7, Div(e8, e9))))))
50 statement = compile(expr)
51@@ -2137,7 +2137,7 @@
52
53 def test_precedence(self):
54 for i in range(10):
55- exec "e%d = SQLRaw('%d')" % (i, i)
56+ exec("e%d = SQLRaw('%d')" % (i, i))
57 expr = And(e1, Or(e2, e3),
58 Add(e4, Mul(e5, Sub(e6, Div(e7, Div(e8, e9))))))
59 py_expr = compile_python(expr)

Subscribers

People subscribed via source and target branches

to status/vote changes: