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

zopefoundation · Mar 2, 2013 · 795346b · 795346b
1 parent 850fb7b
commit 795346b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/setup.py b/setup.py
@@ -89,7 +89,7 @@
       'zope.interface',
       'zope.lifecycleevent',
       'zope.location',
-      'zope.pagetemplate',
+      'zope.pagetemplate >= 4.0.2',
       'zope.processlifetime',
       'zope.proxy',
       'zope.ptresource',

diff --git a/src/Products/PageTemplates/PageTemplate.py b/src/Products/PageTemplates/PageTemplate.py
@@ -16,7 +16,7 @@
 import sys
 import ExtensionClass
 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.tales.expressions import SimpleModuleImporter
 from Products.PageTemplates.Expressions import getEngine
@@ -106,10 +106,10 @@ def read(self):
                 return self.pt_render(source=True)
             except:
                 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) )
 
-        return ('%s\n %s\n-->\n%s' % (_error_start,
+        return ('%s\n %s\n-->\n%s' % (self._error_start,
                                       '\n '.join(self._v_errors),
                                       self._text))
 

diff --git a/versions.cfg b/versions.cfg
@@ -37,7 +37,10 @@ zc.buildout = 1.7.1
 zc.recipe.egg = 1.3.2
 
 # Zope2 dependencies
+mechanize = 0.2.5
 repoze.retry = 1.2
 repoze.tm2 = 1.0
 repoze.who = 2.0
+RestrictedPython = 3.6.0
+zope.sequencesort = 4.0.0
 zope.testbrowser = 3.11.1