1
0
mirror of https://github.com/django/django.git synced 2024-11-19 07:54:07 +00:00
Commit Graph

5123 Commits

Author SHA1 Message Date
Russell Keith-Magee
4016d5264a Fixed #7727 -- Improved the checks for import failure when using PIL. Under PyPy, you can import the PIL module, but when you try to use it, the underlying _imaging module will not be available. Thanks to Maciej Fijalkowski (fijal) for the report and suggested fix.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8016 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-21 11:52:11 +00:00
Malcolm Tredinnick
bfcecbffd3 Changed/fixed the way Django handles SCRIPT_NAME and PATH_INFO (or
equivalents). Basically, URL resolving will only use the PATH_INFO and the
SCRIPT_NAME will be prepended by reverse() automatically. Allows for more
portable development and installation. Also exposes SCRIPT_NAME in the
HttpRequest instance.

There are a number of cases where things don't work completely transparently,
so mod_python and fastcgi users should read the relevant docs.

Fixed #285, #1516, #3414.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8015 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-21 07:57:10 +00:00
Brian Rosner
ca7ee4be17 Fixed #7858 -- Quick CSS fix for right-to-left written languages in inlines. Thanks mksoft for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8014 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-21 04:09:29 +00:00
Gary Wilson Jr
80ac41e2f7 Corrected typo.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8013 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-21 03:50:40 +00:00
Malcolm Tredinnick
ee90b7cf9a Fixed filter_horizontal and filter_vertical handling in admin so that they can
be lists (aren't required to be tuples). It's less error-prone to use one item
lists than one-tuples, but this caused a crash.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8011 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-20 21:12:36 +00:00
Brian Rosner
c2ee295f50 Fixed #7850 -- Added adding django.contrib.admin to INSTALLED_APPS to the steps to activating the Django admin site. Thanks dacort for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8010 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-20 18:20:54 +00:00
Brian Rosner
effa299342 Added admin.autodiscover() to project template urls.py. It is left commented out intentionally. Thanks tome for the suggestion. Refs #7824.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8009 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-20 18:09:27 +00:00
Brian Rosner
a53a1ba541 Fixed #7842 -- Added a raw string identifier in project template urls.py for consistency sake. Added spaces for consistency too. Thanks yoshi.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8008 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-20 18:05:11 +00:00
Russell Keith-Magee
d911a64ce8 Fixed #6450 -- Improved the checking of errors when creating the directories for saved files. Thanks to henry@precheur.org for the report and patch, and vung for the excellent test case.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8007 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-20 12:44:41 +00:00
Russell Keith-Magee
6c4c60b14a Fixed #7775 -- Removed some duplicated code from the admin login sequence. Thanks to Mnewman for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8006 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-20 11:37:20 +00:00
Russell Keith-Magee
6db9fd0116 Made the test case for doctest comparison of XML fragments a little more rigorous. Refs #7441.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8005 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-20 08:47:10 +00:00
Russell Keith-Magee
b58de15139 Fixed #7339 -- Added manual calls to the garbage collector. This is required for PyPy and Jython; these implementations don't use reference counting, so you can't rely on __del__ being run immediately after del is called. Thanks to Maciej Fijalkowski (fijal) and Leo Soto.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8004 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-20 06:32:54 +00:00
Russell Keith-Magee
2f49d18071 Fixed #7441 -- Removed some of the shortcuts in the doctest output comparators, and added a wrapper to allow comparison of xml fragments. Thanks to Leo Soto for the report and fix.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8003 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-20 05:46:41 +00:00
Malcolm Tredinnick
55ebc2b594 Modified [7999] based on some feedback from Marty Alchin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8001 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 22:50:06 +00:00
Ramiro Morales
44c329e1d3 Update es_AR l10n to post nf-a merging (actually r7984).
Yay for first commit :).


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8000 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 22:45:28 +00:00
Malcolm Tredinnick
e942636fbe Added a cavaet to the use of get_FOO_filename() and get_FOO_url(). This
constraint has always existed, but it's very hard to fix in the current code,
so better to work around it for now.

Refs #5619


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7999 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 22:26:46 +00:00
Malcolm Tredinnick
5141b67a19 Reverted [7986].
It turns out that we need to treat filename creation/display (in
particular, the upload_to path) differently depending upon whether the value is
out of the database or provided by other code and there's no reliable way to
determine that at the moment (although some later proposed changes might alter
that). So calling get_FIELD_filename on an unsaved model with a changed file
attribute will not necessarily return the same result as after the save().

