mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-26 11:06:07 +00:00
Code Issues 25 Releases Wiki Activity
12,834 Commits 28 Branches 426 Tags 667 MiB
703c266682
Commit Graph

3456 Commits

Author SHA1 Message Date
Aymeric Augustin
85cd458944 Removed u prefixes on unicode strings. 
They break Python 3.
 2012-07-20 12:29:22 +02:00
Claude Paroz
c54905b359 Fixed #18479 -- Stopped makemessages raising error on gettext warnings 
Thanks Niels Busch for the initial patch.
 2012-07-18 20:43:35 +02:00
Claude Paroz
23f94f0741 Fixed #18561 -- Made HttpResponse.tell() support non-ascii chars 2012-07-17 22:00:54 +02:00
Vebjorn Ljosa
d5012d6371 Fixed #18644 -- Made urlize trim trailing period followed by parenthesis 2012-07-17 12:44:02 -04:00
Anssi Kääriäinen
29132ebdef Fixed #17788 -- Added batch_size argument to qs.bulk_create() 
The qs.bulk_create() method did not work with large batches together
with SQLite3. This commit adds a way to split the bulk into smaller
batches. The default batch size is unlimited except for SQLite3 where
the batch size is limited to 999 SQL parameters per batch.

Thanks to everybody who participated in the discussions at Trac.
 2012-07-17 15:24:41 +03:00
Anssi Kääriäinen
fcad6c48f0 Fixed #17497 -- Corrected FieldError message in add_fields() 
The erroneous message was user visible in values_list() calls.

Thanks to ojii for report and review, and to antoviaque for the patch.
 2012-07-17 12:49:46 +03:00
Nuno Maltez
bebbbb7af0 Fixed #18056 - Cleared aggregations on DateQuery.add_date_select 
Cleared aggregations on add_date_select method so only distinct dates
are returned when dealing with a QuerySet that contained aggregations.
That would cause the query set to return repeated dates because it
would look for distinct (date kind, aggregation) pairs.
 2012-07-16 19:52:31 +03:00
Anssi Kääriäinen
34340517fc Avoid using a column named "date" in tests 
Oracle can have problems with such columns. Fixed #17932 again.
Thanks to Vinay Sajip for the report.
 2012-07-15 12:30:27 +03:00
Alex Gaynor
c57abd3c29 Remove DotExpandedDict, which was undocumented and unused. 2012-07-14 19:04:37 -07:00
Alex Gaynor
8f002867b2 Cleaned up the QueryDict implementation. 
- Use super().
- Don't poke at internals.
- Don't override methods for no reason.
 2012-07-14 14:07:11 -07:00
Claude Paroz
d9db1d3373 Added supplementary check for CUIT number of ar localflavor 
Thanks Kevin Schaul for the initial patch.
 2012-07-09 14:10:54 +02:00
Claude Paroz
1d2982362d Fixed #18537 -- Fixed CUIT calculation in ar localflavor 
Thanks mmoya at 8ksoft.com.ar for the report and Kevin Shaul for the
initial patch.
 2012-07-09 14:10:54 +02:00
Jannis Leidel
1aa0d8ac4d Fixed #18487 -- Made sure that protocol-relative URLs aren't processed by the cached staticfiles storage. Thanks to LukaszBalcerzak for the patch. 2012-07-08 18:25:12 +02:00
Jannis Leidel
3047981517 Fixed #18050 -- Fixed a rather glaring bug in the handling of @import statements when using the cached staticfiles storage. 2012-07-08 18:17:53 +02:00
Jannis Leidel
3727f6d096 Fixed #18430 -- Use the FILE_CHARSET setting when reading from a file during post processing with the cached staticfiles storage. Thanks to Brant Young for initial debugging. 2012-07-08 12:56:49 +02:00
Jannis Leidel
0a68a2994b Fixed #18254 -- Added ability to the static template tags to store the result in a contextt variable. Many thanks to Andrei Antoukh for the initial patch. 2012-07-07 15:30:25 +02:00
Claude Paroz
86eb606b88 Used skipIf decorator to skip image tests when PIL is not available 2012-07-06 11:20:07 +02:00
Andrei Antoukh
0f49b2bce2 Fixed #18362 - Made model.save() update_fields accept attnames 2012-07-05 16:43:28 +03:00
Luke Plant
b0eee0ba4b Removed various unnecessary instances of mark_safe applied to URLs 
Also fixed some test breakages introduced in last commit
 2012-07-03 22:20:12 +01:00
Luke Plant
bee498f3a2 Added 'format_html' utility for formatting HTML fragments safely 2012-07-03 22:20:12 +01:00
Claude Paroz
cf731a543e Fixed widget parent class in generic_relations test 2012-07-03 11:57:15 +02:00
Anssi Kääriäinen
925a6936b9 Stylistic cleanup of Postgres autocommit tests 
Cleaned up tests introduced in f572ee0c65.

Thanks to Claude Paroz for suggesting the changes.
 2012-07-03 10:22:13 +03:00
Julien Phalip
2cd4cf58d3 Fixed #18550 -- Ensured that the admin history view works with escaped primary keys. 
Thanks to josh.oosterman for the report and patch.
 2012-07-01 18:40:50 -07:00
