Merge branch 'master' into fix_1172

Author: dataflake

.meta.toml

@@ -2,15 +2,15 @@
 # https://github.com/zopefoundation/meta/tree/master/config/zope-product
 [meta]
 template = "zope-product"
-commit-id = "571024f0"
+commit-id = "13b9049c"
 
 [python]
 with-pypy = false
 with-docs = true
 with-sphinx-doctests = false
 with-windows = true
 with-macos = true
-with-future-python = true
+with-future-python = false
 
 [coverage]
 fail-under = 80

src/OFS/Image.py

@@ -939,9 +939,9 @@ def getImageInfo(data):
             xmldoc = minidom.parseString(data)
         except Exception:
             return content_type, width, height
+        w = width
+        h = height
         for svg in xmldoc.getElementsByTagName('svg'):
-            w = width
-            h = height
             content_type = 'image/svg+xml'
             if 'height' in svg.attributes and 'width' in svg.attributes:
                 w = svg.attributes['width'].value
@@ -965,8 +965,8 @@ def getImageInfo(data):
                 viewBox = [int(float(x)) for x in viewBox.split(' ')]
                 w = viewBox[2] - viewBox[0]
                 h = viewBox[3] - viewBox[1]
-            width = int(w)
-            height = int(h)
+        width = int(w)
+        height = int(h)
 
     return content_type, width, height
 

src/ZPublisher/HTTPRequest.py

@@ -1505,7 +1505,7 @@ class LimitedFileReader:
     """File wrapper emulating EOF."""
 
     # attributes to be delegated to the file
-    DELEGATE = set(["close", "closed", "fileno", "mode", "name"])
+    DELEGATE = {"close", "closed", "fileno", "mode", "name"}
 
     def __init__(self, fp, limit):
         """emulate EOF after *limit* bytes have been read.

tox.ini

@@ -3,6 +3,7 @@
 [tox]
 minversion = 3.18
 envlist =
+    release-check
     lint
     py37
     py38
@@ -52,6 +53,23 @@ commands =
     autopep8 --verbose --in-place --recursive --aggressive --aggressive {toxinidir}/src setup.py
     docformatter --in-place --recursive {toxinidir}/src setup.py
 
+[testenv:release-check]
+description = ensure that the distribution is ready to release
+basepython = python3
+skip_install = true
+deps =
+    twine
+    build
+    check-manifest
+    check-python-versions >= 0.20.0
+    wheel
+commands_pre =
+commands =
+    check-manifest
+    check-python-versions
+    python -m build --sdist --no-isolation
+    twine check dist/*
+
 [testenv:lint]
 basepython = python3
 commands_pre =
@@ -61,11 +79,7 @@ allowlist_externals =
 commands =
     isort --check-only --diff {toxinidir}/src {toxinidir}/setup.py
     flake8 {toxinidir}/src {toxinidir}/setup.py
-    check-manifest
-    check-python-versions
 deps =
-    check-manifest
-    check-python-versions
     flake8
     isort
     # Useful flake8 plugins that are Python and Plone specific: