Changeset 6459

Timestamp:

10/06/07 17:34:48 (1 year ago)

Author:

jkocherhans

Message:

newforms-admin: Merged to [6458]

Files:

• django/branches/newforms-admin (modified) (1 prop)
• django/branches/newforms-admin/AUTHORS (modified) (3 diffs)
• django/branches/newforms-admin/django/bin/compile-messages.py (modified) (1 diff)
• django/branches/newforms-admin/django/bin/make-messages.py (modified) (1 diff)
• django/branches/newforms-admin/django/conf/locale/de/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/newforms-admin/django/conf/locale/de/LC_MESSAGES/django.po (modified) (2 diffs)
• django/branches/newforms-admin/django/contrib/auth/backends.py (modified) (1 diff)
• django/branches/newforms-admin/django/contrib/sessions/models.py (modified) (1 diff)
• django/branches/newforms-admin/django/core/handlers/wsgi.py (modified) (3 diffs)
• django/branches/newforms-admin/django/core/management/commands/startapp.py (modified) (1 diff)
• django/branches/newforms-admin/django/core/management/__init__.py (modified) (1 diff)
• django/branches/newforms-admin/django/db/models/fields/__init__.py (modified) (1 diff)
• django/branches/newforms-admin/django/http/__init__.py (modified) (1 diff)
• django/branches/newforms-admin/django/newforms/widgets.py (modified) (8 diffs)
• django/branches/newforms-admin/django/oldforms/__init__.py (modified) (2 diffs)
• django/branches/newforms-admin/django/utils/cache.py (modified) (5 diffs)
• django/branches/newforms-admin/django/utils/translation/__init__.py (modified) (4 diffs)
• django/branches/newforms-admin/django/utils/translation/trans_null.py (modified) (1 diff)
• django/branches/newforms-admin/django/utils/translation/trans_real.py (modified) (1 diff)
• django/branches/newforms-admin/django/views/static.py (modified) (1 diff)
• django/branches/newforms-admin/docs/databases.txt (modified) (1 diff)
• django/branches/newforms-admin/docs/email.txt (modified) (1 diff)
• django/branches/newforms-admin/docs/install.txt (modified) (2 diffs)
• django/branches/newforms-admin/docs/newforms.txt (modified) (1 diff)
• django/branches/newforms-admin/tests/modeltests/basic/models.py (modified) (1 diff)
• django/branches/newforms-admin/tests/modeltests/field_defaults/models.py (modified) (1 diff)
• django/branches/newforms-admin/tests/regressiontests/i18n/models.py (modified) (1 diff)
• django/branches/newforms-admin/tests/regressiontests/i18n/tests.py (modified) (1 diff)

django/branches/newforms-admin/AUTHORS

@@ -116 +116 @@
-    A. Murat Eren <meren@pardus.org.tr>
-    Ludvig Ericson <ludvig.ericson@gmail.com>
+    eriks@win.tue.nl
-    Dirk Eschler <dirk.eschler@gmx.net>
-    Marc Fargas <telenieko@telenieko.com>
@@ -240 +241 @@
-    pavithran s <pavithran.s@gmail.com>
-    Barry Pederson <bp@barryp.org>
+    permonik@mesias.brnonet.cz
-    petr.marhoun@gmail.com
-    pgross@thoughtworks.com
@@ -318 +320 @@
-    Milton Waddams
-    wam-djangobug@wamber.net
-wangchun <yaohua2000@gmail.com
+Wang Chun <wangchun@exoweb.net
-    Filip Wasilewski <filip.wasilewski@gmail.com>
-    Dan Watson <http://theidioteque.net/>

django/branches/newforms-admin/django/bin/compile-messages.py

@@ -15 +15 @@
-    if os.environ.get('DJANGO_SETTINGS_MODULE'):
-        from django.conf import settings
-
+
+
-
-    # Gather existing directories.

django/branches/newforms-admin/django/bin/make-messages.py

