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 30 Releases Wiki Activity
11,150 Commits 28 Branches 426 Tags 668 MiB
78a2719def
Commit Graph

11150 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
b7f2aba566 Fixed a test that relied on the database to reject invalid data; MySQL doesn't. Refs #17055. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16996 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-16 14:30:43 +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
Aymeric Augustin
d75337fc7b Fixed a test that was broken at r16978. Refs #17055. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16993 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-16 09:46:01 +00:00
Julien Phalip
d3cd9c0d06 Made an AutoField test more robust. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16992 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-16 06:57:25 +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
c582609c8d Modified the tablespaces tests so that they no longer rely on settings.DEFAULT_INDEX_TABLESPACE being empty. Refs #12308. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16990 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-15 15:54:53 +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
Aymeric Augustin
a8e1d134a5 Fixed a test failure introduced at r16987. Refs #12308. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16988 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-15 09:00:31 +00:00
Aymeric Augustin
246580573d Fixed #12308 -- Added tablespace support to the PostgreSQL backend. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16987 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-14 21:49:43 +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
Luke Plant
d1e7409278 Fixed ReST indentation errors introduced in [16983]. Grr. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16984 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-14 00:16:14 +00:00
Luke Plant
d1e5c55258 Fixed many more ReST indentation errors, somehow accidentally missed from [16955] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16983 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-14 00:12:01 +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
38999f7e00 Fixed #16923 -- Removed unused method in the serialization code. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16979 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-13 19:39:46 +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