Merge lp:~cjwatson/storm/syntax-warnings into lp:storm

[Colin Watson]

Fix several syntax warnings from recent Python versions.

Noticed while updating the Debian packaging.

[Guruprasad (lgp171188)]

LGTM 👍

review: Approve

=== modified file 'NEWS'
--- NEWS	2023-07-04 13:55:37 +0000
+++ NEWS	2023-12-07 17:05:38 +0000
@@ -1,3 +1,11 @@
+0.27
+====
+
+Improvements
+------------
+
+- Fix several syntax warnings from recent Python versions.
+
 0.26 (2023-07-04)
 =================
 

=== modified file 'storm/cache.py'
--- storm/cache.py	2020-05-26 10:37:54 +0000
+++ storm/cache.py	2023-12-07 17:05:38 +0000
@@ -11,7 +11,7 @@
     This prevents recently used objects from being deallocated by Python
     even if the user isn't holding any strong references to it.  It does
     that by holding strong references to the objects referenced by the
-    last C{N} C{obj_info}\ s added to it (where C{N} is the cache size).
+    last C{N} C{obj_info}\\ s added to it (where C{N} is the cache size).
     """
 
     def __init__(self, size=1000):
@@ -54,7 +54,7 @@
     def set_size(self, size):
         """Set the maximum number of objects that may be held in this cache.
 
-        If the size is reduced, older C{obj_info}\ s may be dropped from
+        If the size is reduced, older C{obj_info}\\ s may be dropped from
         the cache to respect the new size.
         """
         if size == 0:
@@ -66,7 +66,7 @@
         self._size = size
 
     def get_cached(self):
-        """Return an ordered list of the currently cached C{obj_info}\ s.
+        """Return an ordered list of the currently cached C{obj_info}\\ s.
 
         The most recently added objects come first in the list.
         """

=== modified file 'storm/database.py'
--- storm/database.py	2020-05-26 10:37:54 +0000
+++ storm/database.py	2023-12-07 17:05:38 +0000
@@ -377,7 +377,7 @@
             self._check_disconnect(trace, "connection_commit", self, xid)
 
     def recover(self):
-        """Return a list of L{Xid}\ s representing pending transactions."""
+        """Return a list of L{Xid}\\ s representing pending transactions."""
         self._ensure_connected()
         raw_xids = self._check_disconnect(self._raw_connection.tpc_recover)
         return [Xid(raw_xid[0], raw_xid[1], raw_xid[2])
@@ -423,7 +423,7 @@
         is not intended to be used externally.
 
         This delegates conversion to any
-        L{Variable <storm.variable.Variable>}\ s in the parameter list, and
+        L{Variable <storm.variable.Variable>}\\ s in the parameter list, and
         passes through all other values untouched.
         """
         for param in params:

=== modified file 'storm/store.py'
--- storm/store.py	2020-05-29 23:08:57 +0000
+++ storm/store.py	2023-12-07 17:05:38 +0000
@@ -1865,7 +1865,7 @@
 
 class block_access(object):
     """
-    Context manager blocks database access by one or more L{Store}\ s in the
+    Context manager blocks database access by one or more L{Store}\\ s in the
     managed scope.
     """
 

=== modified file 'storm/tests/expr.py'
--- storm/tests/expr.py	2022-10-18 17:36:05 +0000
+++ storm/tests/expr.py	2023-12-07 17:05:38 +0000
@@ -142,7 +142,7 @@
         self.assertIdentical(expr.compile_cache, None)
 
         # Test for identity. We don't want False there.
-        self.assertTrue(expr.primary is 0)
+        self.assertIs(expr.primary, 0)
 
         self.assertEqual(expr.variable_factory, Variable)
 
@@ -154,7 +154,7 @@
         self.assertEqual(expr.table, objects[1])
 
         # Test for identity. We don't want True there either.
-        self.assertTrue(expr.primary is 1)
+        self.assertIs(expr.primary, 1)
 
         self.assertEqual(expr.variable_factory, objects[3])
 
@@ -195,7 +195,7 @@
 
         like_expr = expr.startswith(u"abc!!_%")
         self.assertTrue(isinstance(like_expr, Like))
-        self.assertTrue(like_expr.expr1 is expr)
+        self.assertIs(like_expr.expr1, expr)
         self.assertEqual(like_expr.expr2, u"abc!!!!!_!%%")
         self.assertEqual(like_expr.escape, u"!")
 
@@ -214,7 +214,7 @@
 
         like_expr = expr.endswith(u"abc!!_%")
         self.assertTrue(isinstance(like_expr, Like))
-        self.assertTrue(like_expr.expr1 is expr)
+        self.assertIs(like_expr.expr1, expr)
         self.assertEqual(like_expr.expr2, u"%abc!!!!!_!%")
         self.assertEqual(like_expr.escape, u"!")
 
@@ -234,7 +234,7 @@
 
         like_expr = expr.contains_string(u"abc!!_%")
         self.assertTrue(isinstance(like_expr, Like))
-        self.assertTrue(like_expr.expr1 is expr)
+        self.assertIs(like_expr.expr1, expr)
         self.assertEqual(like_expr.expr2, u"%abc!!!!!_!%%")
         self.assertEqual(like_expr.escape, u"!")
 
@@ -1199,7 +1199,7 @@
     def test_eq_none(self):
         expr = Func1() == None
 
-        self.assertTrue(expr.expr2 is None)
+        self.assertIsNone(expr.expr2)
 
         state = State()
         statement = compile(expr, state)
@@ -1222,7 +1222,7 @@
     def test_ne_none(self):
         expr = Func1() != None
 
-        self.assertTrue(expr.expr2 is None)
+        self.assertIsNone(expr.expr2)
 
         state = State()
         statement = compile(expr, state)
@@ -2519,4 +2519,4 @@
         expr = SQL("Hullah!")
         variable = Variable()
         variable.set(expr)
-        self.assertTrue(variable.get(marker) is marker)
+        self.assertIs(variable.get(marker), marker)