mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-27 03:25:58 +00:00
Code Issues 27 Releases Wiki Activity
11,610 Commits 28 Branches 426 Tags 668 MiB
40b248acc7
Commit Graph

2377 Commits

Author SHA1 Message Date
Aymeric Augustin
33a52cde08 Fixed #16040 -- Preserved scheme, host and port in the test client when following a redirect. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17157 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-27 20:04:13 +00:00
Aymeric Augustin
bda21e2b9d Fixed #11555 -- Made SessionBase.session_key read-only. Cleaned up code slightly. Refs #13478. 
This also removes the implicit initialization of the session key on the first access in favor of explicit initialization.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@17155 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-27 17:52:24 +00:00
Aymeric Augustin
02bc523b89 Renamed the fixtures used by the aggregation tests so they're only loaded by the tests that use them. Refs #17275. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17153 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-27 10:31:26 +00:00
Carl Meyer
1086a9a845 Fixed #17287 -- Prevented LocMemCache.incr/decr from changing key expiry time. Thanks Ivan Virabyan for report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17151 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-26 22:27:16 +00:00
Julien Phalip
a89b156284 Disentangled some parts of the admin ChangeList and ListFilter's internals. With this refactoring, the query string lookups are now processed once instead of twice and some bugs (in particular the SimpleListFilter parameter name being mistaken for a model field in some cases) are avoided. 
Refs #17091.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17145 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-22 12:26:17 +00:00
Julien Phalip
8ddecc39db Fixed #17252 -- Fixed a minor regression introduced by the work in #11868, where the default sorted columns wouldn't correctly be visually represented in the changelist table headers if those columns referred to non model fields. Thanks to sebastian for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17143 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-22 09:14:09 +00:00
Aymeric Augustin
c5a899b190 Fixed #16787 -- Restored the ability to {% load %} template tags libraries within packages. Thanks Ivan Sagalaev for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17133 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-21 10:28:12 +00:00
Aymeric Augustin
19e54084dc Fixed #17114 -- Handled integer values 0 and 1 for checkboxes like other integer values, not like False and True. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17132 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-21 10:11:06 +00:00
Aymeric Augustin
0a272e4201 Fixed #17268 -- Two failures in the cache tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17131 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-21 07:08:39 +00:00
Aymeric Augustin
78a2719def Tweaked the skipping condition for the test introduced in r17128 so that it works on non-PostgreSQL backends. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17129 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-20 20:43:59 +00:00
Aymeric Augustin
74b836abf5 Fixed #17062 -- Ensured that the effect of SET TIME ZONE isn't lost when the first transation is rolled back under PostgreSQL. Thanks Anssi for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17128 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-20 16:12:33 +00:00
Julien Phalip
5c9901323e Fixed #12073 -- Made AdminDateWidget and AdminTimeWidget consider user-supplied attrs. Thanks to elliss for the report and to koenb for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17125 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-20 11:12:37 +00:00
Aymeric Augustin
7075e93256 Made the database cache backend, which bypasses the ORM, compatible with time zone support. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17119 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-20 10:17:12 +00:00
Aymeric Augustin
d0eb4693ab Fixed #15255 -- Ensured createcachetable honors database routers. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17114 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-19 19:56:31 +00:00
Aymeric Augustin
40b9532668 Fixed #16753 -- Supported network-path references in the syndication framework. Thanks cato for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17108 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-18 22:54:24 +00:00
Aymeric Augustin
9b1cb755a2 Added support for time zones. Thanks Luke Plant for the review. Fixed #2626. 
For more information on this project, see this thread:
http://groups.google.com/group/django-developers/browse_thread/thread/cf0423bbb85b1bbf



