Commit Graph

360 Commits

Author SHA1 Message Date
Alex Gaynor 7f8dd9cbac [1.1.X] Fix a security issue in the auth system. Disclosure and new release forthcoming.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@15036 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-23 03:47:58 +00:00
Russell Keith-Magee bc9708735f [1.1.X] Fixed #13464 -- Reworked module_has_submodule to break the requirement for loader and finder to be the same class. Thanks to Alex Gaynor for the report and patch, and Brett Cannon for suggesting the approach.
Backport of r13082 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13085 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-04 08:15:34 +00:00
Karen Tracey 33f097e50b Python 2.3 compatibility: replaced rsplit with something that works on 2.3.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13030 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-27 13:40:52 +00:00
Russell Keith-Magee a43464d67e [1.1.X] Fixed #13404 -- Reworked module_has_submodule() to allow it to work under AppEngine. Thanks to Waldemar Kornewald for the report and testing help.
Backport of r13023 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13024 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-25 13:23:14 +00:00
Karen Tracey ce8367f1c8 [1.1.X] Fixed #13348: Restored ability to load models from apps in eggs. Thanks Ramiro and metzen for pointers on how to find out if a module loaded from an egg has a particular submodule.
r12982 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12983 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-15 18:49:37 +00:00
Karen Tracey 7d3846a7b8 [1.1.X] Revert r12763 until we figure out what's wrong with it on 1.1.X. Refs #13111.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12776 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-14 00:17:37 +00:00
Russell Keith-Magee 9137c54353 [1.1.X] Fixed #13093 -- Updated some decorators and the decorator_from_middleware function to allow callable classes to be decorated. Thanks to Brian Neal for the report.
Backport of r12762 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12763 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-12 13:31:10 +00:00
Karen Tracey 1b2b3b0dba [1.1.X] Fixed #12302: Modified force_unicode to avoid raising unicode errors when
handed exceptions with non-ASCII bytestring data and no working unicode method
under Python 2.6 and higher.

r12621 and r12622 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12623 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-28 15:29:14 +00:00
Jannis Leidel 079d9f3738 [1.1.X] Fixed #11384 - Make sure translations in the project directory really override translations in apps as specified in the docs.
Backport of r12447.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-26 17:00:11 +00:00
Karen Tracey 6ca3154bcd [1.1.X] Fixed a bunch of Python 2.3 incompatibilities that had crept into the 1.1.X branch.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12595 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-26 05:14:36 +00:00
Joseph Kocherhans 6bf75fd3f5 [1.1.X] Fixed #12119. Changed smart_split to stop splitting on whitespace in quotes. Backport of r12581 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12582 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-24 20:56:09 +00:00
Joseph Kocherhans 16efc1a92e [1.1.X] Fixed #12820. Implemented other dict methods for MergeDict. Backport of [12498] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12501 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 00:08:03 +00:00
Jannis Leidel df1ad561b1 [1.1.X] Fixed #7720 - Fallback to the base language if the sub language given in the language cookie doesn't exist. Thanks, djoume and Ramiro Morales.
Backport of r12442.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12452 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-16 12:52:04 +00:00
Jacob Kaplan-Moss 9f78e4692c [1.1.X] Fixed a couple Python 2.4 incompatibilities. Backport of [12434].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12435 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-14 20:33:32 +00:00
Russell Keith-Magee f30a4b368c [1.1.X] Fixed #12613 -- Added Q and Z to the list of characters supported by the phone2numeric filter. Thanks to gabrielhurley for the report and patch.
Backport of r12425 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12427 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-13 14:43:33 +00:00
Russell Keith-Magee d751f2cade [1.1.X] Fixed #12524 -- Clarified handling of pre-1000AD dates in datetime_safe (and thus, the serializers). Patch includes moving the datetime_safe tests into the utils regressiontests module. Thanks to gsf for the report and initial patch.
Backport of r12423 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12424 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-13 14:06:13 +00:00
Russell Keith-Magee 4a1be98aee [1.1.X] Fixed #8758 -- Corrected handling of tag creation in feeds when the URL contains a port number.
Partial backport of r12338 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12340 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-28 13:59:57 +00:00
Jannis Leidel 3a417736bc [1.1.X] Fixed #12230 - Updated utils.translation.to_locale to support the special sr_Latn locale. Thanks to Janos Guljas.
Backport of r12056.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12251 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-17 23:10:23 +00:00
Luke Plant 3de16688a9 [1.1.X] Fixed #12506 - 'lazy' fails when there are multiple expected classes with the same method
Thanks to Alex for report and patch

