Commit Graph

6408 Commits

Author SHA1 Message Date
Luke Plant 6a25d90e49 Removed totally unused setting.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15941 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-28 22:19:14 +00:00
Alex Gaynor cc3803e147 Remove a license that no long applies to any code, and add a comment for the next person who wants to do some gardening.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15940 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-28 21:27:22 +00:00
Luke Plant 8bb46d8b7c Fixed #15679 - regression in HttpRequest.POST and raw_post_data access.
Thanks to vkryachko for the report.

This also fixes a slight inconsistency with raw_post_data after parsing of a
multipart request, and adds a test for that.  (Previously accessing
raw_post_data would have returned the empty string rather than raising an
Exception).

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15938 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-28 16:11:40 +00:00
Russell Keith-Magee 728770a5f9 Fixed #15702 -- Corrected problem in test suite introduced by Python 2.4 changes from r15927. Thanks to mk for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15937 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-28 14:22:48 +00:00
Alex Gaynor e54c0a0c94 Move the Python 2.5 specific tests out of their own special files now that 2.5 is the default. Also add __futre__ import where necessary.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15935 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-28 05:58:43 +00:00
Adrian Holovaty b4f0c1a775 Removed a Python 2.4 try/except no longer necessary in django.utils.translation.trans_real
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15934 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-28 02:31:31 +00:00
Adrian Holovaty 579eb97961 Simplified sqlite backend ImproperlyConfigured check now that we don't support Python 2.4
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15932 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-28 02:27:05 +00:00
Adrian Holovaty a89ee065a1 Removed no-longer-valid comment about Python 2.3 and 2.4 in formtools/utils.py
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15931 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-28 02:26:15 +00:00
Adrian Holovaty 7cac1ecbd0 Simplified django.utils.feedgenerator.get_tag_uri now that we don't require Python 2.4
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15930 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-28 02:25:26 +00:00
Adrian Holovaty 13864703bc Removed a bunch more Python 2.4 workarounds now that we don't support that version. Refs #15702 -- thanks to jonash for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15927 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-28 02:11:19 +00:00
Adrian Holovaty a87be3554f Removed a bunch of Python 2.4 workarounds now that we don't support it. Refs #15702 -- thanks to jonash for the patch. Splitting this over muliple commits to make it more manageable.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15926 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-28 01:40:43 +00:00
Adrian Holovaty 18ef901e5f Fixed #6636 -- Added template blocks to admin change_form.html template for fieldsets and inline fieldsets. Thanks, peschler and jpichon
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15925 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-28 01:22:05 +00:00
Adrian Holovaty 15295a852f Fixed #15647 -- Changed in_bulk() not to type check its input, which now allows for passing any iterable. Thanks, calvinspealman
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15922 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-26 17:50:10 +00:00
Adrian Holovaty 471c9aee97 Fixed #9158 -- Changed django-admin.py help to be printed to stdout instead of stderr, so that it's more easily greppable. Thanks, petr.marhoun@gmail.com
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15921 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-26 17:45:42 +00:00
Adrian Holovaty 2f9658fc3a Fixed #15672 -- Fixed bug in core/handlers/wsgi.py where we were referring to the 'request' variable before assigning to it. Thanks for the report, vkryachko
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15918 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-26 03:53:37 +00:00
Adrian Holovaty 3e18969bcb Fixed #15635 -- Converted two legacy old-style raise statements. Thanks, DaNmarner
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15917 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-26 03:30:48 +00:00
Adrian Holovaty 8121aa60fd Fixed #15642 -- Removed redundant imports in http/__init__.py. Thanks, jammon
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15916 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-26 03:13:22 +00:00
Karen Tracey 3e7ce3c750 Ensure stdin is a tty before handing it to termios, so as to prevent prolems when running under IDEs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15911 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-24 12:36:33 +00:00
James Bennett 7c08f4c635 Bump everything for 1.3.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15902 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-23 05:06:31 +00:00
Jannis Leidel 2cb2674048 Copied "Norwegian Bokmål (nb)" translation to old "Norwegian (no)" translation for backwards compatibility.
This change slightly extends what was decided in #11068 (to not update the "no" translation due to complicated maintenance, but only "nb"). Thanks, Transifex!

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15887 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-20 22:16:35 +00:00
Jannis Leidel ada8e2a6fa Pulled translation updates from Transifex again.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15886 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-20 22:16:14 +00:00
Jannis Leidel 7c738cd3e8 Fixed #15618 -- Fixed regression introduced in r15848 regarding not properly deleting messages cookies when honoring SESSION_COOKIE_DOMAIN. Thanks, Julien.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15885 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-20 11:27:03 +00:00
Karen Tracey f5b22ed997 Fixed #15565: Ensure terminal echo is on after reloader reloads (something turns it off on some systems if reload happens while at a pdb prompt). Thanks for the report zimnyx.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15883 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-19 22:09:38 +00:00
Ramiro Morales 775a6e694f Fixed #15632 -- Ignore unrelated content in template multi-line comment blocks when looking for tokens that identify comments for translators. Thanks andrew AT ie-grad DOT ru for the report and Claude Paroz for spotting the problem and helping to fix it.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15882 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-19 12:56:38 +00:00
Russell Keith-Magee 1a6d98dab9 Fixed #13686 -- Ensure that memcache handling of unicode values in add() and set_many() is consistent with the handling provided by get() and set(). Thanks to nedbatchelder for the report, and to jbalogh, accuser and Jacob Burch for their work ont the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15880 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-19 02:42:40 +00:00
Jannis Leidel 16ad1d951a Refined exception message to make sure we don't confuse users.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15877 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-18 18:46:48 +00:00
Russell Keith-Magee fa852966c6 Fixed #15368 -- Ensure that raw unittest TestCase instances can be invoked individually by the test runner. Thanks to SmileyChris for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15876 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-18 01:17:48 +00:00
Ramiro Morales 5347bbd514 Fixed plural forms formula for the Croatian (hr) localization by manually overriding the header of affected .po files and re-generating .mo files, this seems to be a quirck in Transifex export to PO functionality. Thanks bmihelac fot the report. Refs #15634.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15875 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-17 22:56:10 +00:00
Adrian Holovaty 6091f0ead3 Fixed #15621 -- Fixed potentially confusing error message in db backend loading. Thanks, keegan_csmith
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15871 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-17 16:57:37 +00:00
Russell Keith-Magee a0878b5f95 Fixed #15627 -- Use constant time comparison for password checks. Thanks to hvdklauw for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15870 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-17 11:51:07 +00:00
Russell Keith-Magee 7ab5ce6cf1 Fixed #15628 -- Made the admin error email more useful when there isn't a request associated with the message. Thanks to hynek for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15869 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-17 10:33:08 +00:00
Russell Keith-Magee 354aa941b6 Fixed #15622 -- Clear content type cache to avoid problems with subsequence TransactionTestCases. Thanks to zyga for the report
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15867 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-17 08:41:25 +00:00
Russell Keith-Magee b49ee91eb3 Fixed #15142 -- Force test views to be non-cached so that projects with caching middleware enabled don't cause test failures. Thanks to jsdalton for the report and patch
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15865 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-17 08:07:40 +00:00
Russell Keith-Magee 1af33427cb Fixed #15623 -- Corrected province codes for Canadian localflavor. Thanks to shelldweller for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15864 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-17 00:59:30 +00:00
Russell Keith-Magee c2ae6b2af7 Fixed #15569 -- Corrected the numbering updates to inlines when rows are added and deleted. Thanks to sbaechler for the report, to Arthur de Jong and mk for the work on the patch, and to Karen Tracey for the last minute testing help.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15862 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-17 00:44:12 +00:00
Justin Bronn d60a8777c1 Add `setUp` and `tearDown` methods to the geographic feed and sitemap tests to ensure `Site` exists for tests.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15856 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-16 18:22:52 +00:00
Justin Bronn 4da019ea19 Fixed #15194 -- Add OSGeo4W DLL library names to GEOS and GDAL interfaces. Thanks, master for ticket and initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15852 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-16 04:44:26 +00:00
Adrian Holovaty ad55bb0f87 Changed django/db/utils.py load_backend() to call sorted() instead of .sort(). Saves us a line of code. Taken from patch for #15621
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15851 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-16 04:26:38 +00:00
Adrian Holovaty 304a50d8ca Fixed #15603 -- Changed the traceback error e-mails not to use HTML by default. It's now configurable with an 'include_html' parameter to AdminEmailHandler. Thanks, kmtracey
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15850 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-16 04:13:57 +00:00
Adrian Holovaty ccc972e750 Fixed #15618 -- CookieStorage storage in messages framework now honors SESSION_COOKIE_DOMAIN. Thanks for the report and patch, lamby
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15848 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-16 03:50:51 +00:00
Adrian Holovaty f71384a52b Fixed #15229 -- Improved URLValidator to accept ftp:// links. Thanks, codefisher and crayz_train
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15847 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-16 03:38:34 +00:00
Justin Bronn ebd5682989 Fixed #15533 -- Now use 3857 as spherical mercator projection instead of deprecated 900913 on platforms that support it. Thanks to cnorthwood for bug report and Christopher Schmidt for OpenLayers JavaScript workaround.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15845 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-16 02:58:35 +00:00
Jannis Leidel 10e1f5d1d2 Refined changes to Polish localization format file made in r13298 and r13327 by using non-breaking space. Refs #13577.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15843 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 22:13:36 +00:00
Jannis Leidel d83cf4066c Fixed mistake introduced in r15838 regarding naming of Mexican Spanish.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15842 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 22:13:29 +00:00
Jannis Leidel b46cbc49c2 Fixed #15608 -- Added Nicaraguan Spanish locale (format file only). Thanks, fitoria.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15841 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 22:13:24 +00:00
Luke Plant 243d0bec19 Fixed #15617 - CSRF referer checking too strict
Thanks to adam for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15840 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:37:09 +00:00
Jannis Leidel ad4118be44 Fixed #15598 -- Updated static URL helper to be no-op on non-local prefixes. Thanks, traff.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15839 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:13:21 +00:00
Jannis Leidel 5050e30507 Fixed #15563 -- Update the LANG_INFO dictionary with newly added translations az, es-mx and ur. Thanks, lasko.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15838 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:13:18 +00:00
Jannis Leidel 1df1f2aa1c Pulled sites translation updates from Transifex.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15837 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:13:13 +00:00
Jannis Leidel d31cf12be1 Pulled sessions translation updates from Transifex.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15836 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:12:38 +00:00
Jannis Leidel 4380fc2832 Pulled redirects translation updates from Transifex.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15835 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:12:07 +00:00
Jannis Leidel 364cf89e06 Pulled messages translation updates from Transifex.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15834 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:11:36 +00:00
Jannis Leidel e5ccf0b9ba Pulled localflavor translation updates from Transifex.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15833 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:11:04 +00:00
Jannis Leidel f193c17979 Pulled humanize translation updates from Transifex.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15832 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:10:24 +00:00
Jannis Leidel 71e6f9b84d Pulled gis translation updates from Transifex.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15831 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:09:41 +00:00
Jannis Leidel 25f975a729 Pulled formtools translation updates from Transifex.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15830 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:09:10 +00:00
Jannis Leidel f7c8ce1d39 Pulled flatpages translation updates from Transifex.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15829 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:08:36 +00:00
Jannis Leidel e950cbf386 Pulled contenttypes translation updates from Transifex.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15828 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:08:06 +00:00
Jannis Leidel 1bbe626033 Pulled comments translation updates from Transifex.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15827 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:07:32 +00:00
Jannis Leidel ffe88a7a6c Pulled auth translation updates from Transifex.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15826 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:06:58 +00:00
Jannis Leidel ddbbb60077 Pulled admindocs translation updates from Transifex.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15825 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:06:26 +00:00
Jannis Leidel 24350e45a3 Pulled admin translation updates from Transifex.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15824 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:05:50 +00:00
Jannis Leidel 0b468d79b0 Pulled core translation updates from Transifex.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15823 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:05:03 +00:00
Russell Keith-Magee 87a100b642 Fixed #15575 -- Corrected handling of pagination in generic views to match documentation and historical behavior. Thanks to Ivan Virabyan for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15820 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 08:24:31 +00:00
Russell Keith-Magee 350a56ad49 Fixed #15606 -- Ensured that boolean fields always use the Boolean filterspec. Thanks to Martin Tiršel for the report
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15817 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 08:19:39 +00:00
Justin Bronn 1fdbcadd22 Fixed #15378 -- Now properly handle OGR layers that have features with invalid geometries. Thanks, kunitoki for bug report and initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15813 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 02:26:37 +00:00
Adrian Holovaty dd3313bf6d Fixed #10654 -- Removed 'Does it have syntax errors' from the ImportError in django/conf/__init__.py. Evidently syntax errors raise a SyntaxError. Thanks, gutworth and alexr
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15812 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-14 23:06:06 +00:00
Adrian Holovaty 4e25bc71b1 Fixed #15609 -- Fixed some 'raise' statements to use the newer style syntax. Thanks, DaNmarner
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15811 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-14 23:00:03 +00:00
Justin Bronn ab7ada16ed Fixed brittle tests that broke with release of GDAL 1.8.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15806 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-14 21:15:34 +00:00
Carl Meyer 7d71a9e45f Fixed #9213 - Added check to prevent inactive users from resetting their password. Thanks to John Scott for report and draft patch, and Evgeny Fadeev for final patch with test.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15805 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-14 21:14:10 +00:00
Jacob Kaplan-Moss fd2f18008c Fixed #14733: no longer "validate" .raw() queries.
Turns out that a lot more than just SELECT can return data, and this list is
very hard to define up front in a cross-database manner. So let's just assume
that anyone using raw() is at least halfway competant and can deal with
the error messages if they don't use a data-returning query.