git-svn-id: http://code.djangoproject.com/svn/django/trunk@17106 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-18 13:01:06 +00:00
Jannis Leidel
773d91ead2 Fixed #17128 -- Fixed a Python 2.5 incompatibility. Thanks, Simon Meers. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17102 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-17 21:30:07 +00:00
Julien Phalip
a6ccc8cc06 Fixed #15912 -- Ensured that forms.CharField.widget_attrs() always returns a dictionary. Thanks to tsabi and rubyruy for the report and to mmcnickle and prestontimmons for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17096 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-15 09:36:08 +00:00
Karen Tracey
5de31cb8cb Refs #17215: Avoid generating 47 leftover tmp dirs during a clean test run. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17094 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-13 19:05:02 +00:00
Karen Tracey
b8353016b7 Fixed #13640: Avoid generating an exception when a model has an attribute named 'evaluate'. Thanks LukaszKorzybski and tobias. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17093 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-13 15:09:08 +00:00
Karen Tracey
0db571b417 Fixed #17134: Corrected Python 2.5 fallback code for parsing microseconds in time values. Thanks aaugustin and jcd. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17092 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-13 00:43:02 +00:00
Julien Phalip
b45099eefb Fixed #17190 -- Ensured that the NullBooleanSelect widget's options get lazily localized. Thanks to pennersr for the report and to kenth for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17091 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-12 23:07:51 +00:00
Karen Tracey
efe4e2e517 Fix #16570: Restore ability to have decimal fields where max_digits equals decimal_places. Thanks dcwatson and kenth. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17089 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-12 19:53:56 +00:00
Julien Phalip
c3df840c20 Fixed #16903 -- Added --no-location option to the makemessages command to not write '#: filename:line' comment lines in language files. Thanks to alpar for the suggestion and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17081 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-11 13:07:14 +00:00
Julien Phalip
9d410ee64b Fixed #17197 -- Prevented a locale leakage from an i18n test causing collateral failures in the rest of the test suite. Thanks to Florian Apolloner for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17080 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-11 12:25:53 +00:00
Julien Phalip
90d3697417 Fixed #17125 -- Made it possible to change a RegexField's regular expression validator after it has been initialized. Thanks to Claude Paroz for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17076 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-07 07:41:24 +00:00
Chris Beaven
b745fc0f4b Fixes #17173 -- Added some extra regression tests for reversing namespaced urls with special characters 
The actual code was already fixed between 1.3.1 and trunk, but more thorough tests are always a good thing. Thanks for the patch, Yann Kaiser.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17075 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-07 01:09:13 +00:00
Julien Phalip
b2948d8179 Fixed #17165 -- Fixed SelectDateWidget._has_changed() to work correctly with a localized date format. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17071 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-06 00:31:06 +00:00
Jannis Leidel
a82488bf4b Fixed #16966 -- Stopped CachedStaticFilesStorage from choking on querystrings and path fragments. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17068 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-03 10:51:02 +00:00
Jannis Leidel
0e2c543979 Fixed #16967 -- Made sure CachedStaticFilesStorage repopulates its cache if there was a miss (for example if the cache server went down). 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17067 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-02 17:45:32 +00:00
Aymeric Augustin
af1893c4ff Made the cache locale-dependant when USE_L10N is True, even if USE_I18N is False. Refs #5691. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17061 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-01 14:02:31 +00:00
Julien Phalip
977316e0cb Fixed #16816 -- Tweaked the test mock for URLField.verify_exists to allow tests to pass when there is no Internet connection available. Many thanks to Ramiro Morales, Aymeric Augustin and Florian Apolloner for the patch reviews. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17059 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-31 11:09:10 +00:00
Aymeric Augustin
d17bc72880 Fixed #17135 -- Made it possible to use decorators (like stringfilter) on template filter functions in combination with auto-escaping. Refs #16726. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17056 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-30 07:32:21 +00:00
Ramiro Morales
bebbc9e4a5 Made a couple of changes for readability and correctness in loaddata. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17055 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-29 22:32:28 +00:00
Aymeric Augustin
0a1a9b71fa Made the defaultfilters tests run on the actual filters, not on functions imported from django.utils. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17054 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-29 15:28:44 +00:00
Ramiro Morales
345be05622 Enhanced loaddata error message printed when no DB fixture is provided. 
Fixes #7043 by fixing the last code path where a misleading 'No fixtures found.' error message was being shown.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17051 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-29 14:47:45 +00:00
Ramiro Morales
24f3c06e4a More django.conf.urls.defaults removals. Refs #17132 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17049 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-29 12:24:44 +00:00
Carl Meyer
7a718f0f3a Fixed #17127 -- Made field validators list independent per form instance. Thanks claudep for report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17046 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-28 14:38:41 +00:00
Aymeric Augustin
a693bbe0ac Fixed a test isolation problem that remained after r17042. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17043 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-27 06:17:24 +00:00
Aymeric Augustin
0cf139d201 Fixed several problems that hid one another in the cache tests and code. 
1 - Used django.test.TestCase instead of unittest.TestCase so that the override_settings decorator works.
2 - Reverted parts of r17039 that caused failures (masked until 1).
3 - Isolated tests by clearing the cache in tear down (masked until 1). Refs #11505.
4 - Fixed a bug in cache key generation (revealed by 3).
5 - Fixed a test that relied on this bug -- hardcoding the generated cache keys in tests isn't a very good idea anyway.
6 - Uniformized some parts of the cache tests.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@17042 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-26 22:47:04 +00:00
Carl Meyer
233cdcf424 Fixed error message string assumptions in WSGI tests (were breaking tests on PyPy). Thanks to Alex Gaynor for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17041 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-26 21:07:12 +00:00
Aymeric Augustin
4cfb7632e0 Removed remains from times when tests could be run outside of runtests.py. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17040 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-26 21:03:18 +00:00
Aymeric Augustin
4819797f70 Improved settings manipulation in the cache tests with the suitable decorators and context managers. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17039 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-26 20:55:36 +00:00
Julien Phalip
9796f69533 Fixed #16257 -- Added new ModelAdmin.get_list_display_links() method to allow for the dynamic display of links on the admin changelist. Thanks to graveyboat for the suggestion and initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17037 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-26 12:19:18 +00:00
Julien Phalip
600c576ac5 Fixed #17090 -- Made the API specification for ModelAdmin.get_list_display() more consistent with that of ModelAdmin.list_display by separating out the admin action check boxes business. This is backwards-incompatible for those who have been using the still-unreleased get_list_display() method. Thanks to Ramiro Morales for the review. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17035 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-26 09:37:07 +00:00
Julien Phalip
4d79083453 Fixed #17111 -- Made the redirect_to generic view properly handle query strings with percent symbols. Thanks, Chris Adams. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17034 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-26 06:33:13 +00:00
Julien Phalip
2e2689c7c0 Fixed #15938 -- Prevented the max_length number in the admin prepopulated_fields javascript to be localized when USE_THOUSAND_SEPARATOR is turned on. Thanks to Lev Maximov, Mathieu Agopian and feel. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17033 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-26 05:33:17 +00:00
Aymeric Augustin
965c5d7cce Fixed #14202 -- made the atom:link element optional in feeds. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17029 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-23 15:19:09 +00:00
Julien Phalip
4f00a2d316 Fixed #15826 -- Made assertContains and assertNotContains work with SimpleTemplateResponse by forcing it to be rendered if it hasn't been rendered yet. Thanks to bmihelac for the report, to mmcnickle for the initial patch and tests, and to Carl Meyer for the guidance. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17025 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-22 09:15:50 +00:00
Carl Meyer
145a77edc9 Fixed #16360 -- Added WSGI entrypoint to startproject layout, and enabled internal servers (runserver and runfcgi) to use an externally-defined WSGI application. Thanks to Armin Ronacher, Jannis Leidel, Alex Gaynor, ptone, and Jacob Kaplan-Moss. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17022 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-22 04:30:10 +00:00
Julien Phalip
1452cecd15 Fixed 16938 -- Ensured that the active locale's formats take precedence over the default settings even if they would be interpreted as False in a conditional test (e.g. 0 or empty string). Thanks to pikerr for the report and initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17017 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-20 12:14:06 +00:00
Julien Phalip
26698bc851 Fixed #14806 -- Added support for contextual translations to the trans and blocktrans template tags. Thanks to jtiai for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17015 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-19 04:59:47 +00:00
Aymeric Augustin
2bc77be12e Fixed #17054 -- Ensured the test suite runs when gettext isn't available, after r16981. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17013 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-18 20:35:42 +00:00
Aymeric Augustin
14d24eb438 Fixed #17067 -- reverted some backwards-incompatible changes from r16933 and added tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17010 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-18 16:42:32 +00:00
Ramiro Morales
ab72e6bdd1 Tweaked a tests tweak from r16960 so it uses the right model. 
When testing for permission enforcement in the admin for m2m
relationships we were erroneously using the ID of the related model
instead of using the ID of the corresponding automatically created
intermediate model. This manifested as a failure under Oracle but can
fail with any backend if the IDs of both models diverge.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17001 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-17 02:11:12 +00:00
Ramiro Morales
d48510cc6b Tweaked admin_scripts tests enhanced in r16964 a bit more so they don't fail with Oracle. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16999 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-17 00:34:42 +00:00
Ramiro Morales
5f2be4ecbb Fixed #17056 -- Tweaked insert SQL clause generation so a corner case doesn't fail with Oracle. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16997 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-16 20:06:59 +00:00
Aymeric Augustin
8fb7a90026 Fixed multiple database tests that broke foreign keys constraints. Refs #17055. 
The problem was masked by the rollback at the end of each transactional test on backends that deferred constraints checks; it appeared only on MySQL + InnoDB.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@16995 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-16 11:04:34 +00:00
Aymeric Augustin
03316579f4 Fixed a test that depended on how identifiers are quoted by the database backend and broke under MySQL. Refs #17055. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16994 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-16 09:51:22 +00:00
Julien Phalip
93a581431a Fixed #15221 -- Made the admin filters on foreign key and m2m relationships display the related field's verbose name instead of that of the related model. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16991 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-16 06:42:50 +00:00
Aymeric Augustin
22d738c2dc Ensured that the feeds framework supports both datetimes and dates. Refs #4076. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16989 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-15 10:16:24 +00:00
Alex Gaynor
69e1e6187a Switch several assertNumQueries to use the context manager, which is much more beautiful. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16986 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-14 17:03:08 +00:00
Alex Gaynor
6c91521902 Remove the usage of deprecated function in Django. Also simplify the fallback code. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16985 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-14 00:20:50 +00:00
Alex Gaynor
5109ac3709 Fix a Python 2.5-ism. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16982 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-13 21:44:58 +00:00
Alex Gaynor
8c0eefd066 Convert the remainder of the relative imports in the tests to be absolute imports. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16981 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-13 21:34:56 +00:00
Aymeric Augustin
f830166167 Fixed #16899 -- Backported the fix for http://bugs.python.org/issue9063 and added a test. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16980 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-13 21:19:48 +00:00
Aymeric Augustin
06d9b82a27 Fixed #16906 -- Format datetimes with str/unicode instead of strftime where possible: it's faster and it works for all dates. 
Also ensured that datetime_safe is used wherever strftime is called on dates/datetimes that may be before 1900.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@16978 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-13 19:23:45 +00:00
Alex Gaynor
b7845768cb Fix the dispatch tests on python 2.5 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16977 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-13 19:18:27 +00:00
Alex Gaynor
d362c1546f Convert much of the regression tests to use absolute imports. There's still work to be done though. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16976 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-13 18:51:33 +00:00
Julien Phalip
99512d3544 Fixed #16918 -- Ensured that custom querysets are used when provided to BaseDateDetailView.get_object(). Thanks to mitar for the report, to koenb for the patch and to Preston Holmes for the review. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16974 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-13 13:38:38 +00:00
Alex Gaynor
43920cd32e Remove a handful of import * from the tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16973 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-13 12:53:02 +00:00
Carl Meyer
38f1fe3b35 Fixed #15372 -- Switched to a startproject default layout that allows us to avoid sys.path hacks. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16964 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-13 05:56:15 +00:00
Carl Meyer
8b801a7553 Fixed some tests from r16934 to be auto-id-independent. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16960 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-11 21:55:45 +00:00
Julien Phalip
17659adf93 Fixed #16371 -- Added a prefix "field-" to all CSS class names automatically generated from field names in admin forms to avoid conflicts with other common class names (e.g. "button"). This is backwards-incompatible for those who previously used plain field names as selector in custom style sheets or javascript transformations. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16953 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-10 12:35:06 +00:00
Julien Phalip
095dbe8804 Made the tests introduced in r16942 use old-style class decoration to run with Python < 2.6. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16943 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-08 11:36:05 +00:00
Carl Meyer
b6ad1afa68 Fixed #17011 - Made override_settings modify a decorated class in-place rather than creating a dynamic subclass, so as to avoid infinite recursion when used with super(). Thanks jsdalton for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16942 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-08 08:16:17 +00:00
Carl Meyer
b1b1da1eac Fixed #8060 - Added permissions-checking for admin inlines. Thanks p.patruno for report and Stephan Jaensch for work on the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16934 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-07 00:41:25 +00:00
Aymeric Augustin
e2f9c11736 Fixed #16705 - Made the test client adhere to the WSGI spec -- in particular, removed the assumption that environ['QUERY_STRING'] exists. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16933 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-06 20:39:15 +00:00
Ramiro Morales
0d9b6a5bc4 Fixed #10841 -- Switched response served when DEBUG=True and request.is_ajax() returns True (indicating request has been generated by a JS library) to a plain text version for easier debugging. 
Contents of this response are similar to its HTML counterpart modulo frame variables values in the Python traceback section.

