Fixed #3544, #12064, and #16147 - include tag. #920

Closed
wants to merge 24 commits into
from

Conversation

Projects
None yet
8 participants
Contributor

prestontimmons commented Mar 18, 2013

3544 - Allow recursive includes.

12064, 16147 Don't raise a template error if a non-existent template is
contained in a conditional block that is false.

Added a quiet option to suppress template errors if it's known that
the template may not exist. This allows a template to be conditionally
included if it exists or not.

Cleaned up the BaseInclude, ConstantInclude, IncludeNode heirarchy. This
is now a single node class.

Expanded the existing include tests for better readability.

evildmp and others added some commits Mar 13, 2013

@evildmp evildmp removed unused BLANK_CHOICE_NONE a4c9a4a
@bmispelon bmispelon Fix #20054: Removed links to modwsgi.org. 957fcd0
@bmispelon bmispelon Fix 20061: remove out of date comment. babd109
@adrianholovaty adrianholovaty Merge pull request #909 from bmispelon/ticket-20061
Fix 20061: remove out of date comment.
6880c1b
@adrianholovaty adrianholovaty Merge pull request #906 from bmispelon/ticket-20054
Fix #20054: Removed links to modwsgi.org.
d7c83f2
@claudep claudep Merge pull request #910 from bmispelon/ticket-20058
Fix #20058: Make compilemessages use stdout instead of stderr.
74a80a5
@akaariai akaariai Fixed memory leak in tests
The AssertNumQueriesContext didn't reset connection's use_debug_cursor
in case there was an exception. This resulted in leaking query strings
into connection.queries. Maximum memory use pre-patch was around 700MB,
post-patch it is around 200MB for Django's test suite.
9bc8d88
@akaariai akaariai Removed debug code 46f4b19
@aaugustin aaugustin Updated bundled version of six. e11ccc7
@aaugustin aaugustin Stopped using non-standard __globals__ and __code__ attributes.
Some alternative implementations don't have them.

Closes #19944.
9d4a5b0
@aaugustin aaugustin Added structure in the 1.6 release notes.
The backwards-incompatible changes section wasn't structured in sections
like it is in release notes for previous versions.
0555ef7
@aaugustin aaugustin Merge pull request #902 from evildmp/BLANK_CHOICE_NONE
Fixed #20043 -- Removed unused BLANK_CHOICE_NONE
3beabb5
@akaariai akaariai Fixed #19635 -- Made fields pickleable f403653
@aaugustin aaugustin Fixed #19697 -- Added a deployment checklist. 912b5d2
@aaugustin aaugustin Two additions to the deployment checklist.
Thanks Erik Romijn.
c94db53
@aaugustin aaugustin Minor docs fix for e11ccc7. f3a6d74
@aaugustin aaugustin Fixed #19550 -- Made the filtered select widget wider in the admin.
Thanks Claude and Julien for the review.
0df8ff3
@aaugustin aaugustin Fixed #19510 -- Race condition in template loading.
Thanks Kronuz and regebro.
6890569
@aaugustin aaugustin Fixed #17037 -- Added a --all option to diffsettings. 20a91cc
@aaugustin aaugustin Clarified that constant_time_compare doesn't protect string lengths. 7cf0f04
@aaugustin aaugustin Fixed #18447 -- Made LazyObject unwrap on dict access.
Thanks Roman Gladkov and Zbigniew Siciarz.
0efafa4
@aaugustin aaugustin Fixed #19456 -- Avoid infinite recursion when tracing LazyObject.__in…
…it__.

Thanks blaze33 for the patch.
9dc5702
@aaugustin aaugustin Fixed #19968 -- Dropped support for PostgreSQL < 8.4. 6197935
@prestontimmons prestontimmons Fixed #3544, #12064, and #16147 - include tag.
3544 - Allow recursive includes.

12064, 16147 Don't raise a template error if a non-existent template is
contained in a conditional block that is false.

Added a `quiet` option to suppress template errors if it's known that
the template may not exist. This allows a template to be conditionally
included if it exists or not.

Cleaned up the BaseInclude, ConstantInclude, IncludeNode heirarchy. This
is now a single node class.

Expanded the existing include tests for better readability.
98f07fd

tcsorrel referenced this pull request in Alir3z4/django-databrowse Jun 10, 2013

Merged

Fix OneToOneField Support #13

Owner

timgraham commented Sep 6, 2013

fixed in e2f0622

timgraham closed this Sep 6, 2013

prestontimmons deleted the prestontimmons:include-tag-fixes branch Mar 11, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment