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
28b76553
Commit
28b76553
authored
May 08, 2010
by
Tres Seaver
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bad except clause in the ``sequence_sort`` method of the ``<dtml-in>`` tag.
LP #267820
parent
2c0c8869
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
8 deletions
+7
-8
doc/CHANGES.rst
doc/CHANGES.rst
+3
-0
src/DocumentTemplate/DT_In.py
src/DocumentTemplate/DT_In.py
+4
-8
No files found.
doc/CHANGES.rst
View file @
28b76553
...
@@ -36,6 +36,9 @@ Features Added
...
@@ -36,6 +36,9 @@ Features Added
Bugs Fixed
Bugs Fixed
++++++++++
++++++++++
- LP #267820: Fix bad except clause in the ``sequence_sort`` method of
the ``<dtml-in>`` tag.
- LP #351006: Don't nest block tags inside HTML ``<p>`` tags in
- LP #351006: Don't nest block tags inside HTML ``<p>`` tags in
``zExceptions.ExceptionFormatter``.
``zExceptions.ExceptionFormatter``.
...
...
src/DocumentTemplate/DT_In.py
View file @
28b76553
...
@@ -761,19 +761,15 @@ class InClass:
...
@@ -761,19 +761,15 @@ class InClass:
if
multsort
:
# More than one sort key.
if
multsort
:
# More than one sort key.
k
=
[]
k
=
[]
for
sk
in
sortfields
:
for
sk
in
sortfields
:
try
:
if
mapping
:
akey
=
v
.
get
(
sk
)
if
mapping
:
akey
=
v
[
sk
]
else
:
akey
=
getattr
(
v
,
sk
,
None
)
else
:
akey
=
getattr
(
v
,
sk
)
except
AttributeError
,
KeyError
:
akey
=
None
if
not
basic_type
(
akey
):
if
not
basic_type
(
akey
):
try
:
akey
=
akey
()
try
:
akey
=
akey
()
except
:
pass
except
:
pass
k
.
append
(
akey
)
k
.
append
(
akey
)
else
:
# One sort key.
else
:
# One sort key.
try
:
if
mapping
:
k
=
v
.
get
(
sort
)
if
mapping
:
k
=
v
[
sort
]
else
:
k
=
getattr
(
v
,
sort
,
None
)
else
:
k
=
getattr
(
v
,
sort
)
except
AttributeError
,
KeyError
:
k
=
None
if
not
basic_type
(
type
(
k
)):
if
not
basic_type
(
type
(
k
)):
try
:
k
=
k
()
try
:
k
=
k
()
except
:
pass
except
:
pass
...
...
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