Fix tests (#10)

* isort imports + support 3.10

.editorconfig

@@ -28,7 +28,7 @@ max_line_length = off
 # 4 space indentation
 indent_size = 4
 
-[*.{yml,zpt,pt,dtml}]
+[*.{yml,zpt,pt,dtml,zcml}]
 # 2 space indentation
 indent_size = 2
 

.github/workflows/tests.yml

@@ -16,20 +16,24 @@ jobs:
       # We want to see all failures:
       fail-fast: false
       matrix:
+        os:
+        - ubuntu
         config:
         # [Python version, tox env]
-        - ["3.8",   "lint"]
+        - ["3.9",   "lint"]
         - ["2.7",   "py27"]
         - ["3.5",   "py35"]
         - ["3.6",   "py36"]
         - ["3.7",   "py37"]
         - ["3.8",   "py38"]
         - ["3.9",   "py39"]
-        - ["pypy2", "pypy"]
-        - ["pypy3", "pypy3"]
-        - ["3.8",   "coverage"]
+        - ["3.10",  "py310"]
+        - ["pypy-2.7", "pypy"]
+        - ["pypy-3.7", "pypy3"]
+        - ["3.9",   "coverage"]
 
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}-latest
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     name: ${{ matrix.config[1] }}
     steps:
     - uses: actions/checkout@v2

.gitignore

@@ -1,9 +1,11 @@
 # Generated from:
 # https://github.com/zopefoundation/meta/tree/master/config/pure-python
+*.dll
 *.egg-info/
 *.profraw
 *.pyc
 *.pyo
+*.so
 .coverage
 .coverage.*
 .eggs/
@@ -26,4 +28,5 @@ lib64
 log/
 parts/
 pyvenv.cfg
+testing.log
 var/

.meta.toml

@@ -2,14 +2,14 @@
 # https://github.com/zopefoundation/meta/tree/master/config/pure-python
 [meta]
 template = "pure-python"
-commit-id = "a42b1792f61e841423b04385d644c7e2d4581c1c"
+commit-id = "ae61f414cfef4e129d275679c6a76dc67b1a2c11"
 
 [python]
-with-appveyor = false
 with-pypy = true
 with-legacy-python = true
-with-docs = false
 with-sphinx-doctests = false
+with-windows = false
+with-future-python = false
 
 [tox]
 use-flake8 = true

CHANGES.rst

@@ -5,7 +5,7 @@
 1.2.1 (unreleased)
 ==================
 
-- Add support for Python 3.9.
+- Add support for Python 3.9, 3.10.
 
 
 1.2.0 (2020-03-06)

CONTRIBUTING.md

