Minor simplifications

Author: Cito

webware/Examples/AjaxPage.py

@@ -41,12 +41,7 @@ def __str__(self):
     def __call__(self, *args, **kw):
         args = ','.join(map(quoteJs, args))
         kwArgs = ','.join(f'{k}={quoteJs(v)}' for k, v in kw.items())
-        if args and kwArgs:
-            allArgs = f'{args},{kwArgs}'
-        elif not kwArgs:
-            allArgs = args
-        elif not args:
-            allArgs = kwArgs
+        allArgs = f'{args},{kwArgs}' if args and kwArgs else args or kwArgs
         return self.__class__(f'{self}({allArgs}')
 
     def __getitem__(self, index):

webware/MiscUtils/DictForArgs.py

@@ -7,6 +7,16 @@
 
 import re
 
+verbose = False
+
+_nameRE = re.compile(r'\w+')
+_equalsRE = re.compile(r'\=')
+_stringRE = re.compile(r'''"[^"]+"|'[^']+'|\S+''')
+_whiteRE = re.compile(r'\s+')
+
+_REs = {_nameRE: 'name', _equalsRE: 'equals',
+        _stringRE: 'string', _whiteRE: 'white'}
+
 
 class DictForArgsError(Exception):
     """Error when building dictionary from arguments."""
@@ -16,14 +26,6 @@ def _SyntaxError(s):
     raise DictForArgsError(f'Syntax error: {s!r}')
 
 
-_nameRE = re.compile(r'\w+')
-_equalsRE = re.compile(r'\=')
-_stringRE = re.compile(r'''"[^"]+"|'[^']+'|\S+''')
-_whiteRE = re.compile(r'\s+')
-
-_REs = [_nameRE, _equalsRE, _stringRE, _whiteRE]
-
-
 def dictForArgs(s):
     """Build dictionary from arguments.
 
@@ -58,7 +60,6 @@ def dictForArgs(s):
 
     # Tokenize
 
-    verbose = False
     matches = []
     start = 0
     sLen = len(s)
@@ -84,17 +85,7 @@ def dictForArgs(s):
             _SyntaxError(s)
 
     if verbose:
-        names = []
-        for match in matches:
-            if match.re is _nameRE:
-                name = 'name'
-            elif match.re is _equalsRE:
-                name = 'equals'
-            elif match.re is _stringRE:
-                name = 'string'
-            elif match.re is _whiteRE:
-                name = 'white'
-            names.append(name)
+        names = ', '.join(_REs[match.re] for match in matches)
         print('>> names =', names)
 
     # Process tokens
@@ -107,10 +98,7 @@ def dictForArgs(s):
     i = 0
     while i < matchesLen:
         match = matches[i]
-        if i + 1 < matchesLen:
-            peekMatch = matches[i+1]
-        else:
-            peekMatch = None
+        peekMatch = matches[i+1] if i + 1 < matchesLen else None
         if match.re is _nameRE:
             if peekMatch is not None:
                 if peekMatch.re is _nameRE:
@@ -121,9 +109,9 @@ def dictForArgs(s):
                 if peekMatch.re is _equalsRE:
                     if i + 2 < matchesLen:
                         target = matches[i+2]
-                        if target.re is _nameRE or target.re is _stringRE:
+                        if target.re in (_nameRE, _stringRE):
                             value = target.group()
-                            if value[0] == "'" or value[0] == '"':
+                            if value[0] in ("'", '"'):
                                 value = value[1:-1]
                             d[match.group()] = value
                             i += 3

webware/MiscUtils/Tests/TestCSVParser.py

@@ -21,14 +21,10 @@ def testNegatives(self):
             'a\n,b'
         ]
         for inp in inputs:
-            try:
+            with self.assertRaises(
+                    ParseError, msg=f'Did not get an exception for: {inp!r}'):
                 results = self.parse(inp)
-            except ParseError:
-                pass
-            else:
-                print()
-                print('results:', repr(results))
-                raise Exception(f'Did not get an exception for: {inp!r}')
+                print(f'\nresults: {results!r}')
 
     def testPositives(self):
         tests = [
@@ -86,19 +82,16 @@ def testPositives(self):
                 self.assertEqual(
                     res, out,
                     f'\ninput={inp!r}\nresult={res!r}\noutput={out!r}')
-                res = self.parse(inp+'\n')
+                res = self.parse(inp + '\n')
                 self.assertEqual(
                     res, out,
                     f'\ninput={inp!r}\nresult={res!r}\noutput={out!r}')
             else:
                 # multiple lines
-                gotFields = False
+                res = None
                 for line in inp.splitlines():
-                    self.assertFalse(gotFields)
+                    self.assertIsNone(res)
                     res = self.parse(line)
-                    if res is not None:
-                        gotFields = True
-                self.assertTrue(gotFields)
                 self.assertEqual(
                     res, out,
                     f'\ninput={inp!r}\nresult={res!r}\noutput={out!r}')

webware/MiscUtils/Tests/TestDataTable.py

@@ -212,13 +212,10 @@ def testBasics(self):
         self._testSource('MK enums', src, headings, data)
 
         # Unfinished multiline record
-        try:
+        with self.assertRaises(
+                DataTableError,
+                msg='Did not raise error for unfinished multiline record'):
             DataTable().readString('a\n"1\n')
-        except DataTableError:
-            pass  # just what we were expecting
-        else:
-            raise Exception(
-                'Failed to raise exception for unfinished multiline record')
 
     def testDefaultUsePickleCache(self):
         t = DataTable()

webware/PSP/BraceConverter.py

@@ -77,7 +77,7 @@ def parseLine(self, line, writer):
                     self.line = ''
                 else:
                     # should never get here
-                    raise Exception()
+                    raise ValueError(f'Invalid character: {c!r}')
         writer.printChars('\n')
 
     def openBlock(self, writer):

webware/Testing/Main.py

@@ -92,4 +92,4 @@ def writeNotes(self):
 </ul>''')
 
     def error(self, msg):
-        raise Exception(msg)
+        raise RuntimeError(msg)

webware/Tests/TestSessions/Application.py

@@ -22,7 +22,7 @@ def setting(self, key, default=None):
         }.get(key, default)
 
     def handleException(self):
-        raise Exception('Application Error')
+        raise RuntimeError('Application Error')
 
     def sessionTimeout(self, _trans=None):
         return self._sessionTimeout