innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
6,575 Commits 25 Branches 361 Tags 501 MiB
Commit Graph

989 Commits

Author SHA1 Message Date
Jacob Kaplan-Moss fd28d04c39 Merge branch 'master' into upstream-trunk 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9843 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-02-16 21:03:09 +00:00
Jacob Kaplan-Moss 8ada8d7c03 Fixed #9214: EmailMessage now respects the From header instead of blindly using from_email. Thanks, Tai Lee. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9842 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-02-16 20:47:39 +00:00
Brian Rosner e4e964510c Fixed #10240 -- Restored YAML serialization with Decimal objects that broke with r9823. Thanks Alex Gaynor for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9825 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-02-12 02:54:39 +00:00
Malcolm Tredinnick 9c6efb2eea Fixed #9789 -- Handle jython's compiled settings filename correctly. 
Patch from Frank Wierzbicki.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9775 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-19 12:46:54 +00:00
Karen Tracey 81dfd1f5f0 Fixed #8055: Replaced use of traceback.format_exc (new in Python 2.4) with something that works as far back as 2.3. 
Thanks to Ramiro for diagnosis and patch.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9770 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-17 22:15:07 +00:00
Jacob Kaplan-Moss 6332ad4804 Fixed #10044: You can now assign directly to file fields (`instance.filefield = somefile`). Thanks, Marty Alchin. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9766 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-16 21:48:37 +00:00
Jacob Kaplan-Moss c01098e9cb In urlconfs, include() may now be used on an iterable of patterns instead of just a module string. Refs #6470 -- making the admin use a urlconf is much easier with this work done. Thanks, Alex Gaynor. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9728 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-10 22:54:20 +00:00
Karen Tracey 4bede45816 Remove some code in loaddata that bails out of searching for fixture files (only when verbosity > 1) as soon as attempting to open any potential fixture file fails. This code looks to have been mistakenly added in r9527; loaddata ought to proceed with attempting to locate other fixture files, regardless of verbosity setting, as it did before r9527. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9646 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-12-14 19:31:26 +00:00
Malcolm Tredinnick 81c8b3c696 Clean up the imports in loaddata.py to match other code whilst I'm in the neighbourhood. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9538 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-12-01 02:21:33 +00:00
Malcolm Tredinnick 153b5a4a3a Fixed #9723 -- Not all Python distributions contain the bz2 module, so we need to allow for that. Based on a patch from AdamG. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9537 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-12-01 02:20:59 +00:00
Russell Keith-Magee 8e68fc6cd1 Fixed #9717 -- Corrected a problem where django-admin.py flush would attempt to flush database tables that had not yet been created. This occurred when an application had been added to INSTALLED_APPS, but had not yet been synchronized. Thanks to Julien Phalip for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9535 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-11-29 11:51:41 +00:00
Jacob Kaplan-Moss 714490ba51 Fixed a bug introduced by [9527] -- empty/invalid fixtures were no longer being reported. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9531 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-11-24 22:33:18 +00:00
Jacob Kaplan-Moss f4879af2df Fixed a bug introduced by [9527] -- empty/invalid fixtures were no longer being reported. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9528 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-11-24 21:13:33 +00:00
Jacob Kaplan-Moss 089ab18c02 Fixed #4924: added support for loading compressed fixtures. Thanks to Lars Yencken and Jeremy Dunck. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9527 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-11-24 20:42:09 +00:00
Malcolm Tredinnick 2967106274 Fixed #2782 -- Make the server port available through the modpython handler. 
(Originally applied in r3866, reverted in r3927 and now verified as correct).


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9512 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-11-21 12:00:51 +00:00
Malcolm Tredinnick 3e267a695e Fixed #9455 -- Tiny cleanup to avoid an "undefined variable" warning. The net 
effect is the same in any case (bailing out to the global exception catcher).


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9470 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-11-16 09:27:16 +00:00
Russell Keith-Magee b2d2c570b7 Fixed #9011 -- Corrected handling of fixture files that contain errors to correctly report the broken fixture name. Thanks to jlrivitti@gmail.com for the report and initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9357 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-11-06 11:19:13 +00:00
Malcolm Tredinnick e3aa9a2828 Fixed #9383 -- Don't open a network connection for sending email if there's 
nothing to send. Saves a bit of time when, for example, processing 500-error
emails with no ADMINs configured. Based on a patch from Jesse Young.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9248 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-10-24 04:38:43 +00:00
Malcolm Tredinnick 70b6c4c015 Fixed #9233 -- Allow date and message-id headers to be passed in manually in 
email messages. Previously we were creating duplicate headers, which was bad.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9197 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-10-07 12:20:01 +00:00
Malcolm Tredinnick 2ae36375fc Fixed #9224 -- Prevent a crash when certain query strings are sent using 
modpython.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9189 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-10-07 10:39:16 +00:00
Karen Tracey 5d3b222a59 Fixed #9212: Added code to check the xgettext version, and if it is lower than 0.15, undo an incorrect encoding to utf-8 done by xgettext. This bug was fixed in xgettext 0.15, but the most-easily-installed Windows gettext binaries are older (0.13.1), so we work around it. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9155 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-10-06 01:36:35 +00:00
Malcolm Tredinnick 2f188334d3 Fixed #9283 -- Deliberately silence one deprecation warning raised by python 2.6. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9148 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-10-05 11:39:58 +00:00
Russell Keith-Magee 8d98e70e42 Promoted --verbosity to be a top level option for all management commands. Also added -v as a consistent short form of --verbosity. This is mostly to save Malcolm's poor arthritic fingers. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9110 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-10-02 12:57:13 +00:00
Malcolm Tredinnick 37ee86b7ee Fixed another case of reverse URL resolving that wasn't working. 
This is a similar situation to that fixed in r9087. We weren't merging
multiple levels of include() calls together correctly.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9099 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-30 05:52:35 +00:00
Malcolm Tredinnick 15b0158e39 Fixed #9038 -- Correctly handle URL patterns with the same name (or view name), 
declared independently and that differ only by argument signatures.

