Changeset 4142

Timestamp:

11/29/06 14:16:50 (2 years ago)

Author:

jpellerin

Message:

[multi-db] Merge trunk to [3850]. Some tests still failing.

Files:

• django/branches/multiple-db-support/AUTHORS (modified) (1 diff)
• django/branches/multiple-db-support/django/conf/global_settings.py (modified) (1 diff)
• django/branches/multiple-db-support/django/conf/locale/de/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/multiple-db-support/django/conf/locale/de/LC_MESSAGES/django.po (modified) (14 diffs)
• django/branches/multiple-db-support/django/conf/locale/zh_CN/LC_MESSAGES/djangojs.mo (modified) (previous)
• django/branches/multiple-db-support/django/conf/locale/zh_CN/LC_MESSAGES/djangojs.po (modified) (4 diffs)
• django/branches/multiple-db-support/django/conf/locale/zh_CN/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/multiple-db-support/django/conf/locale/zh_CN/LC_MESSAGES/django.po (modified) (2 diffs)
• django/branches/multiple-db-support/django/contrib/auth/decorators.py (modified) (1 diff)
• django/branches/multiple-db-support/django/contrib/auth/forms.py (modified) (6 diffs)
• django/branches/multiple-db-support/django/core/management.py (modified) (1 diff)
• django/branches/multiple-db-support/django/core/servers/basehttp.py (modified) (1 diff)
• django/branches/multiple-db-support/django/core/validators.py (modified) (2 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/db/models/manipulators.py (modified) (1 diff)
• django/branches/multiple-db-support/django/db/models/query.py (modified) (2 diffs)
• django/branches/multiple-db-support/django/forms/__init__.py (modified) (2 diffs)
• django/branches/multiple-db-support/django/middleware/common.py (modified) (1 diff)
• django/branches/multiple-db-support/django/views/generic/create_update.py (modified) (3 diffs)
• django/branches/multiple-db-support/docs/apache_auth.txt (modified) (1 diff)
• django/branches/multiple-db-support/docs/authentication.txt (modified) (3 diffs)
• django/branches/multiple-db-support/docs/contributing.txt (modified) (2 diffs)
• django/branches/multiple-db-support/docs/db-api.txt (modified) (2 diffs)
• django/branches/multiple-db-support/docs/django-admin.txt (modified) (1 diff)
• django/branches/multiple-db-support/docs/forms.txt (modified) (5 diffs)
• django/branches/multiple-db-support/docs/model-api.txt (modified) (1 diff)
• django/branches/multiple-db-support/docs/serialization.txt (modified) (8 diffs)
• django/branches/multiple-db-support/docs/settings.txt (modified) (1 diff)
• django/branches/multiple-db-support/tests/modeltests/basic/models.py (modified) (1 diff)
• django/branches/multiple-db-support/tests/modeltests/custom_pk/models.py (modified) (1 diff)
• django/branches/multiple-db-support/tests/modeltests/one_to_one/models.py (modified) (2 diffs)

django/branches/multiple-db-support/AUTHORS

@@ -83 +83 @@
-    Brant Harris
-    heckj@mac.com
+    Joel Heenan <joelh-django@planetjoel.com>
-    hipertracker@gmail.com
-    Ian Holsman <http://feh.holsman.net/>

django/branches/multiple-db-support/django/conf/global_settings.py

@@ -278 +278 @@
-
-# The profanities that will trigger a validation error in the
--
-['asshat', 'asshead', 'asshole', 'cunt', 'fuck', 'gook', 'nigger', 'shit']
+
+('asshat', 'asshead', 'asshole', 'cunt', 'fuck', 'gook', 'nigger', 'shit')
-
-# The group ID that designates which users are banned.

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

@@ -8 +8 @@
-"Project-Id-Version: Django 1.0\n"
-"Report-Msgid-Bugs-To: \n"
-5:39
+6:04
-"PO-Revision-Date: 2005-10-08 00:03+0200\n"
-"Last-Translator: Georg Bauer <gb@bofh.ms>\n"
@@ -584 +584 @@
-
-#: contrib/admin/views/doc.py:164
+#, python-format
-msgid "App %r not found"
-msgstr "Anwendung %r nicht gefunden"
@@ -823 +824 @@
-
-#: contrib/admin/templates/admin/index.html:18
+#, python-format
-msgid "%(name)s"
-msgstr "%(name)s"
@@ -868 +870 @@
-
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#, python-format
-msgid ""
-"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -878 +881 @@
-
-#: contrib/admin/templates/admin/delete_confirmation.html:21
+#, python-format
-msgid ""
-"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
-"All of the following related items will be deleted:"
-msgstr ""
-wollen? Es 
-
+
+ollen? Es w
-
-#: contrib/admin/templates/admin/delete_confirmation.html:26
@@ -890 +894 @@
-
-#: contrib/admin/templates/admin/filter.html:2
+#, python-format
-msgid " By %(filter_title)s "
-msgstr " Nach %(filter_title)s "
@@ -956 +961 @@
-"the appropriate user."
-msgstr ""
-das 
-ie richtigen Datenbanktabellen angelegt wurden und bitte sicherstellen, das die
-
+
+as die richtigen Datenbanktabellen angelegt wurden und bitte sicherstellen,
+das die 
-
-#: contrib/admin/templates/admin/auth/user/add_form.html:6
@@ -1246 +1251 @@
-"will use 'flatpages/default.html'."
-msgstr ""
-wird 
-
+
+wird 
-
-#: contrib/flatpages/models.py:14
@@ -1344 +1349 @@
-"instead of deleting accounts."
-msgstr ""
-Anstelle 
-
+
+Anstelle 
-
-#: contrib/auth/models.py:97
@@ -1417 +1422 @@
-msgid "This account is inactive."
-msgstr "Dieser Benutzer ist inaktiv."
+
+#: contrib/auth/forms.py:84
+msgid ""
+"That e-mail address doesn't have an associated user acount. Are you sure "
+"you've registered?"
+msgstr ""
+"Die Email-Adresse hat keinen Benutzer zugeordnet. Sicher, das die Adresse "
+"hier angemeldet ist?"
+
+#: contrib/auth/forms.py:116
+msgid "The two 'new password' fields didn't match."
+msgstr "Die zwei Passw�r sind nicht gleich."
+
+#: contrib/auth/forms.py:123
+msgid "Your old password was entered incorrectly. Please enter it again."
+msgstr "Das alte Passwort war falsch. Bitte neu eingeben."
-
-#: contrib/contenttypes/models.py:20
@@ -1865 +1886 @@
-
-#: core/validators.py:142
+#, python-format
-msgid "Invalid date: %s."
-msgstr "Ung�s Datum: %s"
@@ -1888 +1910 @@
-#: core/validators.py:172 core/validators.py:401 forms/__init__.py:661
-msgid "No file was submitted. Check the encoding type on the form."
-
+
+
-
-#: core/validators.py:176
@@ -2000 +2023 @@
-
-#: core/validators.py:381
+#, python-format
-msgid ""
-"Please enter a valid decimal number with a whole part of at most %s digit."
@@ -2104 +2128 @@
-
-#: views/generic/create_update.py:43
+#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s wurde erfolgreich angelegt."
-
-#: views/generic/create_update.py:117
+#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s wurde erfolgreich aktualisiert."
-
-#: views/generic/create_update.py:184
+#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s wurde gel�t"

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

@@ -4 +4 @@
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-PACKAGE VERSION
+Django 0.95
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-21 18:43+0800\n"
-YEAR-MO-DA HO:MI+ZONE
-FULL NAME <max@exoweb.net
-LANGUAGE <LL@li.org
+2006-09-25 08:35+0800
+limodou <limodou@gmail.com
+limodou <limodou@gmail.com
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
@@ -19 +18 @@
-#: contrib/admin/media/js/SelectFilter2.js:33
-msgid "Available %s"
-行
+用
-
-#: contrib/admin/media/js/SelectFilter2.js:41
@@ -31 +30 @@
-#: contrib/admin/media/js/SelectFilter2.js:48
-msgid "Remove"
-移出
+删除
-
-#: contrib/admin/media/js/SelectFilter2.js:53
-msgid "Chosen %s"
-择
+中的
-
-#: contrib/admin/media/js/SelectFilter2.js:54
-msgid "Select your choice(s) and click "
-挑选你的选择并且
+选择并
-
-#: contrib/admin/media/js/SelectFilter2.js:59
-msgid "Clear all"
-所有
+全部
-
-#: contrib/admin/media/js/dateparse.js:32
-#: contrib/admin/media/js/calendar.js:24
-
-
-
+
-msgstr "一月 二月 三月 四月 五月 六月 六月 七月 八月 九月 十月 十一月 十二月"
-
-#: contrib/admin/media/js/dateparse.js:33
-msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
-天
+日
-
-#: contrib/admin/media/js/calendar.js:25
-msgid "S M T W T F S"
-月 火 水 木 金 土
+一 二 三 四 五 六
-
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:45
@@ -106 +103 @@
-msgid "Tomorrow"
-msgstr "明天"
+

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

@@ -9 +9 @@
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-16 10:10+0200\n"
-5-17 13:47
+9-01 22:05
-"Last-Translator: limodou <limodou@gmail.com>\n"
-"Language-Team: Simplified Chinese <limodou@gmail.com>\n"
@@ -1168 +1168 @@
-#: contrib/auth/models.py:77
-msgid "Permissions"
-许可
+权限
-
-#: contrib/auth/models.py:78

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

@@ -30 +30 @@
-def permission_required(perm, login_url=LOGIN_URL):
-    """
-if
-i
+whether
+
-    """
-    return user_passes_test(lambda u: u.has_perm(perm), login_url=login_url)

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

@@ -5 +5 @@
-from django.core import validators
-from django import forms
+from django.utils.translation import gettext_lazy as _
-
-class UserCreationForm(forms.Manipulator):
@@ -14 +15 @@
-            forms.PasswordField(field_name='password1', length=30, maxlength=60, is_required=True),
-            forms.PasswordField(field_name='password2', length=30, maxlength=60, is_required=True,
-"The two password fields didn't match."
+_("The two password fields didn't match.")
-        )
-
@@ -22 +23 @@
-        except User.DoesNotExist:
-            return
-'A user with that username already exists.'
+_('A user with that username already exists.')
-
-    def save(self, new_data):
@@ -82 +83 @@
-            self.user_cache = User.objects.get(email__iexact=new_data)
-        except User.DoesNotExist:
-"That e-mail address doesn't have an associated user acount. Are you sure you've registered?"
+_("That e-mail address doesn't have an associated user acount. Are you sure you've registered?")
-
-    def save(self, domain_override=None, email_template_name='registration/password_reset_email.html'):
@@ -114 +115 @@
-                validator_list=[self.isValidOldPassword]),
-            forms.PasswordField(field_name="new_password1", length=30, maxlength=30, is_required=True,
-"The two 'new password' fields didn't match."
+_("The two 'new password' fields didn't match.")
-            forms.PasswordField(field_name="new_password2", length=30, maxlength=30, is_required=True),
-        )
@@ -121 +122 @@
-        "Validates that the old_password field is correct."
-        if not self.user.check_password(new_data):
-"Your old password was entered incorrectly. Please enter it again."
+_("Your old password was entered incorrectly. Please enter it again.")
-
-    def save(self, new_data):

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

