Lint the code.

Add support for Python 3.9.
zopefoundation · Feb 26, 2021 · 65973be · 65973be
1 parent ce9bb0b
commit 65973be
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 12 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -3,11 +3,11 @@ CHANGES
 =======
 
 2.0 (unreleased)
-------------------
+----------------
 
 - Drop support for Python 2.6, 3.2, 3.3.
 
-- Add support for Python 3.5, 3.6, 3.7, 3.8, PyPy, PyPy3.
+- Add support for Python 3.5, 3.6, 3.7, 3.8, 3.9, PyPy, PyPy3.
 
 
 1.1.2 (2014-02-21)

diff --git a/README.rst b/README.rst
@@ -1 +1 @@
-zc/recipe/filestorage/README.rst
+src/zc/recipe/filestorage/README.rst
diff --git a/setup.py b/setup.py
@@ -9,7 +9,8 @@
     author_email="jim@zope.com",
     description="ZC Buildout recipe for defining a file-storage",
     long_description=(
-        open(os.path.join("zc", "recipe", "filestorage", "README.rst")).read()
+        open(os.path.join(
+            "src", "zc", "recipe", "filestorage", "README.rst")).read()
         + '\n\n' +
         open("CHANGES.rst").read()),
     license="ZPL 2.1",
@@ -33,13 +34,15 @@
         "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",
-        ],
-    packages=find_packages(),
+    ],
+    packages=find_packages('src'),
+    package_dir={'': 'src'},
     namespace_packages=["zc", "zc.recipe"],
     install_requires=["zc.buildout", "zope.testing", "setuptools", "six"],
     entry_points={"zc.buildout": ["default=%s:Recipe" % name]},
     include_package_data=True,
     zip_safe=True,
-    )
+)
diff --git a/src/zc/recipe/filestorage/__init__.py b/src/zc/recipe/filestorage/__init__.py
@@ -12,7 +12,8 @@
 #
 ##############################################################################
 
-import logging, os
+import logging
+import os
 
 
 class Recipe:
@@ -56,6 +57,7 @@ def install(self):
     def update(self):
         self.install()
 
+
 plain_template = """\
 <zodb>
   <filestorage>

diff --git a/src/zc/recipe/filestorage/tests.py b/src/zc/recipe/filestorage/tests.py
@@ -12,11 +12,12 @@
 #
 ##############################################################################
 
-import os, re, unittest
-import pkg_resources
+import os
+import re
 import doctest
 from zope.testing import renormalizing
 
+
 def test_suite():
     return doctest.DocFileSuite(
         "README.rst",
@@ -25,5 +26,5 @@ def test_suite():
                         % dict(sep=re.escape(os.path.sep))),
              r'/tmp/data/Data.fs'),
             (re.compile(r'\S+sample-(\w+)'), r'/sample-\1'),
-            ]),
-        )
+        ]),
+    )