Django

Code

Changeset 7581

Show
Ignore:
Timestamp:
06/06/08 09:09:20 (6 months ago)
Author:
russellm
Message:

Refs #7297 -- Corrected some doctest strings internal to the utils.text module. Thanks, akaihola.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/utils/text.py

    r5895 r7581  
    119119    are removed. 
    120120    >>> get_valid_filename("john's portrait in 2004.jpg") 
    121     'johns_portrait_in_2004.jpg' 
     121    u'johns_portrait_in_2004.jpg' 
    122122    """ 
    123123    s = force_unicode(s).strip().replace(' ', '_') 
    …… 
    128128    """ 
    129129    >>> get_text_list(['a', 'b', 'c', 'd']) 
    130     'a, b, c or d' 
     130    u'a, b, c or d' 
    131131    >>> get_text_list(['a', 'b', 'c'], 'and') 
    132     'a, b and c' 
     132    u'a, b and c' 
    133133    >>> get_text_list(['a', 'b'], 'and') 
    134     'a and b' 
     134    u'a and b' 
    135135    >>> get_text_list(['a']) 
    136     'a' 
     136    u'a' 
    137137    >>> get_text_list([]) 
    138     '' 
     138    u'' 
    139139    """ 
    140140    if len(list_) == 0: return u'' 
    …… 
    199199smart_split_re = re.compile('("(?:[^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'(?:[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*)\'|[^\\s]+)') 
    200200def smart_split(text): 
    201     """ 
     201    r""" 
    202202    Generator that splits a string by spaces, leaving quoted phrases together. 
    203203    Supports both single and double quotes, and supports escaping quotes with 
    …… 
    205205    quote marks. 
    206206 
    207     >>> list(smart_split('This is "a person\'s" test.')) 
    208     ['This', 'is', '"a person\'s"', 'test.'] 
     207    >>> list(smart_split(r'This is "a person\'s" test.')) 
     208    [u'This', u'is', u'"a person\\\'s"', u'test.'] 
     209        >>> list(smart_split(r"Another 'person\'s' test."))  
     210        [u'Another', u"'person's'", u'test.'] 
     211        >>> list(smart_split(r'A "\"funky\" style" test.'))  
     212        [u'A', u'""funky" style"', u'test.'] 
    209213    """ 
    210214    text = force_unicode(text)