Refs #5619. Fixed #7843.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7998 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 22:26:32 +00:00
Nicola Larosa
a4619944dc it translation: updated to r7996
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7997 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 20:02:46 +00:00
Nicola Larosa
be922f1ba5 it translation: regenerated po file, now let's get to work
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7996 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 19:54:09 +00:00
Malcolm Tredinnick
189c704ae6 Revert [7991] - [7993]. I was committing from the wrong branch. Sorry 'bout
that, folks. :-(


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7995 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 19:37:55 +00:00
Malcolm Tredinnick
be36750163 Fixed #7774 -- Updated Norwegian translation from jonklo.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7994 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 19:32:29 +00:00
Malcolm Tredinnick
ff68e85b8e Starting to do the reverse() threading stuff.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7993 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 19:32:18 +00:00
Malcolm Tredinnick
99bbaa0090 Allow avoidance of the Apache mod_rewrite undo.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7992 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 19:32:12 +00:00
Malcolm Tredinnick
b653cdcfb2 First part of setting request.path correctly.
Still needs:
    - testing
    - docs changes
    - some way of fixing reverse().


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7991 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 19:32:01 +00:00
Malcolm Tredinnick
e8dd3855c1 Fixed #7761 -- Updated Georgian translation. Thanks, David Avsajanishvili.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7990 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 19:26:47 +00:00
Malcolm Tredinnick
8ac9cbee2f Fixed #7763 -- Added a Romanian localflavor. Thanks, MihaiD.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7989 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 19:22:44 +00:00
Malcolm Tredinnick
795b6a1271 Fixed #7471 -- If the 400 response handler raises an exception, pass control to
the 500 handler (if that then raises an exception, it's just not your day).

Patch from Leah Culver.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7988 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 18:49:49 +00:00
Malcolm Tredinnick
344383284c Fixed #6009 -- Added regression tests to show that uploading non-ASCII
filenames now works properly. Patch from Leah Culver.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7987 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 18:47:59 +00:00
Malcolm Tredinnick
a103786971 Fixed #5619 -- Return the same path in get_FOO_filename() before and after a
model is saved (i.e. make sure the upload prefix is prepended in both cases).

Patch from wreese@gmail.com. Tests from Leah Culver.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7986 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 18:35:11 +00:00
Malcolm Tredinnick
c09351aec6 Fixed #6965 -- Sped up the urlize and urlizetrunc filters. A nice patch from Andrew Badr.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7985 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 18:05:22 +00:00
Brian Rosner
67eeb72e26 Fixed #7838 -- Corrected an invalid class name the 'classes' usage in the tutorial. Thanks kratorius for catching this.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7984 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 15:51:48 +00:00
Brian Rosner
4729e3836e Fixed #7839 -- Corrected admin documentation and tutorial to reflect that 'classes' should be a list and not a string. Thanks Jan Rademaker for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7983 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 15:37:28 +00:00
Russell Keith-Magee
dce4db49a7 Added svn:ignore properties to some recently added directories.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7982 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 15:05:00 +00:00
Russell Keith-Magee
0cffff024b Fixed #7441 - Improved the doctest OutputChecker to be more lenient with JSON an XML outputs. This is required so that output ordering that doesn't matter at a semantic level (such as the order of keys in a JSON dictionary, or attributes in an XML element) isn't caught as a test failure. Thanks to Leo Soto for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7981 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 14:46:55 +00:00
Russell Keith-Magee
c819252bf5 Fixed #7832 -- Corrected a formatting error in the newforms docs. Thanks to omat@gezgin.com for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7978 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 11:27:55 +00:00
Russell Keith-Magee
649463dd34 Fixed #4412 -- Added support for optgroups, both in the model when defining choices, and in the form field and widgets when the optgroups are displayed. Thanks to Matt McClanahan <cardinal@dodds.net>, Tai Lee <real.human@mrmachine.net> and SmileyChris for their contributions at various stages in the life of this ticket.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7977 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 07:53:02 +00:00
Russell Keith-Magee
b5b0febc4c Fixed #7785 -- Added a note in the contenttypes documentation that GenericRelations must share a common field type for primary keys. Thanks to Rudolph for the suggestion and initial draft.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7976 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 02:46:12 +00:00
Russell Keith-Magee
825622d912 Fixed #7773 -- Added some simple tests for EmailMessage. Thanks to serialx for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7975 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 02:38:41 +00:00
Russell Keith-Magee
69ac815a41 Fixed #7828 -- Removed some unnecessary imports from admin widgets. Thanks to Julien for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7974 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 02:26:58 +00:00
Russell Keith-Magee
56df66baa0 Removed a stale directory missed by [7967].
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7973 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 02:13:39 +00:00
Russell Keith-Magee
d70df568e6 Fixed #7558 -- Added missing svn:ignore property on some directories that were missing it. Thanks to Marc Garcia for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7972 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 01:25:28 +00:00
Jacob Kaplan-Moss
46786b4193 Fixed #7741: django.newforms is now django.forms. This is obviously a backwards-incompatible change. There's a warning upon import of django.newforms itself, but deeper imports will raise errors.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7971 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 01:22:26 +00:00
Russell Keith-Magee
39af2738fd Fixed #7782 -- Corrected documentation to refer to chunks(), rather than the deprecated chunk().
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7970 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 01:07:17 +00:00
Jacob Kaplan-Moss
88ae2d44e0 Fixed django.VERSION after NFA merge.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7968 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 00:07:47 +00:00
Brian Rosner
a19ed8aea3 Merged the newforms-admin branch into trunk.
This is a backward incompatible change. The admin contrib app has been
refactored. The newforms module has several improvements including FormSets
and Media definitions.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7967 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-18 23:54:34 +00:00
Gary Wilson Jr
dc375fb0f3 Refs #3639 -- Minor docstring correction, it's a function not a method.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7966 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-18 23:52:18 +00:00
Gary Wilson Jr
5735e161a2 Refs #6086 -- Changed settings docs to reflect deprecation of "simple" cache backend in [6822].
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7965 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-18 23:46:10 +00:00
Brian Rosner
1442ebe129 svnmerge.py init for newforms-admin merge back into trunk.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7964 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-18 23:25:06 +00:00
Malcolm Tredinnick
5f6b08fc6b Fixed #7685 -- fixed a typo in French localflavor documentation.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7961 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-18 23:02:06 +00:00
Malcolm Tredinnick
436ef181f3 Fixed #5552 -- Raise an error, rather than failing silently, when DATABASE_NAME
is not specified for SQLite.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7956 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-18 22:36:31 +00:00