diff options
| author | Carl Meyer <carl@oddbird.net> | 2012-09-09 12:13:42 -0600 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2012-10-23 18:57:59 +0200 |
| commit | ce168bb8994b0a7e032166e63a8b1cec034694d6 (patch) | |
| tree | cff44066e72e8ebbbcd46bf4e281bb9282150c5b | |
| parent | e86e4ce0bd0a538fcde0f9b0c4f26c6810621bb5 (diff) | |
[1.4.x] Fix an HTML-parser test that's failed in Python 2.6.8 since 5c79dd58.
The problem description in #18239 asserted that
http://bugs.python.org/issue670664 was fixed in Python 2.6.8, but based on
http://bugs.python.org/issue670664#msg146770 it appears that's not correct; the
fix was only applied in 2.7, 3.2, and Python trunk. Therefore we must use our
patched HTMLParser subclass in all Python 2.6 versions.
Backport of fcec904e4f from master. Fixes #19148.
| -rw-r--r-- | django/utils/html_parser.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/django/utils/html_parser.py b/django/utils/html_parser.py index 444946151d..858668ca20 100644 --- a/django/utils/html_parser.py +++ b/django/utils/html_parser.py @@ -5,8 +5,7 @@ import sys current_version = sys.version_info use_workaround = ( - (current_version < (2, 6, 8)) or - (current_version >= (2, 7) and current_version < (2, 7, 3)) or + (current_version < (2, 7, 3)) or (current_version >= (3, 0) and current_version < (3, 2, 3)) ) |