Skip to content

Commit

Permalink
Merge 9d8ae3f into 7d0bb36
Browse files Browse the repository at this point in the history
  • Loading branch information
jugmac00 committed Oct 1, 2020
2 parents 7d0bb36 + 9d8ae3f commit ca7d08e
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 11 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
language: python

python:
- "2.7"
- "3.6"
- "3.7"
- "3.8"
Expand Down
2 changes: 2 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ v2.0.2.unreleased

* enable pre-commit hooks

* drop support for Python versions < 3.6

v2.0.1

* fix link to PyPi badge
Expand Down
14 changes: 9 additions & 5 deletions __init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
except ImportError:
# Zope <2.6
import Interface

Interface.Interface = Interface.Base

# make sure 'from AccessControl import allow_module' works...
Expand All @@ -28,15 +29,18 @@

def allow_module(module_name):
ModuleSecurityInfo(module_name).setDefaultAccess(1)
dot = module_name.find('.')
dot = module_name.find(".")
while dot > 0:
ModuleSecurityInfo(module_name[:dot]).setDefaultAccess(1)
dot = module_name.find('.', dot + 1)
dot = module_name.find(".", dot + 1)


__allow_access_to_unprotected_subobjects__ = 1
__roles__ = None

# make ZopeTree module accessible from PythonScript and ZPT
from ZopeTree import ZopeTree, Node # noqa
from TreeObjectWrapper import TreeObjectWrapper # noqa
allow_module('Products.ZopeTree')

# make ZopeTree module accessible from PythonScript and ZPT
from ZopeTree import Node, ZopeTree # noqa #isort:skip

allow_module("Products.ZopeTree")
5 changes: 1 addition & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
"Framework :: Zope :: 5",
"Intended Audience :: Developers",
"License :: OSI Approved :: Mozilla Public License 1.1 (MPL 1.1)",
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
Expand All @@ -30,7 +28,7 @@
packages=find_packages("src"),
namespace_packages=["Products"],
package_dir={"": "src"},
python_requires=">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*",
python_requires=">3.5",
install_requires=[
"Zope",
"setuptools",
Expand All @@ -41,5 +39,4 @@
],
include_package_data=True,
zip_safe=False,
options={"bdist_wheel": {"universal": "1"}},
)
1 change: 0 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[tox]
envlist =
py27,
py36,
py37,
py38,
Expand Down

0 comments on commit ca7d08e

Please sign in to comment.