Django

Code

Changeset 4052

Show
Ignore:
Timestamp:
11/07/06 13:07:27 (2 years ago)
Author:
adrian
Message:

Formatting fixes from the past round of checkins

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/conf/global_settings.py

    r4048 r4052  
    102102DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3. 
    103103DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3. 
    104 DATABASE_OPTIONS = {}          # Set to empy dictionary for default. 
     104DATABASE_OPTIONS = {}          # Set to empty dictionary for default. 
    105105 
    106106# Host for sending e-mail. 

  • django/trunk/django/core/mail.py

    r4051 r4052  
    5454        msg['To'] = ', '.join(recipient_list) 
    5555        msg['Date'] = rfc822.formatdate() 
    56         msg['Message-ID'] = "<%d.%d@%s>" % ( time.time(), random.getrandbits(64), socket.getfqdn() ) 
     56        msg['Message-ID'] = "<%d.%d@%s>" % (time.time(), random.getrandbits(64), socket.getfqdn()) 
    5757        try: 
    5858            server.sendmail(from_email, recipient_list, msg.as_string()) 

  • django/trunk/django/db/__init__.py

    r4048 r4052  
    77if not settings.DATABASE_ENGINE: 
    88    settings.DATABASE_ENGINE = 'dummy' 
    9 if not settings.DATABASE_OPTIONS: 
    10     settings.DATABASE_OPTIONS = {} 
    119 
    1210try: 

  • django/trunk/django/template/defaulttags.py

    r4050 r4052  
    658658            {% endfor %} 
    659659 
    660     2. If given a variable, check if that variable has changed. For example, the 
     660    2. If given a variable, check whether that variable has changed. For example, the 
    661661       following shows the date every time it changes, but only shows the hour if both 
    662        the hour and the date has changed:: 
     662       the hour and the date have changed:: 
    663663 
    664664            {% for date in days %} 
    665                 {% ifchanged date.date %} {{date.date}} {% endifchanged %} 
     665                {% ifchanged date.date %} {{ date.date }} {% endifchanged %} 
    666666                {% ifchanged date.hour date.date %} 
    667                     {{date.hour}} 
     667                    {{ date.hour }} 
    668668                {% endifchanged %} 
    669669            {% endfor %} 

  • django/trunk/docs/forms.txt

    r4039 r4052  
    612612 
    613613``NumberIsInRange`` 
    614     Takes two boundary number, ``lower`` and ``upper`` and checks that the 
     614    Takes two boundary numbers, ``lower`` and ``upper``, and checks that the 
    615615    field is greater than ``lower`` (if given) and less than ``upper`` (if 
    616616    given).   
    617617     
    618     Both checks are inclusive; that is, ``NumberIsInRange(10, 20)`` will allow 
    619     values of both 10 and 20. This validator only checks numeric fields 
    620     (i.e. floats and integer fields). 
     618    Both checks are inclusive. That is, ``NumberIsInRange(10, 20)`` will allow 
     619    values of both 10 and 20. This validator only checks numeric values 
     620    (e.g., float and integer values). 
    621621 
    622622``IsAPowerOf`` 

  • django/trunk/docs/templates.txt

    r4050 r4052  
    539539        {% endfor %} 
    540540         
    541 2. If given a variable, check if that variable has changed. For example, the 
    542    following shows the date every time it changes, but only shows the hour if both 
    543    the hour and the date has changed:: 
     5412. **New in Django development version.** If given a variable, check whether that 
     542   variable has changed. For example, the following shows the date every time it 
     543   changes, but only shows the hour if both the hour and the date has changed:: 
    544544     
    545545        {% for date in days %} 
    546             {% ifchanged date.date %} {{date.date}} {% endifchanged %} 
     546            {% ifchanged date.date %} {{ date.date }} {% endifchanged %} 
    547547            {% ifchanged date.hour date.date %} 
    548                 {{date.hour}} 
     548                {{ date.hour }} 
    549549            {% endifchanged %} 
    550550        {% endfor %}