Anssi Kääriäinen
e74787391e Fixed a regression introduced in where.as_sql() refactor 
At least Oracle needs parentheses in negated where conditions, even if
there is only single condition negated. Fixed this by reverting to old
logic in that part of as_sql() and adding a comment about this.

I did not investigate why the parentheses are needed. The original
offending commit was bd283aa844.
 2012-07-01 22:52:35 +03:00
Anssi Kääriäinen
f572ee0c65 Fixed #16047 -- Restore autocommit state correctly on psycopg2 
When the postgresql_psycopg2 backend was used with DB-level autocommit
mode enabled, after entering transaction management and then leaving
it, the isolation level was never set back to autocommit mode.

Thanks brodie for report and working on this issue.
 2012-07-01 19:36:43 +03:00
Anssi Kääriäinen
da573fbb41 Fixed some locations to work with autocommit=True 
- backends: supports_transactions()
 - select_for_update tests
 2012-07-01 19:27:36 +03:00
Anssi Kääriäinen
bd283aa844 Refactored the empty/full result logic in WhereNode.as_sql() 
Made sure the WhereNode.as_sql() handles various EmptyResultSet and
FullResultSet conditions correctly. Also, got rid of the FullResultSet
exception class. It is now represented by '', [] return value in the
as_sql() methods.
 2012-07-01 17:21:34 +03:00
Claude Paroz
deed192dda Removed usage of mimetype kwarg of HttpResponse 
Refs #16519.
 2012-06-30 21:19:07 +02:00
Claude Paroz
47da7b7a9a Fixed #18102 -- Defined min/max_length on French localflavor form fields 
Thanks mothsART for the report and the initial patch.
 2012-06-30 13:18:07 +02:00
Claude Paroz
26cb227cfe Fixed #15197 -- Fixed yaml serialization into HttpResponse 
Thanks fourga38 for the report and hirokiky at gmail.com for the
initial patch.
 2012-06-28 16:29:29 +02:00
Josh Smeaton
fa182e8ae8 Fixed #18465 -- Set date formats correctly on Oracle 
Correctly configure NLS_SESSION_PARAMETERS to format Date and DateTime
on Oracle backend.

Thanks to Josh Smeaton for report & patch.
 2012-06-26 19:39:14 +03:00
Claude Paroz
05d333ba3b Fixed #18515 -- Conditionally regenerated filename in FileField validation 
When a FileField value has been saved, a new validation should not
regenerate a new filename when checking the length. Refs #9893.
 2012-06-26 18:18:44 +02:00
Anssi Kääriäinen
b6c356b7bb Fixed #17485 -- Made defer work with select_related 
This commit tackles a couple of issues. First, in certain cases there
were some mixups if field.attname or field.name should be deferred.
Field.attname is now always used.

Another issue tackled is a case where field is both deferred by
.only(), and selected by select_related. This case is now an error.

A lot of thanks to koniiiik (Michal Petrucha) for the patch, and
to Andrei Antoukh for review.
 2012-06-26 18:08:42 +03:00
Claude Paroz
4b722b31e1 Fixed #16317 -- Fixed dumpdata for self-referencing models and natural keys 
Thanks aldaran for the patch.
 2012-06-24 19:54:56 +02:00
Alex Gaynor
e0fce8706d Switch to using context managers for acquiring and releasing locks. 2012-06-23 08:11:15 -07:00
Dmitry Medvinsky
d4da08375b Fixed #18454 -- Added ability to pass a list of signals to receiver. 
Added ability to use receiver decorator in the following way:

    @receiver([post_save, post_delete], sender=MyModel)
    def signals_receiver(sender, **kwargs):
        ...
 2012-06-23 16:31:16 +02:00
Luke Plant
a54a8bab0c Fixed #17776 - DoesNotExist is not picklable 
Thanks to ambv for the report
 2012-06-22 13:28:15 +01:00
Claude Paroz
f08fa5b555 Removed unneeded u prefixes 2012-06-19 17:37:28 +02:00
Chris Beaven
c57ba67331 Fixed #14502 again -- saner verbatim closing token 
Previously, the closing token for the verbatim tag was specified as the
first argument of the opening token. As pointed out by Jannis, this is
a rather major departure from the core tag standard.

The new method reflects how you can give a specific closing name to
{% block %} tags.
 2012-06-19 10:49:33 +12:00
Claude Paroz
fe873e2765 Fixed #12140 -- Fixed http.urlencode result for empty lists 
Thanks aneil for the report and the initial patch.
 2012-06-14 11:32:40 +02:00
Claude Paroz
a2022dae7f Removed escaping test of query content 
As the content of last_executed_query() is not under Django's control
for most backends, it is useless to test too specific aspects of it.
 2012-06-13 13:37:22 +02:00
Anssi Kääriäinen
86c20e39eb Fixed connection.queries encoding handling on Oracle 
In addition, removed a possibly problematic .filter() call from
backends.test_query_encoding test. It is possible the .filter could
cause collation problems on MySQL, and as it wasn't absolutely needed
for the test it seemed better to get rid of the call.

Refs #18461.
 2012-06-13 14:16:34 +03:00
Claude Paroz
e9ef9776d1 Fixed #18461 -- Ensured that last_executed_query returns Unicode 
Thanks Anssi Kääriäinen for the review.
 2012-06-13 12:04:46 +02:00
Claude Paroz
a7ef802fa4 Added missing encoding prefix in localflavor test 2012-06-12 14:25:51 +02:00
Claude Paroz
35f9c2c07a Cleaned up locale-related encoding issues 2012-06-12 14:23:41 +02:00
Claude Paroz
3dd5d726d1 Fixed #18463 -- Forced type() argument to be a byte string 2012-06-11 22:14:06 +02:00
Claude Paroz
fc40a6504b Fixed #17159 -- Validated returned number of next|previous_page_number 
Thanks mehta.apurva at gmail.com for the report and the initial patch
and neaf for the complete patch.
 2012-06-09 17:55:24 +02:00
Claude Paroz
ef906b1632 Removed test of connection features before setting up databases 2012-06-09 17:22:24 +02:00
Claude Paroz
ad47364dd3 Reverted 905e33f, now that DatabaseFeatures does not need confirm 
Connection.features does not need to be confirmed any more, after
commit aa42357, rendering obsolete the workaround when using
TEST_MIRROR (Refs #16885, #17760).
 2012-06-09 17:05:54 +02:00
Claude Paroz
aa423575e7 Fixed #17760 -- Implemented callable database features as cached properties 
This does remove the requirement to call features.confirm() method
before checking the properties.
Thanks cdestiger and Ramiro Morales for their work on the patch.
 2012-06-09 15:59:52 +02:00
Anssi Kääriäinen
484fcd34a4 Fixed #16418 -- Made generic views work with ModelForms 
Generic views assumed any object's _meta will be model Options. This
is not true for ModelForms for example. Took isinstance(obj, Model)
in use instead.
 2012-06-09 01:12:14 +03:00
Aymeric Augustin
23d230f058 Merge pull request #123 from apollo13/ticket18381 
Fixed #18381 -- Stopped escaping object ids

when passing them to the contenttypes.shortcut view.

Thanks apollo13 for the patch and dhepper for the review.
 2012-06-08 01:48:41 -07:00
Daniel Hepper
0ae727beda Fixed #18433 -- Fixed "View on Site" link in inline admin for models with custom PK 2012-06-07 21:08:36 +02:00
Jann Kleen
1a412dda62 Fixed #18432 -- Prevented the ForeignKey field from creating an invalid query when chained. Thanks, Jann Kleen. 2012-06-07 18:49:19 +02:00
Claude Paroz
4a103086d5 Fixed #18269 -- Applied unicode_literals for Python 3 compatibility. 
Thanks Vinay Sajip for the support of his django3 branch and
Jannis Leidel for the review.
 2012-06-07 18:08:47 +02:00
Florian Apolloner
e1643e3535 Don't escape object ids when passing to the contenttypes.shortcut view. 
This commit also changes the string pk to string_pk instead of id, to test
if the admin uses .pk throughout the codebase.
 2012-06-07 17:52:12 +02:00
Claude Paroz
6492e8e5e6 Added more precise assertions on two fixture tests. 2012-06-07 14:37:37 +02:00
Claude Paroz
6fd1950a4e Fixed #10200 -- Raised CommandError when errors happen in loaddata. 2012-06-07 10:32:10 +02:00
Aymeric Augustin
4464bbba15 Fixed #14502 -- Added a verbatim template tag. 
Thanks SmileyChris for the patch.
 2012-06-07 09:59:14 +02:00
Claude Paroz
2c57809a56 Prevented TestNoInitialDataLoading to pollute other tests (Refs #15926) 
Tests were still failing with MySQL. It seems a rollback is solving
the issue.
 2012-06-06 15:47:48 +02:00
Luke Plant
4fea46a030 Fixed #18309 - Prefetch related does not work for fkey to multitable inherited model 
Thanks to milosu for the report, tests and initial patch.
 2012-06-06 14:17:32 +01:00
Claude Paroz
f0664dc8ae Made TestNoInitialDataLoading pass with MySQL (Refs #15926) 2012-06-06 13:54:40 +02:00
Honza Kral
fedac99c85 Fixed #15926 -- Added option --no-initial-data to syncdb and flush. 
Thanks msiedlarek, jpaugh64 and vlinhart!
 2012-06-05 16:46:15 +02:00
Julien Phalip
f699641161 Fixed #17138 -- Made the sensitive_variables decorator work with object methods. 2012-06-03 23:44:13 -07:00
Honza Kral
a89034a2d8 Changed FilePathField tests to use it's own directory with test files. 
In previous version it used /django/forms/ which was fragile - for some
users .pyc files were not generated and this tests failed.
 2012-06-03 22:54:34 +02:00
Honza Kral
71d9a2a7fe Unittest2 style assertTrue instead of assert_ 2012-06-03 22:31:49 +02:00
Honza Kral
f823ae3b3e Fixed incorrect assert in test_filepathfield_folders 2012-06-03 21:46:14 +02:00
Claude Paroz
566ac30eb9 Fixed override_settings usage in test_client_regress 2012-06-02 19:50:24 +02:00
Claude Paroz
ade44b8d40 Fixed settings override in mail regression tests 
self.settings_override from test subclasses were overwriting parent
attribute.
 2012-06-02 19:44:15 +02:00
Ramiro Morales
d4648a3446 Removed debugging code added in last commit. 2012-06-01 21:50:06 -03:00
Ramiro Morales
72130385bf Made inspectdb tests deal with a smaller generated models.py file. 
Implemented this by adding a stealth table_name_filter option for the
command.
 2012-06-01 21:46:07 -03:00
Julien Phalip
f6fc83c975 Fixed #18409 -- Made RegexField work with unicode characters. 2012-05-31 11:45:35 -07:00
Claude Paroz
ea4e0aad9e Cleaned up test_client_regress tests 2012-05-31 17:43:21 +02:00
Claude Paroz
4553f51155 Moved test_client_regress tests from models.py to tests.py 2012-05-31 17:21:13 +02:00
Claude Paroz
0dc904979d Fixed #18407 -- Made model field's to_python methods fully accept unicode. 
When generating error message in to_python, any unicode string
containing non-ascii characters triggered a UnicodeEncodeError for
most field types.
 2012-05-31 16:46:07 +02:00
Claude Paroz
473c272246 Rewrote test_error_messages with helper test utility. 2012-05-31 16:24:37 +02:00
Claude Paroz
2626ea4a74 Fixed #14681 -- Do not set mode to None on file-like objects. 
gzip.GzipFile does not support files with mode set to None.
 2012-05-31 10:02:35 +02:00
Julien Phalip
432339a72c Fixed #18393 -- Prevented blocktrans to crash when a variable name is badly formatted. 2012-05-28 11:03:34 -07:00
Claude Paroz
a535040bfa Used call_command stdout parameter to capture output in staticfiles tests. 2012-05-28 11:55:38 +02:00
Claude Paroz
c3b56c7cdd Used call_command in i18n compilation tests. 
Now that call_command does not raise SystemExit any more, we can
use call_command again for testing compilemessages.
 2012-05-27 23:11:27 +02:00
Claude Paroz
cc4b4d9fd3 Used CommandError in createcachetable command. 
Raising CommandError whenever a management command meets an error
condition is the standard way to handle errors in commands.
 2012-05-27 23:03:21 +02:00
Claude Paroz
f2b6763ad7 Fixed #18387 -- Do not call sys.exit during call_command. 
Moved sys.exit(1) so as failing management commands reach it
only when running from command line.
 2012-05-27 20:38:47 +02:00
Michael Newman
4423757c0c Fixed #18135 -- Close connection used for db version checking 
On MySQL when checking the server version, a new connection could be
created but never closed. This could result in open connections on
server startup.
 2012-05-27 18:45:08 +03:00
Anssi Kääriäinen
a8a81aae20 Fixed #18343 -- Cleaned up deferred model implementation 
Generic cleanup and dead code removal in deferred model field loading
and model.__reduce__().

Also fixed an issue where if an inherited model with a parent field
chain parent_ptr_id -> id would be deferred loaded, then accessing
the id field caused caused a database query, even if the id field's
value is already loaded in the parent_ptr_id field.
 2012-05-27 18:11:13 +03:00
Claude Paroz
7a4233b69c Removed a duplicate test in fixtures_regress. 
test_abort_loaddata_on_error was exactly the same test as
test_empty (error is tested in test_error_message).
 2012-05-26 16:42:28 +02:00
Claude Paroz
3b5083bee5 Fixed #5423 -- Made dumpdata output one row at a time. 
This should prevent storing all rows in memory when big sets of
data are dumped.
See ticket for heroic contributors.
 2012-05-26 11:43:37 +02:00
Claude Paroz
edfa95c22f Specified when open should use binary mode. 
Thanks Vinaj Sajip for the help of his django3 branch.
 2012-05-25 20:43:43 +02:00
Aymeric Augustin
e73838b6dd Fixed #17371 -- Made the test client more flexible 
The OPTIONS, PUT and DELETE methods no longer apply arbitrary
data encoding (in the query string or in the request body).
 2012-05-25 19:03:15 +02:00
Anssi Kääriäinen
323b414441 Added tests for nested exclude/negate queries 2012-05-25 14:10:45 +03:00
Anssi Kääriäinen
8c72aa2379 Fixed qs.order_by() join promotion for already existing joins 
When order_by causes new joins to be added to the query, the joins must
be LEFT OUTER joins for nullable relations, otherwise the order_by
could cause the results to be altered. This commit fixes the logic to
only promote new joins, previously all joins in the order_by lookup
path were promoted.

Thanks to Bruno Desthuilliers for spotting this corner case.
 2012-05-24 18:42:06 +03:00
Aymeric Augustin
1e6c3368f2 Fixed #18177 -- Cached known related instances. 
This was recently fixed for one-to-one relations; this patch adds
support for foreign keys. Thanks kaiser.yann for the report and
the initial version of the patch.
 2012-05-24 13:25:01 +02:00
Aymeric Augustin
3b2993ed04 Fixed #18353 -- Inconsistency in date-based CBVs. 2012-05-24 13:02:19 +02:00
Anssi Kääriäinen
0df4593f0e Fixed #18319 -- Added 'supports_sequence_reset' DB feature 
Added a new feature to allow 3rd party backends to skip tests which
test sequence resetting.

Thanks to manfre for report and patch.
 2012-05-22 23:51:05 +03:00
Anssi Kääriäinen
8ee1a664f9 Fixed #18318 -- Changed some tests to be 3rd party DB friendly 
Thanks to manfre for report and patch.
 2012-05-22 23:33:42 +03:00
Anssi Kääriäinen
459c3b67b7 Fixed #18317 -- Removed db specific raw SQL function from tests 
A test in model_fields used LEN() in raw SQL. This function is not
available on some 3rd party backends. I removed this function and
ensured that the test works correctly (breaks pre e9bbdb39de) with
the change.
 2012-05-22 23:16:24 +03:00
Anssi Kääriäinen
d5c7f9efc3 Fixed #18304 -- Optimized save() when update_can_self_select=False 
Databases with update_can_self_select = False (MySQL for example)
generated non-necessary queries when saving a multitable inherited
model, and when the save resulted in update.
 2012-05-22 20:59:33 +03:00
Aymeric Augustin
03f86a5adb Fixed #18354 -- Performance issue in CBV. 
Prevented repeating a query twice when the model isn't ordered by
-date_field (in Meta), allow_empty is False and pagination isn't
enabled.
 2012-05-20 13:18:42 +02:00
Claude Paroz
38408f8007 Marked bytestrings with b prefix. Refs #18269 
This is a preparation for unicode literals general usage in
Django (Python 3 compatibility).
 2012-05-19 17:43:34 +02:00
Claude Paroz
822d6d6dab Fixed #18325 -- Wrapped self.stdout/stderr in OutputWrapper class 2012-05-19 13:51:54 +02:00
Claude Paroz
45f55a9fcc Fixed broken ES localflavor test after 4774875. 2012-05-18 13:45:42 +02:00
Claude Paroz
7549de841c Fixed #18334 -- Fixed detection of supports_stddev backend feature. 
Thanks to Michael Manfre for the report and Anssi Kääriäinen for the
review.
 2012-05-18 12:12:45 +02:00
Aymeric Augustin
ab268e1848 Added a test for DayArchiveView. Refs #17192. 2012-05-17 17:53:19 +02:00
Aymeric Augustin
dcd4383107 Fixed #9893 -- Validated the length of file names 
after the full file name is generated by the storage class.

Thanks Refefer for the report, carsongee for the patch, and
everyone else involved in the discussion.
 2012-05-17 16:02:05 +02:00
Aymeric Augustin
c4996df16c Fixed #17449 -- Added OPTIONS to generic views. 
Thanks estebistec for the report and patch.
 2012-05-17 13:54:51 +02:00
Aymeric Augustin
009e237cf0 Fixed #17535 -- Optimized list generic views. 
When allow_empty is False, prevented the view from loading
the entire queryset in memory when pagination is enabled.
 2012-05-17 13:34:53 +02:00
Claude Paroz
006c2b8fc1 Fixed #18326 -- Stripped ending chars in LiveServerViews tests. 
Ending chars might be different depending on git crlf setting.
Thanks Michael Manfre for the report and the patch.
 2012-05-17 11:10:48 +02:00
Jannis Leidel
5f75ac91df Fixed #17896 -- Added file_hash method to CachedStaticFilesStorage to be able to customize the way the hashed name of a file is created. Thanks to mkai for the initial patch. 2012-05-16 13:21:50 +02:00
Aymeric Augustin
fcb09b5746 Fixed #10890: added prev/next_week in the context 
of per-week date-based generic views. Thanks ee_lars for the report.
 2012-05-14 22:40:45 +02:00
Claude Paroz
bbb12581db Replaced im_func and im_self by __func__ and __self__. 
The new names are Python 3 compatible.
 2012-05-12 22:35:21 +02:00
Claude Paroz
33ffd28d76 Added missing relative imports in test files. 2012-05-12 19:58:32 +02:00
Anssi Kääriäinen
de79d23ce0 Avoided test failure on MySQL by skipping a failing test 
MySQL generates an extra query in inheritance cases when doing an update.
This results in a test failure when checking for number of queries in
update_only_fields tests. Added a skip temporarily to avoid this test
failure. Refs #18304.
 2012-05-12 12:03:46 +03:00
Andrei Antoukh
365853da01 Fixed #4102 -- Allow update of specific fields in model.save() 
Added the ability to update only part of the model's fields in
model.save() by introducing a new kwarg "update_fields". Thanks
to all the numerous reviewers and commenters in the ticket
 2012-05-12 10:29:41 +03:00
Aymeric Augustin
46648b641d Fixed #17798 -- Tweaked the CA localflavor. 
Thanks shelldweller.
 2012-05-10 22:19:01 +02:00
Claude Paroz
169b1a404c Replaced foo.next() by next(foo). 
This new syntax for next() has been introduced in Python 2.6 and is
compatible with Python 3.
 2012-05-10 20:15:49 +02:00
Anssi Kääriäinen
c2e1ecb4b1 Fix proxy model Query.remove_inherited_models() 
Fixed #18248 -- proxy models were added to included_inherited_models
in sql.query.Query. The variable is meant to be used for multitable
inheritance only. This mistake caused problems in situations where
proxy model's query was reused.
 2012-05-09 20:33:31 +03:00
Simon Charette
5cbfb48b92 Made model fields comparable to other objects 
Fixed #17851 -- Added __lt__ and @total_ordering to models.Field,
made sure these work correctly on other objects than Field, too.
 2012-05-07 20:08:20 +03:00
Claude Paroz
d7dfab59ea Replaced cStringIO.StringIO by io.BytesIO. 
Also replaced StringIO.StringIO by BytesIO in some other appropriate
places. StringIO is not available in Python 3.
 2012-05-05 21:41:44 +02:00
Claude Paroz
208e26b39c Commented on a line that inadvertantly slipped in commit 865cd35c 
Ignoring __pycache__ directories fixes #17393 and prepare testing
with Python 3.
 2012-05-05 16:45:02 +02:00
Claude Paroz
865cd35c9b Made more extensive usage of context managers with open. 2012-05-05 14:06:36 +02:00
Claude Paroz
11a5355517 Inserted more simplefilter calls to be sure warnings are emitted. 
Thanks to Florian Apolloner for suggesting the patch.
 2012-05-03 21:31:23 +02:00
Claude Paroz
00c0d3c44e Made warning assertions work with or without -Wall python switch 2012-05-03 20:18:05 +02:00
Claude Paroz
10cf3c6427 Used catch_warnings instead of save/restore methods. Refs #17049. 2012-05-03 18:30:07 +02:00
Ramiro Morales
ea28bc2688 Removed unused file from i18n regression tests. 2012-05-03 12:00:36 -03:00
Claude Paroz
b52672d778 Replaced deprecated TestCase methods. Refs #17049. 2012-05-03 16:39:16 +02:00
Aymeric Augustin
e84f79f051 Fixed #18042 -- Advanced deprecation warnings. 
Thanks Ramiro for the patch.
 2012-05-03 15:27:01 +02:00
Karen Tracey
b86a00187d Merge pull request #28 from akaariai/ticket_18163 
Ticket 18163 - use faster password hasher in tests.
 2012-05-02 16:06:00 -07:00
Aymeric Augustin
435081fd22 Fixed tests for date-based generic views. 2012-05-01 22:23:17 +02:00
Aymeric Augustin
46b082e05c Fixed #17742 -- Handled aware datetimes in DateField 
Converted aware datetimes to the default time zone before using them
in the context of a DateField.
 2012-05-01 11:29:55 +02:00
Anssi Kääriäinen
0819957eda Use faster password hasher in sqlite tests 
Fixed #18163
 2012-04-30 22:10:27 +03:00
Anssi Kääriäinen
8fad77da95 Ensured tests pass using custom PASSWORD_HASHERS. 2012-04-30 22:10:27 +03:00
Aymeric Augustin
ddfc7c2530 Fixed #4746 -- Allowed spaces around filter separator. 2012-04-30 21:01:06 +02:00
Aymeric Augustin
78ba9670af Fixed #18217 -- Time zone support in generic views 
Introduced a distinct implementation depending on the type of the
date field (DateField or DateTimeField), and applied appropriate
conversions is the latter case, when time zone support is enabled.
 2012-04-30 20:48:19 +02:00
Claude Paroz
596cb9c7e2 Replaced print statement by print function (forward compatibility syntax). 2012-04-30 20:45:03 +02:00
Anssi Kääriäinen
4b11762f7d Fixed SortedDict.__copy__() 
Fixed #18175 -- Calling SortedDict.__copy__() resulted in changes to
the original dictionary. The reason was likely related to subclassing
dict.

Thanks to linovia for report and patch.
 2012-04-30 17:19:55 +03:00
Anssi Kääriäinen
a18e43c5bb Made get_indexes() consistent across backends. 
Fixed #15933, #18082 -- the get_indexes() method introspection was
done inconsitently depending on the backend. For example SQLite
included all the columns in the table in the returned dictionary,
while MySQL introspected also multicolumn indexes.

All backends return now consistenly only single-column indexes.

Thanks to andi for the MySQL report, and ikelly for comments on
Oracle's get_indexes() changes.
 2012-04-30 14:30:29 +03:00
Claude Paroz
3904b74a3f Fixed #18013 -- Use the new 'as' syntax for exceptions. 
Thanks Clueless for the initial patch.
Note that unittest has been purposely left out (external package only used by Python 2.6).
 2012-04-29 20:57:15 +02:00
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
Anssi Kääriäinen
584e2c0337 Prevent Oracle from changing field.null to True 
Fixed #17957 -- when using Oracle and character fields, the fields
were set null = True to ease the handling of empty strings. This
caused problems when using multiple databases from different vendors,
or when the character field happened to be also a primary key.

The handling was changed so that NOT NULL is not emitted on Oracle
even if field.null = False, and field.null is not touched otherwise.

Thanks to bhuztez for the report, ramiro for triaging & comments,
ikelly for the patch and alex for reviewing.
 2012-04-29 19:25:46 +03:00
Alex Gaynor
e75bd7e51c Merge pull request #22 from aviraldg/test_17967 
Added regression test for #17967.  Thanks to aviraldg for the patch!
 2012-04-29 09:08:12 -07:00
Aviral Dasgupta
0525f6d8bd Fixed some style issues in previous commit. 2012-04-29 21:31:09 +05:30
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
Aymeric Augustin
3e8b40f479 Fixed #17992 -- Added a public API for localtime. 
Thanks Bradley Ayers for the report.
 2012-04-29 15:37:23 +02:00
Anssi Kääriäinen
5aa51fa999 Simplified QuerySet field.null handling 
QuerySet had previously some complex logic for dealing with nullable
fields in negated add_filter() calls. It seems the logic is leftover
from a time where the WhereNode wasn't as intelligent in handling
field__in=[] conditions.

Thanks to aaugustin for comments on the patch.
 2012-04-29 16:27:25 +03:00
Aymeric Augustin
9350d1d59c Fixed #17976 -- Made forms.BooleanField pickleable. 
This was a regression in Django 1.4.
Thanks bronger for the report and claudep for the patch.
 2012-04-29 14:25:06 +02:00
Aviral Dasgupta
d12d55ec26 Added regression test for #17967. 2012-04-29 17:26:22 +05:30
Aymeric Augustin
02a5b41db4 Fixed #18224 -- Changed the dev version number. 
Following the move from SVN to git.
 2012-04-29 13:40:10 +02:00
Aymeric Augustin
905bd7fb44 Fixed #13196 -- Formatting in admin changelists. 
Handled values returned by functions more like field values.
In particular, localized dates, times and datetimes properly,
and converted datetimes to the current timezone.
 2012-04-29 11:51:12 +02:00
Anssi Kääriäinen
527cce80dc Made table_names() output sorted. 
Fixed #18218 -- previously Django's introspection table_names() and
get_table_list() methods did not sort the output consistently. This
resulted in random order of inspected models.

This commit also removed all external usages of get_table_list().
table_names() should be used instead.

Thanks to claudep for patch and report.
 2012-04-29 02:11:55 +03:00
Aymeric Augustin
10cade8fac Removed a svn-specific hack from a test. 2012-04-28 15:19:04 +02:00
Claude Paroz
ddc5d59c6a Fixed #15076 -- Quoted ForeignKey target class names in inspectdb when class is defined below. 
Thanks saschwarz for the report, jeff@deserettechnology.com for the initial patch and Ramiro Morales for the review. 


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17942 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-27 06:56:31 +00:00
Claude Paroz
8aca3d1cc2 Removed unneeded deprecation warning silencing in test suite. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17940 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-26 18:06:17 +00:00
Claude Paroz
a6b2a15348 Removed deprecated gender check in cz localflavor. Refs #14593. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17939 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-26 17:48:50 +00:00
Claude Paroz
1858e47672 Fixed #18033 -- Removed function-based generic views, as per official deprecation timeline. Rest in peace! Thanks Anssi Kääriäinen for the review. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17937 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-25 19:17:47 +00:00
Claude Paroz
921d7f08b9 Removed some leftover references to old-syntax ssi template tag tests. Refs #18037. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17935 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-24 21:08:13 +00:00
Claude Paroz
eb351ac9cb Fixed #18037 -- Changed behaviour of url and ssi template tags to the new syntax, as per official deprecation timeline. Thanks Ramiro Morales and Jannis Leidel for the review. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17934 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-24 19:55:52 +00:00
Anssi Kääriäinen
c4e62eff90 Fixed #17653 -- Changed MySQL backend to raise a ValueError if zero is used as an AutoField value. 
Thanks to Sylvain Lebon for the report, krzysiumed for the patch and charettes and claudep for reviews.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17933 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-24 18:03:14 +00:00
Anssi Kääriäinen
612247b3a0 Fixed #16961 -- Skipped resetting AUTO_INCREMENT fields for MySQL if the server version is greater than 5.0.12. This allows for much faster testing. 
Thanks to aigarius for the report and claudep and ramiro for review.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17932 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-24 16:47:31 +00:00
Claude Paroz
03a442c8ad Fixed #17954 -- Fixed dependency checking for test databases. Thanks Łukasz Rekucki for the report and the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17931 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-24 16:05:47 +00:00
Alex Gaynor
e7d648d8cb Ignore .svn directories in the folders test from [17925]. This is what happens when you use git-svn. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17926 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-22 15:07:36 +00:00
Alex Gaynor
3c5ff9d703 Fixed #5893 -- Added a flag to FilePathField to allow listing folders, in addition to regular files. Thank you to Brian Rosner, for encouraging me to first contribute to Django 4 years ago. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17925 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-22 14:44:08 +00:00
Anssi Kääriäinen
53fb45c6d8 Fixed #17615 -- Corrected unique field validation when using multitable inheritance. The validation used wrong pk value if the parent and child model had different pk fields. Thanks ungenio for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17920 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-20 17:34:29 +00: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
Claude Paroz
2cd516002d Fixed #18002 -- Fixed typo in attribute name in ReverseSingleRelatedObjectDescriptor. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17904 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-12 20:23:41 +00:00
Claude Paroz
5a4d7e63ce Fixed #18027 -- Removed an HTMLParser test that doesn't raise any more in recent Python versions. Thanks Arfever and Anssi Kaariainen for the report and the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17900 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-11 21:25:22 +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
Claude Paroz
e2548ec2a9 Fixed #18071 -- Ignored case sensitivity in urlize utility. Thanks luke@creaturecreative.com and adamzap for the report and the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17898 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-11 17:49:22 +00:00
Aymeric Augustin
93240b7d90 Fixed #17229 -- Allow 'True', 'False' and 'None' to resolve to the corresponding Python objects in templates. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17894 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-10 20:49:45 +00:00
Aymeric Augustin
28e5b66518 Fixed #18087 -- Prevented date-based generic views from loading entire tables in memory when pagination is enabled. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17893 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-10 20:05:46 +00:00
Aymeric Augustin
b90d4e5b74 Made the caching of related and reverse related objects consistent in OneToOneFields. Fixed #13839. Refs #17439. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17890 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-10 12:29:25 +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
Julien Phalip
6f7aa51b2c Fixed #17864 -- Added Hong Kong localflavor. Thanks to mrkschan and Adrien Lemaire. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17886 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-09 17:25:02 +00:00
Claude Paroz
883c38c499 Fixed #17848 -- Added setting_changed signal for cases when TEMPLATE_CONTEXT_PROCESSORS is overriden in tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17885 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-09 13:24:57 +00:00
Julien Phalip
a0b55f30a8 Fixed #18086 -- Restored '-pk' as the default order in the admin changelist. This rectifies a slight change in behavior introduced in Django 1.4 and r17635. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17881 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-09 04:28:32 +00:00
Julien Phalip
93d1fdb130 Fixed #17877 -- Ensured that extra WHERE clauses get correctly ANDed when they contain OR operations. Thanks to Marek Brzóska for the report, to eleather for the test case and to Adrien Lemaire for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17880 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-09 00:43:08 +00:00
Claude Paroz
5c53e30607 Fixed #18035 -- Removed deprecated AdminMediaHandler, as per official deprecation timeline. Thanks Jannis Leidel and Ramiro Morales for the review. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17879 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-08 21:13:32 +00:00
Claude Paroz
8dd04fd84b Fixed #15683 -- Prevented escaped string to be needlessly marked safe twice in force_escape filter. Thanks tyrion for the initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17876 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-07 15:16:11 +00:00
Claude Paroz
8663bc1103 Fixed #16074 -- Added ContextMixin to class-based generic views to handle get_context_data. Thanks emyller, Luke Plant, Preston Holmes for working on the ticket and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17875 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-06 21:24:33 +00:00
Claude Paroz
5c954136ea Fixed #15644 -- Improved Django File wrapper to support more file-like objects. Thanks nickname123 and Michael Palumbo for working on the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17871 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-05 15:44:04 +00:00
Claude Paroz
38115ea742 Fixed #17938 -- Made explicit object ordering in LiveServerDatabase test assertion. Thanks Nate Bragg for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17869 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-05 14:06:06 +00:00
Ramiro Morales
b41ebcf1b9 Fixed #18040 -- Removed so-called project-level locale trees from the list of paths the translation loading process takes in account. 
Deprecated in Django 1.3. Removed completely for Django 1.5.

Thanks Claude for the review.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17861 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-31 22:24:24 +00:00
Claude Paroz
2d01c9de69 Removed some more useless code related to the verify_exists removal. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17856 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-31 18:27:17 +00:00
Julien Phalip
c39e1cff99 Fixed #17972 -- Ensured that admin filters on a foreign key respect the to_field attribute. This fixes a regression introduced in [14674] and Django 1.3. Thanks to graveyboat and Karen Tracey for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17854 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-31 18:22:12 +00:00
Claude Paroz
6d9227bb0f Removed some more imports/warnings useless after recent removals. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17850 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-31 15:20:57 +00:00
Aymeric Augustin
37c8bc89f2 Removed deprecated tests missed in r17839. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17848 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-31 13:58:03 +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
800e3941c5 Extended TrailingSlashURLTests to cover STATIC_URL as well as MEDIA_URL. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17846 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-31 13:11:02 +00:00
Aymeric Augustin
fbfaa35fb0 Required that the MEDIA_URL and STATIC_URL settings end with a slash, per the deprecation timeline. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17845 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-31 13:01:59 +00:00
Aymeric Augustin
d38690796c Removed the deprecated reset and sqlreset management commands. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17842 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-31 12:38:11 +00:00
Aymeric Augustin
c7229c681e Removed deprecated DjangoTestRunner. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17840 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-31 12:22:52 +00:00
Claude Paroz
a1ffb02107 Fixed #18029 -- Removed mod_python as of deprecation process. Thanks Aymeric Augustin for the review. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17835 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-31 10:34:11 +00:00
Claude Paroz
23d3459761 Fixed #17965 -- Definitely dropped support for Python 2.5. Thanks jonash for the initial patch and Aymeric Augustin for the review. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17834 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-31 08:24:29 +00:00
Aymeric Augustin
4fe87c370d Removed some Python < 2.6 compatibility code. Refs #17965. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17830 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-30 09:20:04 +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
Aymeric Augustin
1e28567e0d Fixed #17937 -- Avoided an error in the timeuntil filter when it receives a date object. Thanks Dmitry Guyvoronsky for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17774 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-22 07:29:39 +00:00