Backport of r12104 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12105 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-05 13:20:19 +00:00
Gary Wilson Jr f686075083 [1.1.X] Fixed #12445 -- Added ' (single quote), @ (at sign), and ~ (tilde) to safe characters in `iri_to_uri` function.
Backport of r12066 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12067 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-03 18:07:11 +00:00
Russell Keith-Magee e8b001f46f [1.1.X] Fixed #12476 -- Forced the rollout of generators passed to SortedDict so that the data source can be read twice. Thanks to gsf for the report, and Alex for the patch.
Backport of r12064 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12065 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-03 06:56:10 +00:00
Jacob Kaplan-Moss 321fe61f64 [1.1.X] Fixed #11753 - Q objects with callables no longer explode on Python 2.4. Thanks, Jeremy Dunck.
Backport of [11901].

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11903 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-17 22:11:39 +00:00
Jacob Kaplan-Moss c1a8bd6779 [1.1.X] Fixed #10130: you may now delete attributes on `settings`. Thanks, jcassee.
Backport of r11824.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11825 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 17:53:32 +00:00
Russell Keith-Magee 9275297046 [1.1.X] Fixed #11874 -- Optimizations and cleanups for SortedDict. Thanks to Alex Gaynor and Armin Ronacher for the report and patch.
Backport of r11815 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11816 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 06:02:42 +00:00
Luke Plant aaa9ccfe14 [1.1.X] Fixed #12060 - equality tests between User and SimpleLazyObject-wrapped User failed.
Also added more tests for SimpleLazyObject
  
Thanks to ericholscher for report.

Backport of r11637 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11638 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-20 14:14:27 +00:00
Luke Plant c1b3808ec0 [1.1.X] Fixed #12049 - LazyObject-wrapped User breaks queries in template tags
Thanks to chipx86 for the report and patch.

Backport of r11634 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11635 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-19 21:17:33 +00:00
Luke Plant bc3f59787f [1.1.X] Fixed a regression for Python 2.6 introduced in r11624 on this branch.
Backport of r11625 from trunk.



git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11626 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-15 14:18:52 +00:00
Jacob Kaplan-Moss c33355d86a As long as we're micro-optomizing, do it right -- using map() shaves another dozen or so seconds off the test suite run time.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11495 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-10 22:49:05 +00:00
Jacob Kaplan-Moss 9d1a7c203c Micro-optomization to SortedDict.values(). Yes, it looks silly, but it shaves 30 seconds (5%) off the run time of the test suite.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11494 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-10 22:23:24 +00:00
Karen Tracey 50745cc31e Fixed #11066 -- Corrected 15 duplicate "the"s found in docs and code comments. Thanks kaikuehne.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10801 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-17 16:45:28 +00:00
Jacob Kaplan-Moss 2af75b485d Fixed #10825: fixed the 'U' format code to dateformat (and the date/now filter/tag). Thanks to gsong and mir.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10716 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-08 13:39:37 +00:00
Jacob Kaplan-Moss 60cfd45107 Fixed #10335: handle system locals unknown to Python in timezone name handling. Thanks, mitsuhiko.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10703 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-08 09:51:05 +00:00
Russell Keith-Magee cb43898d49 Fixed #9522 -- Modified handling of values in base serializer so that field subclasses can define their own value_to_string() method for serialization. Thanks to Alex Koshelev for the report and initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10554 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-13 12:35:49 +00:00
Malcolm Tredinnick be4a83c448 Fixed #9315 -- Handle spaces in URL tag arguments.
Thanks Natalia Bidart and Matías Bordese for most of this patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10462 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-10 04:13:27 +00:00
Karen Tracey 668bc4f7be Fixed #10254: Changed the regex in get_valid_filename to allow unicode alphanumerics (thanks gulliver). Also updated the file_uploads test for this case to check the name after saving the uploaded file. As it was the test ensured that files with unicode characters in their names could be uploaded, but it wasn't actually ensuring that the unicode characters were preserved through save.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10388 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-04 17:34:58 +00:00
Jacob Kaplan-Moss 374b02e374 Fixed #10372: made `get_svn_revision()` more robust. Thanks, mboersma.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10377 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-03 20:28:23 +00:00
Jacob Kaplan-Moss c6c25adf6d Fixed a whole bunch of small docs typos, errors, and ommissions.
Fixes #8358, #8396, #8724, #9043, #9128, #9247, #9267, #9267, #9375, #9409, #9414, #9416, #9446, #9454, #9464, #9503, #9518, #9533, #9657, #9658, #9683, #9733, #9771, #9835, #9836, #9837, #9897, #9906, #9912, #9945, #9986, #9992, #10055, #10084, #10091, #10145, #10245, #10257, #10309, #10358, #10359, #10424, #10426, #10508, #10531, #10551, #10635, #10637, #10656, #10658, #10690, #10699, #19528.

