Changeset 7770

Timestamp:

06/26/08 10:42:33 (5 months ago)

Author:

brosner

Message:

newforms-admin: Merged from trunk up to [7766].

Files:

• django/branches/newforms-admin (modified) (1 prop)
• django/branches/newforms-admin/AUTHORS (modified) (1 diff)
• django/branches/newforms-admin/django/conf/locale/pl/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/newforms-admin/django/conf/locale/pl/LC_MESSAGES/django.po (modified) (19 diffs)
• django/branches/newforms-admin/django/contrib/auth/views.py (modified) (3 diffs)
• django/branches/newforms-admin/django/contrib/sites/tests.py (modified) (1 diff)
• django/branches/newforms-admin/django/core/servers/basehttp.py (modified) (1 diff)
• django/branches/newforms-admin/django/db/backends/__init__.py (modified) (1 diff)
• django/branches/newforms-admin/django/db/backends/oracle/base.py (modified) (1 diff)
• django/branches/newforms-admin/django/db/backends/oracle/creation.py (modified) (2 diffs)
• django/branches/newforms-admin/django/db/models/fields/__init__.py (modified) (2 diffs)
• django/branches/newforms-admin/django/db/models/fields/related.py (modified) (3 diffs)
• django/branches/newforms-admin/django/db/models/options.py (modified) (1 diff)
• django/branches/newforms-admin/django/db/models/query.py (modified) (11 diffs)
• django/branches/newforms-admin/django/db/models/sql/query.py (modified) (8 diffs)
• django/branches/newforms-admin/django/db/models/sql/subqueries.py (modified) (1 diff)
• django/branches/newforms-admin/django/template/defaulttags.py (modified) (6 diffs)
• django/branches/newforms-admin/django/templatetags/cache.py (modified) (3 diffs)
• django/branches/newforms-admin/django/utils/datastructures.py (modified) (1 diff)
• django/branches/newforms-admin/django/utils/html.py (modified) (3 diffs)
• django/branches/newforms-admin/docs/cache.txt (modified) (1 diff)
• django/branches/newforms-admin/docs/contributing.txt (modified) (8 diffs)
• django/branches/newforms-admin/docs/db-api.txt (modified) (3 diffs)
• django/branches/newforms-admin/docs/model-api.txt (modified) (2 diffs)
• django/branches/newforms-admin/tests/modeltests/model_inheritance/models.py (modified) (2 diffs)
• django/branches/newforms-admin/tests/regressiontests/datastructures/tests.py (modified) (1 diff)
• django/branches/newforms-admin/tests/regressiontests/defaultfilters/tests.py (modified) (2 diffs)
• django/branches/newforms-admin/tests/regressiontests/model_inheritance_regress/models.py (modified) (4 diffs)
• django/branches/newforms-admin/tests/regressiontests/queries/models.py (modified) (10 diffs)
• django/branches/newforms-admin/tests/regressiontests/templates/loaders.py (modified) (8 diffs)
• django/branches/newforms-admin/tests/regressiontests/templates/tests.py (modified) (5 diffs)

django/branches/newforms-admin/AUTHORS

@@ -386 +386 @@
-    Filip Wasilewski <filip.wasilewski@gmail.com>
-    Dan Watson <http://theidioteque.net/>
+    Joel Watts <joel@joelwatts.com>
-    Chris Wesseling <Chris.Wesseling@cwi.nl>
-    James Wheare <django@sparemint.com>

django/branches/newforms-admin/django/conf/locale/pl/LC_MESSAGES/django.po

