Changeset 3086

Timestamp:

06/05/06 20:21:49 (2 years ago)

Author:

jkocherhans

Message:

multi-auth: Merged to [3085]

Files:

• django/branches/multi-auth/django/conf/global_settings.py (modified) (1 diff)
• django/branches/multi-auth/django/conf/locale/nl/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/multi-auth/django/conf/locale/nl/LC_MESSAGES/django.po (modified) (40 diffs)
• django/branches/multi-auth/django/conf/urls/registration.py (modified) (1 diff)
• django/branches/multi-auth/django/contrib/admin/media/css/changelists.css (modified) (2 diffs)
• django/branches/multi-auth/django/contrib/admin/media/css/global.css (modified) (1 diff)
• django/branches/multi-auth/django/contrib/admin/media/css/layout.css (modified) (1 diff)
• django/branches/multi-auth/django/contrib/admin/media/css/patch-iewin.css (modified) (1 diff)
• django/branches/multi-auth/django/contrib/admin/media/js/admin/RelatedObjectLookups.js (modified) (2 diffs)
• django/branches/multi-auth/django/contrib/admin/templates/admin/base.html (modified) (1 diff)
• django/branches/multi-auth/django/contrib/admin/templatetags/admin_list.py (modified) (5 diffs)
• django/branches/multi-auth/django/contrib/admin/utils.py (modified) (1 diff)
• django/branches/multi-auth/django/contrib/admin/views/main.py (modified) (1 diff)
• django/branches/multi-auth/django/contrib/auth/forms.py (modified) (1 diff)
• django/branches/multi-auth/django/contrib/humanize (copied) (copied from django/trunk/django/contrib/humanize)
• django/branches/multi-auth/django/contrib/humanize/__init__.py (copied) (copied from django/trunk/django/contrib/humanize/__init__.py)
• django/branches/multi-auth/django/contrib/humanize/templatetags (copied) (copied from django/trunk/django/contrib/humanize/templatetags)
• django/branches/multi-auth/django/contrib/humanize/templatetags/humanize.py (copied) (copied from django/trunk/django/contrib/humanize/templatetags/humanize.py)
• django/branches/multi-auth/django/contrib/humanize/templatetags/__init__.py (copied) (copied from django/trunk/django/contrib/humanize/templatetags/__init__.py)
• django/branches/multi-auth/django/core/management.py (modified) (6 diffs)
• django/branches/multi-auth/django/core/urlresolvers.py (modified) (4 diffs)
• django/branches/multi-auth/django/core/validators.py (modified) (1 diff)
• django/branches/multi-auth/django/db/backends/ado_mssql/base.py (modified) (1 diff)
• django/branches/multi-auth/django/db/backends/dummy/base.py (modified) (1 diff)
• django/branches/multi-auth/django/db/backends/mysql/base.py (modified) (1 diff)
• django/branches/multi-auth/django/db/backends/oracle/base.py (modified) (2 diffs)
• django/branches/multi-auth/django/db/backends/postgresql/base.py (modified) (1 diff)
• django/branches/multi-auth/django/db/backends/postgresql_psycopg2/base.py (modified) (1 diff)
• django/branches/multi-auth/django/db/backends/sqlite3/base.py (modified) (1 diff)
• django/branches/multi-auth/django/db/models/fields/__init__.py (modified) (1 diff)
• django/branches/multi-auth/django/db/models/fields/related.py (modified) (2 diffs)
• django/branches/multi-auth/django/db/models/query.py (modified) (1 diff)
• django/branches/multi-auth/django/forms/__init__.py (modified) (23 diffs)
• django/branches/multi-auth/django/template/__init__.py (modified) (1 diff)
• django/branches/multi-auth/django/utils/datastructures.py (modified) (2 diffs)
• django/branches/multi-auth/django/utils/translation.py (modified) (2 diffs)
• django/branches/multi-auth/django/utils/xmlutils.py (modified) (1 diff)
• django/branches/multi-auth/django/views/generic/create_update.py (modified) (6 diffs)
• django/branches/multi-auth/django/views/generic/date_based.py (modified) (12 diffs)
• django/branches/multi-auth/django/views/generic/list_detail.py (modified) (4 diffs)
• django/branches/multi-auth/docs/add_ons.txt (modified) (1 diff)
• django/branches/multi-auth/docs/authentication.txt (modified) (1 diff)
• django/branches/multi-auth/docs/db-api.txt (modified) (2 diffs)
• django/branches/multi-auth/docs/django-admin.txt (modified) (1 diff)
• django/branches/multi-auth/docs/faq.txt (modified) (1 diff)
• django/branches/multi-auth/docs/generic_views.txt (modified) (2 diffs)
• django/branches/multi-auth/docs/model-api.txt (modified) (1 diff)
• django/branches/multi-auth/docs/settings.txt (modified) (5 diffs)
• django/branches/multi-auth/docs/templates_python.txt (modified) (1 diff)
• django/branches/multi-auth/docs/templates.txt (modified) (1 diff)
• django/branches/multi-auth/setup.py (modified) (2 diffs)
• django/branches/multi-auth/tests/modeltests/basic/models.py (modified) (7 diffs)
• django/branches/multi-auth/tests/modeltests/choices/models.py (modified) (1 diff)
• django/branches/multi-auth/tests/modeltests/custom_columns/models.py (modified) (2 diffs)
• django/branches/multi-auth/tests/modeltests/custom_managers/models.py (modified) (6 diffs)
• django/branches/multi-auth/tests/modeltests/custom_methods/models.py (modified) (3 diffs)
• django/branches/multi-auth/tests/modeltests/custom_pk/models.py (modified) (6 diffs)
• django/branches/multi-auth/tests/modeltests/get_latest/models.py (modified) (4 diffs)
• django/branches/multi-auth/tests/modeltests/lookup/models.py (modified) (5 diffs)
• django/branches/multi-auth/tests/modeltests/m2m_intermediary/models.py (modified) (4 diffs)
• django/branches/multi-auth/tests/modeltests/m2m_multiple/models.py (modified) (4 diffs)
• django/branches/multi-auth/tests/modeltests/m2m_recursive/models.py (modified) (10 diffs)
• django/branches/multi-auth/tests/modeltests/m2o_recursive2/models.py (modified) (2 diffs)
• django/branches/multi-auth/tests/modeltests/m2o_recursive/models.py (modified) (3 diffs)
• django/branches/multi-auth/tests/modeltests/manipulators/models.py (modified) (5 diffs)
• django/branches/multi-auth/tests/modeltests/many_to_many/models.py (modified) (10 diffs)
• django/branches/multi-auth/tests/modeltests/many_to_one/models.py (modified) (16 diffs)
• django/branches/multi-auth/tests/modeltests/many_to_one_null/models.py (modified) (10 diffs)
• django/branches/multi-auth/tests/modeltests/model_inheritance/models.py (modified) (3 diffs)
• django/branches/multi-auth/tests/modeltests/one_to_one/models.py (modified) (6 diffs)
• django/branches/multi-auth/tests/modeltests/ordering/models.py (modified) (2 diffs)
• django/branches/multi-auth/tests/modeltests/or_lookups/models.py (modified) (5 diffs)
• django/branches/multi-auth/tests/modeltests/pagination/models.py (modified) (2 diffs)
• django/branches/multi-auth/tests/modeltests/repr (deleted)
• django/branches/multi-auth/tests/modeltests/reserved_names/models.py (modified) (4 diffs)
• django/branches/multi-auth/tests/modeltests/reverse_lookup/models.py (modified) (4 diffs)
• django/branches/multi-auth/tests/modeltests/save_delete_hooks/models.py (modified) (2 diffs)
• django/branches/multi-auth/tests/modeltests/str (copied) (copied from django/trunk/tests/modeltests/str)
• django/branches/multi-auth/tests/modeltests/str/__init__.py (copied) (copied from django/trunk/tests/modeltests/str/__init__.py)
• django/branches/multi-auth/tests/modeltests/str/models.py (copied) (copied from django/trunk/tests/modeltests/str/models.py)
• django/branches/multi-auth/tests/modeltests/transactions/models.py (modified) (6 diffs)
• django/branches/multi-auth/tests/modeltests/validation/models.py (modified) (1 diff)

