Fix linting issues

Author: Cito

.github/workflows/test-package.yml

@@ -32,6 +32,6 @@ jobs:
       run: |
         pip install pylint
         pylint webware
-    - name: Test with pytest
+    - name: Run all unit tests
       run: |
         python -m unittest discover -fv

.gitignore

@@ -1,6 +1,7 @@
 *~
 *.address
 *.bak
+*.cache
 *.default
 *.egg-info
 *.log

.pylintrc

@@ -19,6 +19,7 @@ disable =
  exec-used,
  fixme,
  global-statement,
+ import-outside-toplevel,
  inconsistent-return-statements,
  missing-docstring,
  no-self-use,

setup.py

@@ -17,7 +17,8 @@
     'Pygments>=2,<3', 'Pillow>=6,<7', 'dominate>=2,<3', 'yattag>=1,<2'
 ]
 requireTest = [
-    'psutil>=5,<6', 'flake8>=3.7,<4', 'pylint>=2.4,<3', 'tox>=3.14,<4'
+    'psutil>=5,<6', 'flake8>=3.7,<4', 'pylint>=2.4,<3', 'tox>=3.14,<4',
+    'pywin32>=227,<300;platform_system=="Windows"'
 ] + requireDev + requireExamples
 
 

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py{36,37,38}, flake8, docs, manifest
+envlist = py{36,37,38}, flake8, pylint, docs, manifest
 
 [testenv:flake8]
 basepython = python3.8
@@ -40,6 +40,6 @@ deps =
     Pillow>=6,<7
     dominate>=2,<3
     yattag>=1,<2
-    windows: pywin32>=227,<300
+    pywin32>=227,<300;platform_system=="Windows"
 commands =
     python -m unittest discover -fv -p Test*.py

webware/HTTPExceptions.py

@@ -73,7 +73,7 @@ def htTitle(self):
     def htBody(self):
         """The HTML body of the page."""
         body = self.htDescription()
-        if self.args:
+        if self.args:  # pylint: disable=using-constant-test
             # pylint: disable=not-an-iterable
             body += ''.join(
                 '<p>{}</p>\n'.format(htmlEncode(str(p)) for p in self.args))

webware/SessionFileStore.py

@@ -125,7 +125,7 @@ def removeKey(self, key):
 
     def keys(self):
         """Return a list with the keys of all the stored sessions."""
-        return [key for key in self]
+        return list(iter(self))
 
     def clear(self):
         """Clear the session file store, removing all of the session files."""

webware/SessionMemcachedStore.py

@@ -171,7 +171,7 @@ def keys(self):
         """
         if debug:
             print(">> keys()")
-        return [key for key in self]
+        return list(iter(self))
 
     def clear(self):
         """Clear the session store, removing all of its items.

webware/Tests/TestEndToEnd/TestMakeApp.py

@@ -24,7 +24,7 @@ def runMake(self, opts=None):
             args += opts
         result = subprocess.run(
             args, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
-            universal_newlines=True)
+            check=False, universal_newlines=True)
         self.assertEqual(result.returncode, 0)
         self.assertEqual(result.stderr, '')
         return result.stdout.splitlines()

webware/Tests/TestSessions/TestSessionMemcachedStore.py

@@ -28,11 +28,11 @@ def testLen(self):
             len(self._store)
 
     def testIter(self):
-        keys = [key for key in self._store]
+        keys = list(iter(self._store))
         self.assertEqual(keys, [])
         self.setOnIteration('Error')
         with self.assertRaises(NotImplementedError):
-            [key for key in self._store]  # pylint: disable=pointless-statement
+            list(iter(self._store))
 
     def testKeys(self):
         keys = self._store.keys()  # pylint: disable=assignment-from-no-return
@@ -49,12 +49,11 @@ def testItems(self):
             self._store.items()
 
     def testIterItems(self):
-        items = [key for key in self._store.iteritems()]
+        items = list(self._store.iteritems())
         self.assertEqual(items, [])
         self.setOnIteration('Error')
         with self.assertRaises(NotImplementedError):
-            # pylint: disable=expression-not-assigned
-            [key for key in self._store.iteritems()]
+            list(self._store.iteritems())
 
     def testValues(self):
         values = self._store.values()
@@ -64,7 +63,7 @@ def testValues(self):
             self._store.values()
 
     def testIterValues(self):
-        values = [key for key in self._store.values()]
+        values = list(self._store.values())
         self.assertEqual(values, [])
         self.setOnIteration('Error')
         with self.assertRaises(NotImplementedError):