@@ -75 +75 @@
-            os.unlink(potfile)
-
+        all_files = []
-        for (dirpath, dirnames, filenames) in os.walk("."):
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    src = open(os.path.join(dirpath, file), "rb").read()
-                    src = pythonize_re.sub('\n#', src)
-                    open(os.path.join(dirpath, '%s.py' % file), "wb").write(src)
-                    thefile = '%s.py' % file
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    old = '#: '+os.path.join(dirpath, thefile)[2:]
-                    new = '#: '+os.path.join(dirpath, file)[2:]
-                    msgs = msgs.replace(old, new)
-
-
+
+
+
+
+
+
+
+
-                    os.unlink(os.path.join(dirpath, thefile))
-                elif domain == 'django' and (file.endswith('.py') or file.endswith('.html')):
-                    thefile = file
-                    if file.endswith('.html'):
-                        src = open(os.path.join(dirpath, file), "rb").read()
-                        thefile = '%s.py' % file
-                        open(os.path.join(dirpath, thefile), "wb").write(templatize(src))
-                    if verbose:
-                        sys.stdout.write('processing file %s in %s\n' % (file, dirpath))
-                    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"' % (
-                        domain, os.path.join(dirpath, thefile))
-                    (stdin, stdout, stderr) = os.popen3(cmd, 't')
-                    msgs = stdout.read()
-                    errors = stderr.read()
-                    if errors:
-                        print "errors happened while running xgettext on %s" % file
-                        print errors
-                        sys.exit(8)
-                    if thefile != file:
-                        old = '#: '+os.path.join(dirpath, thefile)[2:]
-                        new = '#: '+os.path.join(dirpath, file)[2:]
-                        msgs = msgs.replace(old, new)
-                    if os.path.exists(potfile):
-                        # Strip the header
-                        msgs = '\n'.join(dropwhile(len, msgs.split('\n')))
-                    else:
-                        msgs = msgs.replace('charset=CHARSET', 'charset=UTF-8')
-                    if msgs:
-                        open(potfile, 'ab').write(msgs)
-                    if thefile != file:
-                        os.unlink(os.path.join(dirpath, thefile))
-
-        if os.path.exists(potfile):

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

@@ -1 @@
-
-
-
+
+
+
+
-#
-msgid ""
@@ -1630 +1631 @@
-msgstr "Webseiten"
-
-17
+20
-msgid "th"
-
-
-17
+.
+
+20
-msgid "st"
-
-
-17
+.
+
+20
-msgid "nd"
-
-
-17
+.
+
+20
-msgid "rd"
-
-
-47
+.
+
+50
-#, python-format
-msgid "%(value).1f million"
-msgid_plural "%(value).1f million"
-
-
-
-0
+%(value).1f Million
+%(value).1f Millionen
+
+3
-#, python-format
-msgid "%(value).1f billion"
-msgid_plural "%(value).1f billion"
-
-
-
-3
+%(value).1f Milliarde
+%(value).1f Milliarden
+
+6
-#, python-format
-msgid "%(value).1f trillion"
-msgid_plural "%(value).1f trillion"
-
-
-
-68
+%(value).1f Billion
+%(value).1f Billionen
+
+71
-msgid "one"
-msgstr "ein"
-
-68
+71
-msgid "two"
-msgstr "zwei"
-
-68
+71
-msgid "three"
-msgstr "drei"
-
-68
+71
-msgid "four"
-msgstr "vier"
-
-68
+71
-msgid "five"
-msgstr "fünf"
-
-68
+71
-msgid "six"
-msgstr "sechs"
-
-68
+71
-msgid "seven"
-msgstr "sieben"
-
-68
+71
-msgid "eight"
-msgstr "acht"
-
-68
+71
-msgid "nine"
-msgstr "neun"

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

@@ -2 +2 @@
-from django.contrib.auth.models import User
-
+try: 
+    set 
+except NameError: 
+    from sets import Set as set # Python 2.3 fallback
+        
-class ModelBackend:
-    """

django/branches/newforms-admin/django/contrib/sessions/models.py

@@ -1 @@
-
+
+
+
+
+
+
+
-import cPickle as pickle
+
-from django.db import models
-from django.utils.translation import ugettext_lazy as _

django/branches/newforms-admin/django/core/handlers/wsgi.py

@@ +1 @@
+from threading import Lock
+from pprint import pformat
+try:
+    from cStringIO import StringIO
+except ImportError:
+    from StringIO import StringIO
+
-from django.core.handlers.base import BaseHandler
-from django.core import signals
@@ -5 +12 @@
-from django.utils.encoding import force_unicode
-from django import http
-from pprint import pformat
-from shutil import copyfileobj
-from threading import Lock
-try:
-    from cStringIO import StringIO
-except ImportError:
-    from StringIO import StringIO
-
-# See http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
@@ -106 +106 @@
-
-    def is_secure(self):
-
+
+
-
-    def _load_post_and_files(self):

django/branches/newforms-admin/django/core/management/commands/startapp.py

@@ -17 +17 @@
-        # Determine the project_name a bit naively -- by looking at the name of
-        # the parent directory.
-'..'
+os.pardir
-        parent_dir = os.path.basename(project_dir)
-        project_name = os.path.basename(directory)

django/branches/newforms-admin/django/core/management/__init__.py

@@ -240 +240 @@
-    project_name = os.path.basename(project_directory)
-    settings_name = os.path.splitext(settings_filename)[0]
-'..'
+os.pardir
-    project_module = __import__(project_name, {}, {}, [''])
-    sys.path.pop()

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

@@ -237 +237 @@
-            if callable(self.default):
-                return self.default()
-self.default
+force_unicode(self.default, strings_only=True)
-        if not self.empty_strings_allowed or (self.null and settings.DATABASE_ENGINE != 'oracle'):
-            return None

django/branches/newforms-admin/django/http/__init__.py

@@ -48 +48 @@
-        "Returns the HTTP host using the environment or request headers."
-        # We try three options, in order of decreasing preference.
-
-
+
+
+
-            host = self.META['HTTP_HOST']
-        else:

django/branches/newforms-admin/django/newforms/widgets.py

@@ -8 +8 @@
-    from sets import Set as set   # Python 2.3 fallback
-
+import copy
-from itertools import chain
-from django.conf import settings
@@ -136 +137 @@
-            self.attrs = {}
-
+    def __deepcopy__(self, memo):
+        obj = copy.copy(self)
+        obj.attrs = self.attrs.copy()
+        memo[id(self)] = obj
+        return obj
+
-    def render(self, name, value, attrs=None):
-        """
@@ -192 +199 @@
-
-    def __init__(self, attrs=None, render_value=True):
-elf.attrs = attrs or {}
+uper(PasswordInput, self).__init__(attrs)
-        self.render_value = render_value
-
@@ -209 +216 @@
-    """
-    def __init__(self, attrs=None, choices=()):
+        super(MultipleHiddenInput, self).__init__(attrs)
-        # choices can be any iterable
-        self.attrs = attrs or {}
-        self.choices = choices
-
@@ -249 +256 @@
-class CheckboxInput(Widget):
-    def __init__(self, attrs=None, check_test=bool):
+        super(CheckboxInput, self).__init__(attrs)
-        # check_test is a callable that takes a value and returns True
-        # if the checkbox should be checked for that value.
-        self.attrs = attrs or {}
-        self.check_test = check_test
-
@@ -268 +275 @@
-class Select(Widget):
-    def __init__(self, attrs=None, choices=()):
-elf.attrs = attrs or {}
+uper(Select, self).__init__(attrs)
-        # choices can be any iterable, but we may need to render this widget
-        # multiple times. Thus, collapse it into a list so it can be consumed
@@ -307 +314 @@
-class SelectMultiple(Widget):
-    def __init__(self, attrs=None, choices=()):
+        super(SelectMultiple, self).__init__(attrs)
-        # choices can be any iterable
-        self.attrs = attrs or {}
-        self.choices = choices
-
@@ -531 +538 @@
-            return [value.date(), value.time()]
-        return [None, None]
-    

django/branches/newforms-admin/django/oldforms/__init__.py

@@ -501 +501 @@
-            if smart_unicode(value) == str_data:
-                selected_html = u' selected="selected"'
-escape(display_name
+force_unicode(escape(display_name)
-        output.append(u'  </select>')
-        return u'\n'.join(output)
@@ -613 +613 @@
-            if smart_unicode(value) in str_data_list:
-                selected_html = u' selected="selected"'
-escape(choice
+force_unicode(escape(choice)
-        output.append(u'  </select>')
-        return u'\n'.join(output)

django/branches/newforms-admin/django/utils/cache.py

@@ -24 +24 @@
-from django.conf import settings
-from django.core.cache import cache
-
+, iri_to_uri
-
-cc_delim_re = re.compile(r'\s*,\s*')
@@ -58 +58 @@
-    else:
-        cc = {}
+
+    # If there's already a max-age header but we're being asked to set a new
+    # max-age, use the minumum of the two ages. In practice this happens when
+    # a decorator and a piece of middleware both operate on a given view.
+    if 'max-age' in cc and 'max_age' in kwargs:
+        kwargs['max_age'] = min(cc['max-age'], kwargs['max_age'])
+
-    for (k,v) in kwargs.items():
-        cc[k.replace('_', '-')] = v
@@ -119 +126 @@
-        if value is not None:
-            ctx.update(value)
-request.path
+iri_to_uri(request.path)
-
-def get_cache_key(request, key_prefix=None):
@@ -133 +140 @@
-    if key_prefix is None:
-        key_prefix = settings.CACHE_MIDDLEWARE_KEY_PREFIX
-request.path
+iri_to_uri(request.path)
-    headerlist = cache.get(cache_key, None)
-    if headerlist is not None:
@@ -157 +164 @@
-    if cache_timeout is None:
-        cache_timeout = settings.CACHE_MIDDLEWARE_SECONDS
-request.path
+iri_to_uri(request.path)
-    if response.has_header('Vary'):
-        headerlist = ['HTTP_'+header.upper().replace('-', '_') for header in vary_delim_re.split(response['Vary'])]

django/branches/newforms-admin/django/utils/translation/__init__.py

@@ -3 +3 @@
-"""
-from django.utils.functional import lazy
+from django.utils.encoding import force_unicode
-
-__all__ = ['gettext', 'gettext_noop', 'gettext_lazy', 'ngettext',
@@ -40 +41 @@
-
-    # Make the originally requested function call on the way out the door.
-
+'real_%s' % 
-
-g = globals()
@@ -64 +65 @@
-    return real_ungettext(singular, plural, number)
-
-def string_concat(*strings):
-    return real_string_concat(*strings)
-
-ngettext_lazy = lazy(ngettext, str)
-gettext_lazy = lazy(gettext, str)
-ungettext_lazy = lazy(ungettext, unicode)
-ugettext_lazy = lazy(ugettext, unicode)
-string_concat = lazy(string_concat, unicode)
-
-def activate(language):
@@ -109 +106 @@
-    return real_deactivate_all()
-
+def string_concat(*strings):
+    """
+    Lazy variant of string concatenation, needed for translations that are
+    constructed from multiple parts.
+    """
+    return u''.join([force_unicode(s) for s in strings])
+string_concat = lazy(string_concat, unicode)

django/branches/newforms-admin/django/utils/translation/trans_null.py

@@ -14 +14 @@
-    return force_unicode(ngettext(singular, plural, number))
-
-string_concat = lambda *strings: u''.join([force_unicode(el) for el in strings])
-activate = lambda x: None
-deactivate = deactivate_all = install = lambda: None

django/branches/newforms-admin/django/utils/translation/trans_real.py

@@ -517 +517 @@
-    return out.getvalue()
-
-def string_concat(*strings):
-    """"
-    Lazy variant of string concatenation, needed for translations that are
-    constructed from multiple parts.
-    """
-    return u''.join([force_unicode(s) for s in strings])

django/branches/newforms-admin/django/views/static.py

@@ -30 +30 @@
-    for part in path.split('/'):
-        if not part:
-strip empty path components
+Strip empty path components.
-            continue
-        drive, part = os.path.splitdrive(part)
-        head, part = os.path.split(part)
-        if part in (os.curdir, os.pardir):
-strip '.' amd '..' in path
+Strip '.' and '..' in path.
-            continue
-        newpath = os.path.join(newpath, part).replace('\\', '/')

django/branches/newforms-admin/docs/databases.txt

@@ -164 +164 @@
-.. _AlterModelOnSyncDB: http://code.djangoproject.com/wiki/AlterModelOnSyncDB
-
+
+Oracle Notes
+============
+
+Django supports `Oracle Database Server`_ versions 9i and higher.  Oracle
+version 10g or later is required to use Django's ``regex`` and ``iregex`` query
+operators.  You will also need the `cx_Oracle`_ driver, version 4.3.1 or newer.
+
+.. _`Oracle Database Server`: http://www.oracle.com/
+.. _`cx_Oracle`: http://cx-oracle.sourceforge.net/
+
+To run ``python manage.py syncdb``, you'll need to create an Oracle database
+user with CREATE TABLE, CREATE SEQUENCE, CREATE PROCEDURE, and CREATE TRIGGER
+privileges.  To run Django's test suite, the user also needs 
+CREATE and DROP DATABASE and CREATE and DROP TABLESPACE privileges.
+
+Connecting to the Database
+--------------------------
+
+Your Django settings.py file should look something like this for Oracle::
+
+    DATABASE_ENGINE = 'oracle'
+    DATABASE_NAME = 'xe'
+    DATABASE_USER = 'a_user'
+    DATABASE_PASSWORD = 'a_password'
+    DATABASE_HOST = ''
+    DATABASE_PORT = ''
+
+If you don't use a ``tnsnames.ora`` file or a similar naming method that
+recognizes the SID ("xe" in this example), then fill in both ``DATABASE_HOST``
+and ``DATABASE_PORT`` like so::
+
+    DATABASE_ENGINE = 'oracle'
+    DATABASE_NAME = 'xe'
+    DATABASE_USER = 'a_user'
+    DATABASE_PASSWORD = 'a_password'
+    DATABASE_HOST = 'dbprod01ned.mycompany.com'
+    DATABASE_PORT = '1540'
+
+You should supply both ``DATABASE_HOST`` and ``DATABASE_PORT``, or leave both
+as empty strings.
+
+Tablespace Options
+------------------
+
+A common paradigm for optimizing performance in Oracle-based systems is the
+use of `tablespaces`_ to organize disk layout. The Oracle backend supports
+this use case by adding ``db_tablespace`` options to the ``Meta`` and
+``Field`` classes.  (When using a backend that lacks support for tablespaces,
+these options are ignored.)
+
+.. _`tablespaces`: http://en.wikipedia.org/wiki/Tablespace
+
+A tablespace can be specified for the table(s) generated by a model by
+supplying the ``db_tablespace`` option inside the model's ``Meta`` class.
+Additionally, the ``db_tablespace`` option can be passed to a ``Field``
+constructor to specify an alternate tablespace for the ``Field``'s column
+index.  If no index would be created for the column, the ``db_tablespace``
+option is ignored.
+
+::
+
+    class TablespaceExample(models.Model):
+        name = models.CharField(maxlength=30, db_index=True, db_tablespace="indexes")
+        data = models.CharField(maxlength=255, db_index=True)
+        edges = models.ManyToManyField(to="self", db_tablespace="indexes")
+
+        class Meta:
+            db_tablespace = "tables"
+
+In this example, the tables generated by the ``TablespaceExample`` model
+(i.e., the model table and the many-to-many table) would be stored in the
+``tables`` tablespace.  The index for the name field and the indexes on the
+many-to-many table would be stored in the ``indexes`` tablespace.  The ``data``
+field would also generate an index, but no tablespace for it is specified, so
+it would be stored in the model tablespace ``tables`` by default.
+
+Django does not create the tablespaces for you.  Please refer to `Oracle's
+documentation`_ for details on creating and managing tablespaces.
+
+.. _`Oracle's documentation`: http://download.oracle.com/docs/cd/B19306_01/server.102/b14200/statements_7003.htm#SQLRF01403
+
+Naming Issues
+-------------
+
+Oracle imposes a name length limit of 30 characters.  To accommodate this, the
+backend truncates database identifiers to fit, replacing the final four
+characters of the truncated name with a repeatable MD5 hash value.
+
+NULL and Empty Strings
+----------------------
+
+Django generally prefers to use the empty string ('') rather than NULL, but
+Oracle treats both identically.  To get around this, the Oracle backend
+coerces the ``null=True`` option on fields that permit the empty string as a
+value.  When fetching from the database, it is assumed that a NULL value in
+one of these fields really means the empty string, and the data is silently
+converted to reflect this assumption.
+
+TextField Limitations
+---------------------
+
+The Oracle backend stores ``TextFields`` as ``NCLOB`` columns.  Oracle imposes
+some limitations on the usage of such LOB columns in general:
+
+  * LOB columns may not be used as primary keys.
+
+  * LOB columns may not be used in indexes.
+
+  * LOB columns may not be used in a ``SELECT DISTINCT`` list.  This means that
+    attempting to use the ``QuerySet.distinct`` method on a model that
+    includes ``TextField`` columns will result in an error when run against
+    Oracle.  A workaround to this is to keep ``TextField`` columns out of any
+    models that you foresee performing ``.distinct`` queries on, and to
+    include the ``TextField`` in a related model instead.

django/branches/newforms-admin/docs/email.txt

@@ -318 +318 @@
-    text_content = 'This is an important message.'
-    html_content = '<p>This is an <strong>important</strong> message.</p>'
-to
+[to]
-    msg.attach_alternative(html_content, "text/html")
-    msg.send()

django/branches/newforms-admin/docs/install.txt

@@ -67 +67 @@
-
-* If you're using Oracle, you'll need cx_Oracle_, version 4.3.1 or higher.
+  You will also want to read the database-specific notes for the `Oracle backend`_.
-
-If you plan to use Django's ``manage.py syncdb`` command to
@@ -89 +90 @@
-.. _cx_Oracle: http://cx-oracle.sourceforge.net/
-.. _Oracle: http://www.oracle.com/
+.. _Oracle backend: ../databases/#oracle-notes
-.. _testing framework: ../testing/
-

django/branches/newforms-admin/docs/newforms.txt

@@ -2389 +2389 @@
-
-That's all the documentation for now. For more, see the file
-/tests.py
+
--- the unit tests for ``django.newforms``. This can give you a good idea of
-
+ (Each submodule there contains separate tests.)
-
-If you're really itching to learn and use this library, please be patient.

django/branches/newforms-admin/tests/modeltests/basic/models.py

@@ -153 +153 @@
->>> a6.save()
->>> a6.headline
-
+u
-
-# For DateTimeFields, Django saves as much precision (in seconds) as you

django/branches/newforms-admin/tests/modeltests/field_defaults/models.py

@@ -43 +43 @@
-# Access database columns via Python attributes.
->>> a.headline
-
+u
-
-# make sure the two dates are sufficiently close

django/branches/newforms-admin/tests/regressiontests/i18n/models.py

@@ +1 @@
+from django.db import models
+from django.utils.translation import ugettext_lazy as _
+
+class TestModel(models.Model):
+    text = models.CharField(max_length=10, default=_('Anything'))
+
+__test__ = {'API_TESTS': '''
+>>> tm = TestModel()
+>>> tm.save()
+'''
+}
+

django/branches/newforms-admin/tests/regressiontests/i18n/tests.py

@@ -31 +31 @@
->>> s == s4
-False
+
+unicode(string_concat(...)) should not raise a TypeError - #4796
+