[Checkins] SVN: zope.pagetemplate/trunk/ Switch to zope.untrustedpython, make it an extra.
Albertas Agejevas
cvs-admin at zope.org
Fri Feb 22 16:26:24 UTC 2013
Log message for revision 129658:
Switch to zope.untrustedpython, make it an extra.
Changed:
U zope.pagetemplate/trunk/buildout.cfg
U zope.pagetemplate/trunk/setup.py
U zope.pagetemplate/trunk/src/zope/pagetemplate/engine.py
U zope.pagetemplate/trunk/src/zope/pagetemplate/tests/test_engine.py
-=-
Modified: zope.pagetemplate/trunk/buildout.cfg
===================================================================
--- zope.pagetemplate/trunk/buildout.cfg 2013-02-22 15:27:12 UTC (rev 129657)
+++ zope.pagetemplate/trunk/buildout.cfg 2013-02-22 16:26:24 UTC (rev 129658)
@@ -4,11 +4,11 @@
[test]
recipe = zc.recipe.testrunner
-eggs = zope.pagetemplate [test]
+eggs = zope.pagetemplate [test, untrusted]
[testcompat]
recipe = zc.recipe.testrunner
-eggs = zope.pagetemplate [test]
+eggs = zope.pagetemplate [test, untrusted]
z3c.pt
z3c.ptcompat
Chameleon
@@ -20,7 +20,7 @@
[coverage-test]
recipe = zc.recipe.testrunner
-eggs = zope.pagetemplate [test]
+eggs = zope.pagetemplate [test, untrusted]
defaults = ['--coverage', '../../coverage']
[coverage-report]
Modified: zope.pagetemplate/trunk/setup.py
===================================================================
--- zope.pagetemplate/trunk/setup.py 2013-02-22 15:27:12 UTC (rev 129657)
+++ zope.pagetemplate/trunk/setup.py 2013-02-22 16:26:24 UTC (rev 129658)
@@ -101,11 +101,11 @@
namespace_packages=['zope'],
extras_require=dict(
test=TESTS_REQUIRE,
+ untrusted=['zope.untrustedpython'],
),
install_requires=['setuptools',
'zope.interface',
'zope.component',
- 'zope.security [untrustedpython]',
'zope.tales',
'zope.tal',
'zope.i18n',
Modified: zope.pagetemplate/trunk/src/zope/pagetemplate/engine.py
===================================================================
--- zope.pagetemplate/trunk/src/zope/pagetemplate/engine.py 2013-02-22 15:27:12 UTC (rev 129657)
+++ zope.pagetemplate/trunk/src/zope/pagetemplate/engine.py 2013-02-22 16:26:24 UTC (rev 129658)
@@ -25,11 +25,16 @@
from zope.traversing.interfaces import IPathAdapter, ITraversable
from zope.traversing.interfaces import TraversalError
from zope.traversing.adapters import traversePathElement
-from zope.security.untrustedpython import rcompile
from zope.security.proxy import ProxyFactory, removeSecurityProxy
-from zope.security.untrustedpython.builtins import SafeBuiltins
from zope.i18n import translate
+try:
+ from zope.untrustedpython import rcompile
+ from zope.untrustedpython.builtins import SafeBuiltins
+ HAVE_UNTRUSTED = True
+except ImportError:
+ HAVE_UNTRUSTED = False
+
from zope.tales.expressions import PathExpr, StringExpr, NotExpr, DeferExpr
from zope.tales.expressions import SimpleModuleImporter
from zope.tales.pythonexpr import PythonExpr
@@ -98,6 +103,8 @@
def _compile(self, text, filename):
return rcompile.compile(text, filename, 'eval')
+if not HAVE_UNTRUSTED:
+ ZopePythonExpr = PythonExpr
class ZopeContextBase(Context):
"""Base class for both trusted and untrusted evaluation contexts."""
Modified: zope.pagetemplate/trunk/src/zope/pagetemplate/tests/test_engine.py
===================================================================
--- zope.pagetemplate/trunk/src/zope/pagetemplate/tests/test_engine.py 2013-02-22 15:27:12 UTC (rev 129657)
+++ zope.pagetemplate/trunk/src/zope/pagetemplate/tests/test_engine.py 2013-02-22 16:26:24 UTC (rev 129658)
@@ -14,6 +14,7 @@
"""Doc tests for the pagetemplate's 'engine' module
"""
import unittest
+import zope.pagetemplate.engine
class DummyNamespace(object):
@@ -84,7 +85,8 @@
suite = unittest.TestSuite()
suite.addTest(DocTestSuite('zope.pagetemplate.engine'))
suite.addTest(unittest.makeSuite(EngineTests))
- suite.addTest(unittest.makeSuite(ZopePythonExprTests))
+ if zope.pagetemplate.engine.HAVE_UNTRUSTED:
+ suite.addTest(unittest.makeSuite(ZopePythonExprTests))
return suite
More information about the checkins
mailing list