Merge branch 'Python3_update' into python3_docs_consolidation

zopefoundation · Jan 31, 2017 · fa034ab · fa034ab
2 parents 11c229f + d4bd9d0
commit fa034ab
Show file tree

Hide file tree

Showing 12 changed files with 707 additions and 883 deletions.
diff --git a/src/RestrictedPython/Guards.py b/src/RestrictedPython/Guards.py
@@ -15,7 +15,7 @@
 # AccessControl.ZopeGuards contains a large set of wrappers for builtins.
 # DocumentTemplate.DT_UTil contains a few.
 
-import sys
+from ._compat import IS_PY2
 
 
 try:
@@ -104,8 +104,7 @@
     'ZeroDivisionError',
 ]
 
-version = sys.version_info
-if version >= (2, 7) and version < (2, 8):
+if IS_PY2:
     _safe_names.extend([
         'basestring',
         'cmp',
@@ -118,22 +117,6 @@
         'StandardError',
     ])
 
-if version >= (3, 0):
-    _safe_names.extend([
-
-    ])
-    _safe_exceptions.extend([
-
-    ])
-
-if version >= (3, 5):
-    _safe_names.extend([
-
-    ])
-    _safe_exceptions.extend([
-
-    ])
-
 
 for name in _safe_names:
     safe_builtins[name] = getattr(builtins, name)
@@ -246,7 +229,7 @@ def __init__(self, ob):
 def _full_write_guard():
     # Nested scope abuse!
     # safetype and Wrapper variables are used by guard()
-    safetype = {dict: True, list: True}.has_key if version < (3, 0) else {dict: True, list: True}.keys
+    safetype = {dict: True, list: True}.has_key if IS_PY2 else {dict: True, list: True}.keys
     Wrapper = _write_wrapper()
 
     def guard(ob):

diff --git a/src/RestrictedPython/_compat.py b/src/RestrictedPython/_compat.py
@@ -0,0 +1,8 @@
+import sys
+
+
+_version = sys.version_info
+IS_PY2 = _version.major == 2
+IS_PY3 = _version.major == 3
+IS_PY34_OR_GREATER = _version.major == 3 and _version.minor >= 4
+IS_PY35_OR_GREATER = _version.major == 3 and _version.minor >= 5
diff --git a/src/RestrictedPython/tests/before_and_after.py b/src/RestrictedPython/tests/before_and_after.py