@@ -6 +6 @@
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-4-14 18:02
+6-24 07:36
-"PO-Revision-Date: 2008-02-25 15:53+0100\n"
-Piotr Lewandowski <django@icomputing.pl
+Jarek Zgoda <jarek.zgoda@gmail.com
-"Language-Team: Polish <pl@li.org>\n"
-"MIME-Version: 1.0\n"
@@ -17 +17 @@
-"100<10 || n%100>=20) ? 1 : 2);\n"
-
-39
+44
-msgid "Arabic"
-msgstr "Arabski"
-
-0
+5
-msgid "Bengali"
-msgstr "Bengalski"
-
-1
+6
-msgid "Bulgarian"
-msgstr "Bułgarski"
-
-2
+7
-msgid "Catalan"
-msgstr "Kataloński"
-
-3
+8
-msgid "Czech"
-msgstr "Czeski"
-
-4
+9
-msgid "Welsh"
-msgstr "Walijski"
-
-45
+50
-msgid "Danish"
-msgstr "Duński"
-
-46
+51
-msgid "German"
-msgstr "Niemiecki"
-
-47
+52
-msgid "Greek"
-msgstr "Grecki"
-
-48
+53
-msgid "English"
-msgstr "Angielski"
-
-49
+54
-msgid "Spanish"
-msgstr "Hiszpański"
-
-
+
+
+
+
+
-msgid "Argentinean Spanish"
-msgstr "Hiszpański argentyński"
-
-1
+7
-msgid "Basque"
-msgstr "Baskijski"
-
-2
+8
-msgid "Persian"
-msgstr "Perski"
-
-3
+9
-msgid "Finnish"
-msgstr "Fiński"
-
-54
+60
-msgid "French"
-msgstr "Francuski"
-
-55
+61
-msgid "Irish"
-msgstr "Irlandzki"
-
-56
+62
-msgid "Galician"
-msgstr "Galicyjski"
-
-57
+63
-msgid "Hungarian"
-msgstr "Węgierski"
-
-58
+64
-msgid "Hebrew"
-msgstr "Hebrajski"
-
-59
+65
-msgid "Croatian"
-msgstr "Chorwacki"
-
-0
+6
-msgid "Icelandic"
-msgstr "Islandzki"
-
-1
+7
-msgid "Italian"
-msgstr "Włoski"
-
-2
+8
-msgid "Japanese"
-msgstr "Japoński"
-
-3
+9
-msgid "Georgian"
-msgstr "Gruziński"
-
-64
+70
-msgid "Korean"
-msgstr "Koreański"
-
-65
+71
-msgid "Khmer"
-msgstr "Khmerski"
-
-66
+72
-msgid "Kannada"
-msgstr "Kannada"
-
-67
+73
-msgid "Latvian"
-msgstr "Łotewski"
-
-
+
+
+
+
+
-msgid "Macedonian"
-msgstr "Macedoński"
-
-69
+76
-msgid "Dutch"
-msgstr "Holenderski"
-
-0
+7
-msgid "Norwegian"
-msgstr "Norweski"
-
-1
+8
-msgid "Polish"
-msgstr "Polski"
-
-2
+9
-msgid "Portugese"
-msgstr "Portugalski"
-
-73
+80
-msgid "Brazilian Portuguese"
-msgstr "Brazylijski portugalski"
-
-74
+81
-msgid "Romanian"
-msgstr "Rumuński"
-
-75
+82
-msgid "Russian"
-msgstr "Rosyjski"
-
-76
+83
-msgid "Slovak"
-msgstr "Słowacki"
-
-77
+84
-msgid "Slovenian"
-msgstr "Słoweński"
-
-78
+85
-msgid "Serbian"
-msgstr "Serbski"
-
-79
+86
-msgid "Swedish"
-msgstr "Szwedzki"
-
-0
+7
-msgid "Tamil"
-msgstr "Tamilski"
-
-1
+8
-msgid "Telugu"
-msgstr "Telugu"
-
-2
+9
-msgid "Turkish"
-msgstr "Turecki"
-
-83
+90
-msgid "Ukrainian"
-msgstr "Ukraiński"
-
-84
+91
-msgid "Simplified Chinese"
-msgstr "Uproszczony chiński"
-
-85
+92
-msgid "Traditional Chinese"
-msgstr "Chiński tradycyjny"
@@ -418 +426 @@
-#: contrib/admin/templates/admin/delete_confirmation.html:25
-msgid "Yes, I'm sure"
-usuń
+na pewno
-
-#: contrib/admin/templates/admin/filter.html:2
@@ -825 +833 @@
-"spróbuj ponownie."
-
-
+
+
+
+
+
+
-msgid "Usernames cannot contain the '@' character."
-msgstr "Nazwy użytkowników nie mogą zawierać znaków '@'."
-
-#: contrib/admin/views/decorators.py:92
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "Twój adres e-mail to nie jest twój login. Spróbuj '%s'."
-
-#: contrib/admin/views/doc.py:48 contrib/admin/views/doc.py:50
@@ -1064 +1072 @@
-msgstr "Zaznacz %s aby zmienić"
-
-84
+65
-msgid "Database error"
-msgstr "Błąd bazy danych"
@@ -1129 +1137 @@
-msgstr "grupa"
-
-1
+8
-msgid "groups"
-msgstr "grupy"
-
-1
+8
-msgid "username"
-msgstr "użytkownik"
-
-1
+8
-msgid ""
-"Required. 30 characters or fewer. Alphanumeric characters only (letters, "
@@ -1145 +1153 @@
-"podkreślenia)."
-
-2
+9
-msgid "first name"
-msgstr "Imię"
-
-33
+40
-msgid "last name"
-msgstr "Nazwisko"
-
-34
+41
-msgid "e-mail address"
-msgstr "adres e-mail"
-
-35
+42
-msgid "password"
-msgstr "hasło"
-
-35
+42
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
@@ -1169 +1177 @@
-"hasła</a>."
-
-36
+43
-msgid "staff status"
-msgstr "w zespole"
-
-36
+43
-msgid "Designates whether the user can log into this admin site."
-msgstr "Oznacza czy użytkownik może zalogować się do panelu admina."
-
-37
+44
-msgid "active"
-msgstr "aktywny"
-
-37
+44
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
@@ -1189 +1197 @@
-"konta."
-
-38
+45
-msgid "superuser status"
-msgstr "Główny Administrator"
-
-38
+45
-msgid ""
-"Designates that this user has all permissions without explicitly assigning "
@@ -1201 +1209 @@
-"przypisywania ich."
-
-39
+46
-msgid "last login"
-msgstr "ostatnio zalogowany"
-
-0
+7
-msgid "date joined"
-msgstr "data przyłączenia"
-
-2
+9
-msgid ""
-"In addition to the permissions manually assigned, this user will also get "
@@ -1217 +1225 @@
-"uprawnienia grup, do których należy."
-
-43
+50
-msgid "user permissions"
-msgstr "uprawnienia użytkownika"
-
-47
+54
-msgid "user"
-msgstr "użytkownik"
-
-48
+55
-msgid "users"
-msgstr "użytkownicy"
-
-54
+61
-msgid "Personal info"
-msgstr "Dane osobowe"
-
-55
+62
-msgid "Permissions"
-msgstr "Uprawnienia"
-
-56
+63
-msgid "Important dates"
-msgstr "Ważne daty"
-
-57
+64
-msgid "Groups"
-msgstr "Grupy"
-
-16
+23
-msgid "message"
-msgstr "wiadomość"
-
-7
+8
-msgid "Logged out"
-msgstr "Wylogowany"
@@ -3517 +3525 @@
-msgstr "przekierowania"
-
-1
+5
-msgid "session key"
-msgstr "klucz sesji"
-
-2
+7
-msgid "session data"
-msgstr "data sesji"
-
-3
+8
-msgid "expire date"
-msgstr "data wygaśnięcia sesji"
-
-48
+53
-msgid "session"
-msgstr "sesja"
-
-49
+54
-msgid "sessions"
-msgstr "sesje"
@@ -3618 +3626 @@
-msgstr "Niepoprawna data: %s"
-
-27
+48
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Proszę wpisać poprawną datę w formacie RRRR-MM-DD."
@@ -3626 +3634 @@
-msgstr "Proszę wpisać poprawną godzinę w formacie HH:MM."
-
-04
+25
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
-msgstr "Wprowadź poprawną datę i godzinę w formacie RRRR-MM-DD GG:MM."
@@ -3889 +3897 @@
-msgstr "%(object)s z %(type)s już istnieje dla %(field)s."
-
-2
+1
-#, python-format
-msgid "%(optname)s with this %(fieldname)s already exists."
-msgstr "Już istnieje %(optname)s z %(fieldname)s."
-
-61 db/models/fields/__init__.py:327
-59 db/models/fields/__init__.py:770
+76 db/models/fields/__init__.py:348
+80 db/models/fields/__init__.py:791
-#: newforms/fields.py:46 oldforms/__init__.py:374
-msgid "This field is required."
-msgstr "To pole jest wymagane."
-
-27
+48
-msgid "This value must be an integer."
-msgstr "Ta wartość musi być liczbą całkowitą."
-
-66
+87
-msgid "This value must be either True or False."
-msgstr ""
-"Ta wartość musi być wartością logiczną (True, False - prawda lub fałsz)."
-
-490
+511
-msgid "This field cannot be null."
-msgstr "To pole nie może być puste."
-
-68
+89
-msgid "This value must be a decimal number."
-msgstr "Ta wartość musi być liczbą dziesiętną."
-
-779
+800
-msgid "Enter a valid filename."
-msgstr "Wpisz poprawną nazwę pliku."
-
-60
+81
-msgid "This value must be either None, True or False."
-msgstr ""
-"Ta wartość musi być jedną z None (nic), True (prawda) lub False (fałsz)."
-
-3
+4
-#, python-format
-msgid "Please enter a valid %s."
-msgstr "Proszę wpisać poprawne %s."
-
-01
+46
-msgid "Separate multiple IDs with commas."
-msgstr "Oddziel identyfikatory przecinkami."
-
-03
+48
-msgid ""
-"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
@@ -3942 +3950 @@
-"zaznaczyć więcej niż jeden wybór."
-
-50
+95
-#, python-format
-msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
@@ -4004 +4012 @@
-msgstr "Upewnij się, że jest nie więcej niż %s miejsc przed przecinkiem."
-
-1
+0
-msgid "Enter a valid date."
-msgstr "Wpisz poprawną datę."
-
-2
+1
-msgid "Enter a valid time."
-msgstr "Wpisz poprawną godzinę."
@@ -4032 +4040 @@
-msgstr "Ten odnośnik jest nieprawidłowy."
-
-60 newforms/models.py:299
+59 newforms/models.py:305
-msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr "Wybierz poprawną wartość. Podana nie jest jednym z dostępnych wyborów."
-
-9
+8
-#, python-format
-msgid "Select a valid choice. %(value)s is not one of the available choices."
@@ -4042 +4050 @@
-"Wybierz poprawną wartość. %(value)s nie jest jednym z dostępnych wyborów."
-
-600 newforms/fields.py:662 newforms/models.py:371
+599 newforms/fields.py:661 newforms/models.py:372
-msgid "Enter a list of values."
-msgstr "Podaj listę wartości."
-
-80
+79
-msgid "Enter a valid IPv4 address."
-msgstr "Wprowadź poprawny adres IPv4."
-
-2
+3
-#, python-format
-msgid "Select a valid choice. %s is not one of the available choices."

