Django

Code

Show
Ignore:
Timestamp:
07/04/07 07:11:04 (2 years ago)
Author:
mtredinnick
Message:

Merged Unicode branch into trunk (r4952:5608). This should be fully
backwards compatible for all practical purposes.

Fixed #2391, #2489, #2996, #3322, #3344, #3370, #3406, #3432, #3454, #3492, #3582, #3690, #3878, #3891, #3937, #4039, #4141, #4227, #4286, #4291, #4300, #4452, #4702

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk

    • Property svnmerge-integrated set to /django/trunk:1-5600

  • django/trunk/tests/regressiontests/dateformat/tests.py

    r4647 r5609  
    11r""" 
    22>>> format(my_birthday, '') 
    3 '' 
     3u'' 
    44>>> format(my_birthday, 'a') 
    5 'p.m.' 
     5u'p.m.' 
    66>>> format(my_birthday, 'A') 
    7 'PM' 
     7u'PM' 
    88>>> format(my_birthday, 'd') 
    9 '08' 
     9u'08' 
    1010>>> format(my_birthday, 'j') 
    11 '8' 
     11u'8' 
    1212>>> format(my_birthday, 'l') 
    13 'Sunday' 
     13u'Sunday' 
    1414>>> format(my_birthday, 'L') 
    15 'False' 
     15u'False' 
    1616>>> format(my_birthday, 'm') 
    17 '07' 
     17u'07' 
    1818>>> format(my_birthday, 'M') 
    19 'Jul' 
     19u'Jul' 
    2020>>> format(my_birthday, 'b') 
    21 'jul' 
     21u'jul' 
    2222>>> format(my_birthday, 'n') 
    23 '7' 
     23u'7' 
    2424>>> format(my_birthday, 'N') 
    25 'July' 
     25u'July' 
    2626>>> no_tz or format(my_birthday, 'O') == '+0100' 
    2727True 
    2828>>> format(my_birthday, 'P') 
    29 '10 p.m.' 
     29u'10 p.m.' 
    3030>>> no_tz or format(my_birthday, 'r') == 'Sun, 8 Jul 1979 22:00:00 +0100' 
    3131True 
    3232>>> format(my_birthday, 's') 
    33 '00' 
     33u'00' 
    3434>>> format(my_birthday, 'S') 
    35 'th' 
     35u'th' 
    3636>>> format(my_birthday, 't') 
    37 '31' 
     37u'31' 
    3838>>> no_tz or format(my_birthday, 'T') == 'CET' 
    3939True 
    …… 
    4141True 
    4242>>> format(my_birthday, 'w') 
    43 '0' 
     43u'0' 
    4444>>> format(my_birthday, 'W') 
    45 '27' 
     45u'27' 
    4646>>> format(my_birthday, 'y') 
    47 '79' 
     47u'79' 
    4848>>> format(my_birthday, 'Y') 
    49 '1979' 
     49u'1979' 
    5050>>> format(my_birthday, 'z') 
    51 '189' 
     51u'189' 
    5252>>> no_tz or format(my_birthday, 'Z') == '3600' 
    5353True 
    …… 
    6363 
    6464>>> format(my_birthday, r'Y z \C\E\T') 
    65 '1979 189 CET' 
     65u'1979 189 CET' 
    6666 
    6767>>> format(my_birthday, r'jS o\f F') 
    68 '8th of July' 
     68u'8th of July' 
    6969""" 
    7070