Thanks to all the respective authors of those tickets.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10371 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-03 18:30:54 +00:00
Jacob Kaplan-Moss 16c9df0a76 Fixed #10016: the cache middleware no longer vomits when handed long URLs. Thanks, Matt Croydon.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10335 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-01 18:19:32 +00:00
Jacob Kaplan-Moss 184ea1c91f Fixed #8847, #10370: added some missing methods to MultiValueDict after [8399]. Thanks, James Turk and rfk.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10241 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-31 06:30:07 +00:00
Jacob Kaplan-Moss 9ae873fcd8 Fixed #10184: QueryDicts with multiple values can now be safely pickled. Thanks, Alex Gaynor.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10240 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-31 05:14:13 +00:00
Jacob Kaplan-Moss c8ad87c2dc Fixed #9883: no longer do strange things with whitespace in the linebreaks filter. Thanks, keithb.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10225 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-30 22:39:13 +00:00
Jacob Kaplan-Moss 657eefbf25 Fixed #10387: removed some code duplication in django.utils.cache. Thanks, Travis Swicegood.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10223 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-30 22:37:59 +00:00
Gary Wilson Jr 3e7f5131a5 Fixed #9065 -- Fixed the `timesince` and `timeuntil` template tags to work when both values involved are date objects, thanks to morty and mboersma for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10215 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-30 21:32:34 +00:00
Justin Bronn 9b00b87cf2 Fixed #10655 -- Who uses 5-space indentation anyways? Thanks to Andrew Badr for the ticket & patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10186 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-30 03:03:37 +00:00
Malcolm Tredinnick a6f429e37e Added consistent support for double- and single-quote delimiters in templates.
Some template filters and tags understood single-quoted arguments, others
didn't. This makes everything consistent. Based on a patch from akaihola.

Fixed #7295.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10118 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-23 09:40:25 +00:00
Malcolm Tredinnick b203db6ec8 Fixed #5791 -- Added early-bailout support for views (ETags and Last-modified).
This provides support for views that can have their ETag and/or Last-modified
values computed much more quickly than the view itself. Supports all HTTP
verbs (not just GET).

Documentation and tests need a little more fleshing out (I'm not happy with the
documentation at the moment, since it's a bit backwards), but the functionality
is correct.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10114 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-22 07:58:29 +00:00
Malcolm Tredinnick e3139cc075 More typo fixing. :-(
I'm crawling into my hole now.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10098 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-20 00:58:35 +00:00
Malcolm Tredinnick 380f6be5b8 Whoops. I left some debugging printing in r10096. Nothing to see here.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10097 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-20 00:56:56 +00:00
Malcolm Tredinnick 19290ed051 Fixed database backend creation for Python 2.3.
Previously on "things we changed in the recent past".... the database
connection setup was changed. People were happy. Except for those
running on Python 2.3.

We had completely broken Django on Python 2.3. Turns out, this is due to
a long-standing bug in the _threading_local module that interacts with
object creation in 2.3.

Interestingly, although the bug remains in Python 2.4 and 2.5, they
don't trip over it for reasons I don't entirely understand at the
moment.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10096 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-20 00:51:54 +00:00
Jacob Kaplan-Moss c485e236bd Fixed #8193: all dynamic imports in Django are now done correctly. I know this because Brett Cannon borrowed the time machine and brought Python 2.7's '`importlib` back for inclusion in Django. Thanks for the patch-from-the-future, Brett!
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10088 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-18 16:55:59 +00:00