Lint the code.

zopefoundation · Dec 18, 2020 · 6f724ec · 6f724ec
1 parent d5c05a9
commit 6f724ec
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -2,10 +2,12 @@
 CHANGES
 =======
 
-1.0.0a5 (unreleased)
---------------------
+1.0.0 (unreleased)
+------------------
+
+- Add support for Python 3.7, 3.8 and 3.9.
 
-- Nothing changed yet.
+- Drop support for Python 3.4.
 
 
 1.0.0a4 (2017-06-19)

diff --git a/setup.py b/setup.py
@@ -21,7 +21,7 @@ def read(*rnames):
 
 
 setup(name='z3c.testing',
-      version='1.0.0a5.dev0',
+      version='1.0.0.dev0',
       author='Zope Corporation and Contributors',
       author_email='zope-dev@zope.org',
       description='High-level Testing Support',
@@ -39,9 +39,11 @@ def read(*rnames):
           'Programming Language :: Python :: 2',
           'Programming Language :: Python :: 2.7',
           'Programming Language :: Python :: 3',
-          'Programming Language :: Python :: 3.4',
           'Programming Language :: Python :: 3.5',
           'Programming Language :: Python :: 3.6',
+          'Programming Language :: Python :: 3.7',
+          'Programming Language :: Python :: 3.8',
+          'Programming Language :: Python :: 3.9',
           'Programming Language :: Python :: Implementation :: CPython',
           'Programming Language :: Python :: Implementation :: PyPy',
           'Natural Language :: English',

diff --git a/src/z3c/testing/directive.py b/src/z3c/testing/directive.py
@@ -13,7 +13,7 @@
 ##############################################################################
 try:
     from cStringIO import StringIO
-except:
+except ImportError:
     from io import StringIO
 
 from zope.configuration.xmlconfig import xmlconfig

diff --git a/src/z3c/testing/layer.py b/src/z3c/testing/layer.py
@@ -109,10 +109,10 @@ def defineLayer(name, zcml=None, appSetUp=None, clean=False):
     globals = sys._getframe(1).f_globals
     if zcml is not None:
         zcml = os.path.join(os.path.split(globals['__file__'])[0], zcml)
-    l = BufferedDatabaseTestLayer(
+    layer = BufferedDatabaseTestLayer(
         zcml, globals['__name__'], name,
         path=os.path.dirname(globals['__file__']),
         clean=clean)
     if appSetUp is not None:
-        l.setUpApplication = appSetUp
-    globals[name] = l
+        layer.setUpApplication = appSetUp
+    globals[name] = layer