Commit 795346b7 authored by Hanno Schlichting's avatar Hanno Schlichting

allow buildout to pass and avoid import errors with ZTK 2.0dev

parent 850fb7bb
...@@ -89,7 +89,7 @@ setup(name='Zope2', ...@@ -89,7 +89,7 @@ setup(name='Zope2',
'zope.interface', 'zope.interface',
'zope.lifecycleevent', 'zope.lifecycleevent',
'zope.location', 'zope.location',
'zope.pagetemplate', 'zope.pagetemplate >= 4.0.2',
'zope.processlifetime', 'zope.processlifetime',
'zope.proxy', 'zope.proxy',
'zope.ptresource', 'zope.ptresource',
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
import sys import sys
import ExtensionClass import ExtensionClass
import zope.pagetemplate.pagetemplate import zope.pagetemplate.pagetemplate
from zope.pagetemplate.pagetemplate import _error_start, PTRuntimeError from zope.pagetemplate.pagetemplate import PTRuntimeError
from zope.pagetemplate.pagetemplate import PageTemplateTracebackSupplement from zope.pagetemplate.pagetemplate import PageTemplateTracebackSupplement
from zope.tales.expressions import SimpleModuleImporter from zope.tales.expressions import SimpleModuleImporter
from Products.PageTemplates.Expressions import getEngine from Products.PageTemplates.Expressions import getEngine
...@@ -106,10 +106,10 @@ class PageTemplate(ExtensionClass.Base, ...@@ -106,10 +106,10 @@ class PageTemplate(ExtensionClass.Base,
return self.pt_render(source=True) return self.pt_render(source=True)
except: except:
return ('%s\n Macro expansion failed\n %s\n-->\n%s' % return ('%s\n Macro expansion failed\n %s\n-->\n%s' %
(_error_start, "%s: %s" % sys.exc_info()[:2], (self._error_start, "%s: %s" % sys.exc_info()[:2],
self._text) ) self._text) )
return ('%s\n %s\n-->\n%s' % (_error_start, return ('%s\n %s\n-->\n%s' % (self._error_start,
'\n '.join(self._v_errors), '\n '.join(self._v_errors),
self._text)) self._text))
......
...@@ -37,7 +37,10 @@ zc.buildout = 1.7.1 ...@@ -37,7 +37,10 @@ zc.buildout = 1.7.1
zc.recipe.egg = 1.3.2 zc.recipe.egg = 1.3.2
# Zope2 dependencies # Zope2 dependencies
mechanize = 0.2.5
repoze.retry = 1.2 repoze.retry = 1.2
repoze.tm2 = 1.0 repoze.tm2 = 1.0
repoze.who = 2.0 repoze.who = 2.0
RestrictedPython = 3.6.0
zope.sequencesort = 4.0.0
zope.testbrowser = 3.11.1 zope.testbrowser = 3.11.1
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