Thanks to Riz for the report, to SmileyChris for the patch and to Julien for reviewing.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16921 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-02 02:53:58 +00:00
Luke Plant
10d90cba83 Fixed #16935 - misleading message if AttributeError escapes during SimpleTemplateResponse.render 
Thanks to isagalaev for the report.

As discussed on django-devs, this reverts some of the changes in [16568]
i.e.  the addition of `SimpleTemplateResponse.__getattr__`, because this
makes it much harder to debug the common case of an AttributeError somewhere
during the rendering of a SimpleTemplateResponse.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16917 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-30 11:46:23 +00:00
Luke Plant
5009e45dfe Fixed #14270 - related manager classes should be cached 
Thanks to Alex Gaynor for the report and initial patch, and mrmachine for
more work on it.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16916 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-30 10:41:25 +00:00
Jannis Leidel
2eadc418af Fixed doc references to django.db.models.query.QuerySet and converted some tabs that were introduced in r16699 to spaces. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16915 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-30 10:28:39 +00:00
Julien Phalip
8137027fd7 Fixed #13956 -- Enabled *args and **kwargs support for simple_tag, inclusion_tag and assignment_tag. Many thanks to Stephen Burrows for the report and initial patch, to Gregor Müllegger for the initial tests, to SamBull for the suggestions, and to Jannis Leidel for the review and PEP8 cleanup. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16908 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-27 12:15:15 +00:00
Alex Gaynor
11c1e61b99 Fixed #16925 -- Make sure a signal is disconnected if the test fails. Thanks to aaugustin for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16905 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-26 10:11:18 +00:00
Ramiro Morales
3ef1762cb9 Fixed #16924 -- Corrected date template filter handling of negative (West of UTC) timezone offsets. 
The 'O' format specifier output was incorrect. Thanks mrgriscom and Aymeric Augustin.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16903 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-25 17:08:31 +00:00
Jannis Leidel
6cae2a550d Fixed #16878 -- Improved intword filter to support numbers up to decillion and googol. Thanks to crodjer for the initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16897 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-23 16:45:40 +00:00
Jannis Leidel
66dc22c2d9 Fixed #16909 -- Pass language to get_format_modules when calling it from get_format to make sure the correct module is returned. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16884 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-22 15:04:27 +00:00
Paul McMillan
0781ed8ec8 Fixed #16837 -- Improved error message for admin login. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16872 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-22 04:16:21 +00:00
Jannis Leidel
c4cc875643 Fixed #16703 -- Raise an exception if the storage location of the DefaultStorageFinder is empty. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16863 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-21 15:58:32 +00:00
Jannis Leidel
eb5df8e98d Fixed the relative static file resolution of the CachedStaticFilesStorage backend and the post processing of deeply nested static files. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16862 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-21 15:58:21 +00:00
Carl Meyer
75199e8f6d Fixed #16866 -- Clearer error message if empty list is passed to select_template. Thanks Silver_Ghost for report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16861 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-21 14:20:18 +00:00
Carl Meyer
09a01435de Fixed #16838 -- Corrected broken add-another inline JS in admin with related_name="+". Thanks jamesp for report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16860 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-21 14:00:58 +00:00
Ramiro Morales
aaf77c1676 Converted internal link generation in the admin and admin document generator to use named URLs. 
Thanks to Florian Apolloner for both the initial patch and his final push to get
this fixed, to Dario Ocles for his great work on the admin templates and
switching the admin_doc application to also use named URLs, to Mikko Hellsing
for his comments and to Jannis and Julien for their review and design guidance.