django/branches/multi-auth/django/conf/global_settings.py

@@ -204 +204 @@
-TIME_FORMAT = 'P'
-
+# Default formatting for date objects when only the year and month are relevant.
+# See all available format strings here:
+# http://www.djangoproject.com/documentation/templates/#now
+YEAR_MONTH_FORMAT = 'F Y'
+
+# Default formatting for date objects when only the month and day are relevant.
+# See all available format strings here:
+# http://www.djangoproject.com/documentation/templates/#now
+MONTH_DAY_FORMAT = 'F j'
+
-# Whether to enable Psyco, which optimizes Python code. Requires Psyco.
-# http://psyco.sourceforge.net/

django/branches/multi-auth/django/conf/locale/nl/LC_MESSAGES/django.po

@@ -73 +73 @@
-#: db/models/fields/__init__.py:468 core/validators.py:132
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
-HH
+UU
-
-#: db/models/fields/__init__.py:562
@@ -117 +117 @@
-#: conf/global_settings.py:46
-msgid "Galician"
-s
+c
-
-#: conf/global_settings.py:47
@@ -177 +177 @@
-#: conf/global_settings.py:61
-msgid "Ukrainian"
-Ukrai
+Oekraï
-
-#: conf/global_settings.py:62
@@ -221 +221 @@
-#: core/validators.py:103
-msgid "Empty values are not allowed here."
-
+zijn hier 
-
-#: core/validators.py:107
-msgid "Non-numeric characters aren't allowed here."
-
+zijn hier 
-
-#: core/validators.py:111
@@ -245 +245 @@
-#: core/validators.py:128
-msgid "Enter a valid time in HH:MM format."
-HH
+UU
-
-#: core/validators.py:136
@@ -322 +322 @@
-#: core/validators.py:255
-msgid "Please enter something for at least one field."
-Geef in minimaal één veld een waarde
+Voer tenminste één veld in
-
-#: core/validators.py:264 core/validators.py:275
@@ -356 +356 @@
-msgid_plural ""
-"Please enter a valid decimal number with at most %s total digits."
-maximaal
-maximaal
+hooguit
+hooguit
-
-#: core/validators.py:352
@@ -364 +364 @@
-msgid_plural ""
-"Please enter a valid decimal number with at most %s decimal places."
-maximaal
-maximaal
+hooguit
+hooguit
-
-#: core/validators.py:362
-#, python-format
-msgid "Make sure your uploaded file is at least %s bytes big."
-imaal
+stens
-
-#: core/validators.py:363
-#, python-format
-msgid "Make sure your uploaded file is at most %s bytes big."
-maximaal
+hoogstens
-
-#: core/validators.py:376
@@ -457 +457 @@
-"required for logging in."
-msgstr ""
-u 
+
-"moeten cookies worden geaccepteerd."
-
@@ -466 +466 @@
-"sensitive."
-msgstr ""
-Geef een correcte gebruikersnaam en wachtwoord. Let op
+Voer een correcte gebruikersnaam en wachtwoord in. Let op,
-"hoofdletter-gevoelig."
-
@@ -523 +523 @@
-#: contrib/auth/models.py:60
-msgid "Designates whether the user can log into this admin site."
-
+.
-
-#: contrib/auth/models.py:61
@@ -683 +683 @@
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
- 
+
-
-#: contrib/admin/views/main.py:226
@@ -735 +735 @@
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-Wijzige
+Het wijzigen va
-
-#: contrib/admin/views/main.py:354
@@ -741 +741 @@
-msgid ""
-"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
-
+was 
-
-#: contrib/admin/views/main.py:392
@@ -761 +761 @@
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-Verwijdering
+De verwijdering van
-
-#: contrib/admin/views/main.py:511
@@ -770 +770 @@
-#, python-format
-msgid "Change history: %s"
-historie
+geschiedenis
-
-#: contrib/admin/views/main.py:565
@@ -795 +795 @@
-#, python-format
-msgid "String (up to %(maxlength)s)"
-maximaal
+hooguit
-
-#: contrib/admin/views/doc.py:280
@@ -940 +940 @@
-"types of objects:"
-msgstr ""
-Verwijderen van %(object_name)s '%(object)s' zal ook gerelateerde objecten
-verwijderen. Echter u heeft geen rechten om de volgende typen objecten te
-
+Het verwijderen van %(object_name)s '%(object)s' zal ook gerelateerde
+objecten verwijderen. Echter u heeft geen rechten om de volgende typen
+objecten te 
-
-#: contrib/admin/templates/admin/delete_confirmation.html:21
@@ -964 +964 @@
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-D
+Onze excuses, maar d
-
-#: contrib/admin/templates/admin/change_form.html:15
@@ -1074 +1074 @@
-"admin site."
-msgstr ""
-geschiedenis. Mogelijk niet via de admin sit
-
+wijzigingsgeschiedenis. Het is mogelijk niet via d
+admin site 
-
-#: contrib/admin/templates/admin/500.html:4
@@ -1094 +1094 @@
-"mail and should be fixed shortly. Thanks for your patience."
-msgstr ""
-
-
-
+
+
-
-#: contrib/admin/templates/admin/search_form.html:8
@@ -1189 +1188 @@
-#: contrib/admin/templates/admin_doc/bookmarklets.html:29
-msgid "As above, but opens the admin page in a new window."
-Als 
+Zoals hier
-
-#: contrib/admin/templates/widget/date_time.html:3
@@ -1219 +1218 @@
-"your password and e-mail the new one to you."
-msgstr ""
-Wachtwoord vergeten? Geef u e-mail adres op en we herstellen uw wachtwoord
-en zullen u het nieuwe wachtwoord per e-mail toestur
+Uw wachtwoord vergeten? Geef uw e-mailadres op en er zal een nieuw
+wachtwoord worden toegekend en aan u worden toegezond
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
@@ -1232 +1231 @@
-#: contrib/admin/templates/registration/password_reset_email.html:2
-msgid "You're receiving this e-mail because you requested a password reset"
-een
+deze
-
-#: contrib/admin/templates/registration/password_reset_email.html:3
@@ -1279 +1278 @@
-"should be receiving it shortly."
-msgstr ""
-
-
+
-
-#: contrib/admin/templates/registration/password_change_form.html:4
@@ -1294 +1292 @@
-"password twice so we can verify you typed it in correctly."
-msgstr ""
-Geef voor de veiligheid uw oude wachtwoord op en twee keer een nieuw 
-wachtwoord
+Vanwege de beveiliging moet u uw oude en twee keer een nieuw wachtwoord
+invoeren
-
-#: contrib/admin/templates/registration/password_change_form.html:17
@@ -1341 +1339 @@
-msgid ""
-"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-
+
+
-
-#: contrib/flatpages/models.py:9
@@ -1374 +1373 @@
-msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr ""
-Alleen ingelogde gebruikers kunnen deze pagina zien, indien dit is
-aangekruist
+Indien dit is aangekruist kunnen alleen ingelogde gebruikers deze pagina
+bekijken
-
-#: contrib/flatpages/models.py:18
@@ -1406 +1405 @@
-"'http://'."
-msgstr ""
-zijn (zoals boven) of een volledige URL beginnend
-
+(zoals hierboven) zijn of een volledige URL
+beginnend 
-
-#: contrib/redirects/models.py:12
@@ -1472 +1471 @@
-#: contrib/comments/models.py:84 contrib/comments/models.py:170
-msgid "is public"
-publiek
+openbaar
-
-#: contrib/comments/models.py:86
@@ -1519 +1518 @@
-#: contrib/comments/models.py:173
-msgid "approved by staff"
-
+d
-
-#: contrib/comments/models.py:176
@@ -1605 +1604 @@
-#: contrib/comments/views/karma.py:25
-msgid "No voting for yourself"
-je
+u
-
-#: contrib/comments/views/comments.py:28
@@ -1611 +1610 @@
-"This rating is required because you've entered at least one other rating."
-msgstr ""
-je op zijn minst een andere waardering
-hebt 
+u tenminste één andere waardering hebt
+
-
-#: contrib/comments/views/comments.py:112
@@ -1627 +1626 @@
-"%(text)s"
-msgstr[0] ""
-welke minder dan %(count)s opmerking
-
+die minder dan %(count)s
+opmerking 
-"\n"
-"%(text)s"
-msgstr[1] ""
-welke minder dan %(count)s opmerkingen
-
+die minder dan %(count)s
+opmerkingen 
-"\n"
-"%(text)s"
@@ -1656 +1655 @@
-#: contrib/comments/views/comments.py:284
-msgid "One or more of the required fields wasn't submitted"
-is
+zijn
-
-#: contrib/comments/views/comments.py:197
@@ -1711 +1710 @@
-#: contrib/comments/templates/comments/freeform.html:4
-msgid "Your name:"
-
+s
-
-#: contrib/sessions/models.py:35
@@ -1739 +1738 @@
-#: contrib/contenttypes/models.py:28
-msgid "content type"
-
+s
-
-#: contrib/contenttypes/models.py:29
-msgid "content types"
-
+s
-
-#: forms/__init__.py:380
@@ -1749 +1748 @@
-msgid "Ensure your text is less than %s character."
-msgid_plural "Ensure your text is less than %s characters."
-teken
-S teken
+karakter
+s karakter
-
-#: forms/__init__.py:385
@@ -1779 +1778 @@
-#: utils/dates.py:6
-msgid "Monday"
-M
+m
-
-#: utils/dates.py:6
-msgid "Tuesday"
-D
+d
-
-#: utils/dates.py:6
-msgid "Wednesday"
-W
+w
-
-#: utils/dates.py:6
-msgid "Thursday"
-D
+d
-
-#: utils/dates.py:6
-msgid "Friday"
-V
+v
-
-#: utils/dates.py:7
-msgid "Saturday"
-Z
+z
-
-#: utils/dates.py:7
-msgid "Sunday"
-Z
+z
-
-#: utils/dates.py:14
@@ -1891 +1890 @@
-#: utils/dates.py:20
-msgid "oct"
-c
+k
-
-#: utils/dates.py:20

