Skip to content

Commit dbfdb94

Browse files
committed
Merged in [15267] from rcross@amsl.com:
Fix issue with decorator on utils.html.remove_tags(). - Legacy-Id: 15270 Note: SVN reference [15267] has been migrated to Git commit 0d255f7
1 parent 9fe1820 commit dbfdb94

2 files changed

Lines changed: 46 additions & 1 deletion

File tree

changelog

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,48 @@
1+
ietfdb (6.81.3) ietf; urgency=medium
2+
3+
* Merged in [15248] from rjsparks@nostrum.com:
4+
Improvements to tests after converting to factories suggested by studying
5+
coverage_changes.
6+
7+
* Merged in [15247] from rjsparks@nostrum.com:
8+
Tweaked the color palatte for the agenda editor.
9+
10+
* Removed two instances of log.assertion(); we have enough data on these
11+
now.
12+
13+
* Changed an attribute guard to work with a reverse relationship attribute
14+
(using hasattr()).
15+
16+
* Fixed a broken mailto link on the account edit page.
17+
18+
* Merged in [15238] from rjsparks@nostrum.com:
19+
Use factories for ietf.doc.tests_status_change. Repair previous commit
20+
errors in ietf.doc.tests_material.
21+
22+
* Merged in [15228] from rjsparks@nostrum.com:
23+
Use factories for ietf.doc.tests_downref.
24+
25+
* Merged in [15227] from rjsparks@nostrum.com:
26+
Use factories for ietf.doc.tests_conflict_review.
27+
28+
* Merged in [15226] from rjsparks@nostrum.com:
29+
Use factories for ietf.doc.tests_charter.
30+
31+
* Tweaked unidecode_name() to not produce single-letter ascii surnames
32+
from non-ascii codepoints. The unidecode transliteration is in any case
33+
somewhat arbitrary, and in most cases a real person will tweak the ascii
34+
name of his account. When running tests, however, this tweak avoids some
35+
false test failures. And no, it's not simple to fix the draft
36+
author-extraction heuristics to deal well with single-letter surnames.
37+
38+
* Added a guard against trying to access attributes of a None object.
39+
40+
* Merged in [15225] from rjsparks@nostrum.com:
41+
Use factories for ietf.doc.tests_draft.
42+
43+
-- Henrik Levkowetz <henrik@levkowetz.com> 14 Jun 2018 13:11:49 +0000
44+
45+
146
ietfdb (6.81.2) ietf; urgency=medium
247

348
This is the third in a small series of releases to address compliance with

ietf/utils/html.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ def unescape(text):
3131
"""
3232
return text.replace('&#39;', "'").replace('&quot;', '"').replace('&gt;', '>').replace('&lt;', '<' ).replace('&amp;', '&')
3333

34+
@keep_lazy(six.text_type)
3435
def remove_tags(html, tags):
3536
"""Returns the given HTML sanitized, and with the given tags removed."""
3637
allowed = set(acceptable_tags) - set([ t.lower() for t in tags ])
3738
return bleach.clean(html, tags=allowed)
38-
remove_tags = keep_lazy(remove_tags, six.text_type)
3939

4040
# ----------------------------------------------------------------------
4141
# Html fragment cleaning

0 commit comments

Comments
 (0)