Fixes #15294.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16857 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-20 18:30:06 +00:00
Ramiro Morales
7b21bfc074 Improved test isolation of the admin tests and assigned custom admin sites to 
prevent test order dependant failures.

This involves introducing usage of `TestCase.urls` and implementing proper
admin.py modules for some of the test apps.

Thanks Florian Apolloner for finding the issue and contributing the patch.

Refs #15294 (it solves these problems so the fix for that ticket we are going
to commit doesn't introduce obscure and hard to reproduce test failures when
running the Django test suite.)

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16856 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-20 18:16:49 +00:00
Julien Phalip
436aeb6e15 Fixed #16676 -- Corrected the behavior of the 'add' template filter to return an empty string instead of the given value unchanged in the case of an invalid use. Thanks to dtrebbien for the report and to Aymeric Augustin for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16851 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-18 08:33:39 +00:00
Chris Beaven
e63fa0ff83 Fixes #8103 -- Select widget should only allow for one selected option 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16848 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-18 04:09:44 +00:00
Carl Meyer
343004c4de Fixed #16568 -- Added RequireDebugFalse filter to prevent sending 500 error emails when DEBUG is True in projects with no explicit LOGGING setting. Thanks to Andreas Pelme for report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16840 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-16 16:41:38 +00:00
Carl Meyer
f9dad46d36 Fixed #16803 -- Use model verbose_name directly as ContentType unicode representation so it can be translated. Thanks to bronger for the report and Ivan Sagalaev for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16839 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-16 11:57:03 +00:00
Carl Meyer
4397c587a4 Fixed #16770 -- Eliminated TemplateSyntaxError wrapping of exceptions. Thanks to Justin Myles-Holmes for report and draft patch. 
Exceptions raised in templates were previously wrapped in TemplateSyntaxError
(in TEMPLATE_DEBUG mode only) in order to provide template source details on
the debug 500 page. The same debug information is now provided by annotating
exceptions rather than wrapping them. This makes catching exceptions raised
from templates more sane, as it's consistent in or out of DEBUG, and you can
catch the specific exception(s) you care about rather than having to also catch
TemplateSyntaxError and unwrap it.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16833 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-16 01:16:25 +00:00
Paul McMillan
50255e3305 Fixed #16494 by normalizing HttpResponse behavior with non-string input. HttpResponse now always converts content to string on output, regardless of input type. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16829 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-14 23:27:35 +00:00
Jannis Leidel
f3ae496201 Fixed #16833 -- Removed undocumented mixin parameter from the Storage.open() method as this was an undocumented and obscure feature. Thanks to Marty and Russell for sanity-checking. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16824 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-13 15:10:49 +00:00
Ramiro Morales
26b8122087 Fixed #14675 -- Completed removal of from django.conf.urls.default import * usage. 
This applies to both our own [test] code and documentation examples. Also:
 * Moved the functions and handlers from `django.conf.urls.defaults` up to
   `django.conf.urls` deprecating the former module.
 * Added documentation for `handler403`.
 * Tweaked the URLs topic document a bit.

