055c01103d
[1.0.x] Fixed #9508 -- Added an appropriate FileField.__hash__ implementation.
...
Required because we declare a custom __eq__ method.
Backport of r9997 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10000 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-08 10:01:59 +00:00
244bb7e601
[1.0.X] Fixed #9469 -- Apply the fix from r9189 to the WSGI handler as well.
...
This is a defensive encoding fix. No functionality change for correct URLs.
Patch from magneto.
Backport of r9996 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9999 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-08 10:01:22 +00:00
7dcf651bc5
[1.0.X] Fixed #9323 -- Allow glob loading in INSTALLED_APPS to handle digits in names.
...
Patch from carljm.
Backport of r9994 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9995 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-08 09:41:37 +00:00
34b530fce7
[1.0.X] Fixed #9399 -- Added StopFutureHandlers to export list in file handling.
...
Thanks, George Vilches.
Backport of r9992 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9993 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-08 09:33:14 +00:00
8baac83f30
[1.0.X] Updated svnmerge integrated metadata to include changesets merged via other means.
...
Branch is up-to-date with trunk fixes.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9991 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-08 05:33:30 +00:00
20973954da
[1.0.X] Block translation updates and one more new function fix from merge to branch.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9990 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-08 04:52:07 +00:00
9c5eafe7d5
[1.0.X] Block new function (and fixes to same) from snvmerge.py consideration.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9988 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-08 04:12:56 +00:00
fd5d0cdebb
[1.0.X] Fixed #10432 -- Handle all kinds of iterators in queryset filters.
...
Only consumes the iterators once and works with Python 2.3.
Backport of r9986 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9987 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-08 03:37:47 +00:00
84b890b66e
[1.0.X] Fixed #9649 -- Better error handling in model creation.
...
Previously, you could explicitly assign None to a non-null ForeignKey
(or other) field when creating the model (Child(parent=None), etc). We
now throw an exception when you do that, which matches the behaviour
when you assign None to the attribute after creation.
Thanks to ales.zoulek@gmail.com and ondrej.kohout@gmail.com for some
analysis of this problem.
Backport of r9983 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9984 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-06 04:53:33 +00:00
dd5300274f
[1.0.X] Fixed #6710 -- Made DATABASE_OPTIONS work with postgresql_psycopg2 backend.
...
Thanks to rcoup for the patch.
Backport of r9981 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9982 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-06 02:38:38 +00:00
31e059c9b3
[1.0.X] Improved table join handling for comparisons against NULL.
...
This fixes a broad class of bugs involving filters that look for missing
related models and fields. Most of them don't seem to have been reported
(the added tests cover the root cause). The exception is that this has
also fixed #9968 .
Backport of r9979 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9980 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-06 02:09:59 +00:00
de442c3ab6
[1.0.X] Clarified documentation regarding Oracle's treatment of nulls and empty strings. Backport of [9976] from trunk.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9977 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-05 20:22:54 +00:00
79f53b4f20
[1.0.X] Made it explicit if you accidentally override a Field from a parent model.
...
This was always not working reliably (model initialization and serialization
were two of the problems). Now, it's an explicit error. Also, documented.
Fixed #10252 .
Backport of r9974 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9975 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-04 10:40:50 +00:00
182301c8df
[1.0.X] Fixed #10406 -- Fixed some problems with model inheritance and pk fields.
...
Manually specifying both a OneToOneField(parent_link=True) and separate a
primary key field was causing invalid SQL to be generated. Thanks to Ramiro
Morales for some analysis on this one.
Backport of r9971 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9973 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-04 07:24:30 +00:00
dce458cde2
[1.0.X] Fixed #10251 -- Fixed model inheritance when there's also an explicit pk field.
...
Backport of r9970 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9972 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-04 07:23:18 +00:00
b57d86f226
[1.0.X] Changed the row count value returned from update queries in some cases.
...
If an update only affected an ancestor model (not the child), we were
returning 0 for the number of rows updated. This could have been
misleading if the value is used to detect an update occuring. So we now
return the rowcount from the first non-trivial query that is executed
(if any). Still a slight compromise, but better than what we had.
Backport of r9966 from trunk (turns out this *is* a bugfix, since the returned
rowcount is used in Model.save(force_update=True)).
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9969 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-04 05:40:22 +00:00
f1c9080984
[1.0.X] Fixed #10362 -- An update() that only affects a parent model no longer crashes.
...
This includes a fairly large refactor of the update() query path (and
the initial portions of constructing the SQL for any query). The
previous code appears to have been only working more or less by accident
and was very fragile.
Backport of r9967 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9968 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-04 05:35:10 +00:00
dcb0884d68
[1.0.X] Final pieces (he says, hopefully) of r9945 changes.
...
Fixed "django-admin.py diffsettings" and some GeoDjango stuff.
Refs #10395 .
Backport of r9960 and r9961 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9962 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-03 02:50:23 +00:00
9e6d32edde
[1.0.X] Minor update to documentation for many-to-many filter() calls.
...
Removed a potential ambiguity when describing how multiple conditions in one
filter() call are handled.
Backport of r9958 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9959 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-03 01:44:26 +00:00
f520f440e1
[1.0.X] Fixed #10013 -- Updated French translation for 1.0 branch.
...
Thanks, Stéphane Raimbault and Claude Paroz.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9957 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-02 23:17:10 +00:00
8928a8c9f8
[1.0.X] Polish translations updated
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9956 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-02 08:53:23 +00:00
888b154e9b
[1.0.X] Fixed #10392 -- Fixed an oversight from the refactoring in r9947.
...
Backport of r9953 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9954 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-02 08:26:07 +00:00
1a5588fceb
[1.0.X] Small edit to the caching docs.
...
Turns out, super-lightning is not faster than normal lightning. :-)
Backport of r9949 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9950 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-02 05:47:25 +00:00
0249177836
[1.0.X] Removed a test that was accidentally merged as part of r9927.
...
This was testing a feature that doesn't exist in the 1.0.X branch.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9948 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-02 05:19:51 +00:00
32be118081
Removed some import-time dependencies on Django's settings.
...
Now you can import the file storage stuff and still call settings.configure()
afterwards. There is still one import-time usage of settings in
django.contrib.comments, but that's unavoidable.
Backport of r9945 and r9946 from trunk (this is needed in order to fix #8193 in
a clean fashion, which is why it's being backported).
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9947 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-02 04:57:03 +00:00
9576353835
[1.0.X] The database cache wasn't correctly handling expired keys. Fixed now.
...
The cache tests have been failing for a long time with the db backend. This
change makes them pass again, so no test changes required here.
Backport of r9942 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9943 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-02 03:17:30 +00:00
ec5a3e7a8d
[1.0.X] Updated German translation, fixes #10189 . Thanks julianb
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9939 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-01 14:24:08 +00:00
ec02cf7a85
[1.0.X] Changed the way cache specifiers are parsed.
...
Allows us to reuse the same code in multiple places, avoiding new and
interesting bugs (the testing framework had a DIY version that was slightly
wrong, for example). Fixed #9833 .
Backport of r9936 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9937 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-01 08:15:52 +00:00
4d2de7a307
[1.0.X] Fixed #9548 -- Correctly detect existence of empty sessions with cache backend.
...
Backport of r9934 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9935 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-01 07:33:45 +00:00
3fc72ca8a8
[1.0.X] Fixed #8737 -- Made the PostgreSQL version number detection more flexible.
...
Backport of r9931 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9933 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-01 07:20:19 +00:00
a899f7c662
[1.0.X] Fixed a misnamed test that was inadvertently hiding an earlier one.
...
Backport of r9929 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9932 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-01 07:19:55 +00:00
016f12a2c2
[1.0.X] Fixed insert/update handling when no database interaction is required.
...
Fixed #10205 as part of this.
Backport of r9926 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9927 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-01 01:59:18 +00:00
283c89e4c6
[1.0.X] Fixed #10202 -- Fixed another couple of slicing edge-cases with querysets.
...
Patch from Alex Gaynor and Ramiro Morales.
Backport of r9924 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9925 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-01 01:35:36 +00:00
9b5b2ee2f3
[1.0.X] Fixed #10377 : Added clearer warning to database notes for cx_Oracle 5.0.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9923 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-28 06:05:44 +00:00
9b373d0789
[1.0.X] Fixed #10048 -- Handle non-existent timezone in dateformat functions.
...
Backport of r9919 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9920 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-28 04:52:16 +00:00
106bd0f49e
[1.0.X] Fixed #10028 -- Fixed a problem when ordering by related models.
...
Some results were inadvertently being excluded if we were ordering across a
nullable relation which itself ordering by a non-nullable relation.
Backport of r9916 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9917 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-28 03:02:52 +00:00
7fdd26c582
[1.0.X] Fixed #9634 -- Updated Slovak translation. Thanks Marcel Telka, Marian Andre and scrool.
...
Backport of r9913 and r9263 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9914 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-28 01:24:24 +00:00
2656e6bfa9
[1.0.x] Updated SVN merge properties for some recent commits.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9912 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-27 13:27:11 +00:00
424d158b01
[1.0.X] Invalidate the appropriate SITE_CACHE entry when saving a Site model.
...
This avoids the problem of, for example, saving a change to the Site model in
the admin interface and then seeing the wrong instanec returned in the next
call to get_current_site().
It's still possible to end up with an inconsistent cache if update() is used to
change the Site model, but that's pretty unavoidable. It's also a slightly odd
way to update a Site model, so if you really need to do that, you can manage to
call SiteManager.clear() at the same time.
Backport of r9908 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9909 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-27 05:00:38 +00:00
f799959008
[1.0.X] Fixed #10017 - PasswordResetForm.clean_email was not returning the value.
...
Thanks Zak Johnson, Leo
Backport of r9906 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9907 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-26 17:18:16 +00:00
c9a63889f6
[1.0.X] Fixed #10347 -- Fixed incorrect AttributeError raised when attempting to access a FileField without an instance. Thanks for the report and patch dc.
...
[9902] from trunk. Also updated svnmerge metadata; all trunk changesets have either been merged or blocked.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9903 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-24 17:28:33 +00:00
3550aa2d14
[1.0.X] Fixed ##9842: allow imports of apps that use settings in __init__.py files.
...
Backport of r9843 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9901 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-24 17:05:36 +00:00
734376f947
[1.0.X] Fixed #9214 : EmailMessage now respects the From header instead of blindly using from_email. Thanks, Tai Lee.
...
Backport of r9842 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9900 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-24 17:02:03 +00:00
bd2e7a7876
[1.0.X] Block a bunch of trunk-only changesets from merge to branch.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9899 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-24 16:58:50 +00:00
93b3f89c31
[1.0.X] Fixed #10274 -- Fixed an embarrassing mistake in BaseGenericInlineFormSet.get_queryset. Thanks Zak Johnson for the report and akaihola for the patch.
...
Backport of r9886 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9887 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-23 04:31:29 +00:00
eb442961f5
[1.0.X] Fixed #10307 -- Removed references to FM/Federated States of Micronesia from the US localflavor STATES_NORMALIZED setting. Thanks to mnd for the report.
...
Merge of r9855 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9885 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-22 11:25:25 +00:00
c2807db683
[1.0.X] Fixed #10256 -- Corrected the interaction of extra(select=) with values() and values_list() where an explicit list of columns is requested.
...
Merge of r9837 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9884 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-22 11:18:19 +00:00
8366ef412e
[1.0.X] Blocked AUTHORS addition in r9882 from merge.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9883 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-22 10:25:45 +00:00
315fd2434c
Added SVNmerge annotations for some revisions already merged, and some that need to be blocked.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9881 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-22 09:23:21 +00:00
ef66773cef
[1.0.X] Fixed #9031 -- Clarified the error message when the label used to run a specific test case method doesn't name a valid test case class. Thanks to Thomas Guettler for the suggestion and patch.
...
Merge of r9879 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9880 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-22 08:38:42 +00:00
Malcolm Tredinnick
Karen Tracey
Ian Kelly
Jarek Zgoda
Jannis Leidel
James Bennett
Russell Keith-Magee
Luke Plant
Jacob Kaplan-Moss
Brian Rosner