19526563b5
Merge recent changes from master.
2012-09-09 08:22:26 +08:00
2c5e833a30
Corrected admin_views tests following removal of the email fallback on admin logins.
2012-09-09 07:53:46 +08:00
a78dd109e6
Fixed #15552 -- LOGIN_URL and LOGIN_REDIRECT_URL can take URLpattern names.
...
Thanks UloPe and Eric Florenzano for the patch, and Malcolm Tredinnick for
review.
2012-09-08 16:58:35 -06:00
307706d082
Fixed #18545 -- Make the 'no DJANGO_SETTINGS_MODULE' error message more useful.Thanks Nick Coghlan for the report, and Malcolm Tredinnick for review.
2012-09-08 14:26:33 -06:00
4754f122dd
Moved the admin inline JS to new JS files for cleanliness.
2012-09-08 15:09:37 -04:00
ccd1bb0d81
Remove Admin's swallowing of AttributeError ( #16655 , #18593 , #18747 )
...
During the new-admin changes, catching of AttributeError was added to
the admin. This patch removes that as it's no longer possible to add a
value to a ModelAdmin that is not available. Adding an attribute that
can not be called causes an ImproperlyConfigured exception to be raised.
2012-09-08 11:20:05 -04:00
9b07b5edeb
Fixed #18916 -- Allowed non-ASCII headers.
...
Thanks Malcolm Tredinnick for the review.
2012-09-07 19:08:57 -04:00
b865009d41
Fixed #12397 -- allow safe_join to work with the root file system path, which means you can have your root template or file upload path at this location. You almost certainly don't want to do this, except in *very* limited sandboxed situations.
2012-09-07 16:49:22 -04:00
5999eb42eb
Removed another usage of the bear "except:" (rawr!).
2012-09-07 15:34:48 -04:00
335a9f9cf1
Removed many uses of bare "except:", which were either going to a) silence real issues, or b) were impossible to hit.
2012-09-07 15:08:07 -04:00
6a5a12ea3e
Fixed #17888 -- no longer silence exceptions inside of check_test. Thanks to brutasse for the patch.
2012-09-07 14:37:21 -04:00
a92b81b0e8
Fixed tests that I broke a few commits ago.
2012-09-07 14:01:46 -04:00
f47af9df1d
Cleaned up several test cases, to better isolate state.
2012-09-07 13:47:12 -04:00
292322f977
[py3k] Silence many warnings while running the tests.
2012-09-07 13:17:34 -04:00
7e82e83d67
Merged master changes.
2012-09-07 23:45:03 +08:00
0e296131bb
Cleaned up some small bits of the ORM, including removing an import *.
2012-09-07 10:58:17 -04:00
5262a288df
Fixed #18687 : Removed test_performance_scalability
...
Even after repeated adjustment of the constants, this test still fails
randomly. It has educated us to ignore messages from Jenkins, to a
point where we missed some actual failures. In addition, it accounts
for a non-negligible percentage of the run time of the test suite
just by itself. Since no one has proposed a convincing patch in months,
I'm going to remove the patch. We can't keep a randomly failing test
forever.
2012-09-05 23:02:33 -04:00
22f85b9057
Fixed #18824 -- Allow deleting a setting from overriden settings
2012-09-04 09:41:12 +02:00
cc9b767fc6
Fixed #18902 -- Made force_bytes properly handle exception input
...
Thanks Aymeric Augustin for the report and the initial patch.
2012-09-04 09:27:28 +02:00
28fd876bae
Fixed #17892 -- Do not include whole RegexURLPattern lists in RegexURLResolver repr
...
Thanks milosu for the report and the initial patch.
2012-09-01 22:20:46 +02:00
306d34873c
Fixed #18212 -- Standardized arguments of GenericIPAddressField
...
Unlike other model fields, the newly introduced (1.4)
GenericIPAddressField did not accept verbose_name and name as the
first positional arguments. This commit fixes it.
Thanks Dan McGee for the report and the patch.
2012-09-01 18:38:55 +02:00
879b245baa
Fixed #5725 -- Fixed varchar column size introspection for MySQL
...
Thanks ferdonline for the initial patch and Karen Tracey for the
related post on django-users.
2012-08-30 19:28:13 +02:00
4e70ad11d2
Made FileSystemStorage accept both text and byte streams
...
Thanks Alexey Boriskin for his help on the patch.
2012-08-29 16:37:37 +02:00
b5240d25c1
Removed unnecessary bytes prefix for ContentFile
2012-08-29 11:32:18 +02:00
361d6738f8
Fixed #11739 -- Made ContentFile support Unicode input
2012-08-29 11:21:33 +02:00
ebc773ada3
Replaced many smart_bytes by force_bytes
...
In all those occurrences, we didn't care about preserving the
lazy status of the strings, but we really wanted to obtain a
real bytestring.
2012-08-29 11:20:32 +02:00
9eafb6592e
[py3] Fixed test failures introduced in 3afb5916b2.
2012-08-29 00:04:34 +02:00
3afb5916b2
Fixed #18091 -- Non-ASCII templates break `django-admin.py startproject --template=TEMPLATE`.
...
Thanks to Claude Huchet and Tomáš Ehrlich for the patch.
2012-08-28 23:23:07 +02:00
5a9e127efc
Made model instance history admin view link not hard-coded. Refs #15294 .
2012-08-26 17:54:49 -03:00
28ea4d4b07
Fixed #18852 -- Restored backwards compatibility
...
in django.core.signing. Specifically, kept the same return types
(str/unicode) under Python 2. Related to [92b2dec918
2012-08-25 22:22:32 +02:00
01b9c3d519
Fixed #16715 -- Fixed join promotion logic for nested nullable FKs
...
The joins for nested nullable foreign keys were often created as INNER
when they should have been OUTER joins. The reason was that only the
first join in the chain was promoted correctly. There were also issues
with select_related etc.
The basic structure for this problem was:
A -[nullable]-> B -[nonnull]-> C
And the basic problem was that the A->B join was correctly LOUTER,
the B->C join not.
The major change taken in this patch is that now if we promote a join
A->B, we will automatically promote joins B->X for all X in the query.
Also, we now make sure there aren't ever join chains like:
a LOUTER b INNER c
If the a -> b needs to be LOUTER, then the INNER at the end of the
chain will cancel the LOUTER join and we have a broken query.
Sebastian reported this problem and did also major portions of the
patch.
2012-08-25 14:14:45 +03:00
f5ea730dac
Fixed #18843 -- Replaced more special chars in column names (inspectdb)
...
Thanks airstrike for the report.
2012-08-23 22:59:45 +02:00
395c6083af
Fixed #12460 -- Improved inspectdb handling of special field names
...
Thanks mihail lukin for the report and elijahr and kgibula for their
work on the patch.
2012-08-23 21:46:57 +02:00
10d32072af
Fixed #18798 -- Renamed conflicting test methods in i18n tests
2012-08-23 11:27:56 +02:00
44c09de555
Fixed #18678 -- HttpResponse init arguments allowed for subclasses
...
Thanks hp1337@gmail.com for the report.
2012-08-23 10:59:22 +02:00
7cfe8e8fce
Fixed #11340 -- Prevented HttpResponseNotModified to have content/content-type
...
The HTTP 1.1 spec tells that the 304 response MUST NOT contain a
message body.
Thanks aparajita for the report.
2012-08-22 20:55:24 +02:00
dfe63a52ef
Revert "Fixed #18063 -- Avoid unicode in Model.__repr__ in python 2"
...
This reverts commit 3fce0d2a91
2012-08-22 11:48:47 +10:00
4353a6163c
Fixed #18196 -- Improved loaddata error messages.
2012-08-21 21:52:25 +02:00
a193372753
Fixed #17886 -- Fixed join promotion in ORed nullable queries
...
The ORM generated a query with INNER JOIN instead of LEFT OUTER JOIN
in a somewhat complicated case. The main issue was that there was a
chain of nullable FK -> non-nullble FK, and the join promotion logic
didn't see the need to promote the non-nullable FK even if the
previous nullable FK was already promoted to LOUTER JOIN. This resulted
in a query like a LOUTER b INNER c, which incorrectly prunes results.
2012-08-21 21:23:57 +03:00
e89bc39935
Reverted type check added in 62954ba04c.
...
Refs #17040 .
2012-08-21 09:00:55 +02:00
62954ba04c
[py3] Fixed #17040 -- ported django.utils.crypto.constant_time_compare.
...
This is a private API; adding a type check is acceptable.
2012-08-20 22:50:49 +02:00
3fce0d2a91
Fixed #18063 -- Avoid unicode in Model.__repr__ in python 2
...
Thanks guettli and mrmachine.
2012-08-20 16:47:30 +10:00
8e3fd703d0
Merged recent changes from trunk.
2012-08-20 13:09:09 +08:00
9729f77326
Reordered import statements for clarity.
2012-08-19 21:50:07 +02:00
2f59e94a41
Fixed #18728 -- Made colon optional in tzinfo
...
Made two-digit hours and minutes mandatory in tzinfo (the code used
to crash if a one-digit representation was provided).
Added standalone tests for django.utils.dateparse.
2012-08-19 21:47:41 +02:00
536b030363
[py3] Supported integers in HttpResponse
...
Fixed #18764 .
2012-08-19 16:38:21 +02:00
e945842042
Merge pull request #291 from uruz/ticket18793
...
Fixed #18793 : Removed duplicate test_head_no_get in generic_views.base
Thanks uruz.
2012-08-18 17:12:54 -07:00
f29032eac6
Fixed #18793 : Duplicate test test_head_no_get in generic_views.base
2012-08-19 01:04:08 +04:00
5b09fc8ad2
Merge pull request #288 from mjtamlyn/date-list-period
...
Fixed #3542 -- Add support for changing granularity on ArchiveView.
2012-08-18 09:10:52 -07:00
8d5c11caad
Fixed #3542 -- Add support for changing granularity on ArchiveView.
...
Resolving the concept from a very old ticket in a more class-based-view
manner.
2012-08-18 17:03:57 +01:00
Russell Keith-Magee
Carl Meyer
Travis Swicegood
Travis Swicegood
Aymeric Augustin
Alex Gaynor
Claude Paroz
Florian Apolloner
Ramiro Morales
Anssi Kääriäinen
Alexey Boriskin
Simon Meers
Karen Tracey
Andrew Godwin
Marc Tamlyn