Patch from Russell Keith-Magee.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9087 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-27 06:14:11 +00:00
James Bennett 5563362c4c Add some docstrings to the base classes for management commands. Refs #9170. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9082 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-22 06:03:24 +00:00
Malcolm Tredinnick 36f8b8d687 Fixed #9014 -- Check that we really are processing a POST before processing 
POST data. Some nice debugging form aaron to track this down.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9064 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-17 09:02:25 +00:00
Adrian Holovaty cc7b0f986a Fixed #8409 -- The runserver now uses conditional GET for admin media files, instead of reloading the files off disk for every request. Thanks for reporting, andylowry 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9055 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-17 05:42:12 +00:00
Adrian Holovaty 26a9ac491c Fixed #8573 -- Fixed bug in 'inspectdb' regarding case-sensitivity of field names. It was automatically lowercasing the column name to create the Field name, which was inaccurate in the case of column names that contained a capital letter. Thanks for reporting and detective work, ramiro 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9053 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-17 05:12:53 +00:00
Adrian Holovaty 883aa6b9c8 Fixed #9092 -- Improved validation of app/project names by startapp/startproject so that it doesn't allow names to start with a number. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9043 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-16 05:39:49 +00:00
Adrian Holovaty 640f198111 Fixed #8978 -- We now print a helpful error message for 'manage.py dbshell' if the client executable is not found. Previously we were displaying a traceback 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8990 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-09 02:18:06 +00:00
Malcolm Tredinnick 7838493b9e Fixed #8726 -- When doing reverse URL resolving, make sure we're consistently 
dealing with unicode strings throughout by promoting up from UTF-8 as necessary.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8777 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-31 22:47:25 +00:00
Malcolm Tredinnick 79968f9867 Fixed #8703 -- Allow deeply nested import paths for DJANGO_SETTINGS_MODULE when 
running django-admin.py. Also adds a parameter to setup_environ() for others to
use as well.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8768 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-31 18:21:06 +00:00
Malcolm Tredinnick a63a83e5d8 A rewrite of the reverse URL parsing: the reverse() call and the "url" template tag. 
This is fully backwards compatible, but it fixes a bunch of little bugs. Thanks
to SmileyChris and Ilya Semenov for some early patches in this area that were
incorporated into this change.

