Django

Code

Show
Ignore:
Timestamp:
04/22/08 13:27:02 (7 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7408-7415,7420-7424,7435 via svnmerge from trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7404 to /django/trunk:1-7441

  • django/branches/gis/django/contrib/markup/templatetags/markup.py

    r6920 r7442  
    6666            else: 
    6767                safe_mode = False 
    68             return mark_safe(force_unicode(markdown.markdown(smart_str(value), extensions, safe_mode=safe_mode))) 
     68 
     69            # Unicode support only in markdown v1.7 or above. Version_info 
     70            # exist only in markdown v1.6.2rc-2 or above. 
     71            if getattr(markdown, "version_info", None) < (1,7): 
     72                return mark_safe(force_unicode(markdown.markdown(smart_str(value), extensions, safe_mode=safe_mode))) 
     73            else: 
     74                return mark_safe(markdown.markdown(force_unicode(value), extensions, safe_mode=safe_mode)) 
    6975        else: 
    7076            return mark_safe(force_unicode(markdown.markdown(smart_str(value))))