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

5245 Commits

Author SHA1 Message Date
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
Adrian Holovaty
13643a7f5d Fixed #7816 -- Fixed error in a few DeprecationWarnings. Thanks, leahculver
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7955 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-18 21:45:25 +00:00
Jacob Kaplan-Moss
7997133a3d Fixed #3639: updated generic create_update views to use newforms. This is a backwards-incompatible change.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7952 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-18 19:45:00 +00:00
Jacob Kaplan-Moss
cd80ce7a3d Added missing files form [7946]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7950 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-18 17:39:31 +00:00
Malcolm Tredinnick
c681f4070c Removed the mysql_old backend. It smells bad and has no friends.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7949 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-18 17:38:53 +00:00
Adrian Holovaty
d261c1d000 Fixed #7805 -- Removed ImageField.get_internal_type() because it doesn't offer anything beyond FileField's implementation. Thanks, Gulopine
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7947 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-18 04:34:47 +00:00
Adrian Holovaty
df2b19cc17 Fixed #1443 -- Django's various bits now support dates before 1900. Thanks to SmileyChris, Chris Green, Fredrik Lundh and others for patches and design help
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7946 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-18 03:47:27 +00:00
Adrian Holovaty
f6fafc02c8 Improved LocalTimezone._isdst() to handle dates before approximately 1901-12-01 (the specific cutoff date is platform-specific). Refs #1443
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7945 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-18 03:45:30 +00:00
Russell Keith-Magee
c4d0cfe1ee Refs #7745 -- Modified use of assertTrue to failUnless, because assertTrue isn't available in Python 2.3. Thanks to Karen Tracey for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7941 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-17 13:29:35 +00:00
Russell Keith-Magee
1107e6b479 Fixed #7751 -- Added check to allow for the fact that autocommit can be a property, rather than a function on certain database backends. Thanks to Leo Soto for the fix.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7940 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-17 13:24:05 +00:00
Malcolm Tredinnick
431206a252 Fixed #7786 -- Removed some tests from running when using Python 2.3.
The problem being "hidden" here is not serious. It won't affect correct code
and only gives a different failure mode for incorrect code. The moral is: don't
write incorrect code.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7939 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-16 23:55:10 +00:00
Malcolm Tredinnick
52fdedba48 Fixed #7759 -- Fixed QuerySet.count() when the results cache was only partially
populated.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7938 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-16 23:17:29 +00:00
Malcolm Tredinnick
57bb10e6c4 Refactored the HTTP 500 error response creation slightly. Provides the ability
for subclassing that piece of the processing path.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7928 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-15 19:17:49 +00:00
Malcolm Tredinnick
e7e4b8b0f7 Fixed #6862 -- Refactored debug traceback extraction into an easy-to-use class.
Aside from being a little easier to read and use, this means you could subclass
a request/response handler class (from django.core.handlers) to add your own
traceback extraction handling in non-DEBUG environments and reuse this code.
Thanks, Ned Batchelder.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7927 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-15 18:47:49 +00:00
Malcolm Tredinnick
3b37c8151a Fixed #7411 -- worked around some possible transaction conflicts in SQLite.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7926 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-15 18:47:32 +00:00
Russell Keith-Magee
e867c5a0cc Removed a Python2.3 incompatible generator construct. Thanks to Karen Tracey for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7921 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-14 04:57:01 +00:00
Russell Keith-Magee
b4cc77c73d Fixed #7605 -- Added a note about SQLite database creation to Tutorial 1. Thanks to pfctdayelise for the suggestion.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7917 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-13 12:16:11 +00:00
Russell Keith-Magee
bba79ce4b4 Fixed #7534 -- Added a note about TEST_DATABASE_CHARSET in the contribution documentation. Thanks to Peter Melvyn for the suggestion and initial draft.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7916 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-13 11:47:09 +00:00
Russell Keith-Magee
be6ca58d43 Fixed #7728 -- Modified the output check in the admin script tests. Checking for pyc is a CPython-specific check, and it breaks CPython if pyc files aren't generated (due to permission problems, etc). Thanks to Maciej Fijalkowski (fijal) for the report and fix.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7915 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-13 08:57:30 +00:00
Russell Keith-Magee
32b8c3e1c0 Fixed #7718 -- Added a naive implementation of sorted() for Python 2.3 compatibility, and modified test cases to import the function when required.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7914 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-13 08:48:18 +00:00
Russell Keith-Magee
502e9a5ab4 Fixed #7737 -- Corrected a comment in the testing docs to be PEP257 compliant. Thanks to msas@telia.com for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7913 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-13 08:45:17 +00:00
Gary Wilson Jr
dee7de0c23 Re-organized imports, removing a couple that were unused.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7912 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-13 01:22:31 +00:00
Gary Wilson Jr
1bb8809561 Added a docstring to CyclicDependency exception class.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7911 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-13 01:17:23 +00:00
Malcolm Tredinnick
e47d8e7fb1 Fixed #7734 -- Fixed a Python 2.3 compatibility problem.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7910 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-12 23:25:22 +00:00
Jacob Kaplan-Moss
185ba8f7e4 FIxed #7696: fixed model_form tests on Windows after [7814]. Thanks, Marty Alchin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7909 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-12 20:44:05 +00:00
Jacob Kaplan-Moss
476d5f2c0d Fixed #7675: corrected TemporaryUploadedFile.temporary_file_path. Thanks, Florian Apolloner.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7908 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-12 20:43:52 +00:00
Jacob Kaplan-Moss
e63f8bf655 Fixed #7673: make sure to rewind uploaded image data when validating ImageFields. Thanks, Mike Axiak.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7907 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-12 20:43:38 +00:00
Jacob Kaplan-Moss
5f73e2c4fa Fixed #7667: fixied FileField.save_file for inline related objects. This is really just papering over a bigger problem that should get fixed either by newforms-admin or the file-storage refactoring, but this fix makes the admin work until either of those things happen. Thanks, oggy.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7906 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-12 20:43:28 +00:00
Jacob Kaplan-Moss
c121ff4046 Fixed #7635: do a better job checking for infinite loops in multi-part MIME parsing. Thanks, Mike Axiak.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7905 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-12 20:43:15 +00:00