← Back to branch summary

~ubuntu-branches/debian/sid/python-django/sid

« back to all changes in this revision

Viewing changes to django/contrib/markup/templatetags/markup.py

  • Committer: Package Import Robot
  • Author(s): Raphaël Hertzog
  • Date: 2012-08-02 10:44:02 UTC
  • mfrom: (1.2.13)
  • Revision ID: package-import@ubuntu.com-20120802104402-446mwidqmqizf5b2
Tags: 1.4.1-1
http://bugs.debian.org/683364
* New upstream security and maintenance release. Closes: #683364
  Fixes: CVE-2012-3442 CVE-2012-3443 CVE-2012-3444
* Drop 01_disable_broken_test.diff and 04_hyphen-manpage.diff which
  have been merged upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
django/contrib/markup/templatetags/markup.py
65
65
                safe_mode = True
66
66
            else:
67
67
                safe_mode = False
68
 
            python_markdown_deprecation = "The use of Python-Markdown "
69
 
            "< 2.1 in Django is deprecated; please update to the current version"
 
68
            python_markdown_deprecation = ("The use of Python-Markdown "
 
69
            "< 2.1 in Django is deprecated; please update to the current version")
70
70
            # Unicode support only in markdown v1.7 or above. Version_info
71
71
            # exist only in markdown v1.6.2rc-2 or above.
72
72
            markdown_vers = getattr(markdown, "version_info", None)