django/branches/newforms-admin/django/contrib/auth/views.py

@@ +1 @@
+from django.contrib.auth import REDIRECT_FIELD_NAME
+from django.contrib.auth.decorators import login_required
-from django.contrib.auth.forms import AuthenticationForm
-from django.contrib.auth.forms import PasswordResetForm, PasswordChangeForm, AdminPasswordChangeForm
-from django.core.exceptions import PermissionDenied
-from django.shortcuts import render_to_response, get_object_or_404
-from django.template import RequestContext
-from django.contrib.sites.models import Site, RequestSite
-from django.http import HttpResponseRedirect
-contrib.auth.decorators import login_required
-contrib.auth import REDIRECT_FIELD_NAME
+template import RequestContext
+utils.http import urlquote
-from django.utils.html import escape
-from django.utils.translation import ugettext as _
@@ -63 +64 @@
-        from django.conf import settings
-        login_url = settings.LOGIN_URL
-redirect_field_name, next
+urlquote(redirect_field_name), urlquote(next)
-
-def password_reset(request, is_admin_site=False, template_name='registration/password_reset_form.html',
@@ -74 +75 @@
-                form.save(domain_override=request.META['HTTP_HOST'])
-            else:
-
+
+
+
+
-            return HttpResponseRedirect('%sdone/' % request.path)
-    else:

django/branches/newforms-admin/django/contrib/sites/tests.py

@@ -3 +3 @@
->>> from django.contrib.sites.models import Site
->>> s = Site.objects.get_current()
-s
-
+isinstance(s, Site)
+
-
->>> s.delete()

django/branches/newforms-admin/django/core/servers/basehttp.py

@@ -18 +18 @@
-
-__version__ = "0.1"
-,'demo_app'
+
-
-server_version = "WSGIServer/" + __version__

django/branches/newforms-admin/django/db/backends/__init__.py

@@ -46 +46 @@
-    inline_fk_references = True
-    needs_datetime_string_cast = True
-    needs_upper_for_iops = False
-    supports_constraints = True
-    supports_tablespaces = False

django/branches/newforms-admin/django/db/backends/oracle/base.py

@@ -28 +28 @@
-    empty_fetchmany_value = ()
-    needs_datetime_string_cast = False
-    needs_upper_for_iops = True
-    supports_tablespaces = True
-    uses_case_insensitive_names = True

django/branches/newforms-admin/django/db/backends/oracle/creation.py

@@ -6 +6 @@
-# be interpolated against the values of Field.__dict__ before being output.
-# If a column type is set to None, it won't be included in the output.
+#
+# Any format strings starting with "qn_" are quoted before being used in the
+# output (the "qn_" prefix is stripped before the lookup is performed.
+
-DATA_TYPES = {
-    'AutoField':                    'NUMBER(11)',
-
+qn_
-    'CharField':                    'NVARCHAR2(%(max_length)s)',
-    'CommaSeparatedIntegerField':   'VARCHAR2(%(max_length)s)',
@@ -20 +24 @@
-    'IntegerField':                 'NUMBER(11)',
-    'IPAddressField':               'VARCHAR2(15)',
-
+qn_
-    'OneToOneField':                'NUMBER(11)',
-    'PhoneNumberField':             'VARCHAR2(20)',
-
-
+qn_
+qn_
-    'SlugField':                    'NVARCHAR2(50)',
-    'SmallIntegerField':            'NUMBER(11)',

django/branches/newforms-admin/django/db/models/fields/__init__.py

@@ -17 +17 @@
-from django import newforms as forms
-from django.core.exceptions import ObjectDoesNotExist
+from django.utils.datastructures import DictWrapper
-from django.utils.functional import curry
-from django.utils.itercompat import tee
@@ -154 +155 @@
-        # can implement db_type() instead of get_internal_type() to specify
-        # exactly which wacky database column type you want to use.
+        data = DictWrapper(self.__dict__, connection.ops.quote_name, "qn_")
-        try:
-self.__dict__
+data
-        except KeyError:
-            return None

django/branches/newforms-admin/django/db/models/fields/related.py

@@ -104 +104 @@
-        if hasattr(sup, 'contribute_to_class'):
-            sup.contribute_to_class(cls, name)
+
+        if not cls._meta.abstract and self.rel.related_name:
+            self.rel.related_name = self.rel.related_name % {'class': cls.__name__.lower()}
+
-        other = self.rel.to
-        if isinstance(other, basestring):
@@ -109 +113 @@
-        else:
-            self.do_related_class(other, cls)
-        if not cls._meta.abstract and self.rel.related_name:
-            self.rel.related_name = self.rel.related_name % {'class': cls.__name__.lower()}
-
-    def set_attributes_from_rel(self):
@@ -120 +122 @@
-        self.set_attributes_from_rel()
-        related = RelatedObject(other, cls, self)
-
+
+
-
-    def get_db_prep_lookup(self, lookup_type, value):

django/branches/newforms-admin/django/db/models/options.py

@@ -274 +274 @@
-        Initialises the field name -> field object mapping.
-        """
-
-
-
-
+
+
+
-        for f, model in self.get_all_related_m2m_objects_with_model():
-            cache[f.field.related_query_name()] = (f, model, False, True)
-        for f, model in self.get_all_related_objects_with_model():
-            cache[f.field.related_query_name()] = (f, model, False, False)
+        for f, model in self.get_m2m_with_model():
+            cache[f.name] = (f, model, True, True)
+        for f, model in self.get_fields_with_model():
+            cache[f.name] = (f, model, True, False)
-        if self.order_with_respect_to:
-            cache['_order'] = OrderWrt(), None, True, False

django/branches/newforms-admin/django/db/models/query.py

@@ -37 +37 @@
-        Adds an item.
-        model is the class of the object being added,
- 
+
-        parent_model is the model of the parent object
-        that this object was reached through, nullable should
@@ -78 +78 @@
-    def ordered_keys(self):
-        """
- 
+
-        dealth with i.e. models with no dependencies first.
-        """
@@ -93 +93 @@
-            if not found:
-                raise CyclicDependency("There is a cyclic dependency of items to be processed.")
-
+
-        return dealt_with.keys()
-
@@ -219 +219 @@
-    def __and__(self, other):
-        self._merge_sanity_check(other)
+        if isinstance(other, EmptyQuerySet):
+            return other._clone()
-        combined = self._clone()
-        combined.query.combine(other.query, sql.AND)
@@ -226 +228 @@
-        self._merge_sanity_check(other)
-        combined = self._clone()
+        if isinstance(other, EmptyQuerySet):
+            return combined
-        combined.query.combine(other.query, sql.OR)
-        return combined
@@ -489 +493 @@
-        """
-        if isinstance(filter_obj, Q) or hasattr(filter_obj, 'add_to_query'):
-
+
+
+
-        else:
-            return self._filter_or_exclude(None, **filter_obj)
@@ -584 +590 @@
-    def _merge_sanity_check(self, other):
-        """
-
-"""
-f self.__class__ is not other.__class__:
-    raise TypeError("Cannot merge querysets of different types ('%s' and '%s'.
-            % (self.__class__.__name__, other.__class__.__name__))
+ By default
+this does nothing, but see the ValuesQuerySet for an example of where
+t's useful.
+""
+pass
-
-class ValuesQuerySet(QuerySet):
@@ -600 +606 @@
-
-    def iterator(self):
- 
+
-            len(self.field_names) != len(self.model._meta.fields)):
-            self.query.trim_extra_select(self.extra_names)
@@ -689 +695 @@
-        self.query = self.query.clone(klass=sql.DateQuery, setup=True)
-        self.query.select = []
-.column
+
-        if self._field.null:
-Tru
+Fals
-
-    def _clone(self, klass=None, setup=False, **kwargs):
@@ -705 +711 @@
-        super(EmptyQuerySet, self).__init__(model, query)
-        self._result_cache = []
+
+    def __and__(self, other):
+        return self._clone()
+
+    def __or__(self, other):
+        return other._clone()
-
-    def count(self):
@@ -774 +786 @@
-        # if there is a cyclic dependency, we cannot in general delete
-        # the objects.  However, if an appropriate transaction is set
- 
+
-        # So for now, we go ahead and try anway.
-        ordered_classes = seen_objs.unordered_keys()