Use more modern Python idioms

Author: Cito

DBUtils/Examples/DBUtilsExample.py

@@ -63,7 +63,7 @@ class DBUtilsExample(ExamplePage):
                 if dbapi_name != 'pg':
                     config['creator'] = dbapi
                 dbclass = getattr(dbmod, dbmod_name)(**config)
-            except dbapi.Error, error:
+            except dbapi.Error as error:
                 dbstatus = str(error)
             except Exception:
                 dbstatus = 'Could not connect to the database.'
@@ -107,7 +107,7 @@ def output(self, s):
 
     def outputMsg(self, msg, error=False):
         self._output.append('<p style="color:%s">%s</p>'
-            % (error and 'red' or 'green', msg))
+            % ('red' if error else 'green', msg))
 
     def connection(self, shareable=True):
         if self.dbstatus:
@@ -118,7 +118,7 @@ def connection(self, shareable=True):
                     return self.dbclass.connection(shareable)
                 else:
                     return self.dbclass.connection()
-            except self.dbapi.Error, error:
+            except self.dbapi.Error as error:
                 error = str(error)
             except Exception:
                 error = 'Cannot connect to the database.'
@@ -288,7 +288,7 @@ def listAttendees(self):
             '<tr><th>Name</th><th>Seminar</th><th>Paid</th>'
             '<th>%s</th></tr>' % button)
         for name, id, title, paid in result:
-            paid = paid and 'Yes' or 'No'
+            paid = 'Yes' if paid else 'No'
             id = id.ljust(4) + name
             wr('<tr><td>%s</td><td>%s</td><td>%s</td>'
                 '<td><input type="checkbox" name="id" value="%s"></td>'

DBUtils/SteadyDB.py

@@ -188,7 +188,7 @@ def __init__(self, creator, maxusage=None, setsession=None,
                 failures, tuple) and not issubclass(failures, Exception):
             raise TypeError("'failures' must be a tuple of exceptions.")
         self._failures = failures
-        self._ping = isinstance(ping, int) and ping or 0
+        self._ping = ping if isinstance(ping, int) else 0
         self._closeable = closeable
         self._args, self._kwargs = args, kwargs
         self._store(self._create())
@@ -667,7 +667,7 @@ def tough_method(*args, **kwargs):
     def __getattr__(self, name):
         """Inherit methods and attributes of underlying cursor."""
         if self._cursor:
-            if name.startswith('execute') or name.startswith('call'):
+            if name.startswith(('execute', 'call')):
                 # make execution methods "tough"
                 return self._get_tough_method(name)
             else:

DBUtils/Tests/TestPooledDB.py

@@ -514,7 +514,7 @@ def test09_SortShared(self):
             db.cursor().execute('select test')
             cache.append(db)
         for i, db in enumerate(cache):
-            self.assertEqual(db._shared_con.shared, 2 <= i < 4 and 1 or 2)
+            self.assertEqual(db._shared_con.shared, 1 if 2 <= i < 4 else 2)
         cache[2].begin()
         cache[3].begin()
         db = pool.connection()

DBUtils/Tests/TestSimplePooledDB.py

@@ -49,7 +49,7 @@ def cursor(self):
 def versionString(version):
     """Create version string."""
     ver = [str(v) for v in version]
-    numbers, rest = ver[:ver[2] == '0' and 2 or 3], ver[3:]
+    numbers, rest = ver[:2 if ver[2] == '0' else 3], ver[3:]
     return '.'.join(numbers) + '-'.join(rest)
 
 

DBUtils/Tests/TestSteadyDB.py

@@ -440,10 +440,10 @@ def test06_ConnectionMaxUsage(self):
             if i == 5:
                 db._con.valid = cursor._cursor.valid = False
             cursor.callproc('test')
-            j = (i + (i < 5 and 3 or -5)) % 10 + 1
+            j = (i + (3 if i < 5 else -5)) % 10 + 1
             self.assertEqual(db._usage, j)
             self.assertEqual(db._con.num_uses, j)
-            j = i < 5 and 3 or 0
+            j = 3 if i < 5 else 0
             self.assertEqual(db._con.num_queries, j)
         db.close()
         cursor.execute('select test1')

DBUtils/Tests/TestSteadyPg.py

@@ -321,9 +321,9 @@ def test5_ConnectionMaxUsage(self):
                 db.db.status = False
             r = db.get_tables()
             self.assertEqual(r, 'test')
-            j = (i + (i < 5 and 3 or -5)) % 10 + 1
+            j = (i + (3 if i < 5 else -5)) % 10 + 1
             self.assertEqual(db._usage, j)
-            j = i < 5 and 3 or 0
+            j = 3 if i < 5 else 0
             self.assertEqual(db.num_queries, j)
         db.close()
         self.assertEqual(db.query('select test1'), 'test1')

buildhtml.py

@@ -2,11 +2,13 @@
 
 """Build HMTL from reST files."""
 
+from __future__ import print_function
+
 from glob import glob
 from os.path import splitext, join
 from docutils.core import publish_file
 
-print "Creating the documentation..."
+print("Creating the documentation...")
 
 for rst_file in glob(join('DBUtils', 'Docs', '*.rst')):
     name = splitext(rst_file)[0]
@@ -18,18 +20,18 @@
     else:
         lang = 'en'
     html_file = name + '.html'
-    print name, lang
+    print(name, lang)
 
-    source = open(rst_file, 'r')
-    destination=open(html_file, 'w')
-    publish_file(writer_name='html5',
-        source=source, destination=destination,
-        settings_overrides = dict(
-            stylesheet_path='Doc.css',
-            embed_stylesheet=False,
-            toc_backlinks=False,
-            language_code=lang
-        )
-    )
+    with open(rst_file) as source:
+        with open(html_file, 'w') as destination:
+            publish_file(writer_name='html5',
+                source=source, destination=destination,
+                settings_overrides = dict(
+                    stylesheet_path='Doc.css',
+                    embed_stylesheet=False,
+                    toc_backlinks=False,
+                    language_code=lang
+                )
+            )
 
-print "Done."
+print("Done.")

setversion.py

@@ -39,7 +39,7 @@ def versionString(version):
 
     """
     ver = map(str, version)
-    numbers, rest = ver[:ver[2] == '0' and 2 or 3], ver[3:]
+    numbers, rest = ver[:2 if ver[2] == '0' else 3], ver[3:]
     return '.'.join(numbers) + '-'.join(rest)
 
 versionString = versionString(version)