Changeset 3523

Timestamp:

08/04/06 18:27:18 (2 years ago)

Author:

jpellerin

Message:

[multi-db] Merge trunk to [3522]

Files:

• django/branches/multiple-db-support/AUTHORS (modified) (1 diff)
• django/branches/multiple-db-support/django/conf/locale/ru/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/multiple-db-support/django/conf/locale/ru/LC_MESSAGES/django.po (modified) (2 diffs)
• django/branches/multiple-db-support/django/conf/urls/defaults.py (modified) (1 diff)
• django/branches/multiple-db-support/django/contrib/admin/media/js/admin/DateTimeShortcuts.js (modified) (7 diffs)
• django/branches/multiple-db-support/django/contrib/admin/media/js/admin/RelatedObjectLookups.js (modified) (1 diff)
• django/branches/multiple-db-support/django/contrib/admin/templates/admin/auth (copied) (copied from django/trunk/django/contrib/admin/templates/admin/auth)
• django/branches/multiple-db-support/django/contrib/admin/templates/admin/auth/user (copied) (copied from django/trunk/django/contrib/admin/templates/admin/auth/user)
• django/branches/multiple-db-support/django/contrib/admin/templates/admin/auth/user/add_form.html (copied) (copied from django/trunk/django/contrib/admin/templates/admin/auth/user/add_form.html)
• django/branches/multiple-db-support/django/contrib/admin/urls.py (modified) (1 diff)
• django/branches/multiple-db-support/django/contrib/admin/views/auth.py (copied) (copied from django/trunk/django/contrib/admin/views/auth.py)
• django/branches/multiple-db-support/django/contrib/auth/forms.py (modified) (1 diff)
• django/branches/multiple-db-support/django/core/management.py (modified) (1 diff)
• django/branches/multiple-db-support/django/core/urlresolvers.py (modified) (3 diffs)
• django/branches/multiple-db-support/django/db/backends/ansi/sql.py (modified) (1 diff)
• django/branches/multiple-db-support/django/db/models/fields/__init__.py (modified) (1 diff)
• django/branches/multiple-db-support/django/db/models/fields/related.py (modified) (1 diff)
• django/branches/multiple-db-support/django/middleware/gzip.py (modified) (1 diff)
• django/branches/multiple-db-support/docs/add_ons.txt (modified) (1 diff)
• django/branches/multiple-db-support/docs/db-api.txt (modified) (1 diff)
• django/branches/multiple-db-support/docs/faq.txt (modified) (1 diff)
• django/branches/multiple-db-support/docs/url_dispatch.txt (modified) (3 diffs)

django/branches/multiple-db-support/AUTHORS

@@ -71 +71 @@
-    gandalf@owca.info
-    Baishampayan Ghose
+    martin.glueck@gmail.com
+    Simon Greenhill <dev@simon.net.nz>
-    Espen Grindhaug <http://grindhaug.org/>
-    Brant Harris

django/branches/multiple-db-support/django/conf/locale/ru/LC_MESSAGES/django.po

@@ -142 +142 @@
-
-#: contrib/comments/models.py:237
+#, fuzzy
-msgid "karma score"
-msgstr "Карма счёт"
@@ -736 +737 @@
-#, python-format
-msgid "Models available in the %(name)s application."
-s
+
-
-#: contrib/admin/templates/admin/index.html:28

django/branches/multiple-db-support/django/conf/urls/defaults.py

@@ -11 +11 @@
-    pattern_list = []
-    for t in tuples:
-
-
+
+
+
+
-        else:
-t[0], prefix and (prefix + '.' + t[1]) or t[1], *t[2:]
+regex, prefix and (prefix + '.' + view_or_include) or view_or_include, *default_kwargs
-    return pattern_list

django/branches/multiple-db-support/django/contrib/admin/media/js/admin/DateTimeShortcuts.js

