mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-26 02:56:25 +00:00
Code Issues 25 Releases Wiki Activity
11,272 Commits 28 Branches 426 Tags 667 MiB
dce820ff70
Commit Graph

11272 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alex Gaynor
3e66913f96 Fixed #17132 -- remove a leftover reference to django.conf.default.urls in Django. THanks to claudep for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17048 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-28 21:23:50 +00:00
Carl Meyer
11861a29d5 Fixed #17130 -- Corrected import path of get_wsgi_application in deployment docs. Thanks jsdalton for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17047 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-28 16:22:51 +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
Julien Phalip
b87114962f Tweaked some AutoField tests to not raise wanings in Python>=2.6, where BaseException.message has been deprecated. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17045 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-28 04:11: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
Carl Meyer
5a16b64ed2 Avoid spurious failures in naturaltime tests. 
Previous fix didn't cover timesince module, which naturaltime delegates to
under certain conditions. Extended mock of datetime to timesince module, and
switched to a fixed datetime rather than now() for testing, for more
reproducible tests (failures in mock will fail fast, rather than sporadically).

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17038 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-26 15:17:43 +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
Aymeric Augustin
a05c70fae1 Fixed a reference that was broken at r17026. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17036 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-26 10:38:12 +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
Julien Phalip
c1a014bba4 Made some contrib.messages tests use override_settings for clarity. Thanks to Claude Paroz for the patch. Refs #16507, #16574. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17032 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-25 02:55:25 +00:00
Carl Meyer
6df91d9539 Fixed #17086 -- Removed pollution of global template-builtins from markup and humanize tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17031 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-24 21:30:55 +00:00
Carl Meyer
d89be53d95 Fixed #17099 -- Removed an out-of-date warning and some unused code, now that startapp doesn't require creating app inside project. Thanks ptone for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17030 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-24 20:50:39 +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
59c051d170 Fixed #13760 -- Cleaned up unnecessary default option handling in a bunch of management commands. Thanks to Paul McMillan for the report and to adamv and Claude Paroz for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17028 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-23 03:43:43 +00:00
Julien Phalip
adf51b0cb8 Fixed #16574 -- Strengthened the contrib.messages tests' isolation to avoid failures under certain project setting environments. Thanks to Boldewyn for the report and to Claude Paroz for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17027 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-22 23:39:09 +00:00
Aymeric Augustin
67e6e0fcf3 Fixed #17087 -- Re-organized the i18n docs to reduce confusion between USE_I18N/USE_L10N and the concepts of internationalization/localisation. Re 
moved some duplicate content.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17026 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-22 17:17:57 +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
Alex Gaynor
ac88f048c9 Fixed the grammar of a sentence in the docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17024 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-22 06:13:01 +00:00
Carl Meyer
36a44ae75f Mocked datetime in the naturaltime tests to avoid sporadic test failure. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17023 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-22 06:06:44 +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
dca81ad58a Fixed #17064 -- Improved the UX for the admin's time and date picker widgets by brushing up the 'Cancel' button's visual feedback and by allowing the popups to get closed by pressing the 'Escape' key. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17021 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-22 03:38:10 +00:00
Alex Gaynor
9117a4af30 move an mport out of a function 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17020 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-21 23:38:52 +00:00
Justin Bronn
01f4ce4c49 Fixed #17059 -- Encode GeoIP query strings properly so libGeoIP returns results for unicode strings. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17019 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-20 20:08:33 +00:00
Ramiro Morales
b3b9049942 Fixed #17071 -- Made sure we report the right version of system-level {simple,}json module. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17018 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-20 17:21: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
51b8f0a240 Removed a small useless piece of code from contrib.auth. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17016 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-20 04:23:34 +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
Alex Gaynor
358e5a8031 Fixed #16393 -- FormWizard's cookie storage backend now works with all versions of simplejson and the standard library json module. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17014 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-19 00:09:41 +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
Paul McMillan
67565a5379 Remove comments referencing encryption. Django doesn't do encryption. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17012 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-18 20:28:52 +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
Alex Gaynor
396fcaaef9 Remove all relative imports. We have always been at war with relative imports. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17009 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-18 00:47:49 +00:00
Alex Gaynor
66210cbc70 Remove a great many of the remaining relative imports. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17008 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-17 18:45:22 +00:00
Alex Gaynor
544a8372fd Remove several more relative imports. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17007 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-17 16:56:18 +00:00
Alex Gaynor
1856e398c5 Remove more relative imports (I will kill them all). 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17006 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-17 16:39:53 +00:00
Luke Plant
4209ff1fcd Fixed typo in my last commit. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17005 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-17 15:52:01 +00:00
Luke Plant
6205a348f0 Added warning about replay attacks when using the cookies backend for sessions. 
The paragraph about encryption was reworded for clarity.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17004 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-17 15:43:24 +00:00
Alex Gaynor
87ffc6a6c2 remove some relative imports from django 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17003 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-17 13:15:40 +00:00
Ramiro Morales
da5c766dbb Tweaked test added in r16873 so it also works with Oracle. 
* Changed invalid fixture from trying to insert a NULL value in a
  null=False CharField to try with a DateTimeField instead because our
  Oracle backend allows NULLs for CharFields than can be blank and that
  insert wouldn't generate an error.

* cx_Oracle raises a
  `DatabaseError: Could not load fixtures.Article(pk=1): ORA-01407: cannot update ("USER_DEFAULT"."FIXTURES_ARTICLE"."PUB_DATE") to NULL'`
  instead of an IntegrityError like the rest of the DB-API drivers we
  support, changed the error message we test for to start simply with
  'Error' to catch both messages.

  We might want to consider converting DatabaseError to IntegrityError
  in the backend when the error code is ORA-1407.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17002 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-17 03:29:07 +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
Carl Meyer
62afd58c87 Fixed #17057 -- Corrected flatpage url uniqueness validation to account for flatpage editing. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17000 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-17 00:56:32 +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
313fab8623 Fixed #17023 -- Unified WizardView process_step() documentation. Thanks semente for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16998 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-16 20:38:22 +00:00