mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 17:59:13 +00:00
Code Issues 32 Releases Wiki Activity
8,545 Commits 29 Branches 451 Tags
Commit Graph

8545 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul McMillan
fe09017f70 [soc2010/test-refactor] converted custom_managers_regress 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13635 bcc190cf-cafb-0310-a4f2-bffc1f526a37
archive/soc2010/test-refactor 		2010-08-24 01:03:51 +00:00
Paul McMillan
6f5899c281 [soc2010/test-refactor] fix to updated syntax for error messages to match trunk 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13567 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-09 22:59:55 +00:00
Paul McMillan
a2e30a41dd [soc2010/test-refactor] Merged back up to trunk 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13566 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-09 22:11:28 +00:00
Paul McMillan
6c7baa96d8 [soc2010/test-refactor] Merged up to trunk again to fix failing tests. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13478 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-05 04:30:44 +00:00
Paul McMillan
0620a1c223 [soc2010/test-refactor] Update docs to reflect unittest2 changes. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-05 04:23:03 +00:00
Paul McMillan
5875c4e01c [soc2010/test-refactor] Merged up to trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13468 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-04 18:47:42 +00:00
Paul McMillan
9315b44ad1 [soc2010/test-refactor] Merged up to trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13428 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-07-06 23:31:50 +00:00
Paul McMillan
ae2c227f51 [soc2010/test-refactor] Fixed @skipIfDBEngine to be more explicit 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13427 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-07-06 23:27:34 +00:00
Paul McMillan
90fab13583 [soc2010/test-refactor] Can't use class decorators in python 2.4. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13418 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-07-02 19:14:58 +00:00
Paul McMillan
cee4afc267 [soc2010/test-refactor] updated fixtures tests to use @skipIfDBEngine() decorator 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13417 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-07-02 19:07:56 +00:00
Paul McMillan
e0bd235ffa [soc2010/test-refactor] Added skipIfDBEngine() decorator to django.test 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13416 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-07-02 19:06:53 +00:00
Paul McMillan
9d69c8f01d [soc2010/test-refactor] Updated field_defaults to use unittest2 delta arg for assertAlmostEqual 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13415 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-07-02 18:06:24 +00:00
Paul McMillan
dfd3da2853 [soc2010/test-refactor] update expressions test to use unittest2 assertItemsEqual 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13414 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-07-02 17:53:09 +00:00
Paul McMillan
c298937c94 [soc2010/test-refactor] small fix to allow unittest2 to compare ValuesQuerySet using assertItemsEqual 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13413 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-07-02 17:51:12 +00:00
Paul McMillan
62e587418c [soc2010/test-refactor] updated custom_pk modeltest to take advantage of unittest2 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13412 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-07-02 17:19:17 +00:00
Paul McMillan
e87ead6d08 [soc2010/test-refactor] Forgot to remove a comment. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13411 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-07-02 16:34:41 +00:00
Paul McMillan
86580d042e [soc2010/test-refactor] Unittest2 integration properly done. unittest2 package (at rev 221) is bundled as django.utils.unittest and the imports are patched to reflect django usage. Tests should import django.utils.unittest rather than the stdlib package. "It's a beautiful thing, the destruction of doctests." 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13410 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-07-02 16:30:52 +00:00
Paul McMillan
154808166a [soc2010/test-refactor] Provisional unittest2 support. Currently requires unittest2 to be in the pythonpath. The test_client_regress fix cleans up error checking to be less brittle (and pass with unittest2). 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13406 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-30 23:34:39 +00:00
Paul McMillan
2ca92d49f8 [soc2010/test-refactor] Converted force_insert_update to unittest. We have always been at war with doctests. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13395 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-23 14:12:45 +00:00
Paul McMillan
e09d2de906 [soc2010/test-refactor] Converted files modeltest to unittest. Removed unused custom field on Storage model (the same functionality is tested by random). Sadly these tests aren't threadsafe because the Storage model's temp_storage can't be changed for each testcase. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13392 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-23 10:08:19 +00:00
Paul McMillan
c8624d43cb [soc2010/test-refactor] Merged changes from trunk up to 13390 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13391 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-23 05:23:15 +00:00
Paul McMillan
222cc77e52 [soc2010/test-refactor] Added svnmerge props 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13390 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-23 05:07:02 +00:00
Paul McMillan
6f851bca15 [soc2010/test-refactor] Updated field_defaults modeltest to unittest 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13379 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-22 02:58:45 +00:00
Paul McMillan
dc2fd96803 [soc2010/test-refactor] Updated expressions modeltest to unittests 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13378 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-22 02:57:35 +00:00
Paul McMillan
52a855fd37 [soc2010/test-refactor] updated empty modeltest to unittest 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13377 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-22 02:56:53 +00:00
Paul McMillan
85f024c2b1 [soc2010/test-refactor] updated delete modeltest to unittest 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13376 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-22 02:56:25 +00:00
Paul McMillan
af64237c31 [soc2010/test-refactor] Updated modeltests.defer to unittests 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13375 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-22 02:55:06 +00:00
Paul McMillan
42570206db [soc2010/test-refactor] Moved custom_pk modeltest to unittest 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13374 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-22 02:54:18 +00:00
Paul McMillan
078b13e97e [soc2010/test-refactor] Updated custom_methods model test to unittests 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13373 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-22 02:53:14 +00:00
Paul McMillan
cc4703d5ae [soc2010/test-refactor] Converted custom_managers doctests to unittests. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13349 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-11 01:17:52 +00:00
Paul McMillan
4ffeb59e86 [soc2010/test-refactor] Modified contrib docs to require unittests. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13347 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-10 03:31:29 +00:00
Paul McMillan
101796ce8d [soc2010/test-refactor] Converted custom_columns doctest to unittest. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13346 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-10 01:46:36 +00:00
Paul McMillan
75302ff635 [soc2010/test-refactor] Renamed choices test fixture to be semantically meaningful. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13345 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-09 22:33:19 +00:00
Paul McMillan
7289013cf1 Converted modeltests.choices to unittests 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13344 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-09 22:13:03 +00:00
Paul McMillan
e3bad40d3e Merged trunk changes r13316:13342 into test-refactor SOC branch. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13343 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-09 21:20:49 +00:00
Paul McMillan
8bdf160e05 Merged trunk changes r13307:13316 into test-refactor SoC branch. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13317 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-02 23:49:27 +00:00
Jacob Kaplan-Moss
6c10480e99 Created test-refactor SoC branch. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13307 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-27 09:38:59 +00:00
James Bennett
6cffb9b880 Bump to 1.2.1. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13302 bcc190cf-cafb-0310-a4f2-bffc1f526a37
1.2.1 		2010-05-24 19:10:30 +00:00
Jannis Leidel
e6ec07dc1f Fixed #13592 -- Make sure the SelectDateWidget works with dates before 1900 when localization is enabled. Thanks for the report and patch, magnus. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13301 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-23 10:38:23 +00:00
Luke Plant
6b2d6e1833 Fixed #13590 - Made CSRF failure page styling consistent with Django's default error page styling. 
Thanks to alefteris for suggestion.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@13300 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-22 18:42:16 +00:00
Russell Keith-Magee
84060a1f7a Refs #13573 -- Modified the key technique added in r13295 to be more robust against potential key collisions while keeping key names human-readable. Thanks to Alex for being finicky. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13299 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-21 14:25:26 +00:00
Jannis Leidel
5acd9cd8ba Fixed #13577 -- Updated Polish formats file. Thanks, ludwik. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13298 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-21 14:09:25 +00:00
Jannis Leidel
286ce85e45 Fixed #13569 -- Fixed createsuperuser management command to work with the new relaxed requirements for usernames. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13297 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-21 14:08:49 +00:00
Jannis Leidel
b057a8b247 Fixed #13560 -- Fixed localization of widgets. 
Particularly this fixes the SplitDateTimeField and the AdminDateWidget by localizating the widget's value in its render method instead of the form field. Thanks to David Danier for the report and Russell for help with the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13296 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-21 14:07:54 +00:00
Russell Keith-Magee
8a6cb3d969 Fixed #13573 -- Corrected problem with template caching when template directories are provided. Thanks to lamby for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13295 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-21 08:54:15 +00:00
Karen Tracey
6b2fd346ad Fixed #13566, a typo in the 1.2 release notes. Thanks johnthedebs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13294 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-19 12:35:02 +00:00
Jacob Kaplan-Moss
747e8dfe5f Fixed #13563, a typo in the GeoDjango tutorial. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13293 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-19 03:25:42 +00:00
Jacob Kaplan-Moss
97560f3a07 Fixed a couple of typos in the release notes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13291 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-17 22:28:44 +00:00
Jacob Kaplan-Moss
ffcffcb96b Updated the docs conf.py to have the correct version number. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13287 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-17 18:51:50 +00:00
James Bennett
5b6c20f2c4 Trunk is now 1.2.1 pre-alpha. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13286 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-17 18:21:18 +00:00