Django

Code

Changeset 6268

Show
Ignore:
Timestamp:
09/15/07 03:29:56 (1 year ago)
Author:
russellm
Message:

Fixed #3036 -- Fixed some doctest strings that were failing. Thanks to pterk for the original patch.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/core/serializers/__init__.py

    r5609 r6268  
    44Usage:: 
    55 
    6     >>> from django.core import serializers 
    7     >>> json = serializers.serialize("json", some_query_set) 
    8     >>> objects = list(serializers.deserialize("json", json)) 
     6    from django.core import serializers 
     7    json = serializers.serialize("json", some_query_set) 
     8    objects = list(serializers.deserialize("json", json)) 
    99 
    1010To add your own serializers, use the SERIALIZATION_MODULES setting:: 

  • django/trunk/django/core/validators.py

    r6175 r6268  
    406406class IsAPowerOf(object): 
    407407    """ 
    408     >>> v = IsAPowerOf(2) 
    409     >>> v(4, None) 
    410     >>> v(8, None) 
    411     >>> v(16, None) 
    412     >>> v(17, None) 
    413     django.core.validators.ValidationError: ['This value must be a power of 2.'] 
     408    Usage: If you create an instance of the IsPowerOf validator: 
     409        v = IsAPowerOf(2) 
     410     
     411    The following calls will succeed: 
     412        v(4, None)  
     413        v(8, None) 
     414        v(16, None) 
     415     
     416    But this call: 
     417        v(17, None) 
     418    will raise "django.core.validators.ValidationError: ['This value must be a power of 2.']" 
    414419    """ 
    415420    def __init__(self, power_of): 

  • django/trunk/django/template/__init__.py

    r6211 r6268  
    3535Sample code: 
    3636 
    37 >>> import template 
    38 >>> s = ''' 
    39 ... <html> 
    40 ... {% if test %} 
    41 ...     <h1>{{ varvalue }}</h1> 
    42 ... {% endif %} 
    43 ... </html> 
    44 ... ''' 
     37>>> from django import template 
     38>>> s = u'<html>{% if test %}<h1>{{ varvalue }}</h1>{% endif %}</html>' 
    4539>>> t = template.Template(s) 
    4640 
    …… 
    5044>>> c = template.Context({'test':True, 'varvalue': 'Hello'}) 
    5145>>> t.render(c) 
    52 '\n<html>\n\n    <h1>Hello</h1>\n\n</html>\n' 
     46u'<html><h1>Hello</h1></html>' 
    5347>>> c = template.Context({'test':False, 'varvalue': 'Hello'}) 
    5448>>> t.render(c) 
    55 '\n<html>\n\n</html>\n' 
     49u'<html></html>' 
    5650""" 
    5751import re 
    …… 
    530524    Sample: 
    531525        >>> token = 'variable|default:"Default value"|date:"Y-m-d"' 
    532         >>> p = FilterParser(token) 
    533         >>> p.filters 
    534         [('default', 'Default value'), ('date', 'Y-m-d')] 
    535         >>> p.var 
     526        >>> p = Parser('') 
     527        >>> fe = FilterExpression(token, p) 
     528        >>> len(fe.filters) 
     529        2 
     530        >>> fe.var 
    536531        'variable' 
    537532 
    …… 
    648643    >>> c = {'article': {'section':'News'}} 
    649644    >>> resolve_variable('article.section', c) 
    650     'News' 
     645    u'News' 
    651646    >>> resolve_variable('article', c) 
    652647    {'section': 'News'} 
    …… 
    656651    >>> c.article.section = 'News' 
    657652    >>> resolve_variable('article.section', c) 
    658     'News' 
     653    u'News' 
    659654 
    660655    (The example assumes VARIABLE_ATTRIBUTE_SEPARATOR is '.') 

  • django/trunk/django/utils/datastructures.py

    r6098 r6268  
    239239    example should make sense. 
    240240 
    241     >>> d = DotExpandedDict({'person.1.firstname': ['Simon'], 
    242             'person.1.lastname': ['Willison'], 
    243             'person.2.firstname': ['Adrian'], 
     241    >>> d = DotExpandedDict({'person.1.firstname': ['Simon'], \ 
     242            'person.1.lastname': ['Willison'], \ 
     243            'person.2.firstname': ['Adrian'], \ 
    244244            'person.2.lastname': ['Holovaty']}) 
    245245    >>> d 
    246     {'person': {'1': {'lastname': ['Willison'], 'firstname': ['Simon']}, 
    247     '2': {'lastname': ['Holovaty'], 'firstname': ['Adrian']}}} 
     246    {'person': {'1': {'lastname': ['Willison'], 'firstname': ['Simon']}, '2': {'lastname': ['Holovaty'], 'firstname': ['Adrian']}}} 
    248247    >>> d['person'] 
    249     {'1': {'firstname': ['Simon'], 'lastname': ['Willison'], 
    250     '2': {'firstname': ['Adrian'], 'lastname': ['Holovaty']} 
     248    {'1': {'lastname': ['Willison'], 'firstname': ['Simon']}, '2': {'lastname': ['Holovaty'], 'firstname': ['Adrian']}} 
    251249    >>> d['person']['1'] 
    252     {'firstname': ['Simon'], 'lastname': ['Willison']} 
     250    {'lastname': ['Willison'], 'firstname': ['Simon']} 
    253251 
    254252    # Gotcha: Results are unpredictable if the dots are "uneven": 
    255253    >>> DotExpandedDict({'c.1': 2, 'c.2': 3, 'c': 1}) 
    256     >>> {'c': 1} 
     254    {'c': 1} 
    257255    """ 
    258256    def __init__(self, key_to_list_mapping): 

  • django/trunk/django/utils/feedgenerator.py

    r6233 r6268  
    44Sample usage: 
    55 
     6>>> from django.utils import feedgenerator 
    67>>> feed = feedgenerator.Rss201rev2Feed( 
    78...     title=u"Poynter E-Media Tidbits",