Django

Code

Show
Ignore:
Timestamp:
04/18/08 18:53:24 (9 months ago)
Author:
jkocherhans
Message:

newforms-admin: Merged from trunk up to [7435].

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/newforms-admin

    • Property svnmerge-integrated changed from /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7377 to /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7435

  • django/branches/newforms-admin/django/contrib/markup/templatetags/markup.py

    r6864 r7436  
    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))))