innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
25,056 Commits 25 Branches 361 Tags 501 MiB
Commit Graph

64 Commits

Author SHA1 Message Date
Anton Samarchyan 4696078832 Refs #27656 -- Updated django.template/tag docstring verbs according to PEP 257. 2017-02-17 11:29:38 -05:00
Claude Paroz 7b2f2e74ad Refs #23919 -- Removed six.<various>_types usage 
Thanks Tim Graham and Simon Charette for the reviews.
 2017-01-18 20:18:46 +01:00
Tim Graham ff419de263 Refs #25466 -- Removed aliases for LoaderOrigin and StringOrigin. 
Per deprecation timeline.
 2017-01-17 20:52:01 -05:00
Ahmed Mohamed 229488c8a1 Fixed #26109 -- Raised a helpful error if loader.select_tamplate() is passed a string. 2016-01-25 18:37:02 -05:00
Tim Graham 8d1a001ef6 Fixed #25466 -- Added backwards compatibility aliases for LoaderOrigin and StringOrigin. 
Thanks Simon Charette for the DeprecationInstanceCheck class.
 2015-09-29 18:31:11 -04:00
Tim Graham 4811f09fa3 Removed template.loader.BaseLoader per deprecation timeline. 2015-09-23 19:31:11 -04:00
Tim Graham 9023696613 Removed dictionary and context_instance parameters for render functions. 
Per deprecation timeline.
 2015-09-23 19:31:11 -04:00
Tim Graham b3641512c8 Removed dirs parameter in template engine methods and related funtions. 
Per deprecation timeline.
 2015-09-23 19:31:11 -04:00
Andriy Sokolovskiy 4359be023b Removed unreachable code 2015-06-29 17:14:29 -04:00
Tim Graham aaacaeb096 Renamed RemovedInDjangoXYWarnings for new roadmap. 
Forwardport of ae1d663b79
from stable/1.8.x plus more.
 2015-06-24 16:08:20 -04:00
Preston Timmons d17a035132 Moved engine-related exceptions to django.template.exceptions. 
With the introduction of multiple template engines these exceptions are no
longer DTL-specific. It makes more sense for them to be moved out of
DTL-related modules.
 2015-05-06 17:33:47 -05:00
Preston Timmons adff499e47 Fixed #24119, #24120 -- Formalized debug integration for template backends. 2015-05-06 17:33:47 -05:00
Preston Timmons fc21471526 Fixed #15053 -- Enabled recursive template loading. 2015-04-22 14:49:00 -05:00
Preston Timmons 55f12f8709 Cleaned up the template debug implementation. 
This patch does three major things:

* Merges the django.template.debug implementation into django.template.base.

* Simplifies the debug implementation.

  The old implementation copied debug information to every token and node.
  The django_template_source attribute was set in multiple places, some
  quite hacky, like django.template.defaulttags.ForNode.

  Debug information is now annotated in two high-level places:

  * Template.compile_nodelist for errors during parsing
  * Node.render_annotated for errors during rendering

  These were chosen because they have access to the template and context
  as well as to all exceptions that happen during either the parse or
  render phase.

* Moves the contextual line traceback information creation from
  django.views.debug into django.template.base.Template. The debug views now
  only deal with the presentation of the debug information.
 2015-03-20 08:58:07 -04:00
Tim Graham 0ed7d15563 Sorted imports with isort; refs #23860. 2015-02-06 08:16:28 -05:00
Aymeric Augustin eaa1a22341 Added a request argument to render_to_string. 
This is for consistency with Template.render.

It adds a little bit of knowledge about HTTP requests in
django.template.loader but I think consistency trumps purity.
 2015-01-07 21:54:22 +01:00
Aymeric Augustin ed220c4cbe Added comments to remove Engine.render_to_string in Django 2.0. 
Since this is a private API introduced in Django 1.8, no documentation
is required.
 2015-01-06 22:02:26 +01:00
Aymeric Augustin 90805b240f Supported multiple template engines in render_to_string. 
Adjusted its API through a deprecation path according to the DEP.
 2014-12-28 16:23:02 +01:00
Aymeric Augustin f50a09f2cd Removed private API get_template_from_string. 
It wasn't documented and it wasn't used anywhere.
 2014-12-28 16:23:01 +01:00
Aymeric Augustin 5523e4cdbb Removed private API find_template. 
It wasn't documented and it wasn't used anywhere, except in a few tests
that don't test it specifically and can be rewritten with get_template.
 2014-12-28 16:23:01 +01:00
Aymeric Augustin 4ea43ac915 Supported multiple template engines in get_template and select_template. 
This commit changes the return type of these two functions. Instead of
returning a django.template.Template they return a backend-specific
Template class that must implement render(self, context).
 2014-12-28 16:23:01 +01:00
Aymeric Augustin bfa21ddf76 Renamed get_template_from_string to from_string. 
The shorter name is just as explicit and, well, shorter.
 2014-12-28 14:47:31 +01:00
Aymeric Augustin 246cfdeae3 Moved make_origin into the Engine class. 2014-11-23 11:52:45 +01:00
Aymeric Augustin 29a977ab14 Moved template loaders management in Engine. 
Passed the engine instance to loaders. This is a prerequisite for
looking up configuration on the engine instance instead of global
settings.

This is backwards incompatible for custom template loaders that override
__init__. However the documentation doesn't talk about __init__ and the
way to pass arguments to custom template loaders isn't specified. I'm
considering it a private API.
 2014-11-23 11:52:12 +01:00