@@ -0,0 +1,23 @@
+<!--
+Generated from:
+https://github.com/zopefoundation/meta/tree/master/config/pure-python
+--> 
+# Contributing to zopefoundation projects
+
+The projects under the zopefoundation GitHub organization are open source and
+welcome contributions in different forms:
+
+* bug reports
+* code improvements and bug fixes
+* documentation improvements
+* pull request reviews
+
+For any changes in the repository besides trivial typo fixes you are required
+to sign the contributor agreement. See
+https://www.zope.dev/developer/becoming-a-committer.html for details.
+
+Please visit our [Developer
+Guidelines](https://www.zope.dev/developer/guidelines.html) if you'd like to
+contribute code changes and our [guidelines for reporting
+bugs](https://www.zope.dev/developer/reporting-bugs.html) if you want to file a
+bug report.

MANIFEST.in

@@ -1,5 +1,6 @@
 # Generated from:
 # https://github.com/zopefoundation/meta/tree/master/config/pure-python
+include *.md
 include *.rst
 include *.txt
 include buildout.cfg

setup.cfg

@@ -10,3 +10,14 @@ doctests = 1
 ignore =
     .editorconfig
     .meta.toml
+
+[isort]
+force_single_line = True
+combine_as_imports = True
+sections = FUTURE,STDLIB,THIRDPARTY,ZOPE,FIRSTPARTY,LOCALFOLDER
+known_third_party = six, docutils, pkg_resources
+known_zope =
+known_first_party =
+default_section = ZOPE
+line_length = 79
+lines_after_imports = 2

setup.py

@@ -15,7 +15,9 @@
 
 """
 import os
-from setuptools import setup, find_packages
+
+from setuptools import find_packages
+from setuptools import setup
 
 
 def read(*rnames):
@@ -39,17 +41,17 @@ def read(*rnames):
     'zope.app.principalannotation',
     'zope.app.publication',
     'zope.app.wsgi',
-
     'zope.applicationcontrol',
-    'zope.copypastemove',
     'zope.browser',
     'zope.browsermenu',
+    'zope.copypastemove',
     'zope.login',
     'zope.password',
-    'zope.proxy >= 4.2.1',
     'zope.principalregistry',
+    'zope.proxy >= 4.2.1',
     'zope.securitypolicy',
     'zope.testbrowser >= 5.2',
+    'zope.testing',
     'zope.testrunner',
 ]
 
@@ -91,6 +93,7 @@ def read(*rnames):
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Natural Language :: English',

src/zope/file/adapters.py

@@ -10,8 +10,10 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-from zope import interface, component
 import zope.filerepresentation.interfaces
+
+from zope import component
+from zope import interface
 from zope.file import interfaces
 
 

src/zope/file/adapters.rst

@@ -25,9 +25,9 @@ whose size we can get:
 Writing to this read-only file is impossible, as the interface does
 not require it:
 
-   >>> r.write(b"some more content")
+   >>> r.write(b"some more content")  # doctest: +ELLIPSIS
    Traceback (most recent call last):
-   AttributeError: 'ReadFileAdapter' object has no attribute 'write'
+   AttributeError: 'ReadFileAdapter' object has no attribute 'write'...
 
 With a write-file the opposite happens. We can write but not read:
 

src/zope/file/browser.py

@@ -15,12 +15,12 @@
 """
 __docformat__ = "reStructuredText"
 
-from zope import interface
-from zope import component
-
 import zope.size
 import zope.size.interfaces
+
 import zope.file.interfaces
+from zope import component
+from zope import interface
 
 
 @interface.implementer(zope.size.interfaces.ISized)

src/zope/file/contenttype.py

@@ -24,22 +24,17 @@
 import zope.formlib.interfaces
 import zope.interface
 import zope.schema
-
-from zope.mimetype.interfaces import IContentTypeEncoded
-from zope.mimetype.interfaces import IContentTypeInterface
+from zope.lifecycleevent import ObjectModifiedEvent
+from zope.mimetype.event import changeContentType
 from zope.mimetype.interfaces import ICharsetCodec
 from zope.mimetype.interfaces import ICodecPreferredCharset
-
-from zope.mimetype.event import changeContentType
-
-from zope.mimetype.source import contentTypeSource
+from zope.mimetype.interfaces import IContentTypeEncoded
+from zope.mimetype.interfaces import IContentTypeInterface
 from zope.mimetype.source import codecSource
-
-from zope.file.i18n import _
-
+from zope.mimetype.source import contentTypeSource
 from zope.security.proxy import removeSecurityProxy
 
-from zope.lifecycleevent import ObjectModifiedEvent
+from zope.file.i18n import _
 
 
 def validateCodecUse(file, iface, codec, codec_field):

src/zope/file/file.py

@@ -16,14 +16,14 @@
 
 
 from contextlib import closing
-import persistent
 
-import zope.location.interfaces
-import zope.file.interfaces
+import persistent
 import zope.interface
-
+import zope.location.interfaces
 from ZODB.blob import Blob
 
+import zope.file.interfaces
+
 
 @zope.interface.implementer(
     zope.file.interfaces.IFile,

src/zope/file/i18n.py

@@ -16,4 +16,5 @@
 
 import zope.i18nmessageid
 
+
 _ = zope.i18nmessageid.MessageFactory("zope.file")

src/zope/file/testing.py

@@ -20,26 +20,22 @@
 
 from six.moves import urllib_parse as urllib
 
-from zope.app.wsgi.testlayer import http
+import zope.app.wsgi.testlayer
+import zope.security.checker
+import zope.testbrowser.wsgi
 from zope.app.wsgi.testlayer import FakeResponse
+from zope.app.wsgi.testlayer import http
 from zope.browser.interfaces import IAdding
 from zope.browsermenu.menu import getFirstMenuItem
 from zope.browserpage.viewpagetemplatefile import ViewPageTemplateFile
-
 from zope.container.interfaces import IContainerNamesContainer
 from zope.container.interfaces import INameChooser
-
 from zope.interface import implementer
-
 from zope.publisher.browser import BrowserView
 from zope.publisher.interfaces.browser import IBrowserPublisher
-
 from zope.traversing.browser.absoluteurl import absoluteURL
 
-import zope.app.wsgi.testlayer
 import zope.file
-import zope.security.checker
-import zope.testbrowser.wsgi
 
 
 class BrowserLayer(zope.testbrowser.wsgi.TestBrowserLayer,

src/zope/file/tests/test_contenttype.py

@@ -2,12 +2,11 @@
 
 import unittest
 
-from zope import component
 from zope.interface import implementer
-
-from zope.mimetype.interfaces import IContentTypeEncoded
 from zope.mimetype.interfaces import ICodecPreferredCharset
+from zope.mimetype.interfaces import IContentTypeEncoded
 
+from zope import component
 from zope.file.tests import skipWithoutZopeFormlib
 
 

src/zope/file/tests/test_doctests.py

@@ -17,13 +17,15 @@
 
 __docformat__ = "reStructuredText"
 import doctest
-import unittest
 import re
+import unittest
 
-import zope.file
 from zope.component.testlayer import ZCMLFileLayer
 from zope.testing import renormalizing
 
+import zope.file
+
+
 checker = renormalizing.RENormalizing([
     # Python 3 unicode removed the "u".
     (re.compile("u('.*?')"), r"\1"),

src/zope/file/tests/test_upload.py

@@ -1,19 +1,16 @@
 
 
 import unittest
+from io import BytesIO
 
-from zope import component
 from zope.interface import implementer
-
-from zope.mimetype.interfaces import IContentTypeEncoded
 from zope.mimetype.interfaces import ICharsetCodec
 from zope.mimetype.interfaces import ICodecPreferredCharset
+from zope.mimetype.interfaces import IContentTypeEncoded
 from zope.mimetype.interfaces import IMimeTypeGetter
-
 from zope.mimetype.typegetter import smartMimeTypeGuesser
 
-from io import BytesIO
-
+from zope import component
 from zope.file.tests import skipWithoutZopeFormlib
 
 

src/zope/file/upload.py

@@ -18,29 +18,25 @@
 
 import re
 
-import zope.contenttype.parse
 import zope.component
+import zope.contenttype.parse
 import zope.event
-import zope.file.file
 import zope.formlib.form
-
 import zope.schema
-
-from zope.file.i18n import _
-
 from zope.container.interfaces import INameChooser
-
-from zope.mimetype.interfaces import IContentInfo
-from zope.mimetype.interfaces import ICodecPreferredCharset
+from zope.lifecycleevent import ObjectModifiedEvent
+from zope.mimetype.event import changeContentType
 from zope.mimetype.interfaces import ICharsetCodec
-from zope.mimetype.interfaces import IContentTypeInterface
+from zope.mimetype.interfaces import ICodecPreferredCharset
+from zope.mimetype.interfaces import IContentInfo
 from zope.mimetype.interfaces import IContentTypeEncoded
+from zope.mimetype.interfaces import IContentTypeInterface
 from zope.mimetype.interfaces import IMimeTypeGetter
+from zope.security.proxy import removeSecurityProxy
 
-from zope.mimetype.event import changeContentType
+import zope.file.file
+from zope.file.i18n import _
 
-from zope.security.proxy import removeSecurityProxy
-from zope.lifecycleevent import ObjectModifiedEvent
 
 _nameFinder = re.compile(r'(.*[\\/:])?(.+)')