Thanks to Christophe Pettus for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15803 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-14 19:49:53 +00:00
Karen Tracey f1f10a9ce2 Fixed #15597: When formatting the debug page for inclusion in an e-mail, suppress the note about "seeing this" because DEBUG is True.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15802 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-14 14:58:54 +00:00
Adrian Holovaty e494f88be0 Fixed #15601 -- Corrected a weird typo. Thanks, jMyles
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15800 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-14 05:45:55 +00:00
Adrian Holovaty 72c5733869 Fixed #15604 -- Changed django.db.models.permalink to use wraps() so that it doesn't eat the docstring. Thanks for the report, sfllaw. Also added tests.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15798 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-14 05:22:39 +00:00
Adrian Holovaty 3a5b87cf6d Importing django.forms no longer requires DJANGO_SETTINGS_MODULE. Moved django.db.connections import in django.forms.models to the method where it's used.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15797 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-14 04:42:04 +00:00
Luke Plant e2627d267d Removed an unused code path.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15796 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-10 18:42:33 +00:00
Luke Plant e9d2763947 Fixed #15572 - include with "only" option discards context properties (such as autoescape)
Thanks to dfoerster for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15795 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-10 18:42:24 +00:00
Luke Plant 0a3aae8362 Fixed #15559 - distinct queries introduced by [15607] cause errors with some custom model fields
This patch just reverts [15607] until a more satisfying solution can be
found.

