Modernize code a bit

Author: Cito

webware/Examples/AjaxPage.py

@@ -18,7 +18,7 @@ def quoteJs(what):
     """Return quoted JavaScript string corresponding to the Python object."""
     if isinstance(what, bool):
         ret = str(what).lower()
-    elif isinstance(what, (int, float, PyJs)):
+    elif isinstance(what, int | float | PyJs):
         ret = str(what)
     else:
         ret = "'{}'".format(str(what).replace('\\', '\\\\').replace(

webware/Examples/Introspect.py

@@ -20,7 +20,7 @@ def writeContent(self):
         self.writeln('</table>')
 
     def pair(self, key, value):
-        if isinstance(value, (list, tuple)):
+        if isinstance(value, list | tuple):
             value = ', '.join(map(str, value))
         value = self.htmlEncode(str(value))
         self.writeln(
@@ -29,6 +29,6 @@ def pair(self, key, value):
 
     def list(self, codeString):
         value = eval(codeString)
-        if not isinstance(value, (list, tuple)):
+        if not isinstance(value, list | tuple):
             value = '<em>not a list or a tuple</em>'
         self.pair(codeString, value)

webware/Examples/YattagDemo.py

@@ -63,9 +63,8 @@ def demoForm(self):
             with tag('p', klass='success'):
                 text('Congratulations! You have sent the following message:')
             with tag('div', klass='output'):
-                with tag('p'):
-                    with tag('strong'):
-                        text(subject)
+                with tag('p'), tag('strong'):
+                    text(subject)
                 with tag('p'):
                     text(message)
             with tag('a', href='YattagDemo'):

webware/ExceptionHandler.py

@@ -506,7 +506,7 @@ def emailException(self, htmlErrMsg):
         headers['Subject'] = '{} {}: {}'.format(
             headers.get('Subject', '[Webware Error]'), *sys.exc_info()[:2])
         for header, value in headers.items():
-            if isinstance(value, (list, tuple)):
+            if isinstance(value, list | tuple):
                 value = ','.join(value)
             message.add_header(header, value)
 

webware/HTTPResponse.py

@@ -134,13 +134,13 @@ def setCookie(
             elif t.startswith('+'):
                 t = time() + timeDecode(t[1:])
         if t:
-            if isinstance(t, (int, float)):
+            if isinstance(t, int | float):
                 t = gmtime(t)
-            if isinstance(t, (tuple, struct_time)):
+            elif isinstance(t, tuple | struct_time):
                 t = strftime("%a, %d-%b-%Y %H:%M:%S GMT", t)
-            if isinstance(t, timedelta):
+            elif isinstance(t, timedelta):
                 t = datetime.now() + t
-            if isinstance(t, datetime):
+            elif isinstance(t, datetime):
                 d = t.utcoffset()
                 if d is None:
                     d = localTimeDelta()

webware/MiscUtils/DataTable.py

@@ -702,7 +702,7 @@ def __init__(self, table, values=None, headings=None):
         self._headings = table.headings() if headings is None else headings
         self._nameToIndexMap = table.nameToIndexMap()
         if values is not None:
-            if isinstance(values, (list, tuple)):
+            if isinstance(values, list | tuple):
                 self.initFromSequence(values)
             elif isinstance(values, dict):
                 self.initFromDict(values)

webware/MiscUtils/MixIn.py

@@ -85,7 +85,7 @@ def foo(self):
                     continue  # built in or descriptor
             else:
                 member = getattr(mixInClass, name)
-            if isinstance(member, (FunctionType, MethodType)):
+            if isinstance(member, FunctionType | MethodType):
                 if mixInSuperMethods:
                     if hasattr(pyClass, name):
                         origMember = getattr(pyClass, name)

webware/MiscUtils/PickleCache.py

@@ -47,10 +47,7 @@
 import sys
 from time import sleep
 from pprint import pprint
-try:
-    from pickle import load, dump, HIGHEST_PROTOCOL as maxPickleProtocol
-except ImportError:
-    from pickle import load, dump, HIGHEST_PROTOCOL as maxPickleProtocol
+from pickle import load, dump, HIGHEST_PROTOCOL as maxPickleProtocol
 
 verbose = False
 

webware/MiscUtils/Tests/BenchCSVParser.py

@@ -1,10 +1,7 @@
 import sys
 import time
 from glob import glob
-try:
-    from cProfile import Profile
-except ImportError:
-    from profile import Profile
+from cProfile import Profile
 
 from MiscUtils.CSVParser import CSVParser
 

webware/MiscUtils/Tests/BenchDataTable.py

@@ -3,10 +3,7 @@
 import sys
 import time
 from glob import glob
-try:
-    from cProfile import Profile
-except ImportError:
-    from profile import Profile
+from cProfile import Profile
 
 from MiscUtils.DataTable import DataTable