@@ -9 +9 @@
-    calendarDivName1: 'calendarbox', // name of calendar <div> that gets toggled
-    calendarDivName2: 'calendarin',  // name of <div> that contains calendar
+    calendarLinkName: 'calendarlink',// name of the link that is used to toggle
-    clockDivName: 'clockbox',        // name of clock <div> that gets toggled
+    clockLinkName: 'clocklink',      // name of the link that is used to toggle
-    admin_media_prefix: '',
-    init: function() {
@@ -47 +49 @@
-        var clock_link = document.createElement('a');
-        clock_link.setAttribute('href', 'javascript:DateTimeShortcuts.openClock(' + num + ');');
+        clock_link.id = DateTimeShortcuts.clockLinkName + num;
-        quickElement('img', clock_link, '', 'src', DateTimeShortcuts.admin_media_prefix + 'img/admin/icon_clock.gif', 'alt', gettext('Clock'));
-        shortcuts_span.appendChild(document.createTextNode('\240'));
@@ -70 +73 @@
-        clock_box.style.display = 'none';
-        clock_box.style.position = 'absolute';
-        if (getStyle(document.body,'direction')!='rtl') {
-            clock_box.style.left = findPosX(clock_link) + 17 + 'px';
-        }
-        else {
-            // since style's width is in em, it'd be tough to calculate
-            // px value of it. let's use an estimated px for now
-            // TODO: IE returns wrong value for findPosX when in rtl mode
-            //       (it returns as it was left aligned), needs to be fixed.
-            clock_box.style.left = findPosX(clock_link) - 110 + 'px';
-        }
-        clock_box.style.top = findPosY(clock_link) - 30 + 'px';
-        clock_box.className = 'clockbox module';
-        clock_box.setAttribute('id', DateTimeShortcuts.clockDivName + num);
@@ -99 +91 @@
-    },
-    openClock: function(num) {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        addEvent(window, 'click', function() { DateTimeShortcuts.dismissClock(num); return true; });
-    },
@@ -124 +134 @@
-        var cal_link = document.createElement('a');
-        cal_link.setAttribute('href', 'javascript:DateTimeShortcuts.openCalendar(' + num + ');');
+        cal_link.id = DateTimeShortcuts.calendarLinkName + num;
-        quickElement('img', cal_link, '', 'src', DateTimeShortcuts.admin_media_prefix + 'img/admin/icon_calendar.gif', 'alt', gettext('Calendar'));
-        shortcuts_span.appendChild(document.createTextNode('\240'));
@@ -150 +161 @@
-        cal_box.style.display = 'none';
-        cal_box.style.position = 'absolute';
-        // is it left-to-right or right-to-left layout ?
-        if (getStyle(document.body,'direction')!='rtl') {
-            cal_box.style.left = findPosX(cal_link) + 17 + 'px';
-        }
-        else {
-            // since style's width is in em, it'd be tough to calculate
-            // px value of it. let's use an estimated px for now
-            // TODO: IE returns wrong value for findPosX when in rtl mode
-            //       (it returns as it was left aligned), needs to be fixed.
-            cal_box.style.left = findPosX(cal_link) - 180 + 'px';
-        }
-        cal_box.style.top = findPosY(cal_link) - 75 + 'px';
-        cal_box.className = 'calendarbox module';
-        cal_box.setAttribute('id', DateTimeShortcuts.calendarDivName1 + num);
@@ -196 +195 @@
-    },
-    openCalendar: function(num) {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        addEvent(window, 'click', function() { DateTimeShortcuts.dismissCalendar(num); return true; });
-    },

django/branches/multiple-db-support/django/contrib/admin/media/js/admin/RelatedObjectLookups.js

@@ -12 +12 @@
-        href = triggeringLink.href + '?pop=1';
-    }
-74
+80
-    win.focus();
-    return false;

django/branches/multiple-db-support/django/contrib/admin/urls.py

@@ -29 +29 @@
-    ('^doc/templates/(?P<template>.*)/$', 'django.contrib.admin.views.doc.template_detail'),
-
+    # "Add user" -- a special-case view
+    ('^auth/user/add/$', 'django.contrib.admin.views.auth.user_add_stage'),
+
-    # Add/change/delete/history
-    ('^([^/]+)/([^/]+)/$', 'django.contrib.admin.views.main.change_list'),

django/branches/multiple-db-support/django/contrib/auth/forms.py

@@ -5 +5 @@
-from django.core import validators
-from django import forms
+
+class UserCreationForm(forms.Manipulator):
+    "A form that creates a user, with no privileges, from the given username and password."
+    def __init__(self):
+        self.fields = (
+            forms.TextField(field_name='username', length=30, maxlength=30, is_required=True,
+                validator_list=[validators.isAlphaNumeric, self.isValidUsername]),
+            forms.PasswordField(field_name='password1', length=30, maxlength=60, is_required=True),
+            forms.PasswordField(field_name='password2', length=30, maxlength=60, is_required=True,
+                validator_list=[validators.AlwaysMatchesOtherField('password1', "The two password fields didn't match.")]),
+        )
+
+    def isValidUsername(self, field_data, all_data):
+        try:
+            User.objects.get(username=field_data)
+        except User.DoesNotExist:
+            return
+        raise validators.ValidationError, 'A user with that username already exists.'
+
+    def save(self, new_data):
+        "Creates the user."
+        return User.objects.create_user(new_data['username'], '', new_data['password1'])
-
-class AuthenticationForm(forms.Manipulator):

django/branches/multiple-db-support/django/core/management.py

@@ -830 +830 @@
-                        except models.FieldDoesNotExist:
-                            e.add(opts, '"admin.list_filter" refers to %r, which isn\'t a field.' % fn)
+                # date_hierarchy
+                if opts.admin.date_hierarchy:
+                    try:
+                        f = opts.get_field(opts.admin.date_hierarchy)
+                    except models.FieldDoesNotExist:
+                        e.add(opts, '"admin.date_hierarchy" refers to %r, which isn\'t a field.' % opts.admin.date_hierarchy)
-
-        # Check ordering attribute.

django/branches/multiple-db-support/django/core/urlresolvers.py

