Commit 796a8c9d authored by Jérome Perrin's avatar Jérome Perrin

restricted py3

parent fee9c49e
...@@ -31,6 +31,7 @@ import tempfile ...@@ -31,6 +31,7 @@ import tempfile
import textwrap import textwrap
import unittest import unittest
import uuid import uuid
import six
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
from Products.ERP5Type.tests.utils import createZODBPythonScript from Products.ERP5Type.tests.utils import createZODBPythonScript
...@@ -121,41 +122,41 @@ class TestRestrictedPythonSecurity(ERP5TypeTestCase): ...@@ -121,41 +122,41 @@ class TestRestrictedPythonSecurity(ERP5TypeTestCase):
return decimal.Decimal.from_float(3.3) return decimal.Decimal.from_float(3.3)
''') ''')
def test_urlparse(self): def test_six_moves_urlparse(self):
self.createAndRunScript(''' self.createAndRunScript('''
import urlparse import six.moves.urllib.parse
return urlparse.urlparse("http://example.com/pa/th/?q=s").path return six.moves.urllib.parse.urlparse("http://example.com/pa/th/?q=s").path
''', ''',
expected='/pa/th/' expected='/pa/th/'
) )
# access computed attributes (property) is also OK # access computed attributes (property) is also OK
self.createAndRunScript(''' self.createAndRunScript('''
import urlparse import six.moves.urllib.parse
return urlparse.urlparse("http://example.com/pa/th/?q=s").hostname return six.moves.urllib.parse.urlparse("http://example.com/pa/th/?q=s").hostname
''', ''',
expected='example.com' expected='example.com'
) )
self.createAndRunScript(''' self.createAndRunScript('''
import urlparse import six.moves.urllib.parse
return urlparse.urlsplit("http://example.com/pa/th/?q=s").path return six.moves.urllib.parse.urlsplit("http://example.com/pa/th/?q=s").path
''', ''',
expected='/pa/th/' expected='/pa/th/'
) )
self.createAndRunScript(''' self.createAndRunScript('''
import urlparse import six.moves.urllib.parse
return urlparse.urldefrag("http://example.com/#frag")[1] return six.moves.urllib.parse.urldefrag("http://example.com/#frag")[1]
''', ''',
expected='frag' expected='frag'
) )
self.createAndRunScript(''' self.createAndRunScript('''
import urlparse import six.moves.urllib.parse
return urlparse.parse_qs("q=s") return six.moves.urllib.parse.parse_qs("q=s")
''', ''',
expected={'q': ['s']} expected={'q': ['s']}
) )
self.createAndRunScript(''' self.createAndRunScript('''
import urlparse import six.moves.urllib.parse
return urlparse.parse_qsl("q=s") return six.moves.urllib.parse.parse_qsl("q=s")
''', ''',
expected=[('q', 's')] expected=[('q', 's')]
) )
...@@ -342,11 +343,11 @@ class TestRestrictedPythonSecurity(ERP5TypeTestCase): ...@@ -342,11 +343,11 @@ class TestRestrictedPythonSecurity(ERP5TypeTestCase):
except StopIteration: except StopIteration:
break break
except Exception as e: except Exception as e:
result.append(repr(e)) result.append(str(type(e)))
return result return result
''', ''',
kwargs={'generator': generator_with_not_allowed_objects()}, kwargs={'generator': generator_with_not_allowed_objects()},
expected=["one", "Unauthorized()", 2], expected=["one", str(Unauthorized), 2],
) )
def test_json(self): def test_json(self):
...@@ -967,14 +968,22 @@ def test_suite(): ...@@ -967,14 +968,22 @@ def test_suite():
self.assertUnauth('subprocess', ()) self.assertUnauth('subprocess', ())
AccessControl.tests.testModuleSecurity.ModuleSecurityTests.test_unprotected_module = test_unprotected_module AccessControl.tests.testModuleSecurity.ModuleSecurityTests.test_unprotected_module = test_unprotected_module
add_tests(suite, AccessControl.tests.testModuleSecurity) add_tests(suite, AccessControl.tests.testModuleSecurity)
import AccessControl.tests.testOwned if six.PY2:
add_tests(suite, AccessControl.tests.testOwned) import AccessControl.tests.testOwned # pylint:disable=no-name-in-module,import-error
add_tests(suite, AccessControl.tests.testOwned)
else:
import AccessControl.tests.test_owner # pylint:disable=no-name-in-module,import-error
add_tests(suite, AccessControl.tests.test_owner)
import AccessControl.tests.testPermissionMapping import AccessControl.tests.testPermissionMapping
add_tests(suite, AccessControl.tests.testPermissionMapping) add_tests(suite, AccessControl.tests.testPermissionMapping)
import AccessControl.tests.testPermissionRole import AccessControl.tests.testPermissionRole
add_tests(suite, AccessControl.tests.testPermissionRole) add_tests(suite, AccessControl.tests.testPermissionRole)
import AccessControl.tests.testRole if six.PY2:
add_tests(suite, AccessControl.tests.testRole) import AccessControl.tests.testRole # pylint:disable=no-name-in-module,import-error
add_tests(suite, AccessControl.tests.testRole)
else:
import AccessControl.tests.test_rolemanager # pylint:disable=no-name-in-module,import-error
add_tests(suite, AccessControl.tests.test_rolemanager)
import AccessControl.tests.testSecurityManager import AccessControl.tests.testSecurityManager
add_tests(suite, AccessControl.tests.testSecurityManager) add_tests(suite, AccessControl.tests.testSecurityManager)
import AccessControl.tests.testZCML import AccessControl.tests.testZCML
......
...@@ -29,11 +29,25 @@ Restricted collections module. ...@@ -29,11 +29,25 @@ Restricted collections module.
From restricted python, use "import collections" (see patches/Restricted.py). From restricted python, use "import collections" (see patches/Restricted.py).
""" """
import six
from collections import ( from collections import (
Counter, defaultdict, deque, OrderedDict, namedtuple as _namedtuple) Counter, defaultdict, deque, OrderedDict, namedtuple as _namedtuple)
if six.PY2:
def namedtuple(typename, field_names, verbose=False, rename=False):
ret = _namedtuple(typename, field_names, verbose, rename)
ret.__allow_access_to_unprotected_subobjects__ = 1
return ret
else:
def namedtuple(typename, field_names, rename=False, defaults=None, module=None):
ret = _namedtuple(
typename,
field_names,
rename=rename,
defaults=defaults,
module=module
)
ret.__allow_access_to_unprotected_subobjects__ = 1
return ret
def namedtuple(typename, field_names, verbose=False, rename=False):
ret = _namedtuple(typename, field_names, verbose, rename)
ret.__allow_access_to_unprotected_subobjects__ = 1
return ret
...@@ -48,5 +48,6 @@ from AccessControl.ZopeGuards import SafeIter ...@@ -48,5 +48,6 @@ from AccessControl.ZopeGuards import SafeIter
iterkeys = lambda d: SafeIter(_six.iterkeys(d), d) iterkeys = lambda d: SafeIter(_six.iterkeys(d), d)
itervalues = lambda d: SafeIter(_six.itervalues(d), d) itervalues = lambda d: SafeIter(_six.itervalues(d), d)
from AccessControl.ZopeGuards import safe_builtins as _safe_builtins if PY2:
_safe_builtins['xrange'] = _six.moves.xrange from AccessControl.ZopeGuards import safe_builtins as _safe_builtins
_safe_builtins['xrange'] = _six.moves.xrange
...@@ -385,6 +385,8 @@ import six.moves.urllib.parse ...@@ -385,6 +385,8 @@ import six.moves.urllib.parse
allow_module('six.moves.urllib.parse') allow_module('six.moves.urllib.parse')
allow_type(six.moves.urllib.parse.ParseResult) allow_type(six.moves.urllib.parse.ParseResult)
allow_type(six.moves.urllib.parse.SplitResult) allow_type(six.moves.urllib.parse.SplitResult)
# BBB this is different type on python3
allow_type(type(six.moves.urllib.parse.urldefrag('')))
ModuleSecurityInfo('six.moves.urllib.parse').declarePublic( ModuleSecurityInfo('six.moves.urllib.parse').declarePublic(
'urlencode', 'urlencode',
'quote', 'unquote', 'quote', 'unquote',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment