Update to Python 3

.coveragerc

@@ -0,0 +1,15 @@
+[run]
+branch = True
+source = RestrictedPython
+omit =
+    # Tests are classically not part of source code
+    # and should not be calculated into coverage sum
+    # on the other hand, the coverage tools do a handy job on highlighting
+    # code branches and tests that that did not get executed.
+    # Therefore we include tests into coverage analysis for the moment.
+    #tests/*.py
+    #src/RestrictedPython/tests
+    #src/RestrictedPython/tests/*.py
+
+[report]
+precision = 3

.editorconfig

@@ -0,0 +1,12 @@
+[*]
+indent_style = space
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+charset = utf-8
+
+[*.{py,cfg}]
+indent_size = 4
+
+[Makefile]
+indent_style = tab

.gitignore

@@ -1,13 +1,34 @@
-*.egg-info
-*.py?
-.installed.cfg
-.mr.developer.cfg
-bin/
-build/
-develop/
-develop-eggs/
-dist/
-eggs/
-include/
-lib/
-parts/
+*.mo
+*.py[cod]
+.coverage*
+pip-selfcheck.json
+pyvenv.cfg
+/.python-version
+/*.egg-info
+/.eggs/
+/.Python
+/.cache
+/.installed.cfg
+/.mr.developer.cfg
+/.project
+/.pydevproject
+/.tox
+/bin
+/build
+/develop-eggs
+/dist
+/downloads
+/eggs
+/fake-eggs
+/htmlcov
+/report-*.html
+/include
+/lib
+/share
+/local.cfg
+/parts
+/src/*.egg-info
+/var
+coverage.xml
+docs/doctrees
+docs/html

.travis.yml

@@ -2,10 +2,29 @@ language: python
 sudo: false
 python:
     - 2.7
+    - 3.4
+    - 3.5
+    - 3.6
+    - pypy-5.4
+env:
+    - ENVIRON=py
+    - ENVIRON=py27-rp3,py27-datetime,py36-datetime
+    - ENVIRON=isort,flake8,docs
+matrix:
+    exclude:
+        - env: ENVIRON=isort,flake8,docs
+        - env: ENVIRON=py27-rp3,py27-datetime,py36-datetime
+    include:
+        - python: "3.6"
+          env: ENVIRON=py36-datetime,isort,flake8,docs
+        - python: "2.7"
+          env: ENVIRON=py27-rp3,py27-datetime
 install:
-    - python bootstrap.py
-    - bin/buildout
+    - pip install tox coveralls coverage
 script:
-    - bin/test
+    - tox -e $ENVIRON
+after_success:
+    - coverage combine
+    - coveralls
 notifications:
     email: false

README.rst

@@ -0,0 +1,7 @@
+================
+RestrictedPython
+================
+
+RestrictedPython is a defined subset of the Python language which allows to provide a program input into a trusted environment.
+
+For full documentation please see  http://restrictedpython.readthedocs.io/en/python3_update/ or local docs/index.

bootstrap.py

@@ -49,8 +49,8 @@
 parser.add_option("-t", "--accept-buildout-test-releases",
                   dest='accept_buildout_test_releases',
                   action="store_true", default=False,
-                  help=("Normally, if you do not specify a --version, the "
-                        "bootstrap script and buildout gets the newest "
+                  help=("Normally, if you do not specify a --buildout-version, "
+                        "the bootstrap script and buildout gets the newest "
                         "*final* versions of zc.buildout and its recipes and "
                         "extensions for you.  If you use this flag, "
                         "bootstrap and buildout will get the newest releases "

buildout.cfg

@@ -1,12 +1,63 @@
 [buildout]
 develop = .
-parts = interpreter test
+parts =
+    code-analysis
+    githook
+    interpreter
+    test
+    pytest
+    tox
+    sphinx
+    isort
+
+versions = versions
 
 [interpreter]
 recipe = zc.recipe.egg
-interpreter = python
-eggs = RestrictedPython
+interpreter = tpython
+eggs = RestrictedPython[test,develop,docs]
 
 [test]
 recipe = zc.recipe.testrunner
 eggs = RestrictedPython
+
+[pytest]
+recipe = zc.recipe.egg
+eggs =
+    pytest
+    pytest-flake8
+    pytest-isort
+    RestrictedPython
+    tox
+
+[tox]
+recipe = zc.recipe.egg
+eggs =
+    tox
+
+[sphinx]
+recipe = zc.recipe.egg
+eggs =
+    Sphinx
+
+[isort]
+recipe = zc.recipe.egg
+eggs =
+    isort
+
+[code-analysis]
+recipe = plone.recipe.codeanalysis[recommended]
+directory = ${buildout:directory}/
+flake8 = False
+flake8-exclude = bootstrap.py,bootstrap-buildout.py,docs,*.egg.,omelette
+flake8-max-complexity = 15
+
+[githook]
+recipe = plone.recipe.command
+command =
+    #echo "\nbin/pytest" >> .git/hooks/pre-commit
+    echo "\nbin/tox" >> .git/hooks/pre-commit
+    cat .git/hooks/pre-commit
+
+[versions]
+pycodestyle = 2.2.0

CHANGES.txt → docs/CHANGES.rst

@@ -1,10 +1,17 @@
 Changes
 =======
 
-3.7.0a1 (unreleased)
---------------------
+4.0.0 (unreleased)
+------------------
+
+- Mostly complete rewrite based on Python AST module.
+  [loechel (Alexander Loechel), icemac (Michael Howitz), stephan-hof (Stephan Hofmockel), tlotze (Thomas Lotze)]
+
+- switch to pytest
+
+- The ``compile_restricted*`` functions now return a
+  ``namedtuple CompileResult`` instead of a simple ``tuple``.
 
-- TBD
 
 3.6.0 (2010-07-09)
 ------------------