@@ -1129 +1129 @@
-        type='choice', choices=['0', '1', '2'],
-        help='Verbosity level; 0=minimal output, 1=normal output, 2=all output'),
-Lets you manually specify the directory to serve admin media from when running the development 
+Specifies the directory from which to serve admin media for run
-
-    options, args = parser.parse_args(argv[1:])

django/branches/multiple-db-support/django/core/servers/basehttp.py

@@ -595 +595 @@
-    security and is not super efficient.
-    """
- = 
+=
-        from django.conf import settings
-        self.application = application

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

@@ -250 +250 @@
-    """
-    field_data = field_data.lower() # normalize
-field_data.find(w) > -1
+w in field_data
-    if words_seen:
-        from django.utils.text import get_text_list
@@ -378 +378 @@
-            raise ValidationError, ngettext("Please enter a valid decimal number with at most %s total digit.",
-                "Please enter a valid decimal number with at most %s total digits.", self.max_digits) % self.max_digits
-)) or ('.' in data and len(data) > (self.max_digits - (self.decimal_places - len(data.split('.')[1])) + 1
+ - 1)) or ('.' in data and len(data) > (max_allowed_length - (self.decimal_places - len(data.split('.')[1]))
-            raise ValidationError, ngettext( "Please enter a valid decimal number with a whole part of at most %s digit.",
-                "Please enter a valid decimal number with a whole part of at most %s digits.", str(self.max_digits-self.decimal_places)) % str(self.max_digits-self.decimal_places)

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

@@ -74 +74 @@
-
-        for f in opts.fields:
-models.ForeignKey
+(models.ForeignKey, models.OneToOneField)
-                rel_field = f.rel.get_related_field()
-                data_type = self.get_rel_data_type(rel_field)

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

@@ -368 +368 @@
-    def to_python(self, value):
-        if value in (True, False): return value
-
-
+, '1'
+, '0'
-        raise validators.ValidationError, gettext("This value must be either True or False.")
-

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

@@ -619 +619 @@
-        else:
-            msg = gettext_lazy('Hold down "Control", or "Command" on a Mac, to select more than one.')
-
+' ', 
-
-    def get_manipulator_field_objs(self):

django/branches/multiple-db-support/django/db/models/manipulators.py

@@ -216 +216 @@
-                        for f in related.opts.many_to_many:
-                            if child_follow.get(f.name, None) and not f.rel.edit_inline:
-was_changed = getattr(new_rel_obj, 'set_%s' % f.name)(rel_new_data[f.attname]
- and was_changed
+setattr(new_rel_obj, f.name, f.rel.to.objects.filter(pk__in=rel_new_data[f.attname])
+
-                                    self.fields_changed.append('%s for %s "%s"' % (f.verbose_name, related.opts.verbose_name, new_rel_obj))
-

django/branches/multiple-db-support/django/db/models/query.py

@@ -733 +733 @@
-            # The very-last is the lookup_type (equals, like, etc).
-            # The second-last is the table column on which the lookup_type is
-
-
-
-
-
-
-
-
+
+
+
+
-            lookup_type = path.pop()
-            if lookup_type == 'pk':
@@ -790 +786 @@
-    # Has the primary key been requested? If so, expand it out
-    # to be the name of the current class' primary key
-
+ or name == 'pk'
-        name = current_opts.pk.name
-

django/branches/multiple-db-support/django/forms/__init__.py

@@ -55 +55 @@
-        "Returns dictionary mapping field_names to error-message lists"
-        errors = {}
+        self.prepare(new_data)
-        for field in self.fields:
-            errors.update(field.get_validation_errors(new_data))
@@ -639 +640 @@
-                checked_html = ' checked="checked"'
-            field_name = '%s%s' % (self.field_name, value)
-
+value="on" 
-                (self.get_id() + escape(value), self.__class__.__name__, field_name, checked_html,
-                self.get_id() + escape(value), choice))

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

@@ -65 +65 @@
-                path = request.get_full_path()
-                if referer and not _is_ignorable_404(path) and (is_internal or '?' not in referer):
-
+ 
-                    mail_managers("Broken %slink on %s" % ((is_internal and 'INTERNAL ' or ''), domain),
-A
+a
-                return response
-

django/branches/multiple-db-support/django/views/generic/create_update.py

@@ -103 +103 @@
-        raise Http404, "No %s found for %s" % (model._meta.verbose_name, lookup_kwargs)
-
-
+att
-
-    if request.POST:
@@ -143 +143 @@
-            c[key] = value
-    response = HttpResponse(t.render(c))
-
+att
-    return response
-
@@ -197 +197 @@
-                c[key] = value
-        response = HttpResponse(t.render(c))
-
+att
-        return response

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

@@ -7 +7 @@
-`authentication system`_ directly.  For example, you could:
-
-
+static/
-
-    * Authenticate access to a Subversion_ repository against Django users with

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

@@ -457 +457 @@
-    my_view = user_passes_test(lambda u: u.has_perm('polls.can_vote'))(my_view)
-
- are using this particular test as a relatively simple example, however be
-
-you can use the ``permission_required()`` decorator described below
+'re using this particular test as a relatively simple example. However, if
+
+the ``permission_required()`` decorator, described later in this document
-
-Here's the same thing, using Python 2.4's decorator syntax::
@@ -496 +496 @@
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-
-
-
+
+
+
+
+
+
-
-    from django.contrib.auth.decorators import permission_required
-
-
-
-
+
+
+
-    my_view = permission_required('polls.can_vote')(my_view)
-
-Note that ``permission_required()`` also takes an optional ``login_url``
-
+
+
+
+
+
+
+
+
+
+
-
-Limiting access to generic views
@@ -634 +644 @@
-
-    {% if user.is_authenticated %}
-    
+
-    {% else %}
-        <p>Welcome, new user. Please log in.</p>

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

@@ -260 +260 @@
-
-The Django tests all use the testing infrastructure that ships with Django for
-A
+a
-how to write new tests.
-
-A
+a
-
-Running the unit tests
@@ -274 +274 @@
-Yes, the unit tests need a settings module, but only for database connection
-info -- the ``DATABASE_ENGINE``, ``DATABASE_USER`` and ``DATABASE_PASSWORD``.
-'
+
-needs to be present) and a ``SITE_ID`` setting (any integer value will do) in
-order for all the tests to pass.

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

@@ -1141 +1141 @@
-
-For convenience, Django provides a ``pk`` lookup type, which stands for
-This is shorthand for "an exact lookup on the primary-key."
+
-
-In the example ``Blog`` model, the primary key is the ``id`` field, so these
@@ -1150 +1150 @@
-    Blog.objects.get(pk=14) # pk implies id__exact
-
+The use of ``pk`` isn't limited to ``__exact`` queries -- any query term 
+can be combined with ``pk`` to perform a query on the primary key of a model::
+
+    # Get blogs entries  with id 1, 4 and 7
+    Blog.objects.filter(pk__in=[1,4,7])
+    # Get all blog entries with id > 14
+    Blog.objects.filter(pk__gt=14) 
+    
-``pk`` lookups also work across joins. For example, these three statements are
-equivalent::

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

@@ -393 +393 @@
-    django-admin.py manage.py --adminmedia=/tmp/new-admin-style/
-
- Django where to find the various stylesheets and Javascript files for the
-
-
-iles f
+s Django where to find the various CSS and JavaScript files for the admin
+
+
+
-
-Extra niceties

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

@@ -338 +338 @@
-
-    * We set ``new_data`` based upon ``flatten_data()`` from the manipulator.
- 
- 
+
+
-      to populate form elements with the existing values for the object.
-
@@ -405 +405 @@
-        form = forms.FormWrapper(manipulator, new_data, errors)
-        return render_to_response('contact_form.html', {'form': form})
-
+
-``FileField`` and ``ImageField`` special cases
-==============================================
@@ -482 +482 @@
-to put punctuation at the end of your validation messages.
-
-Are Validators C
+are validators c
----------------------------
-
@@ -488 +488 @@
-required fields are present and non-empty. For each field that passes that
-test *and if the form submission contained data* for that field, all the
-s
+z
-last sentence is important: if a form field is not submitted (because it
-contains no data -- which is normal HTML behaviour), the validators are not
@@ -498 +498 @@
-contribute to the form submission.
-
-*always* run, regardless of whether the
-field it is attached to contains any data, set the ``always_test`` attribut
-on the 
+run *always*, regardless of whether its
+attached field contains any data, set the ``always_test`` attribute on th
+
-
-    def my_custom_validator(field_data, all_data):
-        # ...
-
-    my_custom_validator.always_test = True
-
-This validator will always be executed for any field it is attached to.
-
-V
+v
----------------------
-

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

@@ -546 +546 @@
-If ``False``, the field will not be editable in the admin or via form
-processing using the object's ``AddManipulator`` or ``ChangeManipulator``
- 
+
-
-``help_text``

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

@@ -4 +4 @@
-
-.. note::
-
+
-    This API is currently under heavy development and may change --
-    perhaps drastically -- in the future.
-
+
-    You have been warned.
-
+
-Django's serialization framework provides a mechanism for "translating" Django
-objects into other formats. Usually these other formats will be text-based and
@@ -22 +22 @@
-    from django.core import serializers
-    data = serializers.serialize("xml", SomeModel.objects.all())
-
+
-The arguments to the ``serialize`` function are the format to serialize the
-data to (see `Serialization formats`_) and a QuerySet_ to serialize.
@@ -35 +35 @@
-    xml_serializer.serialize(queryset)
-    data = xml_serializer.getvalue()
-
+
-This is useful if you want to serialize data directly to a file-like object
-(which includes a HTTPResponse_)::
@@ -51 +51 @@
-    for obj in serializers.deserialize("xml", data):
-        do_something_with(obj)
-
+
-As you can see, the ``deserialize`` function takes the same format argument as
-``serialize``, a string or stream of data, and returns an iterator.
@@ -70 +70 @@
-        if object_should_be_saved(deserialized_object):
-            obj.save()
-
+
-In other words, the usual use is to examine the deserialized objects to make
-sure that they are "appropriate" for saving before doing so.  Of course, if you trust your data source you could just save the object and move on.
@@ -90 +90 @@
-
-    ``python``  Translates to and from "simple" Python objects (lists, dicts,
- 
+
-                used as a base for other serializers.
-    ==========  ==============================================================
@@ -97 +97 @@
-.. _simplejson: http://undefined.org/python/#simplejson
-
-For Specific Serialization F
+for specific serialization f
-----------------------------------------
-
@@ -103 +103 @@
-~~~~
-
- a
+'
-serializer, you must pass ``ensure_ascii=False`` as a parameter to the
- the output will no
+, the output won'
-
-For example::

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

@@ -607 +607 @@
-----------------
-
-
-
+
+
+
+