Django

Code

Changeset 6466

Show
Ignore:
Timestamp:
10/08/07 11:10:39 (1 year ago)
Author:
mtredinnick
Message:

queryset-refactor: Merged changed from trunk up to [6463].

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/queryset-refactor

    • Property svnmerge-integrated changed from /django/trunk:1-5600 to /django/trunk:1-6465

  • django/branches/queryset-refactor/AUTHORS

    r6382 r6466  
    115115    A. Murat Eren <meren@pardus.org.tr> 
    116116    Ludvig Ericson <ludvig.ericson@gmail.com> 
     117    eriks@win.tue.nl 
    117118    Dirk Eschler <dirk.eschler@gmx.net> 
    118119    Marc Fargas <telenieko@telenieko.com> 
    …… 
    235236    pavithran s <pavithran.s@gmail.com> 
    236237    Barry Pederson <bp@barryp.org> 
     238    permonik@mesias.brnonet.cz 
    237239    petr.marhoun@gmail.com 
    238240    pgross@thoughtworks.com 
    …… 
    313315    Milton Waddams 
    314316    wam-djangobug@wamber.net 
    315     wangchun <yaohua2000@gmail.com> 
     317    Wang Chun <wangchun@exoweb.net> 
     318    Filip Wasilewski <filip.wasilewski@gmail.com> 
    316319    Filip Wasilewski <filip.wasilewski@gmail.com> 
    317320    Dan Watson <http://theidioteque.net/> 
    …… 
    322325    Gary Wilson <gary.wilson@gmail.com> 
    323326    Jakub Wiśniowski <restless.being@gmail.com> 
     327    Maciej Wiśniowski <pigletto@gmail.com> 
    324328    wojtek 
    325329    ye7cakf02@sneakemail.com 

  • django/branches/queryset-refactor/django/bin/compile-messages.py

    r6382 r6466  
    1515    if os.environ.get('DJANGO_SETTINGS_MODULE'): 
    1616        from django.conf import settings 
    17         basedirs += settings.LOCALE_PATHS 
     17        if hasattr(settings, 'LOCALE_PATHS'): 
     18            basedirs += settings.LOCALE_PATHS 
    1819 
    1920    # Gather existing directories. 

  • django/branches/queryset-refactor/django/bin/make-messages.py

    r5842 r6466  
    7575            os.unlink(potfile) 
    7676 
     77        all_files = [] 
    7778        for (dirpath, dirnames, filenames) in os.walk("."): 
    78             for file in filenames: 
    79                 if domain == 'djangojs' and file.endswith('.js'): 
    80                     if verbose: sys.stdout.write('processing file %s in %s\n' % (file, dirpath)) 
     79            all_files.extend([(dirpath, f) for f in filenames]) 
     80        all_files.sort() 
     81        for dirpath, file in all_files: 
     82            if domain == 'djangojs' and file.endswith('.js'): 
     83                if verbose: sys.stdout.write('processing file %s in %s\n' % (file, dirpath)) 
     84                src = open(os.path.join(dirpath, file), "rb").read() 
     85                src = pythonize_re.sub('\n#', src) 
     86                open(os.path.join(dirpath, '%s.py' % file), "wb").write(src) 
     87                thefile = '%s.py' % file 
     88                cmd = 'xgettext %s -d %s -L Perl --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy:1,2 --from-code UTF-8 -o - "%s"' % ( 
     89                    os.path.exists(potfile) and '--omit-header' or '', domain, os.path.join(dirpath, thefile)) 
     90                (stdin, stdout, stderr) = os.popen3(cmd, 't') 
     91                msgs = stdout.read() 
     92                errors = stderr.read() 
     93                if errors: 
     94                    print "errors happened while running xgettext on %s" % file 
     95                    print errors 
     96                    sys.exit(8) 
     97                old = '#: '+os.path.join(dirpath, thefile)[2:] 
     98                new = '#: '+os.path.join(dirpath, file)[2:] 
     99                msgs = msgs.replace(old, new) 
     100                if msgs: 
     101                    open(potfile, 'ab').write(msgs) 
     102                os.unlink(os.path.join(dirpath, thefile)) 
     103            elif domain == 'django' and (file.endswith('.py') or file.endswith('.html')): 
     104                thefile = file 
     105                if file.endswith('.html'): 
    81106                    src = open(os.path.join(dirpath, file), "rb").read() 
    82                     src = pythonize_re.sub('\n#', src) 
    83                     open(os.path.join(dirpath, '%s.py' % file), "wb").write(src) 
    84107                    thefile = '%s.py' % file 
    85                     cmd = 'xgettext %s -d %s -L Perl --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy:1,2 --from-code UTF-8 -o - "%s"' % ( 
    86                         os.path.exists(potfile) and '--omit-header' or '', domain, os.path.join(dirpath, thefile)) 
    87                     (stdin, stdout, stderr) = os.popen3(cmd, 't') 
    88                     msgs = stdout.read() 
    89                     errors = stderr.read() 
    90                     if errors: 
    91                         print "errors happened while running xgettext on %s" % file 
    92                         print errors 
    93                         sys.exit(8) 
     108                    open(os.path.join(dirpath, thefile), "wb").write(templatize(src)) 
     109                if verbose: 
     110                    sys.stdout.write('processing file %s in %s\n' % (file, dirpath)) 
     111                cmd = 'xgettext -d %s -L Python --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy:1,2 --keyword=ugettext_noop --keyword=ugettext_lazy --keyword=ungettext_lazy:1,2 --from-code UTF-8 -o - "%s"' % ( 
     112                    domain, os.path.join(dirpath, thefile)) 
     113                (stdin, stdout, stderr) = os.popen3(cmd, 't') 
     114                msgs = stdout.read() 
     115                errors = stderr.read() 
     116                if errors: 
     117                    print "errors happened while running xgettext on %s" % file 
     118                    print errors 
     119                    sys.exit(8) 
     120                if thefile != file: 
    94121                    old = '#: '+os.path.join(dirpath, thefile)[2:] 
    95122                    new = '#: '+os.path.join(dirpath, file)[2:] 
    96123                    msgs = msgs.replace(old, new) 
    97                     if msgs: 
    98                         open(potfile, 'ab').write(msgs) 
     124                if os.path.exists(potfile): 
     125                    # Strip the header 
     126                    msgs = '\n'.join(dropwhile(len, msgs.split('\n'))) 
     127                else: 
     128                    msgs = msgs.replace('charset=CHARSET', 'charset=UTF-8') 
     129                if msgs: 
     130                    open(potfile, 'ab').write(msgs) 
     131                if thefile != file: 
    99132                    os.unlink(os.path.join(dirpath, thefile)) 
    100                 elif domain == 'django' and (file.endswith('.py') or file.endswith('.html')): 
    101                     thefile = file 
    102                     if file.endswith('.html'): 
    103                         src = open(os.path.join(dirpath, file), "rb").read() 
    104                         thefile = '%s.py' % file 
    105                         open(os.path.join(dirpath, thefile), "wb").write(templatize(src)) 
    106                     if verbose: 
    107                         sys.stdout.write('processing file %s in %s\n' % (file, dirpath)) 
    108                     cmd = 'xgettext -d %s -L Python --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy:1,2 --keyword=ugettext_noop --keyword=ugettext_lazy --keyword=ungettext_lazy:1,2 --from-code UTF-8 -o - "%s"' % ( 
    109                         domain, os.path.join(dirpath, thefile)) 
    110                     (stdin, stdout, stderr) = os.popen3(cmd, 't') 
    111                     msgs = stdout.read() 
    112                     errors = stderr.read() 
    113                     if errors: 
    114                         print "errors happened while running xgettext on %s" % file 
    115                         print errors 
    116                         sys.exit(8) 
    117                     if thefile != file: 
    118                         old = '#: '+os.path.join(dirpath, thefile)[2:] 
    119                         new = '#: '+os.path.join(dirpath, file)[2:] 
    120                         msgs = msgs.replace(old, new) 
    121                     if os.path.exists(potfile): 
    122                         # Strip the header 
    123                         msgs = '\n'.join(dropwhile(len, msgs.split('\n'))) 
    124                     else: 
    125                         msgs = msgs.replace('charset=CHARSET', 'charset=UTF-8') 
    126                     if msgs: 
    127                         open(potfile, 'ab').write(msgs) 
    128                     if thefile != file: 
    129                         os.unlink(os.path.join(dirpath, thefile)) 
    130133 
    131134        if os.path.exists(potfile): 

  • django/branches/queryset-refactor/django/conf/locale/de/LC_MESSAGES/django.po

    r5836 r6466  
    1 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER 
    2 # This file is distributed under the same license as the PACKAGE package. 
    3 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. 
     1# Translation of django.po to German 
     2# 
     3# Copyright (C) 2005-2007, 
     4# This file is distributed under the same license as the django package. 
    45# 
    56msgid "" 
    …… 
    16301631msgstr "Webseiten" 
    16311632 
    1632 #: contrib/humanize/templatetags/humanize.py:17 
     1633#: contrib/humanize/templatetags/humanize.py:20 
    16331634msgid "th" 
    1634 msgstr "" 
    1635  
    1636 #: contrib/humanize/templatetags/humanize.py:17 
     1635msgstr "." 
     1636 
     1637#: contrib/humanize/templatetags/humanize.py:20 
    16371638msgid "st" 
    1638 msgstr "" 
    1639  
    1640 #: contrib/humanize/templatetags/humanize.py:17 
     1639msgstr "." 
     1640 
     1641#: contrib/humanize/templatetags/humanize.py:20 
    16411642msgid "nd" 
    1642 msgstr "" 
    1643  
    1644 #: contrib/humanize/templatetags/humanize.py:17 
     1643msgstr "." 
     1644 
     1645#: contrib/humanize/templatetags/humanize.py:20 
    16451646msgid "rd" 
    1646 msgstr "" 
    1647  
    1648 #: contrib/humanize/templatetags/humanize.py:47 
     1647msgstr "." 
     1648 
     1649#: contrib/humanize/templatetags/humanize.py:50 
    16491650#, python-format 
    16501651msgid "%(value).1f million" 
    16511652msgid_plural "%(value).1f million" 
    1652 msgstr[0] "" 
    1653 msgstr[1] "" 
    1654  
    1655 #: contrib/humanize/templatetags/humanize.py:50 
     1653msgstr[0] "%(value).1f Million" 
     1654msgstr[1] "%(value).1f Millionen" 
     1655 
     1656#: contrib/humanize/templatetags/humanize.py:53 
    16561657#, python-format 
    16571658msgid "%(value).1f billion" 
    16581659msgid_plural "%(value).1f billion" 
    1659 msgstr[0] "" 
    1660 msgstr[1] "" 
    1661  
    1662 #: contrib/humanize/templatetags/humanize.py:53 
     1660msgstr[0] "%(value).1f Milliarde" 
     1661msgstr[1] "%(value).1f Milliarden" 
     1662 
     1663#: contrib/humanize/templatetags/humanize.py:56 
    16631664#, python-format 
    16641665msgid "%(value).1f trillion" 
    16651666msgid_plural "%(value).1f trillion" 
    1666 msgstr[0] "" 
    1667 msgstr[1] "" 
    1668  
    1669 #: contrib/humanize/templatetags/humanize.py:68 
     1667msgstr[0] "%(value).1f Billion" 
     1668msgstr[1] "%(value).1f Billionen" 
     1669 
     1670#: contrib/humanize/templatetags/humanize.py:71 
    16701671msgid "one" 
    16711672msgstr "ein" 
    16721673 
    1673 #: contrib/humanize/templatetags/humanize.py:68 
     1674#: contrib/humanize/templatetags/humanize.py:71 
    16741675msgid "two" 
    16751676msgstr "zwei" 
    16761677 
    1677 #: contrib/humanize/templatetags/humanize.py:68 
     1678#: contrib/humanize/templatetags/humanize.py:71 
    16781679msgid "three" 
    16791680msgstr "drei" 
    16801681 
    1681 #: contrib/humanize/templatetags/humanize.py:68 
     1682#: contrib/humanize/templatetags/humanize.py:71 
    16821683msgid "four" 
    16831684msgstr "vier" 
    16841685 
    1685 #: contrib/humanize/templatetags/humanize.py:68 
     1686#: contrib/humanize/templatetags/humanize.py:71 
    16861687msgid "five" 
    16871688msgstr "fünf" 
    16881689 
    1689 #: contrib/humanize/templatetags/humanize.py:68 
     1690#: contrib/humanize/templatetags/humanize.py:71 
    16901691msgid "six" 
    16911692msgstr "sechs" 
    16921693 
    1693 #: contrib/humanize/templatetags/humanize.py:68 
     1694#: contrib/humanize/templatetags/humanize.py:71 
    16941695msgid "seven" 
    16951696msgstr "sieben" 
    16961697 
    1697 #: contrib/humanize/templatetags/humanize.py:68 
     1698#: contrib/humanize/templatetags/humanize.py:71 
    16981699msgid "eight" 
    16991700msgstr "acht" 
    17001701 
    1701 #: contrib/humanize/templatetags/humanize.py:68 
     1702#: contrib/humanize/templatetags/humanize.py:71 
    17021703msgid "nine" 
    17031704msgstr "neun" 

  • django/branches/queryset-refactor/django/contrib/admin/templates/admin/auth/user/change_password.html

    r5863 r6466  
    77{% block stylesheet %}{% admin_media_prefix %}css/forms.css{% endblock %} 
    88{% block bodyclass %}{{ opts.app_label }}-{{ opts.object_name.lower }} change-form{% endblock %} 
    9 {% block userlinks %}<a href="../../../../doc/">{% trans 'Documentation' %}</a> / <a href="../../../../password_change/">{% trans 'Change password' %}</a> / <a href="../../../../logout/">{% trans 'Log out' %}</a>{% endblock %} 
    109{% block breadcrumbs %}{% if not is_popup %} 
    1110<div class="breadcrumbs"> 

  • django/branches/queryset-refactor/django/contrib/admin/templates/admin/base.html

    r4230 r6466  
    2323        </div> 
    2424        {% if user.is_authenticated and user.is_staff %} 
    25         <div id="user-tools">{% trans 'Welcome,' %} <strong>{% if user.first_name %}{{ user.first_name|escape }}{% else %}{{ user.username }}{% endif %}</strong>. {% block userlinks %}<a href="doc/">{% trans 'Documentation' %}</a> / <a href="password_change/">{% trans 'Change password' %}</a> / <a href="logout/">{% trans 'Log out' %}</a>{% endblock %}</div> 
     25        <div id="user-tools"> 
     26        {% trans 'Welcome,' %} <strong>{% if user.first_name %}{{ user.first_name|escape }}{% else %}{{ user.username }}{% endif %}</strong>. 
     27        {% block userlinks %} 
     28        <a href="{% url django.contrib.admin.views.doc.doc_index %}">{% trans 'Documentation' %}</a> 
     29        / <a href="{% url django.contrib.auth.views.password_change %}">{% trans 'Change password' %}</a> 
     30        / <a href="{% url django.contrib.auth.views.logout %}">{% trans 'Log out' %}</a> 
     31        {% endblock %} 
     32        </div> 
    2633        {% endif %} 
    2734        {% block nav-global %}{% endblock %} 

  • django/branches/queryset-refactor/django/contrib/admin/templates/admin/change_form.html

    r4230 r6466  
    88{% block coltype %}{% if ordered_objects %}colMS{% else %}colM{% endif %}{% endblock %} 
    99{% block bodyclass %}{{ opts.app_label }}-{{ opts.object_name.lower }} change-form{% endblock %} 
    10 {% block userlinks %}<a href="../../../doc/">{% trans 'Documentation' %}</a> / <a href="../../../password_change/">{% trans 'Change password' %}</a> / <a href="../../../logout/">{% trans 'Log out' %}</a>{% endblock %} 
    1110{% block breadcrumbs %}{% if not is_popup %} 
    1211<div class="breadcrumbs"> 

  • django/branches/queryset-refactor/django/contrib/admin/templates/admin/change_list.html

    r4230 r6466  
    33{% block stylesheet %}{% admin_media_prefix %}css/changelists.css{% endblock %} 
    44{% block bodyclass %}change-list{% endblock %} 
    5 {% block userlinks %}<a href="../../doc/">{% trans 'Documentation' %}</a> / <a href="../../password_change/">{% trans 'Change password' %}</a> / <a href="../../logout/">{% trans 'Log out' %}</a>{% endblock %} 
    65{% if not is_popup %}{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">{% trans "Home" %}</a> &rsaquo; {{ cl.opts.verbose_name_plural|capfirst|escape }}</div>{% endblock %}{% endif %} 
    76{% block coltype %}flex{% endblock %} 

  • django/branches/queryset-refactor/django/contrib/admin/templates/admin/delete_confirmation.html

    r3349 r6466  
    11{% extends "admin/base_site.html" %} 
    22{% load i18n %} 
    3 {% block userlinks %}<a href="../../../../doc/">{% trans 'Documentation' %}</a> / <a href="../../../../password_change/">{% trans 'Change password' %}</a> / <a href="../../../../logout/">{% trans 'Log out' %}</a>{% endblock %} 
    43{% block breadcrumbs %} 
    54<div class="breadcrumbs"> 

  • django/branches/queryset-refactor/django/contrib/admin/templates/admin_doc/bookmarklets.html

    r2809 r6466  
    22 
    33{% block breadcrumbs %}{% load i18n %}<div class="breadcrumbs"><a href="../../">{% trans "Home" %}</a> &rsaquo; <a href="../">{% trans "Documentation" %}</a> &rsaquo; {% trans "Bookmarklets" %}</div>{% endblock %} 
    4 {% block userlinks %}<a href="../../password_change/">{% trans 'Change password' %}</a> / <a href="../../logout/">{% trans 'Log out' %}</a>{% endblock %} 
    54{% block title %}{% trans "Documentation bookmarklets" %}{% endblock %} 
    65 

  • django/branches/queryset-refactor/django/contrib/admin/templates/admin_doc/index.html

    r3415 r6466  
    22{% load i18n %} 
    33{% block breadcrumbs %}<div class="breadcrumbs"><a href="../">Home</a> &rsaquo; Documentation</div>{% endblock %} 
    4 {% block userlinks %}<a href="../password_change/">{% trans 'Change password' %}</a> / <a href="../logout/">{% trans 'Log out' %}</a>{% endblock %} 
    54{% block title %}Documentation{% endblock %} 
    65 

  • django/branches/queryset-refactor/django/contrib/admin/templates/admin_doc/missing_docutils.html

    r3415 r6466  
    22{% load i18n %} 
    33{% block breadcrumbs %}<div class="breadcrumbs"><a href="../">Home</a> &rsaquo; Documentation</div>{% endblock %} 
    4 {% block userlinks %}<a href="../password_change/">{% trans 'Change password' %}</a> / <a href="../logout/">{% trans 'Log out' %}</a>{% endblock %} 
    54{% block title %}Please install docutils{% endblock %} 
    65 

  • django/branches/queryset-refactor/django/contrib/admin/templates/admin_doc/model_detail.html

    r3642 r6466  
    11{% extends "admin/base_site.html" %} 
    22{% load i18n %} 
    3 {% block userlinks %}<a href="../../../password_change/">{% trans 'Change password' %}</a> / <a href="../../../logout/">{% trans 'Log out' %}</a>{% endblock %} 
    43{% block extrahead %} 
    54{{ block.super }} 

  • django/branches/queryset-refactor/django/contrib/admin/templates/admin_doc/model_index.html

    r2809 r6466  
    33{% block coltype %}colSM{% endblock %} 
    44{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">Home</a> &rsaquo; <a href="../">Documentation</a> &rsaquo; Models</div>{% endblock %} 
    5 {% block userlinks %}<a href="../../password_change/">{% trans 'Change password' %}</a> / <a href="../../logout/">{% trans 'Log out' %}</a>{% endblock %} 
    65 
    76{% block title %}Models{% endblock %} 

  • django/branches/queryset-refactor/django/contrib/admin/templates/admin_doc/template_detail.html

    r3350 r6466  
    22{% load i18n %} 
    33{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../../">Home</a> &rsaquo; <a href="../../">Documentation</a> &rsaquo; Templates &rsaquo; {{ name|escape }}</div>{% endblock %} 
    4 {% block userlinks %}<a href="../../../password_change/">{% trans 'Change password' %}</a> / <a href="../../../logout/">{% trans 'Log out' %}</a>{% endblock %} 
    54 
    65{% block title %}Template: {{ name|escape }}{% endblock %} 

  • django/branches/queryset-refactor/django/contrib/admin/templates/admin_doc/template_filter_index.html

    r2809 r6466  
    33{% block coltype %}colSM{% endblock %} 
    44{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">Home</a> &rsaquo; <a href="../">Documentation</a> &rsaquo; filters</div>{% endblock %} 
    5 {% block userlinks %}<a href="../../password_change/">{% trans 'Change password' %}</a> / <a href="../../logout/">{% trans 'Log out' %}</a>{% endblock %} 
    65{% block title %}Template filters{% endblock %} 
    76 

  • django/branches/queryset-refactor/django/contrib/admin/templates/admin_doc/template_tag_index.html

    r2809 r6466  
    33{% block coltype %}colSM{% endblock %} 
    44{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">Home</a> &rsaquo; <a href="../">Documentation</a> &rsaquo; Tags</div>{% endblock %} 
    5 {% block userlinks %}<a href="../../password_change/">{% trans 'Change password' %}</a> / <a href="../../logout/">{% trans 'Log out' %}</a>{% endblock %} 
    65{% block title %}Template tags{% endblock %} 
    76 

  • django/branches/queryset-refactor/django/contrib/admin/templates/admin_doc/view_detail.html

    r3856 r6466  
    22{% load i18n %} 
    33{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../../">Home</a> &rsaquo; <a href="../../">Documentation</a> &rsaquo; <a href="../">Views</a> &rsaquo; {{ name }}</div>{% endblock %} 
    4 {% block userlinks %}<a href="../../../password_change/">{% trans 'Change password' %}</a> / <a href="../../../logout/">{% trans 'Log out' %}</a>{% endblock %} 
    54{% block title %}View: {{ name }}{% endblock %} 
    65 

  • django/branches/queryset-refactor/django/contrib/admin/templates/admin_doc/view_index.html

    r2809 r6466  
    33{% block coltype %}colSM{% endblock %} 
    44{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">Home</a> &rsaquo; <a href="../">Documentation</a> &rsaquo; Views</div>{% endblock %} 
    5 {% block userlinks %}<a href="../../password_change/">{% trans 'Change password' %}</a> / <a href="../../logout/">{% trans 'Log out' %}</a>{% endblock %} 
    65{% block title %}Views{% endblock %} 
    76 

  • django/branches/queryset-refactor/django/contrib/admin/templates/admin/object_history.html

    r3349 r6466  
    11{% extends "admin/base_site.html" %} 
    22{% load i18n %} 
    3 {% block userlinks %}<a href="../../../../doc/">{% trans 'Documentation' %}</a> / <a href="../../../../password_change/">{% trans 'Change password' %}</a> / <a href="../../../../logout/">{% trans 'Log out' %}</a>{% endblock %} 
    43{% block breadcrumbs %} 
    54<div class="breadcrumbs"><a href="../../../../">{% trans 'Home' %}</a> &rsaquo; <a href="../../">{{ module_name|escape }}</a> &rsaquo; <a href="../">{{ object|escape|truncatewords:"18" }}</a> &rsaquo; {% trans 'History' %}</div> 

  • django/branches/queryset-refactor/django/contrib/admin/templates/registration/password_change_done.html

    r2840 r6466  
    11{% extends "admin/base_site.html" %} 
    22{% load i18n %} 
    3 {% block userlinks %}<a href="../../doc/">{% trans 'Documentation' %}</a> / {% trans 'Change password' %} / <a href="../../logout/">{% trans 'Log out' %}</a>{% endblock %} 
    43{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">{% trans 'Home' %}</a> &rsaquo; {% trans 'Password change' %}</div>{% endblock %} 
    54 

  • django/branches/queryset-refactor/django/contrib/admin/templates/registration/password_change_form.html

    r2809 r6466  
    11{% extends "admin/base_site.html" %} 
    22{% load i18n %} 
    3 {% block userlinks %}<a href="../doc/">{% trans 'Documentation' %}</a> / {% trans 'Change password' %} / <a href="../logout/">{% trans 'Log out' %}</a>{% endblock %} 
    43{% block breadcrumbs %}<div class="breadcrumbs"><a href="../">{% trans 'Home' %}</a> &rsaquo; {% trans 'Password change' %}</div>{% endblock %} 
    54 

  • django/branches/queryset-refactor/django/contrib/admin/templatetags/admin_modify.py

    r5803 r6466  
    7373 
    7474    def __init__(self, bound_field_var): 
    75         self.bound_field_var = bound_field_var 
     75        self.bound_field_var = template.Variable(bound_field_var) 
    7676 
    7777    def get_nodelist(cls, klass): 
    …… 
    9797 
    9898    def render(self, context): 
    99         bound_field = template.resolve_variable(self.bound_field_var, context) 
     99        bound_field = self.bound_field_var.resolve(context) 
    100100 
    101101        context.push() 
    …… 
    157157class EditInlineNode(template.Node): 
    158158    def __init__(self, rel_var): 
    159         self.rel_var = rel_var 
     159        self.rel_var = template.Variable(rel_var) 
    160160 
    161161    def render(self, context): 
    162         relation = template.resolve_variable(self.rel_var, context) 
     162        relation = self.rel_var.resolve(context) 
    163163        context.push() 
    164164        if relation.field.rel.edit_inline == models.TABULAR: 

  • django/branches/queryset-refactor/django/contrib/auth/backends.py

    r6382 r6466  
    22from django.contrib.auth.models import User 
    33 
     4try:  
     5    set  
     6except NameError:  
     7    from sets import Set as set # Python 2.3 fallback 
     8         
    49class ModelBackend: 
    510    """ 

  • django/branches/queryset-refactor/django/contrib/comments/templatetags/comments.py

    r5848 r6466  
    2020        is_public=True): 
    2121        self.content_type = content_type 
     22        if obj_id_lookup_var is not None: 
     23            obj_id_lookup_var = template.Variable(obj_id_lookup_var) 
    2224        self.obj_id_lookup_var, self.obj_id, self.free = obj_id_lookup_var, obj_id, free 
    2325        self.photos_optional, self.photos_required = photos_optional, photos_required 
    …… 
    3335        if self.obj_id_lookup_var is not None: 
    3436            try: 
    35                 self.obj_id = template.resolve_variable(self.obj_id_lookup_var, context) 
     37                self.obj_id = self.obj_id_lookup_var.resolve(context) 
    3638            except template.VariableDoesNotExist: 
    3739                return '' 
    …… 
    7678    def __init__(self, package, module, context_var_name, obj_id, var_name, free): 
    7779        self.package, self.module = package, module 
     80        if context_var_name is not None: 
     81            context_var_name = template.Variable(context_var_name) 
    7882        self.context_var_name, self.obj_id = context_var_name, obj_id 
    7983        self.var_name, self.free = var_name, free 
    …… 
    8387        manager = self.free and FreeComment.objects or Comment.objects 
    8488        if self.context_var_name is not None: 
    85             self.obj_id = template.resolve_variable(self.context_var_name, context) 
     89            self.obj_id = self.context_var_name.resolve(context) 
    8690        comment_count = manager.filter(object_id__exact=self.obj_id, 
    8791            content_type__app_label__exact=self.package, 
    …… 
    9397    def __init__(self, package, module, context_var_name, obj_id, var_name, free, ordering, extra_kwargs=None): 
    9498        self.package, self.module = package, module 
     99        if context_var_name is not None: 
     100            context_var_name = template.Variable(context_var_name) 
    95101        self.context_var_name, self.obj_id = context_var_name, obj_id 
    96102        self.var_name, self.free = var_name, free 
    …… 
    103109        if self.context_var_name is not None: 
    104110            try: 
    105                 self.obj_id = template.resolve_variable(self.context_var_name, context) 
     111                self.obj_id = self.context_var_name.resolve(context) 
    106112            except template.VariableDoesNotExist: 
    107113                return '' 

  • django/branches/queryset-refactor/django/contrib/sessions/backends/base.py

    r6382 r6466  
    1717    Base class for all Session classes. 
    1818    """