mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity
19,937 Commits 30 Branches 460 Tags
5355baf6c770ac1e5c7f7a4f86ef95042f76b8b4
Commit Graph

31 Commits

Author SHA1 Message Date
Tim Graham
a8b70d251d [1.8.x] Sorted imports with isort; refs #23860. 
Backport of 0ed7d15563 from master
 2015-02-09 14:24:06 -05:00
Aymeric Augustin
a3e783fe11 Deprecated passing a Context to a generic Template.render. 
A deprecation path is required because the return type of
django.template.loader.get_template changed during the
multiple template engines refactor.

test_csrf_token_in_404 was incorrect: it tested the case when the
hardcoded template was rendered, and that template doesn't depend on the
CSRF token. This commit makes it test the case when a custom template is
rendered.
 2015-01-12 21:01:34 +01:00
Claude Paroz
51890ce889 Applied ignore_warnings to Django tests 2014-12-30 18:16:25 +01:00
Aymeric Augustin
cf0fd65ed4 Deprecated TEMPLATE_LOADERS. 2014-12-28 17:02:30 +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
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
71a559e771 Removed obsolete code for running test_loaders.py. 
Running this file as a standalone script doesn't work anyway.
 2014-12-13 22:51:57 +01:00
Ramiro Morales
16f26defa7 Converted recently refactored templates tests to SimpleTestCase. 
These test methods don't need DB setup/teardown.

Refs #23768 and b872134b.
 2014-12-03 18:56:46 -05: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
17012b6936 Deprecated dirs argument to override TEMPLATE_DIRS. 
Cancels 2f0566fa. Refs #4278.
 2014-11-23 09:29:33 +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
Tim Graham
d38a00332e Updated tests for added newlines in 6868643063. 2014-08-12 20:16:04 -04:00
Rodolfo Carvalho
0d91225892 Fixed many typos in comments and docstrings. 
Thanks Piotr Kasprzyk for help with the patch.
 2014-03-03 07:38:09 -05: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
Carl Meyer
2b27224180 Fixed #21929 - Fixed test regression on Windows. 
Thanks Michael Manfre for the report.
 2014-02-04 13:14:41 -07:00
Carl Meyer
88a2d39159 Fixed #21874 -- Require Django applications to have a filesystem path. 
Wherever possible this filesystem path is derived automatically from the app
module's ``__path__`` and ``__file__`` attributes (this avoids any
backwards-compatibility problems).

AppConfig allows specifying an app's filesystem location explicitly, which
overrides all autodetection based on ``__path__`` and ``__file__``. This
permits Django to support any type of module as an app (namespace packages,
fake modules, modules loaded by other hypothetical non-filesystem module
loaders), as long as the app is configured with an explicit filesystem path.

Thanks Aymeric for review and discussion.
 2014-01-27 15:34:22 -07:00
Alex Gaynor
9d487ae2a1 Refs #21628 -- removed one usage of the imp module in the tests. It is deprecated in Python 3.4 2014-01-19 00:58:22 -06:00
Aymeric Augustin
da16bb30ff Dropped AppCache._empty, _with_app and _without_app. 
It's now easier to achieve the same effect with modify_settings or
override_settings.
 2013-12-23 21:37:56 +01:00
Aymeric Augustin
2fef9e5375 Moved apps back in the toplevel django namespace. 
Reverted 4a56a93cc4.
 2013-12-22 11:39:55 +01:00
Aymeric Augustin
65cd74be8e Stopped iterating on INSTALLED_APPS. 
Used the app cache's get_app_configs() method instead.
 2013-12-22 11:39:18 +01:00
Pablo Martín
3ac823fc5b Fixed #21460 -- Reenabled proper template precedence in find_template 
Refs #20806. Thanks Unai Zalakain for the review.
 2013-11-22 11:09:51 +01:00
Jason Myers
c3791463a5 Fixing E302 Errors 
Signed-off-by: Jason Myers <jason@jasonamyers.com>
 2013-11-02 23:48:47 -05:00
Bouke Haarsma
3565efaa45 Removed some direct settings manipulations in tests; refs #21230. 2013-10-21 11:31:05 -04:00
Alasdair Nicol
b289fcf1bf Fixed #21288 -- Fixed E126 pep8 warnings 2013-10-21 08:31:30 -04:00
Alasdair Nicol
a800036981 Fixed #21287 -- Fixed E123 pep8 warnings 2013-10-18 10:07:39 +01: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
Ramiro Morales
b785a80d19 Added further fixes, tests for #19949/f33db5a09a. 
Thanks Susan Tan. Refs #19949.
 2013-08-26 08:47:24 -03:00
SusanTan
f33db5a09a Fixed 19949 -- Cached template loader now caches TemplateDoesNotExist 
Thanks @timgraham and @jdunck for the code reviews and Kronuz for bug
report and initial patch.
 2013-08-24 09:19:55 -04:00
Carl Meyer
8f3aefdec3 Fixed handling of template loader tests. 
Previously, the CachedLoaderTests were never run at all.
 2013-07-25 17:19:17 -05:00
Preston Timmons
6d96831769 Fixed template_tests so discovery doesn't directly find tests that require setuptools. 2013-04-12 15:42:58 -06:00
Preston Timmons
3810dc3070 Modified template_tests for unittest2 discovery. 2013-04-12 15:13:59 -06:00