summaryrefslogtreecommitdiff
path: root/django/template/base.py
AgeCommit message (Collapse)Author
2013-07-29Deprecated django.utils.importlibClaude Paroz
This was a shim for pre-Python 2.7 support.
2013-06-25Fixed #20650 -- Fixed {% filter %} incorrectly accepting 'escape' as argumentBaptiste Mispelon
Thanks to grzesiof for the report and to loic84 and Alex Gaynor for the review.
2013-05-17Replaced an antiquated pattern.Aymeric Augustin
Thanks Lennart Regebro for pointing it out.
2013-02-25Remove leading underscore from a function that's all growed up now.Carl Meyer
This function is now the de facto standard function for rendering values in a template, and is imported by two other built-in template modules. It shouldn't have a leading underscore.
2013-02-14Fixed #19829 -- Fixed index lookups for NumPy arrays in templates.Julien Phalip
2013-02-14Fixed #19819 - Improved template filter errors handling.Michael van Tellingen
Wrap the Parser.compile_filter method call with a try/except and call the newly added Parser.compile_filter_error(). Overwrite this method in the DebugParser to throw the correct error. Since this error was otherwise catched by the compile_function try/except block the debugger highlighted the wrong line.
2012-08-30Replaced some smart_xxx by force_xxx equivalentClaude Paroz
smart_str/smart_text should only be used when a potential lazy string should be preserved in the result of the function call.
2012-08-12[py3] Made __repr__ return str with Python 3Claude Paroz
2012-08-12[py3] Refactored __unicode__ to __str__.Aymeric Augustin
* Renamed the __unicode__ methods * Applied the python_2_unicode_compatible decorator * Removed the StrAndUnicode mix-in that is superseded by python_2_unicode_compatible * Kept the __unicode__ methods in classes that specifically test it under Python 2
2012-08-12[py3] Removed redundant __str__ methods.Aymeric Augustin
These classes already have an identical __unicode__ method, which will be used after an upcoming refactoring.
2012-08-07[py3] Ported django.utils.encoding.Aymeric Augustin
* Renamed smart_unicode to smart_text (but kept the old name under Python 2 for backwards compatibility). * Renamed smart_str to smart_bytes. * Re-introduced smart_str as an alias for smart_text under Python 3 and smart_bytes under Python 2 (which is backwards compatible). Thus smart_str always returns a str objects. * Used the new smart_str in a few places where both Python 2 and 3 want a str.
2012-08-07[py3] Fixed access to dict keys/values/items.Aymeric Augustin
2012-07-22[py3] Replaced unicode/str by six.text_type/bytes.Aymeric Augustin
2012-07-22[py3] Replaced basestring by six.string_types.Aymeric Augustin
2012-06-19Fixed #14502 again -- saner verbatim closing tokenChris Beaven
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-07Fixed #18269 -- Applied unicode_literals for Python 3 compatibility.Claude Paroz
Thanks Vinay Sajip for the support of his django3 branch and Jannis Leidel for the review.
2012-06-07Fixed #14502 -- Added a verbatim template tag.Aymeric Augustin
Thanks SmileyChris for the patch.
2012-05-10Replaced foo.next() by next(foo).Claude Paroz
This new syntax for next() has been introduced in Python 2.6 and is compatible with Python 3.
2012-04-30Fixed #4746 -- Allowed spaces around filter separator.Aymeric Augustin
2012-04-29Fixed #18013 -- Use the new 'as' syntax for exceptions.Claude Paroz
Thanks Clueless for the initial patch. Note that unittest has been purposely left out (external package only used by Python 2.6).
2012-04-29Fixed #17992 -- Added a public API for localtime.Aymeric Augustin
Thanks Bradley Ayers for the report.
2012-01-28Made a tiny performance improvement in the template system's Parser.parse() ↵Adrian Holovaty
-- don't look up the global variables TOKEN_TEXT, etc. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17400 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-27Made a small optimization to the template lexer. There's no need to ↵Adrian Holovaty
calculate the len of VARIABLE_TAG_START, et al, each time we create a token. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17399 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-09Fixed #3100 -- Added support for arguments on intermediate tag tokens.Aymeric Augustin
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17186 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-21Fixed #16787 -- Restored the ability to {% load %} template tags libraries ↵Aymeric Augustin
within packages. Thanks Ivan Sagalaev for the report and patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17133 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-18Fixed #17255 -- Removed "as" prefix from new timezone template filter names ↵Jannis Leidel
for the sake of clarity. Cheers to Aymeric Augustin for bearing with me. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17107 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-18Added support for time zones. Thanks Luke Plant for the review. Fixed #2626.Aymeric Augustin
For more information on this project, see this thread: http://groups.google.com/group/django-developers/browse_thread/thread/cf0423bbb85b1bbf git-svn-id: http://code.djangoproject.com/svn/django/trunk@17106 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-30Fixed #17135 -- Made it possible to use decorators (like stringfilter) on ↵Aymeric Augustin
template filter functions in combination with auto-escaping. Refs #16726. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17056 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-19Fixed #14806 -- Added support for contextual translations to the `trans` and ↵Julien Phalip
`blocktrans` template tags. Thanks to jtiai for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17015 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-17Remove several more relative imports.Alex Gaynor
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17007 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-11Simplify some code to have one loop, rather than two.Alex Gaynor
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16959 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-11Change some string literals to be unicode, because:Alex Gaynor
* It's the most micro of optimizations (forget I even said it) * It makes significantly more sense semantically, given these are functions which return unicode. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16957 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-27Fixed #13956 -- Enabled `*args` and `**kwargs` support for `simple_tag`, ↵Julien Phalip
`inclusion_tag` and `assignment_tag`. Many thanks to Stephen Burrows for the report and initial patch, to Gregor Müllegger for the initial tests, to SamBull for the suggestions, and to Jannis Leidel for the review and PEP8 cleanup. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16908 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-10Make a comment more accurate.Alex Gaynor
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16786 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-07-13Fixed #16225 -- Removed unused imports. Many thanks to Aymeric Augustin for ↵Jannis Leidel
the work on the patch and Alex for reviewing. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16539 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-11Fixed #11989 -- Allow passing a Template instance to inclusion_tag. Thanks ↵Jannis Leidel
to Jeremy Dunck and tcoenen. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16374 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-11Fixed #12847 -- Added name parameter to simple_tag, assignment_tag and ↵Jannis Leidel
inclusion_tag helpers. Thanks, vladmos. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16373 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-03Fixed #14262 -- Added new assignment_tag as a simple way to assign the ↵Jannis Leidel
result of a template tag to a context variable. Thanks, Julien Phalip. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16149 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-01Replaced old-style with new-style decorator syntax.Jannis Leidel
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16138 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-28Fixed #15070 -- Also pass current_app and use_l10n in inclusion_tags. ↵Jannis Leidel
Thanks, raony, mk and goodtune. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16117 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-19Fixed #15791 - method to signal that callable objects should not be called ↵Luke Plant
in templates Thanks to ejucovy for the suggestion and patch! git-svn-id: http://code.djangoproject.com/svn/django/trunk@16045 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-28Removed a bunch more Python 2.4 workarounds now that we don't support that ↵Adrian Holovaty
version. Refs #15702 -- thanks to jonash for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15927 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-26Fixed #15157 -- Modified evaluation of literals surrounded by _(' and ')' in ↵Ramiro Morales
templates to be evaluated at render time instead of at compile time by using ugettext_lazy. Thanks Jonathan S for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15327 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-19Fixed #7153 -- _resolve_lookup now does a better job of resolving callables ↵Chris Beaven
and correctly catches all silent_variable_exceptions git-svn-id: http://code.djangoproject.com/svn/django/trunk@14992 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-19Fixed #14908 -- Added a 'takes_context' argument to simple_tag. Thanks to ↵Russell Keith-Magee
Julien Phalip for driving the issue and providing the final patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14987 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04Fixed #12201 -- Added a lineno attibute to template Token so e.g. we can ↵Ramiro Morales
report line numbers in errors during i18n literals extraction. Thanks madewulf for the report and Claude Paroz for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14813 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-27Fixed #12248 -- Refactored django.template to get code out of __init__.py, ↵Russell Keith-Magee
to help with avoiding circular import dependencies. Thanks to Tom Tobin for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14722 bcc190cf-cafb-0310-a4f2-bffc1f526a37