django/branches/multi-auth/django/conf/urls/registration.py

@@ -2 +2 @@
-
-urlpatterns = patterns('',
-
+s
-    (r'^logout/$', 'django.contrib.auth.views.logout'),
-    (r'^login_another/$', 'django.contrib.auth.views.logout_then_login'),

django/branches/multi-auth/django/contrib/admin/media/css/changelists.css

@@ -5 +5 @@
-#changelist table { width:100%; }
-.change-list .filtered table { border-right:1px solid #ddd;  }
-_height:400px; 
+
-.change-list .filtered { background:white url(../img/admin/changelist-bg.gif) top right repeat-y !important; }
-.change-list .filtered table, .change-list .filtered .paginator, .filtered #toolbar, .filtered div.xfull { margin-right:160px !important; width:auto !important; }
@@ -28 +28 @@
-#changelist-filter h2 { font-size:11px; padding:2px 5px; border-bottom:1px solid #ddd; }
-#changelist-filter h3 { font-size:12px; margin-bottom:0; }
-_margin-right:-10px;
+
-#changelist-filter li { list-style-type:none; margin-left:0; padding-left:0; }
-#changelist-filter a { color:#999; }

django/branches/multi-auth/django/contrib/admin/media/css/global.css

@@ -87 +87 @@
-
-/*  FORM BUTTONS  */
-
+border:1px solid #bbb; border-color:#ddd #aaa #aaa #ddd; 
-input[type=submit]:active, input[type=button]:active { background-image:url(../img/admin/nav-bg-reverse.gif); background-position:top; }
-input[type=submit].default, .submit-row input.default { border:2px solid #5b80b2; background:#7CA0C7 url(../img/admin/default-bg.gif) bottom repeat-x; font-weight:bold; color:white; }

django/branches/multi-auth/django/contrib/admin/media/css/layout.css

@@ -4 +4 @@
-#header { width:100%; }
-#content-main { float:left; width:100%; }
-220px; position:relative; margin-right:-230px
+18em; position:relative; margin-right:-19em
-#footer { clear:both; padding:10px; }
-
-/*  COLUMN TYPES  */
-45px
-45px
-230px
+0em
+0em
+19em
-.colSM #content-main { float:right; }
-.popup .colM { width:95%; }

django/branches/multi-auth/django/contrib/admin/media/css/patch-iewin.css

@@ -5 +5 @@
-* html .dashboard #content { width:768px; } /* proper fixed width for dashboard in IE6 */
-* html .dashboard #content-main { width:535px; } /* proper fixed width for dashboard in IE6 */
+* html #changelist-filter ul { margin-right:-10px; } /* fix right margin for changelist filters in IE6 */
+* html .change-list .filtered { height:400px; } /* IE ignores min-height, but treats height as if it were min-height */

django/branches/multi-auth/django/contrib/admin/media/js/admin/RelatedObjectLookups.js

@@ -4 +4 @@
-function showRelatedObjectLookupPopup(triggeringLink) {
-    var name = triggeringLink.id.replace(/^lookup_/, '');
+    // IE doesn't like periods in the window name, so convert temporarily.
+    name = name.replace(/\./g, '___');
-    var href;
-    if (triggeringLink.href.search(/\?/) >= 0) {
@@ -16 +18 @@
-
-function dismissRelatedLookupPopup(win, chosenId) {
-
+
+
-    if (elem.className.indexOf('vRawIdAdminField') != -1 && elem.value) {
-        elem.value += ',' + chosenId;
-    } else {
-win.
+
-    }
-    win.close();

django/branches/multi-auth/django/contrib/admin/templates/admin/base.html

@@ -20 +20 @@
-        {% block branding %}{% endblock %}
-        </div>
-
+{% if user.is_staff %}
-        <div id="user-tools">{% trans 'Welcome,' %} <strong>{% if user.first_name %}{{ user.first_name }}{% 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>
-
+{% endif %}
-        {% block nav-global %}{% endblock %}
-    </div>

django/branches/multi-auth/django/contrib/admin/templatetags/admin_list.py

@@ -3 +3 @@
-from django.contrib.admin.views.main import MAX_SHOW_ALL_ALLOWED, ALL_VAR
-from django.contrib.admin.views.main import ORDER_VAR, ORDER_TYPE_VAR, PAGE_VAR, SEARCH_VAR
-, MONTHS
+
-from django.core.exceptions import ObjectDoesNotExist
-from django.db import models
@@ -9 +9 @@
-from django.utils.html import escape
-from django.utils.text import capfirst
-
+, get_partial_date_formats
-from django.template import Library
+import datetime
-
-register = Library()
@@ -194 +195 @@
-        month_lookup = cl.params.get(month_field)
-        day_lookup = cl.params.get(day_field)
+        year_month_format, month_day_format = get_partial_date_formats()
-
-        link = lambda d: cl.get_query_string(d, [field_generic])
-
-        if year_lookup and month_lookup and day_lookup:
-month_name = MONTHS[int(month_lookup)]
+day = datetime.date(int(year_lookup), int(month_lookup), int(day_lookup))
-            return {
-                'show': True,
-                'back': {
-                    'link': link({year_field: year_lookup, month_field: month_lookup}),
-"%s %s" % (month_name, year_lookup
+dateformat.format(day, year_month_format
-                },
-"%s %s" % (month_name, day_lookup
+dateformat.format(day, month_day_format
-            }
-        elif year_lookup and month_lookup:
@@ -217 +219 @@
-                'choices': [{
-                    'link': link({year_field: year_lookup, month_field: month_lookup, day_field: day.day}),
-y.strftime('%B %d'
+teformat.format(day, month_day_format
-                } for day in days]
-            }
@@ -230 +232 @@
-                'choices': [{
-                    'link': link({year_field: year_lookup, month_field: month.month}),
-"%s %s" % (month.strftime('%B'), month.year
+dateformat.format(month, year_month_format
-                } for month in months]
-            }

django/branches/multi-auth/django/contrib/admin/utils.py

@@ -82 +82 @@
-
-def create_reference_role(rolename, urlbase):
-
+
+
+
-        node = docutils.nodes.reference(rawtext, text, refuri=(urlbase % (inliner.document.settings.link_base, text.lower())), **options)
-        return [node], []
-    docutils.parsers.rst.roles.register_canonical_role(rolename, _role)
-
-
+
+
+
-    context = inliner.document.settings.default_reference_context
-    node = docutils.nodes.reference(rawtext, text, refuri=(ROLES[context] % (inliner.document.settings.link_base, text.lower())), **options)

django/branches/multi-auth/django/contrib/admin/views/main.py

@@ -580 +580 @@
-        return filter_specs, bool(filter_specs)
-
-
+
+
+
-        p = self.params.copy()
-        for r in remove:

django/branches/multi-auth/django/contrib/auth/forms.py

@@ -36 +36 @@
-        if self.user_cache is None:
-            raise validators.ValidationError, _("Please enter a correct username and password. Note that both fields are case-sensitive.")
+        elif not self.user_cache.is_active:
+            raise validators.ValidationError, _("This account is inactive.")
-
-    def get_user_id(self):

django/branches/multi-auth/django/core/management.py

@@ -1056 +1056 @@
-            raise ImportError
-        import IPython
-
+
+
+
-        shell.mainloop()
-    except ImportError:
@@ -1138 +1140 @@
-    sys.exit(1)
-
-
+
+
+
+
+
-    # Parse the command-line arguments. optparse handles the dirty work.
-    parser = DjangoOptionParser(usage=get_usage(action_mapping), version=get_version())
@@ -1147 +1153 @@
-    parser.add_option('--plain', action='store_true', dest='plain',
-        help='Tells Django to use plain Python, not IPython, for "shell" command.')
-
+argv[1:]
-
-    # Take care of options.
@@ -1162 +1168 @@
-        parser.print_usage_and_exit()
-    if not action_mapping.has_key(action):
-sys.
+
-
-    # Switch to English, because django-admin.py creates database content
@@ -1221 +1227 @@
-            print style.SQL_KEYWORD("COMMIT;")
-
-
+, argv=None
-    # Add this project to sys.path so that it's importable in the conventional
-    # way. For example, if this file (manage.py) lives in a directory
@@ -1248 +1254 @@
-
-    # Run the django-admin.py command.
-
+, argv

django/branches/multi-auth/django/core/urlresolvers.py

@@ -23 +23 @@
-    dot = callback.rindex('.')
-    return callback[:dot], callback[dot+1:]
+
+def reverse_helper(regex, *args, **kwargs):
+    """
+    Does a "reverse" lookup -- returns the URL for the given args/kwargs.
+    The args/kwargs are applied to the given compiled regular expression.
+    For example:
+
+        >>> reverse_helper(re.compile('^places/(\d+)/$'), 3)
+        'places/3/'
+        >>> reverse_helper(re.compile('^places/(?P<id>\d+)/$'), id=3)
+        'places/3/'
+        >>> reverse_helper(re.compile('^people/(?P<state>\w\w)/(\w+)/$'), 'adrian', state='il')
+        'people/il/adrian/'
+
+    Raises NoReverseMatch if the args/kwargs aren't valid for the regex.
+    """
+    # TODO: Handle nested parenthesis in the following regex.
+    result = re.sub(r'\(([^)]+)\)', MatchChecker(args, kwargs), regex.pattern)
+    return result.replace('^', '').replace('$', '')
-
-class MatchChecker(object):
@@ -109 +128 @@
-
-    def reverse_helper(self, *args, **kwargs):
-
-
-