Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
Zope
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
Zope
Commits
795346b7
Commit
795346b7
authored
Mar 02, 2013
by
Hanno Schlichting
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
allow buildout to pass and avoid import errors with ZTK 2.0dev
parent
850fb7bb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
4 deletions
+7
-4
setup.py
setup.py
+1
-1
src/Products/PageTemplates/PageTemplate.py
src/Products/PageTemplates/PageTemplate.py
+3
-3
versions.cfg
versions.cfg
+3
-0
No files found.
setup.py
View file @
795346b7
...
...
@@ -89,7 +89,7 @@ setup(name='Zope2',
'zope.interface'
,
'zope.lifecycleevent'
,
'zope.location'
,
'zope.pagetemplate'
,
'zope.pagetemplate
>= 4.0.2
'
,
'zope.processlifetime'
,
'zope.proxy'
,
'zope.ptresource'
,
...
...
src/Products/PageTemplates/PageTemplate.py
View file @
795346b7
...
...
@@ -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 @@ class PageTemplate(ExtensionClass.Base,
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
))
...
...
versions.cfg
View file @
795346b7
...
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment