mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-25 10:35:48 +00:00
Code Issues 25 Releases Wiki Activity
11,922 Commits 28 Branches 426 Tags 667 MiB
cec6bd5a59
Commit Graph

677 Commits

Author SHA1 Message Date
Aymeric Augustin
cec6bd5a59 Fixed #18023 -- Removed bundled simplejson. 
And started the deprecation path for django.utils.simplejson.

Thanks Alex Ogier, Clueless, and other contributors for their
work on the patch.
 2012-04-29 19:58:00 +02:00
Anssi Kääriäinen
ee0a7c741e Fixed an Oracle-specific test case failure 
Made a test checking ORM-generated query string case-insensitive.
 2012-04-29 19:48:43 +03:00
Aymeric Augustin
a15cfb2e45 Simplified timezones tests with settings_changed. 
All relevant state is now properly reset whenever TIME_ZONE or USE_TZ
are changed in tests.
 2012-04-29 16:03:46 +02:00
Anssi Kääriäinen
d5b93d3281 Fixed #10494 -- Added kwargs to QuerySet.get() error message in the case no objects were found. 
Thanks brondsem for the report, Szymon Pyzalski for the patch and oinopion for review.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17917 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-20 11:09:32 +00:00
Claude Paroz
0e01023897 Converted more test assertions to assert[Not]Contains. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17910 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-14 13:35:25 +00:00
Aymeric Augustin
632b6a1a73 Fixed #17439 -- Prevented spurious queries for missing objects after prefetch_related has run. 
That affects nullable foreign key, nullable one-to-one, and reverse one-to-one relations.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17899 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-11 21:11:22 +00:00
Aymeric Augustin
1f11069aa5 Fixed #18090 -- Applied filters when running prefetch_related backwards through a one-to-one relation. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17888 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-10 06:04:53 +00:00
Carl Meyer
f195f1ed24 Fixed #18083 -- Fixed cascade deletion with proxy model of concrete subclass. Thanks Simon Charette for report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17887 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-09 22:41:20 +00:00
Aymeric Augustin
9ed6e08ff9 Removed deprecated URLField.verify_exists. 
The deprecation schedule was slightly accelerated because of possible security ramifications.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@17847 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-31 13:55:03 +00:00
Aymeric Augustin
eb163f37cb Use the class decorator syntax available in Python >= 2.6. Refs #17965. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17829 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-30 09:08:29 +00:00
Claude Paroz
9383a2761c Removed with_statement imports, useless in Python >= 2.6. Refs #17965. Thanks jonash for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17828 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-30 08:02:08 +00:00
Claude Paroz
159d1be656 Fixed #11150 -- Removed dependency on cStringIO in ImageField validation. Thanks vvd for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17825 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-29 16:49:59 +00:00
Aymeric Augustin
e78d6b406b Reverted parts of r16963 to fix a regression on the creation of permissions on proxy models. Refs #17904. Thanks koenb for the report and claudep for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17776 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-22 08:49:48 +00:00
Luke Plant
b018128ea5 Fixed #17838 - prefetch_related fails for GenericForeignKeys when related object id is not a CharField/TextField 
Thanks to mkai for the report and debugging, and tmitchell and Przemek
Lewandowski for their work on the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17744 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-15 15:06:57 +00:00
Aymeric Augustin
43cb17bbe5 Added cleanup code to the proxy_model_inheritance tests. Refs #12286, #16329. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17712 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-14 08:40:35 +00:00
Aymeric Augustin
aa900c39a8 Fixed #17882 -- Reopened the database connection when a test changes time zone settings. Thanks brodie for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17699 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-13 06:59:04 +00:00
Jannis Leidel
f7daa38a00 Fixed #10498 (again) -- Made sure the improvements done in r17641 have a smaller impact on speed. Thanks to Anssi Kääriäinen for the patch and Jonas Obrist for reviewing. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17698 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-13 03:48:20 +00:00
Karen Tracey
d174216587 Refs #17876: enhanced new test to actually test underlying function, not just ensure trying to use it does not raise an exception. Thanks Przemek Lewandowski. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17695 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-13 01:01:22 +00:00
Karen Tracey
9d98b9eb4b Fix #17876: Corrected an exception (regression) raised where select_realted and only is used on a proxy model. Thanks milosu and charettes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17692 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-12 22:33:18 +00:00
Jannis Leidel
c988397279 Fixed #10498 -- Fixed using ugettext_lazy values when creating model instances. Thanks to Claude Paroz and Jonas Obrist. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17641 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-03 19:02:49 +00:00
Luke Plant
3db5b0e485 Fixed #17696 - Queryset prefetch_related() ignores using() 
Thanks to simon29 for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17605 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-01 00:57:01 +00:00
Luke Plant
de9942a667 Fixed #17668 - prefetch_related does not work in in_bulk 
Thanks to gurets for the report, and akaariai for the initial patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17600 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-28 19:34:04 +00:00
Aymeric Augustin
ce88b57b9a Fixed #17755 -- Ensured datetime objects that bypass the model layer (for instance, in raw SQL queries) are converted to UTC before sending them to the database when time zone support is enabled. Thanks Anssi for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17596 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-27 21:15:25 +00:00
Aymeric Augustin
8b53616198 Fixed #17728 -- When filtering an annotation, ensured the values used in the filter are properly converted to their database representation. This bug was particularly visible with timezone-aware DateTimeFields. Thanks gg for the report and Carl for the review. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17576 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-22 19:40:27 +00:00
Carl Meyer
354c84d277 Fixed #17678 -- Corrected setup of _meta.proxy_for_model and added _meta.concrete_model. Thanks Anssi Kääriäinen. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17573 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-22 05:26:50 +00:00
Jannis Leidel
538257b4ae Fixed #10080 -- Slightly extended the fix made in r10401 by also taking command line options into account that don't have have a default set. Thanks, Claude Paroz. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17467 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-09 18:56:41 +00:00
Julien Phalip
d02ba7f4ee Fixed #11670 -- Prevented genuine model fields named 'year', 'month', 'gt', 'lt' etc. from being mistaken for lookup types in lookups across relations. Thanks to andy for the report, to jpwatts for the initial patch and to Anssi Kääriäinen and Alex Gaynor for the reviews. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17450 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-05 07:11:53 +00:00
Julien Phalip
d3154d1896 Fixed #8291 -- Allowed 'pk' to be used as an ordering option in Model.Meta. Thanks to peterd12 for the report and to evan_schulz, gruszczy, frog32 and David Gouldin for their work on the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17445 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-04 19:56:40 +00:00
Jannis Leidel
62efdcb037 Fixed #17602 -- Stopped the XML serializer from doing unneeded queries. Thanks, gnosek. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17439 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-04 18:27:07 +00:00
Jannis Leidel
2b0c1ea641 Fixed #17527 -- Improved exception message when adding the wrong type of object to a ManyToManyField. Thanks, guettli and cClaude Paroz. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17437 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-04 16:06:09 +00:00
Carl Meyer
844a24bbb9 Fixed #16921 -- Added assertHTMLEqual and assertHTMLNotEqual assertions, and converted Django tests to use them where appropriate. Thanks Greg Müllegger. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17414 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-01-31 20:36:11 +00:00
Aymeric Augustin
c82f1dcf95 Skipped the test introduced at r17403 on Python 2.5, because it requires warnings.catch_warnings. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17413 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-01-31 19:47:40 +00:00
Aymeric Augustin
58bcb7d161 Caught (and tested) the warning added at r17393 in the corresponding test. Refs #17580. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17403 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-01-28 20:34:02 +00:00
Jannis Leidel
8f168976d6 Fixed #17580 -- Made sure datetime.date instances are correctly handled when being passed to a DateTimeField fields and the timezone support is enabled by making it aware using the default timezone. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17392 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-01-24 10:00:39 +00:00
Aymeric Augustin
aa5d307da6 Fixed #17100 -- Typo in the regex for EmailValidator. Thanks reames AT asymmetricventures com for the report and Claude Paroz for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17349 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-01-07 18:43:46 +00:00
Julien Phalip
31b1cbc623 Fixed #16340 -- Made get_or_create() re-raise any IntegrityError with its original traceback. Thanks to d0ugal and Jonas Obrist. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17333 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-01-02 21:30:47 +00:00
Aymeric Augustin
fc9e0606d5 Fixed a stupid bug in the implementation of timezone.make_aware. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17332 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-01-02 20:45:09 +00:00
Aymeric Augustin
a62ce30661 Fixed #17463 -- Conditionally skipped tests that Windows isn't able to run. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17278 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-27 09:28:50 +00:00
Ramiro Morales
287565779d Added support for modifying the effect of `DISTINCT` clauses so they 
only consider some fields (PostgreSQL only).

For this, the ``distinct()`` QuerySet method now accepts an optional
list of model fields names and generates ``DISTINCT ON`` clauses on
these cases. Thanks Jeffrey Gelens and Anssi Kääriäinen for their work.

Fixes #6422.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17244 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-22 20:42:40 +00:00
Adrian Holovaty
20c8aa2a20 Fixed various dodgy behaviours 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17226 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-17 17:37:24 +00:00
Adrian Holovaty
3f003a3c4b Fixed #17323 -- Renamed HttpRequest.raw_post_data to request.body. Thanks for the patch, dstufft 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17210 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-16 23:40:32 +00:00
Aymeric Augustin
545c3159f5 Fixed #17251 -- In the select_for_update tests, close manually database connections made in threads, so they don't stay "idle in transaction" until the GC deletes them. Thanks Anssi Kääriäinen for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17195 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-11 08:43:01 +00:00
Aymeric Augustin
33bb3cd47c Fixed #17343 -- Changed the {% now %} tag to use the current time zone when time zone support is enabled. Thanks oinopion for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17169 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-04 22:11:12 +00:00
Aymeric Augustin
fb7ab7730d Changed the fixtures used to test the 'initial_data' feature so they don't contain datetimes. Refs #17275. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17154 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-27 13:00:56 +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
Aymeric Augustin
866c229f52 Fixed #17294 -- Supported nullable DateTimeFields when time zone support is enabled. Thanks pressureman for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17148 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-25 09:25:43 +00:00
Aymeric Augustin
43c5d35315 Fixed #17274 -- Accepted TIME_ZONE = None when USE_TZ = True. Thanks pressureman for the report. 
This problem only occured when pytz is installed. It's still strongly recommended to define the correct time zone in TIME_ZONE in order to use pytz' implementation and not the approximation based on system time.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@17134 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-21 12:42:09 +00:00
Aymeric Augustin
37b7f00fd0 Ensured that the warning added at r17117 also applies to queryset filter arguments. Refs #17263. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17126 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-20 15:29:39 +00:00
Aymeric Augustin
f6ee168919 Disabled tests that require warnings.catch_warnings when running under Python 2.5. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17118 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-20 07:40:19 +00:00
Aymeric Augustin
9c30d48b45 Fixed #17263 -- Added a warning when a naive datetime reaches the database layer while time zone support is enabled. 
After this commit, timezones.AdminTests will raise warnings because the sessions contrib app hasn't been upgraded to support time zones yet.
This will be fixed in an upcoming commit.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@17117 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-19 23:27:20 +00:00