Aymeric Augustin 572cdb4391 Introduced a template engine class. 
Moved Django templates loading infrastructure there.
 2014-11-23 09:29:53 +01:00
Aymeric Augustin 17012b6936 Deprecated dirs argument to override TEMPLATE_DIRS. 
Cancels 2f0566fa. Refs #4278.
 2014-11-23 09:29:33 +01:00
Aymeric Augustin 7331788300 Avoided rewrapping Contexts in render_to_response. 
This change preserves backwards-compatibility for a very common misuse
of render_to_response which even occurred in the official documentation.

It fixes that misuse wherever it happened in the code base and docs.

Context.__init__ is documented as accepting a dict and nothing else.
Since Context is dict-like, Context(Context({})) could work to some
extent. However, things get complicated with RequestContext and that
gets in the way of refactoring the template engine. This is the real
rationale for this change.
 2014-11-22 17:58:38 +01:00
Aymeric Augustin 9eeb788cfb Refactored getting the list of template loaders. 
This provides the opportunity to move utility functions specific to the
Django Template Language outside of django.template.loader.
 2014-11-16 21:41:44 +01:00
Aymeric Augustin 1851dcf377 Deprecated function-based loaders. 2014-11-16 21:41:42 +01:00
Aymeric Augustin 0bf99193f8 Removed obsolete comment. 
It didn't account for class-based template loaders.
 2014-11-16 21:40:54 +01:00
Aymeric Augustin 2577ae6a08 Moved all template loaders under django.template.loaders. 
Reformatted the code of base.Loader according to modern standards.

Turned the test template loader into a regular locmem.Loader -- but
didn't document it.

Added a normal deprecation path for BaseLoader which is a public API.

Added an accelerated deprecation path for TestTemplateLoader which is
a private API.
 2014-11-16 21:28:26 +01:00
Tim Graham 1101467ce0 Limited lines to 119 characters in django/ 
refs #23395.
 2014-09-05 09:22:16 -04:00
Baptiste Mispelon 7e1376c2b0 Fixed #21741 -- Fixed render_to_string to stop pushing empty dictionaries to its Context 
Thanks to kezabelle for the report and original patch
and to numerodix for his improved patch.
 2014-02-22 23:33:48 +01:00
Berker Peksag 5d263dee30 Fixed #21674 -- Deprecated the import_by_path() function in favor of import_string(). 
Thanks Aymeric Augustin for the suggestion and review.
 2014-02-08 11:12:19 -05:00
Baptiste Mispelon 34263c67b4 Moved the loader tags registration with the other builtins. 2014-01-19 20:11:32 +01:00
Alex Gaynor fe995e6cbd Fixed the remaining E302 violations int eh django package 2013-11-02 17:37:15 -07:00
Berker Peksag 2f0566fa61 Fixed #4278 -- Added a dirs parameter to a few functions to override TEMPLATE_DIRS. 
* django.template.loader.get_template()
* django.template.loader.select_template()
* django.shortcuts.render()
* django.shortcuts.render_to_response()

Thanks amcnabb for the suggestion.
 2013-09-18 07:37:08 -04:00
Gregor MacGregor b2b763448f Fixed #20841 -- Added messages to NotImplementedErrors 
Thanks joseph at vertstudios.com for the suggestion.
 2013-09-10 11:09:59 -04:00
Curtis Maloney a3e7d73ed7 Allowed Context.push to behave as a context mananger. 
Thanks Loic Bistuer for the review.
 2013-07-17 13:32:32 -04:00
Claude Paroz 7c5b244826 Fixed #17061 -- Factored out importing object from a dotted path 
Thanks Carl Meyer for the report.
 2013-02-04 16:38:25 +01:00
Aymeric Augustin 3cb2457f46 [py3] Replaced basestring by six.string_types. 2012-07-22 09:29:54 +02: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
Carl Meyer 75199e8f6d Fixed #16866 -- Clearer error message if empty list is passed to select_template. Thanks Silver_Ghost for report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16861 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-21 14:20:18 +00:00
Russell Keith-Magee 4d94c0cb38 Advanced deprecations in django.template. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15985 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-02 08:41:03 +00:00
Russell Keith-Magee edfed18581 Fixed #15502 -- Ensure that nested TemplateDoesNotExist errors are propegated with a meaningful error message when loaded using select_template. Thanks to jaylett for the report, and GDorn for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15717 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-03 00:41:40 +00:00
Russell Keith-Magee 17bd34930a Fixed #15530 -- Corrected typo in template loader deprecation message. Thanks to msaelices for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15714 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-03 00:25:17 +00:00
Chris Beaven 1073a83f2c Ensure render_to_string leaves the context instance stack in the state it was originally passed in. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15591 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-20 04:55:11 +00:00
Russell Keith-Magee 0be14b0b96 Fixed #12248 -- Refactored django.template to get code out of __init__.py, 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
 2010-11-27 05:47:30 +00:00
Russell Keith-Magee 1070c57b83 Fixed #14436 -- Escalated 1.2 PendingDeprecationWarnings to DeprecationWarnings, and removed 1.1 deprecated code. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14138 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-11 12:20:07 +00:00
Russell Keith-Magee 003fe52225 Fixed #13123 -- Cleaned up template loader for PyPy compatibility. Thanks to avostryakov for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12805 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-18 15:35:15 +00:00