summaryrefslogtreecommitdiff
path: root/tests/regressiontests/templates
AgeCommit message (Collapse)Author
2008-10-06Added some better error reporting and path handling when creating template ↵Malcolm Tredinnick
paths. We now raise UnicodeDecodeError for non-UTF-8 bytestrings (thanks to Daniel Pope for diagnosing this was being swallowed by ValueError) and allow UTF-8 bytestrings as template directories. Refs #8965. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9161 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-05Altered a failing url template tag test to work more reliably.Malcolm Tredinnick
There's no guarantee about the order in which ambiguous patterns are resolved. The solution is "don't do that" and avoid ambiguity. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9113 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-31Fixed #8726 -- When doing reverse URL resolving, make sure we're consistentlyMalcolm Tredinnick
dealing with unicode strings throughout by promoting up from UTF-8 as necessary. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8777 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-31Fixed #7027: template tags now corectly break tokens around strings marked ↵Jacob Kaplan-Moss
for translation. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8769 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-31Added a couple of extra tests to ensure url tag robustness. These are anMalcolm Tredinnick
attempt to verify #8726. Refs #8726. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8766 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-31A rewrite of the reverse URL parsing: the reverse() call and the "url" ↵Malcolm Tredinnick
template tag. This is fully backwards compatible, but it fixes a bunch of little bugs. Thanks to SmileyChris and Ilya Semenov for some early patches in this area that were incorporated into this change. Fixed #2977, #4915, #6934, #7206. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8760 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-30Fixed #8710: removed a few stray tabs. Thanks, gkelly.Jacob Kaplan-Moss
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8746 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-29Merge branch 'url-tag-asvar'Jacob Kaplan-Moss
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8716 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-26Fixed #7201 -- Fixed the timeuntil filter to work correctly with timezone-awareMalcolm Tredinnick
times. Patch from Jeremy Carbaugh. This is backwards incompatible in the sense that previously, if you tried to compare timezone-aware and timezone-naive values, you got an incorrect result. Now you get an empty string. So your previously incorrect code returns a different incorrect result. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8579 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-26Fixed #7177 -- Added extra robustness to the escapejs filter so that allMalcolm Tredinnick
invalid characters are correctly escaped. This avoids any chance to inject raw HTML inside <script> tags. Thanks to Mike Wiacek for the patch and Collin Grady for the tests. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8577 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-25Because the filter tests take non-zero time to pass, it's possible for one ofMalcolm Tredinnick
the timeuntil tests to fail because the pre-recorded "now" has moved on sufficiently far from actual "now()". Fixed the one test that was failing for me (the other timeuntil and timesince tests already have a small buffer built in to guard against this problem). The problem was revealed after [8535]. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8556 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-25Fixed #7743: Reverted [8483], which was itself a reversion of [8481], after ↵Russell Keith-Magee
confirmation from Malcolm. Corrected a long standing mistake in the timesince/timeuntil filters when using a parameter for 'now'. Thanks to Andrew Shearer <ashearerw@shearersoftware.com> for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8535 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-25Fixed #7460 -- Made the "cache" template tag always generate keys that can beMalcolm Tredinnick
used with the memcache backend (which has the strongest restriction on keys). Based on a patch from trbs. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8533 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-23Reverted [8481] and [8482] while we work out what is going on with #8453 and ↵Russell Keith-Magee
the related discussions that I wasn't previously aware of. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8486 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-23Corrected a test case error mistakenly committed in [8481].Russell Keith-Magee
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8482 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-23Fixed #7443: Corrected a long standing mistake in the timesince/timeuntil ↵Russell Keith-Magee
filters when using a parameter for 'now'. Thanks to Andrew Shearer <ashearerw@shearersoftware.com> for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8481 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-15Fixed #5270 -- Allow template tags and filters to accept an emtpy string, ↵Gary Wilson Jr
patch from jdunck. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8393 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-05Fixed #8031 - url tag no longer silences NoReverseMatch exceptions since ↵Luke Plant
this is very rarely useful git-svn-id: http://code.djangoproject.com/svn/django/trunk@8211 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-29Fixed #7767 -- Fixed template egg loading test for Windows systems.Malcolm Tredinnick
Thanks, Ramiro Morales. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8135 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-26Fixed #4534 -- Added an "else" option to the "ifchanged" template tag.Malcolm Tredinnick
Patch from SmileyChris. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8095 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-06-26Fixed #6201 -- Improved the {% cache %} template tag to allow the timeout to ↵Adrian Holovaty
be a template variable. Inspired by the patch by zz and edrik git-svn-id: http://code.djangoproject.com/svn/django/trunk@7754 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-06-26Fixed infuriating lack of apostrophe in a commentAdrian Holovaty
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7753 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-06-26Fixed #6322 -- Fixed bug in 'ifchanged' template tag where it wasn't ↵Adrian Holovaty
resetting itself properly in some cases. Thanks, nedbatchelder git-svn-id: http://code.djangoproject.com/svn/django/trunk@7752 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-06-26Improved our tests so that they don't raise an error if setuptools isn't ↵Adrian Holovaty
installed, hence ridding the test suite of all dependencies. Also updated docs. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7751 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-06-26Negligible formatting changes to tests/regressiontests/templates/loaders.pyAdrian Holovaty
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7750 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-06-18Fixed #7318 -- Cleaned up the template inheritance logic, specifically to ↵Russell Keith-Magee
handle the case where the parent template has no template tags/blocks. Took the opportunity to optimize the logic a little. Thanks to Matthias Kestenholz <mk@spinlock.ch> for the original report and test case. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7688 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-05-30Fixed a messy test case (regressiontests/templates/loaders) that could cause ↵Jacob Kaplan-Moss
future tests to fail by not cleaning up after itself. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7567 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-05-29Fixed #6430 -- Corrected the loading of templates from eggs, which was ↵Russell Keith-Magee
broken by the unicode merge. Thanks for the excellent report and patch, Juan Manuel Caicedo <juan.manuel.caicedo@gmail.com>. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7565 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-02-03Fixed #6279, #6514 -- Fixed some HTML escaping problems in the urlize filter.Malcolm Tredinnick
Based on a patch from SmileyChris with some test additions from Rob Hudson. Thanks, both. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7079 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-02-03Fixed #6326 -- Made the test for translations of filter arguments test ↵Malcolm Tredinnick
something that has a chance of failure. Thanks akaihola. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7060 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-01-06Fixed #5567 -- Added a "last" filter. Based on a patch from darkpixel.Malcolm Tredinnick
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6998 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-01-05Reverted 'regroup' template tag changes from [6956], as they caused bug ↵Adrian Holovaty
#6271, which affects one of my sites. I don't have time to inspect the #6271 patch, so I'm reverting this change in the interim, to fix the bug immediately. git-svn-id: http://code.djangoproject.com/svn/django/trunk@6996 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-01-02Fixed #6295 -- Made the {% for %} tag a bit more efficient by creating a ↵Adrian Holovaty
single context dictionary rather than recreating it each time through the loop. Thanks, Ned Batchelder git-svn-id: http://code.djangoproject.com/svn/django/trunk@6981 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-12-19Removed some reverse string craziness from the regroup template tag argument ↵Gary Wilson Jr
checking and added a few syntax tests. git-svn-id: http://code.djangoproject.com/svn/django/trunk@6956 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-12-19Fixed #6239 -- Fixed an auto-escaping problem with urlizetrunc. Thanks, ↵Malcolm Tredinnick
SmileyChris. git-svn-id: http://code.djangoproject.com/svn/django/trunk@6950 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-12-02Fixed #4563 -- Context.pop/push/update return the top-level dictionary (the newMalcolm Tredinnick
one for push() and update(), the one removed for pop()). Based on a patch from Brian Harring. git-svn-id: http://code.djangoproject.com/svn/django/trunk@6854 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-11-30Fixed #6057 -- Mark rendered template output as safe for auto-escaping purposes.Malcolm Tredinnick
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6778 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-11-29Added tests and a small optimisation for [6721]. Thanks SmileyChris. Fixed #6049Malcolm Tredinnick
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6729 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-11-28Fixed #5890 -- fixed the far edge-case of allowing constant strings insideMalcolm Tredinnick
template template markers: we now treat embedded, escaped double quotes consistently with constant string arguments to filters. Patch from Dmitri Fedortchenko. git-svn-id: http://code.djangoproject.com/svn/django/trunk@6724 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-11-20Fixed #5983 -- Made iriencode filter respect safe strings. Patch fromMalcolm Tredinnick
SmileyChris. git-svn-id: http://code.djangoproject.com/svn/django/trunk@6706 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-11-18Fixed #5969 -- Corrected a problem introduced in [6682].Malcolm Tredinnick
*sigh* As usual, the one case I forget to test turned out to be broken. git-svn-id: http://code.djangoproject.com/svn/django/trunk@6689 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-11-17Fixed a couple of chained filter tests that weren't demonstrating what theyMalcolm Tredinnick
claimed (since the "cut" filter's behaviour had changed since I originally wrote those tests). git-svn-id: http://code.djangoproject.com/svn/django/trunk@6684 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-11-17Fixed some missed auto-escaping and URL quoting cases in the urlize filter.Malcolm Tredinnick
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6683 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-11-17Fixed a few problems with variable resolving inside of blocktrans tags. A ↵Malcolm Tredinnick
couple of these were exposed by the auto-escaping changes, but I suspect the other one has been hiding in plain sight for a while. Fixed #5952, #5953 git-svn-id: http://code.djangoproject.com/svn/django/trunk@6682 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-11-17Fixed #5945 -- Treat string literals in template filter arguments as safeMalcolm Tredinnick
strings for auto-escaping purposes. git-svn-id: http://code.djangoproject.com/svn/django/trunk@6680 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-11-17Fixed #4713 -- Fixed handling of _() in template tag arguments. Based onMalcolm Tredinnick
patched from Indy and SmileyChris. git-svn-id: http://code.djangoproject.com/svn/django/trunk@6679 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-11-14Content coming via {{ block.super }} is always going to be correctly escapedMalcolm Tredinnick
already. We mark it as safe so that template authors don't need to. git-svn-id: http://code.djangoproject.com/svn/django/trunk@6673 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-11-14Implemented auto-escaping of variable output in templates. Fully ↵Malcolm Tredinnick
controllable by template authors and it's possible to write filters and templates that simulataneously work in both auto-escaped and non-auto-escaped environments if you need to. Fixed #2359 See documentation in templates.txt and templates_python.txt for how everything works. Backwards incompatible if you're inserting raw HTML output via template variables. Based on an original design from Simon Willison and with debugging help from Michael Radziej. git-svn-id: http://code.djangoproject.com/svn/django/trunk@6671 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-10-27Fixed an invalid URL specification.Malcolm Tredinnick
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6618 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-10-21Fixed #2920 -- Removed _() from builtins.Malcolm Tredinnick
This is backwards incompatible, but easy to work around. git-svn-id: http://code.djangoproject.com/svn/django/trunk@6582 bcc190cf-cafb-0310-a4f2-bffc1f526a37