Thanks to pupeno and cdestigter for their great work contributing patches.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16818 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-11 22:36:16 +00:00
Alex Gaynor
b45a4acf6f Ensure bulk_create returns the right value if the argument is an empty list. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16792 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-10 21:46:59 +00:00
Alex Gaynor
f2bc919ec0 Ensure bulk_create returns what it is supposed to. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16791 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-10 21:44:57 +00:00
Russell Keith-Magee
fcee0c1b66 Fixed #16809 -- Forced MySQL to behave like a database. This avoids a problem where queries that do IS NONE checks can return the wrong result the first time they are executed if there is a recently inserted row. Thanks to James Pyrich for the debug work and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16785 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-10 18:58:30 +00:00
Alex Gaynor
efb8327444 Fixed #16808, removed some dead code from teh ORM. Thanks to aaugustin for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16782 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-10 17:38:58 +00:00
Alex Gaynor
67dde2f52f Fixed #16162. Added timeout arg to DummyCache.set_many, for compatiblity with other caches. Thanks to aaugustin for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16778 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-10 17:09:23 +00:00
Alex Gaynor
d14bf8c62b Fixed #11404. Added `FormSet.has_changed, for consistancy with Form.has_changed`. Thanks to michelts for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16773 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-10 02:42:05 +00:00
Alex Gaynor
01b0eb50fd Make `Formset.__getitem__ O(1), rather than O(n). If you override __iter__ you now need to also override __getitem__` for consistant behavior. Thanks to Carl and Russ for the review. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16770 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-10 01:53:56 +00:00
Russell Keith-Magee
5f287f75f2 Altered the behavior of URLField to avoid a potential DOS vector, and to avoid potential leakage of local filesystem data. A security announcement will be made shortly. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16760 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-10 00:47:00 +00:00
Russell Keith-Magee
893cea211a Added protection against spoofing of X_FORWARDED_HOST headers. A security announcement will be made shortly. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16758 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-10 00:46:38 +00:00
Karen Tracey
e061b036a5 Fixed #15722: ensure formsets evaluate to True even if they have no forms. Thanks mlavin. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16756 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-10 00:05:48 +00:00
Russell Keith-Magee
228654d17f Added two pointless query repeats to work around a known issue with MySQL that was causing failures in our test suite. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16753 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-09 23:02:33 +00:00
Chris Beaven
470c70f876 Fixes #16664 -- URLField's to_python method fails with ValueError on some urls on python 2.7. Based on patch by zigzag. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16752 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-09 22:57:12 +00:00
Chris Beaven
fe88584589 Fix and test for cleaning a non-string value in a URLField 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16747 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-09 22:32:38 +00:00
Alex Gaynor
7deb25b8dd Fixed #7596. Added Model.objects.bulk_create, and make use of it in several places. This provides a performance benefit when inserting multiple objects. THanks to Russ for the review, and Simon Meers for the MySQl implementation. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16739 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-09 19:22:28 +00:00
Jannis Leidel
e55bbf4c3c Fixed #15237 -- Fixed a typo in specifying UTF-8 encoding in the feed generator and signing tests. Thanks, Aymeric Augustin. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16738 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-09 18:34:33 +00:00
Jannis Leidel
8258fe7845 Fixed #16042 -- Use the content types caching in the comments contrib app. Thanks, ptone, Julien Phalip and Thejaswi Puthraya. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16737 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-09 18:34:24 +00:00
Karen Tracey
64e16c094b Add a test for the intcomma regression described in #16404/#16562, fixed in r16726. Refs #16404. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16736 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-09 17:57:45 +00:00
Russell Keith-Magee
dc3b2a0fdf Fixed #16780 -- Removed a timing sensitive test from the template test suite. Thanks to Alex for the lend of his eyeballs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16735 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-09 17:54:04 +00:00
Jannis Leidel
387e192f25 Fixed #16721 -- Made sure that blocktrans correctly handles percents (%), even in the plural block. Thanks for the initial patch, Claude Paroz. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16730 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-08 13:25:41 +00:00
Jannis Leidel
7cb140e6d8 Fixed #16003 -- Restored compatibility of the admin when using USE_ETAGS. Thanks for the initial patch, pterk. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16729 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-08 13:25:31 +00:00
Jannis Leidel
2189a8e50a Fixed #16686 -- Reduced time to wait for cache expiration in a test to alleviate race-condition-y effects. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16728 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-08 13:25:24 +00:00
Jannis Leidel
cf70c96ce0 Fixed #15997 -- Added list_max_show_all option to ModelAdmin in replacement for a global module level variable. Thanks, jsdalton. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16725 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-08 13:25:00 +00:00
Jannis Leidel
16bb9c594c Fixed #16516 -- Relaxed the blocktrans rendering a little by falling back to the default language if resolving one of the arguments fails, raising a KeyError. Thanks, Claude Paroz and Aymeric Augustin. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16723 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-08 13:24:41 +00:00
Ramiro Morales
2b4341d532 Also copy __module__ to our dynamically created TestCase subclass when override_settings acts as a class decorator. 
Otherwise, an error in e.g. a test in tests/modeltests/proxy_model_inheritance/tests.py
was being reported as:

ERROR: test_table_exists (django.test.utils.ProxyModelInheritanceTests)

Refs #16672 and [16650].

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16722 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-04 22:51:53 +00:00
Julien Phalip
de35a3ab14 Fixed #16736 -- Enabled the merging of user-supplied arguments to format the error emails' subject in AdminEmailHandler. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16715 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-02 03:04:02 +00:00
Jannis Leidel
3256862f5f Fixed #16717 -- Added ability to store result of trans template tag in context variable. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16712 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-30 12:09:45 +00:00
Julien Phalip
6757568bfa Fixed #16202 -- Added a Slovenian localflavor. Thanks to Jure Cuhalev < gandalf@owca.info>, Gasper Zejn and Domen Kozar for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16706 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-28 13:51:28 +00:00
Julien Phalip
93fbb77d9b Fixed #16716 -- Fixed two small regressions in the development version introduced in r16144 where the changelist crashed with a 500 error instead of nicely operating a 302 redirection back to the changelist. 
The two specific cases were:

* a lookup through a non-existing field and apparently spanning multiple relationships (e.g. "?nonexistant__whatever=xxxx").
* a proper list_filter's queryset failing with an exception. In Django 1.3 the queryset was only directly manipulated by the changelist, whereas in 1.4 the list_filters may manipulate the queryset themselves. The fix here implies catching potential failures from the list_filters too.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16705 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-28 07:57:56 +00:00
Julien Phalip
ce477f0873 Repaired an admin list_filter test that wasn't testing anything special. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16704 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-28 06:49:29 +00:00
Chris Beaven
0f8f46802a Fixed #15525 -- Custom template tags loading breaks whenever templatetags is a python file 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16703 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-28 02:37:16 +00:00
Julien Phalip
3e65f9633b Further improved on the work done in r16622 by making the help text icons look hoverable in the admin tabular inline headers. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16690 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-26 04:36:31 +00:00
Julien Phalip
bf9ba45f6b Fixed #16677 -- Fixed the future version of the ssi template tag to work with template file names that contain spaces. Note that this fix cannot be applied to the currently deprecated version of the ssi tag since it requires an unquoted literal as parameter. Many thanks to Aymeric Augustin for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16687 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-25 23:02:15 +00:00
Julien Phalip
a3fd9cf288 Fixed #15837. Consolidated all the locaflavor tests into a single, logical, place (regressiontests/localflavor/). 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16680 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-24 12:30:59 +00:00
Russell Keith-Magee
be4acff319 Reverted r16662 -- There are bunch of problems with this patch, including failing tests, that I didn't pick up before committing. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16669 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-23 06:31:03 +00:00
Malcolm Tredinnick
a86dde20f0 Fixed a broken test from r16656. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16667 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-23 06:28:45 +00:00
Russell Keith-Magee
43024142a1 Fixed #16202 -- Added a Slovenian localflavor. Thanks to Jure Cuhalev <gandalf@owca.info>, Gasper Zejn, Domen Kozar and iElectric for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16662 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-23 04:41:56 +00:00
Russell Keith-Magee
a5cbb892f8 Fixed #15315 -- Added support for the 'widget' argument to modelform_factory. Thanks to SardarNL and Will Hardy for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16659 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-23 04:08:24 +00:00
Russell Keith-Magee
6cd9023635 Fixed #15499 -- Ensure that cache control headers don't try to set public and private as a result of multiple calls to patch_cache_control with different arguments. Thanks to AndiDog for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16657 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-23 03:51:10 +00:00
Malcolm Tredinnick
2e56066a5b Fixed an isnull=False filtering edge-case. Fixes #15316. 
The bulk of this patch is due to some fine analysis from Aleksandra
Sendecka.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16656 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-23 03:38:42 +00:00
Russell Keith-Magee
2664fa1896 Fixed #15838 -- Promoted assertFieldOutput to a general test utility. Thanks to Ramiro Morales for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16653 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-23 02:32:37 +00:00
Russell Keith-Magee
d310f91ee7 Fixed #10571 -- Factored out the payload encoding code to make sure it is used for PUT requests. Thanks to kennu for the report, pterk for the patch, and wildfire for the review comments. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16651 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-23 00:52:45 +00:00
Russell Keith-Magee
0f767f9a99 Fixed #16672 -- Ensure that test classes decorated with @override_setings gets the right name when running the tests. Thanks to Julien Phalip for the report and initial patch 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16650 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-23 00:32:35 +00:00
Russell Keith-Magee
3afe409d0e Fixed #14876 -- Ensure that join promotion works correctly when there are nullable related fields. Thanks to simonpercivall for the report, oinopion and Aleksandra Sendecka for the original patch, and to Malcolm for helping me wrestle the edge cases to the ground. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16648 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-22 07:40:12 +00:00
Jannis Leidel
7d782e51c1 Fixed #8190 -- Added support for a field's help text to the tabular admin inline. Thanks, Julien Phalip and Idan Gazit. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16622 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-17 14:12:25 +00:00
Jannis Leidel
283526a5a6 Fixed #15206 -- Added select_related call to the permissions field of the GroupAdmin to lower the number of queries. Thanks, Chris Adams. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16620 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-15 09:01:12 +00:00
Jannis Leidel
1abafe696e Fixed #14695 -- Stopped model fields from incorrectly overwriting the field name during model initialization if it was already passed as a keyword argument. Thanks, erikrose and willhardy. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16614 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-13 11:53:42 +00:00
Ramiro Morales
326949e444 Fixed #14503 -- Unified multiple implementations of test cases assert* methods that verify a given exception is raised by a callable throughout the Django test suite. 
Replaced them with a new assertRaisesMessage method of a new SimpleTestCase, a lightweight subclass of unittest.TestCase. Both are also available for usage in user tests.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16610 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-13 00:42:08 +00:00
Jannis Leidel
02dcbe3317 Fixed #11559 -- Fixed the URL resolver to be able to handle captured parameters in parent URLconfs when also using namespaces. Thanks, cwb, ungenio and hvdklauw. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16608 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-12 14:15:50 +00:00
Jannis Leidel
1ca6e9b9e2 Fixed #9847 -- Added 403 response handler. Many thanks to kgrandis, adamnelson, vkryachko, fvox13 and Chris Beaven. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16606 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-12 14:15:31 +00:00
Jannis Leidel
958e049d4d Fixed #5831 -- Made sure the ForNode reports the correct source of an exception happening in one of the loops. Thanks, Charmless and vladmos. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16605 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-12 14:15:17 +00:00
Jannis Leidel
1d485cf14f Fixed #10405 -- Raise a more useful error if the formfield of a related model field can't be created yet because the related model isn't loaded yet. Thanks ojii and charstring. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16604 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-12 14:15:08 +00:00
Jannis Leidel
386b12c1c6 Fixed #15907 -- Fixed another conflict between the ModelForm exclude and the GenericInline. Thanks, leonelfreire and prestontimmons. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16603 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-12 14:14:58 +00:00
Jannis Leidel
3d027b72eb Fixed #14496 -- Fixed conflict between ModelForm exclude and ModelAdmin readonly values. Thanks, Julien Phalip. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16602 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-12 14:14:49 +00:00
Jannis Leidel
d68666700f Fixed #16604 -- Use new save_related hook when saving objects on the changelist, too. Thanks, pdeglopper. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16599 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-12 14:14:24 +00:00
Jannis Leidel
bce890ace4 Fixed #16584 -- Fixed a bunch of typos in code comments. Thanks, Bernhard Essl. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16598 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-12 14:14:15 +00:00
Jannis Leidel
1d32bdd3c9 Fixed #15252 -- Added static template tag and CachedStaticFilesStorage to staticfiles contrib app. 
Many thanks to Florian Apolloner and Jacob Kaplan-Moss for reviewing and eagle eyeing.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16594 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-11 14:07:39 +00:00
Ramiro Morales
27eb8bbfd0 Made override_settings also work with TransactionTestCase when acting as a class decorator. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16592 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-10 22:26:34 +00:00
Ramiro Morales
4fc3741ee8 Added fixtures files missing from [16590]. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16591 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-08 17:08:35 +00:00
Karen Tracey
be87f0b0ec Fixed #3615: Added support for loading fixtures with forward references on database backends (such as MySQL/InnoDB) that do not support deferred constraint checking. Many thanks to jsdalton for coming up with a clever solution to this long-standing issue, and to jacob, ramiro, graham_king, and russellm for review/testing. (Apologies if I missed anyone else who helped here.) 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16590 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-07 00:43:26 +00:00
Ramiro Morales
290d7d4d21 Fixed #16542 -- Made Raw ID form widgets shipped with the admin app render the related object lookup tool only when the related model is effectively registered with the AdminSite. 
Also, converted these widgets to reverse named URLs instead of hard-coded '../../...'-style links, refs #15294.
Thanks Florian Apolloner for the initial patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16578 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-01 23:38:11 +00:00
Jannis Leidel
343b4f1ea5 Fixed #14288 -- Fixed linebreaksbr template filter to normalize newlines first. Thanks, Julien Phalip. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16573 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-29 10:22:25 +00:00
Jannis Leidel
0fbadfd1c8 Fixed #16497 -- Added new form and model fields to the Mexican local flavor. Many thanks to Andrés Torres Marroquín and Gerardo Orozco. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16572 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-29 10:20:16 +00:00
Jannis Leidel
4a6e1b5613 Fixed #8013 -- Added Columbian and Ecuadorian local flavor. Thanks, ikks and Bernhard Essl. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16570 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-29 09:41:14 +00:00
Jannis Leidel
2ccfb6d5c2 Fixed #16101 -- Added parameters to SingleObjectMixin to override the name of the URL keyword arguments used for pk and slug. Thanks, Andrew Ingram and Julien Phalip. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16569 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-29 09:41:00 +00:00
Jannis Leidel
5fffe574bd Fixed #16326 -- Fixed re-pickling of unpickled TemplateResponse instances. Thanks, natrius and lrekucki. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16568 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-29 09:40:50 +00:00
Jannis Leidel
db594f90ba Fixed #16533 -- Stopped the memcache cache backend from raising an exception if the timeout value isn't an integer. Thanks, Jeff Balogh. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16556 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-29 09:39:23 +00:00
Chris Beaven
34a71dc4e4 Add some simple regression tests for the truncatechars filter. Refs #16510. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16551 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-25 22:18:59 +00:00
Ramiro Morales
0452d4c3cc Fixed #16480 -- Modified test added in r16522 so it doesn't use a query not supported under Oracle (GROUP BY a NCLOB field). Thanks Aymeric for the report. Refs #4186 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16546 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-17 22:22:39 +00:00
Jannis Leidel
3b77458371 Fixed #5025 -- Add a "truncatechars" template filter. Many thanks to Chris Beaven. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16542 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-14 13:47:10 +00:00
Jannis Leidel
24f4764a48 Fixed #16225 -- Removed unused imports. Many thanks to Aymeric Augustin for the work on the patch and Alex for reviewing. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16539 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-13 09:35:51 +00:00
Jannis Leidel
723b574793 Fixed #16447 -- Stopped using the setting name as the sender parameter for the setting_changed signal. Thanks, Alex Gaynor. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16530 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-10 19:35:05 +00:00
Ramiro Morales
54b9c03d80 Fixed a typo in the multiple_database tests. Thanks Jim Dalton. 
Also, removed some unused imports.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16529 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-10 13:52:04 +00:00
Ramiro Morales
823a231500 Fixed typos in admin_views tests XML fixtures. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16527 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-08 14:22:36 +00:00
Luke Plant
6d029359e9 Fixed bug with our SimpleCookie regarding load/custom Morsel, and simplified implementation 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16526 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-08 12:07:54 +00:00
Ramiro Morales
68d18b8492 FIlter warnings about deprecated syntax of the url template tag in recently added tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16524 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-08 00:39:59 +00:00
Ramiro Morales
b2050ff546 Fixed #16409 -- Fixed an error condition when using QuerySet only()/defer() on the result of an annotate() call. Thanks jaklaassen AT gmail DOT com and Tai Lee for the reports and Tai for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16522 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-07 01:12:45 +00:00
Jannis Leidel
21e0b3a243 Fixed #16424 -- Fixed regression in collect static management command introduced in r16509 that prevented prefixed collection. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16519 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-06 10:28:18 +00:00
Jannis Leidel
89c302cf3f Rolled back r16510, r16513 and r16514 because it wasn't ready. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16515 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-05 14:16:37 +00:00
Jannis Leidel
b37dca1aec Removed left over print statement. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16514 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-05 13:56:20 +00:00
Jannis Leidel
b884990388 Made cache table test case multidb capable. Refs #16411. Thanks, Russ. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16513 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-05 13:55:14 +00:00
Jannis Leidel
2b2bec0cc9 Fixed test failure on Postgres that was added in r16510. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16512 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-05 09:40:29 +00:00
Jannis Leidel
90b6181657 Fixed #16410 -- Fixed get_cache to behave gracefully when given a string that can't be split. Thanks, jedie. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16511 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-05 09:10:58 +00:00
Jannis Leidel
6de65ab76f Fixed #15255 -- Stopped database cache from ignoring database routers when creating the cache table. Thanks, aaugustin. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16510 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-04 21:53:17 +00:00
Jannis Leidel
94a38dfd0e Fixed #16161 -- Added --clear option to collectstatic management command to be able to explicitly clear the files stored in the destination storage before collecting. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16509 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-04 21:34:29 +00:00
Ramiro Morales
87eb3a25aa Removed superflous commented-out lines. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16502 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-04 12:23:12 +00:00
Jannis Leidel
286a1cad88 Fixed #16332 -- Added language template tag that switches the activate language for the enclosed template section, e.g. to allow translation of URLs as added in r16405. Many thanks to Florian Apolloner and Orne Brocaar. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16501 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-04 09:52:06 +00:00
Jannis Leidel
332a485567 Fixed #16115 -- Added ModelAdmin.save_related method to be able to do pre- or post-save operations for objects related to the parent object currently displayed. Thanks, Julien Phalip. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16498 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-03 17:56:43 +00:00
Jannis Leidel
f9fe112f2d Fixed #15820 -- Fixed the use of the InlineAdmin's get_formset method by actually passing in the obj. Thanks, Julien Phalip. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16497 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-03 17:56:33 +00:00
Jannis Leidel
43cb78fafd Fixed #14506 -- Added an assertion to XViewMiddleware about the dependency on the authentication middleware. Thanks, vanschelven. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16496 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-03 17:56:25 +00:00
Jannis Leidel
c29e45491e Fixed #14608 -- Added phone number field to Indian local flavor. Thanks, lawgon and Julien Phalip. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16495 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-03 17:56:15 +00:00
Jannis Leidel
3bd23ee96f Fixed #15750 -- Handle empty mail server credentials gracefully. Thanks, LeandroSouza and bedmondmark. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16494 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-03 17:56:05 +00:00
Jannis Leidel
38a2444277 Fixed #16050 -- BACKWARDS-INCOMPATIBLE CHANGE: Moved static files of the admin to conventional file system location. 
This also removes the need for ADMIN_MEDIA_PREFIX and replaces it with the convention to find admin's static files at STATIC_URL + 'admin/'.

Thanks to Jacob for the review and general help.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16487 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-30 09:06:19 +00:00
Jannis Leidel
940aed10b7 Fixed #15813 -- Updated Indian localflavor to use correct state choices and fixed various other bugs. Thanks, jsdalton. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16480 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-28 10:44:33 +00:00
Jannis Leidel
a6cd78662e Fixed #15785 -- Stopped HttpRequest.read() from reading beyond the end of a wsgi.input stream and removed some redundant code in the multipartparser. Thanks, tomchristie, grahamd and isagalaev. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16479 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-28 10:17:56 +00:00
Jannis Leidel
f801e2c15d Fixed #12761 -- Added Paraguayan local flavor. Thanks, dschulz and BernhardEssl. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-28 10:17:23 +00:00
Jannis Leidel
e0139910f1 Fixed #15669 -- Included app label in admin validation messages. Thanks, lamby and Jure Cuhalev. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16462 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-26 16:52:31 +00:00
Jannis Leidel
b9eb94e789 Fixed #16230 -- Correctly escape errors message passed to ErrorDict. Thanks, Gregor Müllegger. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16461 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-26 16:52:21 +00:00
Jannis Leidel
352b7ffaf0 Fixed #16322 -- Fixed Accept-Language parsing to allow spaces around semicolons. Thanks, Max Arnold. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16457 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-26 16:51:54 +00:00