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

[Colin Watson]

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

[Kristian Glass (doismellburning)]

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

[Colin Watson (cjwatson)]

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.

[Kristian Glass (doismellburning)]

Right ok, makes sense, thanks!

[Kristian Glass (doismellburning)]

review: Approve

=== modified file 'tests/expr.py'
--- tests/expr.py	2019-06-07 16:36:44 +0000
+++ tests/expr.py	2019-08-11 11:10:10 +0000
@@ -499,10 +499,9 @@
         self.assertEquals(statement, "child")
 
     def test_precedence(self):
-        for i in range(10):
-            exec("e%d = SQLRaw('%d')" % (i, i))
-        expr = And(e1, Or(e2, e3),
-                   Add(e4, Mul(e5, Sub(e6, Div(e7, Div(e8, e9))))))
+        e = [SQLRaw('%d' % i) for i in range(10)]
+        expr = And(e[1], Or(e[2], e[3]),
+                   Add(e[4], Mul(e[5], Sub(e[6], Div(e[7], Div(e[8], e[9]))))))
         statement = compile(expr)
         self.assertEquals(statement, "1 AND (2 OR 3) AND 4+5*(6-7/(8/9))")
 
@@ -2136,10 +2135,9 @@
 class CompilePythonTest(TestHelper):
 
     def test_precedence(self):
-        for i in range(10):
-            exec("e%d = SQLRaw('%d')" % (i, i))
-        expr = And(e1, Or(e2, e3),
-                   Add(e4, Mul(e5, Sub(e6, Div(e7, Div(e8, e9))))))
+        e = [SQLRaw('%d' % i) for i in range(10)]
+        expr = And(e[1], Or(e[2], e[3]),
+                   Add(e[4], Mul(e[5], Sub(e[6], Div(e[7], Div(e[8], e[9]))))))
         py_expr = compile_python(expr)
         self.assertEquals(py_expr, "1 and (2 or 3) and 4+5*(6-7/(8/9))")
 
 
=== modified file 'tests/sqlobject.py'
--- tests/sqlobject.py	2019-06-05 11:41:07 +0000
+++ tests/sqlobject.py	2019-08-11 11:10:10 +0000
@@ -1214,7 +1214,7 @@
         self.assertEquals([person.name for person in result],
                           [u"John Doe"])
 
-        person.name = u"Funny !%_ Name"
+        result[0].name = u"Funny !%_ Name"
 
         expr = NOT(CONTAINSSTRING(self.Person.q.name, u"!%_"))
         result = self.Person.select(expr)
 
=== modified file 'tests/variables.py'
--- tests/variables.py	2019-06-07 17:14:33 +0000
+++ tests/variables.py	2019-08-11 11:10:10 +0000
@@ -145,8 +145,9 @@
         try:
             variable.set(None)
         except NoneError as e:
-            pass
-        self.assertTrue("column_name" in str(e))
+            self.assertTrue("column_name" in str(e))
+        else:
+            self.fail("NoneError not raised")
 
     def test_set_none_with_allow_none_and_column_with_table(self):
         column = Column("column_name", SQLToken("table_name"))
@@ -154,8 +155,9 @@
         try:
             variable.set(None)
         except NoneError as e:
-            pass
-        self.assertTrue("table_name.column_name" in str(e))
+            self.assertTrue("table_name.column_name" in str(e))
+        else:
+            self.fail("NoneError not raised")
 
     def test_set_with_validator(self):
         args = []