Refs #11707

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15791 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-10 01:15:19 +00:00
Ian Kelly f17fc56602 Fixed a bunch more tests that were failing in Oracle due to false assumptions about the primary keys of objects.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15789 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-09 23:46:28 +00:00
Ian Kelly 23103bddb9 Fixed another case-sensitivity bug in Oracle introspection. This one was harmless, but it was causing an irritating test failure.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15787 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-09 22:45:20 +00:00
Ian Kelly 5a79b55239 Fixed a case-sensitivity bug in Oracle introspection that was preventing inspectdb from identifying foreign keys.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15785 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-09 19:40:44 +00:00
Jannis Leidel f05aab1a43 Modified collectstatic management command to not include STATIC_ROOT in the user prompt since it's misleading when using a non-local storage backend.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15782 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-09 12:34:17 +00:00
Alex Gaynor 6ffe1d1e1f Removed some dead code, and old/bad constructs from the HttpResponse classes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15781 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-09 04:09:47 +00:00
Ian Kelly d9e61a435a Added a skip for a test that fails in Oracle. Unlike other backends, Oracle does not allow duplicate rows where there is a unique_together constraint for which some but not all of the columns are NULL.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15777 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-08 22:41:25 +00:00
Russell Keith-Magee c260c533e1 Fixed #15570 -- Corrected a flaw in the design of the silent flag on {% cycle %}. Thanks to Brian Neal for the report, and to Andrew and Jannis for the design consult.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15773 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-08 13:43:53 +00:00
Chris Beaven c47b69ba53 Fix the docstring of contrib.staticfiles BaseFinder so it's not misleading.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15771 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-07 22:54:55 +00:00
Russell Keith-Magee 7f363eb6dc Fixed #15553 -- Updated Macedonian locale. Thanks to vasiliyeah for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15768 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-07 00:31:48 +00:00
Russell Keith-Magee 6bf1c343ca Fixed #15554 -- Corrected test failure in contenttypes when default site isn't example.com. Thanks to twil for the report, and PaulM for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15766 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-07 00:09:11 +00:00
Russell Keith-Magee 299874cbe1 Fixed #15560 -- Cleaned up some redundant post->put redirections in the class-based generic views. Thanks to maney for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15763 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-06 05:55:12 +00:00
James Bennett 5e9deba988 Bump trunk to 1.3 release candidate status.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15755 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-04 05:27:28 +00:00
Jannis Leidel 90564a156c Fixed Hungarian, Russian, Serbian and Ukranian plural forms introduced in r15680.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15752 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-04 01:07:11 +00:00
Jannis Leidel c11140d04b Fixed plural forms of Irish translation introduced in r15680.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15751 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-04 01:05:10 +00:00
Jannis Leidel 53b2a25396 Fixed plural forms of Welsh translation introduced in r15680.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15750 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-04 01:04:31 +00:00
Jannis Leidel bef353873e Fixed plural forms of Bosnian translation introduced in r15680.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15749 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-04 01:03:14 +00:00
Ramiro Morales 3ecf628b36 Fixed #11206 -- Ensure that the floatformat template filter doesn't switch to scientific notation when asked to format a zero value with more than six decimal places. Thanks Tai Lee for the report and fix and Facundo Batista for his help when Decimal module expertise was needed.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15736 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 20:56:46 +00:00
Ramiro Morales d50f59ee18 Fixed #15543 -- Tweaked change from r15696 to not use 'if' syntax introduce in Python 2.5. Thanks to an anonymous reporter for the heads up.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15731 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 18:42:59 +00:00
Russell Keith-Magee afd040d4d3 Updated test assertions that have been deprecated by the move to unittest2. In summary, this means:
assert_ -> assertTrue
 assertEquals -> assertEqual
 failUnless -> assertTrue

For full details, see http://www.voidspace.org.uk/python/articles/unittest2.shtml#deprecations

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15728 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 15:04:39 +00:00
Russell Keith-Magee b7c41c1fbb Fixed #12252 -- Ensure that queryset unions are commutative. Thanks to benreynwar for the report, and draft patch, and to Karen and Ramiro for the review eyeballs and patch updates.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15726 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 13:51:54 +00:00
Russell Keith-Magee d1290b5b43 Fixed #3094 -- Accelerated deprecation of XMLField, since it hasn't served any useful purpose since oldforms. Thanks to PaulM for driving the issue and providing the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15723 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 13:28:20 +00:00
Jannis Leidel b921f1bac0 Fixed #12475 -- Fixed an edge case with hidden fields in ModelAdmin changelists when used in conjunction with list_display_links or list_editable. Thanks, Simon Meers, Julien Phalip, Karen and master.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15722 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 13:20:45 +00:00