@@ -131 +131 @@
-
-class RegexURLResolver(object):
-
+, default_kwargs=None
-        # regex is a string representing a regular expression.
-        # urlconf_name is a string representing the module containing urlconfs.
@@ -137 +137 @@
-        self.urlconf_name = urlconf_name
-        self.callback = None
+        self.default_kwargs = default_kwargs or {}
-
-    def resolve(self, path):
@@ -150 +151 @@
-                else:
-                    if sub_match:
-
+
+
-                    tried.append(pattern.regex.pattern)
-            raise Resolver404, {'tried': tried, 'path': new_path}

django/branches/multiple-db-support/django/db/backends/ansi/sql.py

@@ -138 +138 @@
-                    table = opts.db_table
-                    col = opts.get_field(f.rel.field_name).column
+                    # For MySQL, r_name must be unique in the first 64 
+                    # characters. So we are careful with character usage here.
+                    r_name = '%s_refs_%s_%x' % (r_col, col,
+                                                abs(hash((r_table, table))))
-                    sql = style.SQL_KEYWORD('ALTER TABLE') + ' %s ADD CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s (%s);' % \
-
-
+
-                        quote_name(r_col), quote_name(r_table), quote_name(col))
-                    pending.setdefault(rel_class, []).append(

django/branches/multiple-db-support/django/db/models/fields/__init__.py

@@ -290 +290 @@
-            return first_choice + list(self.choices)
-        rel_model = self.rel.to
-
-
+
+
+
+
+
-
-    def get_choices_default(self):

django/branches/multiple-db-support/django/db/models/fields/related.py

@@ -26 +26 @@
-    # Has the model already been loaded?
-    # If so, resolve the string reference right away
-field.rel.to
+ field.rel.to, False
-    if model:
-        field.rel.to = model

django/branches/multiple-db-support/django/middleware/gzip.py

@@ -13 +13 @@
-    def process_response(self, request, response):
-        patch_vary_headers(response, ('Accept-Encoding',))
-
+
+
+
+
+
-            return response
-

django/branches/multiple-db-support/docs/add_ons.txt

@@ -3 +3 @@
-=====================
-
-
-
+
+
+
-
-This code lives in ``django/contrib`` in the Django distribution. Here's a
-rundown of the packages in ``contrib``:
+
+.. _"batteries included" philosophy: http://docs.python.org/tut/node12.html#batteries-included
-
-admin

django/branches/multiple-db-support/docs/db-api.txt

@@ -579 +579 @@
-    c = p.hometown       # Hits the database.
-
+Note that ``select_related()`` does not follow foreign keys that have
+``null=True``.
+
-``extra(select=None, where=None, params=None, tables=None)``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

django/branches/multiple-db-support/docs/faq.txt

@@ -621 +621 @@
--------------------------------------------------------------
-
-
-
-
-
-
-
-
+
+
+
+
-
-.. _creating users: http://www.djangoproject.com/documentation/authentication/#creating-users

django/branches/multiple-db-support/docs/url_dispatch.txt

@@ -264 +264 @@
-
-    urlpatterns = patterns('',
-project
-project
-project
-
-
-project
+site
+site
+site
+
+
+site
-Instead of typing that out for each entry in ``urlpatterns``, you can use the
-first argument to the ``patterns()`` function to specify a prefix to apply to
@@ -278 +278 @@
-    from django.conf.urls.defaults import *
-
-project
+site
-        (r'^articles/(\d{4})/$', 'year_archive'),
-        (r'^articles/(\d{4})/(\d{2})/$', 'month_archive'),
@@ -390 +390 @@
-.. _generic views: http://www.djangoproject.com/documentation/generic_views/
-.. _syndication framework: http://www.djangoproject.com/documentation/syndication/
+
+Passing extra options to ``include()``
+--------------------------------------
+
+**New in the Django development version.**
+
+Similarly, you can pass extra options to ``include()``. When you pass extra
+options to ``include()``, *each* line in the included URLconf will be passed
+the extra options.
+
+For example, these two URLconf sets are functionally identical:
+
+Set one::
+
+    # main.py
+    urlpatterns = patterns('',
+        (r'^blog/', include('inner'), {'blogid': 3}),
+    )
+
+    # inner.py
+    urlpatterns = patterns('',
+        (r'^archive/$', 'mysite.views.archive'),
+        (r'^about/$', 'mysite.views.about'),
+    )
+
+Set two::
+
+    # main.py
+    urlpatterns = patterns('',
+        (r'^blog/', include('inner')),
+    )
+
+    # inner.py
+    urlpatterns = patterns('',
+        (r'^archive/$', 'mysite.views.archive', {'blogid': 3}),
+        (r'^about/$', 'mysite.views.about', {'blogid': 3}),
+    )
+
+Note that extra options will *always* be passed to *every* line in the included
+URLconf, regardless of whether the line's view actually accepts those options
+as valid. For this reason, this technique is only useful if you're certain that
+every view in the the included URLconf accepts the extra options you're passing.