Fixed #2977, #4915, #6934, #7206.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8760 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-31 11:11:20 +00:00
Malcolm Tredinnick 1729d92f71 Fixed #8702 -- Set up the initial locale correctly for the development server. 
Previously, "--noreload" wasn't picking up the default language setting. Thanks
to arien and Karen Tracey for debugging this.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8749 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-30 20:17:58 +00:00
Jacob Kaplan-Moss 15644cb255 Fixed #8622: accessing POST after a POST handling exception no longer throws the server into an infinite loop. Thanks to vung for tracking this one down and fixing it. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8748 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-30 19:56:14 +00:00
Jacob Kaplan-Moss ae953a8c4e Fixed #8673: fixed a missing import in `django.core.files.move`. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8720 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 20:00:55 +00:00
Jacob Kaplan-Moss b5da9e8b2d Fixed #8687, a bad variable name in validation. Thanks, vung. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8697 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 15:45:23 +00:00
Jacob Kaplan-Moss 9f59fc5560 Fixed #8651: correctly deserialize objects with 0 for pk/fk. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8676 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 19:38:56 +00:00
Malcolm Tredinnick 195420259a Fixed #8403 -- Changed the use of fcntl.flock() to fcntl.lockf(). On some 
systems, this will ensure fnctl-based file locking is always used, which means
locking of NFS-mounted files should work.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8675 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 19:28:45 +00:00
Jacob Kaplan-Moss a46d3ebfcc Fixed #8221: added some better `NoReverseMatch` error strings. Thanks, mrts. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8672 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 19:05:14 +00:00
Jacob Kaplan-Moss 3d577febc7 Fixed #7524: allow errors raised during import of a urlconf to bubble up. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8664 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 16:14:13 +00:00
Jacob Kaplan-Moss ff420b4364 Fixed #8454: added a FILE_UPLOAD_PERMISSIONS setting to control the permissoin of files uploaded by the built-in file storage system. Thanks, dcwatson. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8640 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-27 22:21:14 +00:00
Jacob Kaplan-Moss f58217cc02 Fixed #8455: a lack of permissions in `MEDIA_ROOT` no longer causes an infinite loop when saving files. Thanks, carljm. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8639 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-27 21:44:14 +00:00
Jacob Kaplan-Moss c33aeaa082 FIxed #8156: `UploadedFile.__repr__` now returns a string, a good `__repr__` should. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8636 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-27 20:53:02 +00:00
Jacob Kaplan-Moss 615ed20006 Fixed #7769: Added a couple missing file methods to `TemporaryUploadedFile`. Thanks, Mads Sülau Jørgensen. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8634 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-27 20:29:45 +00:00
Gary Wilson Jr c2ba59fc1d Removed oldforms, validators, and related code: 
* Removed `Manipulator`, `AutomaticManipulator`, and related classes.
 * Removed oldforms specific bits from model fields:
   * Removed `validator_list` and `core` arguments from constructors.
   * Removed the methods:
     * `get_manipulator_field_names`
     * `get_manipulator_field_objs`
     * `get_manipulator_fields`
     * `get_manipulator_new_data`
     * `prepare_field_objs_and_params`
     * `get_follow`
   * Renamed `flatten_data` method to `value_to_string` for better alignment with its use by the serialization framework, which was the only remaining code using `flatten_data`.
 * Removed oldforms methods from `django.db.models.Options` class: `get_followed_related_objects`, `get_data_holders`, `get_follow`, and `has_field_type`.
 * Removed oldforms-admin specific options from `django.db.models.fields.related` classes: `num_in_admin`, `min_num_in_admin`, `max_num_in_admin`, `num_extra_on_change`, and `edit_inline`.
 * Serialization framework
   * `Serializer.get_string_value` now calls the model fields' renamed `value_to_string` methods.
   * Removed a special-casing of `models.DateTimeField` in `core.serializers.base.Serializer.get_string_value` that's handled by `django.db.models.fields.DateTimeField.value_to_string`.
 * Removed `django.core.validators`:
   * Moved `ValidationError` exception to `django.core.exceptions`.
   * For the couple places that were using validators, brought over the necessary code to maintain the same functionality.
 * Introduced a SlugField form field for validation and to compliment the SlugField model field (refs #8040).
 * Removed an oldforms-style model creation hack (refs #2160).

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-27 07:19:44 +00:00
Malcolm Tredinnick fcf059d539 Fixed #7084 -- Fixed the "makemessages" command to handle line endings 
correctly on Windows (previous behaviour was to explode when encountering a
multi-line messages). Patch and testing from Ramiro Morales.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8576 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-26 07:43:59 +00:00
Malcolm Tredinnick 948a833eb7 Fixed #8490 -- Worked around a bug in flup 1.0.1 when working out the correct 
path_info setting in the WSGI handler. Thanks, Mike Richardson.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8569 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-26 02:42:39 +00:00
Jacob Kaplan-Moss 7e06b69a3d Removed outdated "adminindex" command -- the same behavior is now far easier and better done in a template, or perhaps a custom `AdminSite.index` function. Refs #5500. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8548 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-25 18:53:18 +00:00