mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-26 19:16:11 +00:00
Code Issues 27 Releases Wiki Activity
9,770 Commits 28 Branches 426 Tags 667 MiB
accee3961c
Commit Graph

173 Commits

Author SHA1 Message Date
Russell Keith-Magee
d8c38bd2c9 Fixed #14046 -- Made {% include %} behave the same, regardless of whether the template included is named by variable or constant string. Thanks to defcube for the report, and George Karpenkov for the draft patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15413 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-04 17:10:21 +00:00
Russell Keith-Magee
456b8a9d0c Fixed #14818 -- Added explicit tests for the way that the cycle tag handles escaping. Thanks to steveire. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15335 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-27 02:28:53 +00:00
Russell Keith-Magee
7012042544 Fixed #15041 -- Added tests for the spaceless tag interacting with escaping. Thanks to steveire. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15334 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-27 02:28:17 +00:00
Russell Keith-Magee
3f528e10d5 Fixed #15012 -- Added post-rendering callbacks to TemplateResponse so that decorators (in particular, the cache decorator) can defer processing until after rendering has occurred. Thanks to Joshua Ginsberg for the draft patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15295 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-24 14:24:35 +00:00
Jannis Leidel
5f4bc1ff23 Fixed a few translation related tests: 
* Extended the admin i18n view to also take the admin translation catalogues into account.
  * Use a translation string from the core translations to test LOCALE_PATHS.
  * Fixed Russian translation of singular forms.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15273 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-21 19:36:26 +00:00
Russell Keith-Magee
f89f1c8acb Fixed #15083 -- Corrected the order of TemplateResponse middleware handling, ensuring that custom URLConfs are valid, and that ResponseMiddleware is invoked if the TemplateResponseMiddleware causes errors. Thanks to Sayane for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15226 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-16 15:38:03 +00:00
Jannis Leidel
a3894945b6 Fixed #15010 -- Added current_app parameter to close gap between TemplateResponse and render method. Thanks, acdha. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15153 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-05 22:41:43 +00:00
Russell Keith-Magee
673e6fc7fb Fixed #11675 -- Added support for the PyLibMC cache library. In order to support this, and clean up some other 1.3 caching additions, this patch also includes some changes to the way caches are defined. This means you can now have multiple caches, in the same way you have multiple databases. A huge thanks to Jacob Burch for the work on the PyLibMC backend, and to Jannis for his work on the cache definition changes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15005 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-21 15:19:19 +00:00
Chris Beaven
df6ad35c56 Fixed #7153 -- _resolve_lookup now does a better job of resolving callables 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-19 23:47:24 +00:00
Russell Keith-Magee
314fabc930 Fixed #14908 -- Added a 'takes_context' argument to simple_tag. Thanks to 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-19 15:00:50 +00:00
Chris Beaven
3ae9117c46 Fixes #7817 and #9456. 
- The include tag now has a 'with' option to include to provide extra context
  vairables to the included template.

- The include tag now has an 'only' option to exclude the current context
  when rendering the included template.

- The with tag now accepts multiple variable assignments.

- The with, include and blocktrans tags now use a new keyword argument format
  for variable assignments (e.g. `{% with foo=1 bar=2 %}`).

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14922 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-18 02:50:26 +00:00
Jannis Leidel
9ab85e05e2 Fixed #4030 -- Added ability to translate language names. Thanks to Antti Kaihola and Ramiro Morales for the initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14894 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-12 23:02:45 +00:00
Russell Keith-Magee
e0dcd7666a Fixed #12815 -- Added TemplateResponse, a lazy-evaluated Response class. Thanks to Simon Willison for the original idea, and to Mikhail Korobov and Ivan Sagalaev for their assistance, including the draft patch from Mikhail. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14850 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-07 13:57:01 +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
7ff5580d95 Fixed #14389, #9666 -- Started the migration path to make the first argument to url and ssi template tags syntactically consistent with other tags. Thanks to Sean Brant for the draft patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14643 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-20 06:22:28 +00:00
Jannis Leidel
33d8fcde8a Fixed #14693, #14709 -- Backwards incompatible change to rectify the confusion around the STATICFILES_URL and STATICFILES_ROOT settings. 
* Two new global settings that will be used by -- **but are not limited to** -- the staticfiles app: STATIC_ROOT and STATIC_URL.

  * Moving the 'django.contrib.staticfiles.templatetags.staticfiles' template tag to the core ('django.templatetags.static') and renaming it to 'get_static_prefix'.

  * Moving the context processor 'django.contrib.staticfiles.context_processors.staticfiles' to the core ('django.core.context_processors.static') and renaming it to 'static'.

  * Paths in media definitions will use STATIC_URL as the prefix if the value is not None, and falls back to the previously used MEDIA_URL.

Thanks again to the community for constructive criticism and Carl and Russ for sanity-inducing discussions on IRC.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14592 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-17 15:36:26 +00:00
Luke Plant
02fc6276d7 Fixed #14508 - test suite silences warnings. 
Utility functions get_warnings_state and save_warnings_state have been added
to django.test.utils, and methods to django.test.TestCase for convenience.

The implementation is based on the catch_warnings context manager from
Python 2.6.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14526 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-11 15:06:20 +00:00
Alex Gaynor
0659391baf Converted templates doctests into unittests. We have always been at war with doctests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14448 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-04 04:47:05 +00:00
Russell Keith-Magee
a89e02637b Fixed #13567 -- Added a 'silent' argument to the cycle tag, so that you can declare a cycle without producing a value in the template. Thanks to anentropic for the suggestion and initial patch, and Łukasz Rekucki for the final patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14439 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-02 13:42:30 +00:00
Alex Gaynor
89219a6829 Fixed a few more cases of the tests not properly restoring sys.path (follow up on [14429]). 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14431 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-02 05:31:19 +00:00
Jannis Leidel
d931f43b70 Fixed #14126 -- Fixed an issue with changes to the blocktrans tag introduced in r13967 related to multiple plural forms. Thanks, mark0978, svetlyak40wt and Ramiro. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14239 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-16 20:40:17 +00:00
Russell Keith-Magee
121d2e3678 Fixed #12991 -- Added unittest2 support. Thanks to PaulM for the draft patch, and to Luke, Karen, Justin, Alex, Łukasz Rekucki, and Chuck Harmston for their help testing and reviewing the final patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14139 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-11 12:55:17 +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
Jannis Leidel
a64e96c227 Fixed #13568 -- Fixed the blocktrans tag to not raise a KeyError if the number of variables in the singular and the plural block differ. Thanks, deloide. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13967 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-01 02:02:01 +00:00
Luke Plant
6fb4f6e299 Fixed #13765 - 'safe' parameter for urlencode filter 
Thanks to KyleMac for the suggestion and SmileyChris for the patch

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13849 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-13 23:01:34 +00:00
Russell Keith-Magee
720299053a Modified the egg template loader tests; firstly to ensure that we are testing the new, non-deprecated interface; secondly to ensure that the old deprecated interface is also tested, but deprecation warnings are silenced. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13812 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-12 21:53:35 +00:00
Jannis Leidel
7bb6abed12 Fixed #13702 -- Made sure to actually fall back to the l10n format strings provided in the settings, when disabled. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13770 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-12 19:40:44 +00:00
Luke Plant
0b37d56481 Fixed #13475 - for tag raises an exception when trying to unpack a non-iterable item 
Thanks to SmileyChris for the report and patch.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@13690 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-07 20:30:46 +00:00
Jacob Kaplan-Moss
e64cdf7129 Fixed #11377: the template join filter now correctly escapes the joiner, too. 
Thanks, Stephen Kelly.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13464 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-03 15:42:39 +00:00
Jacob Kaplan-Moss
f40922609f Fixed #11376: added some extra tests for autoescaping subtleties. 
Thanks, Stephen Kelly.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13461 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-03 15:34:59 +00:00
Jacob Kaplan-Moss
2e3fdc6326 Fixed #11288: added some tests for the handling of number-like variables in templates. 
Thanks, Stephen Kelly.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13460 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-03 15:34:52 +00:00
Russell Keith-Magee
8a6cb3d969 Fixed #13573 -- Corrected problem with template caching when template directories are provided. Thanks to lamby for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13295 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-21 08:54:15 +00:00
Russell Keith-Magee
fef0d25bdc Fixed #13373 -- Ensured that {% if %} statements will short circuit template logic and not evaluate clauses that don't require evaluation. Thanks to Jerry Stratton for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13001 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-19 14:18:14 +00:00
Karen Tracey
a288f97a2a Add file mistakenly left out of r12986. Refs #13334. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12988 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-15 20:36:00 +00:00
Karen Tracey
da36e32224 Fixed #13334: Restored ability to load template tags from eggs. Again thanks Ramiro and metzen for pointers on how to find out if a module loaded from an egg has a particular submodule, and Russ for review. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12986 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-15 19:57:09 +00:00
Russell Keith-Magee
2cebe4395e Refs #13167 -- Corrected a regression in the way non-existent variables are handled by {% if %} tags. Thanks to ohmi2 for pointing out the regression in 1.2, and Karen for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12954 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-12 13:56:38 +00:00
Russell Keith-Magee
b579350cd1 Fixed #13275 -- Modified the parsing logic of the {% url %} tag to avoid catastrophic backtracking. Thanks to SmileyChris for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12943 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-10 07:35:31 +00:00
Russell Keith-Magee
dafc077e4a Fixed #12945 -- Corrected the parsing of arguments in {% url %} when the argument list has spaces between commas. This is a revised version of r12503, which was a fix for #12072. Thanks to SmileyChris for the patch, and to dmoisset for finding all the places in the docs that the old style syntax was used. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12889 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-30 12:44:30 +00:00
Karen Tracey
ed36a5f2ce Fixed #12554 again: Corrected regression in silencing attribute lookups introduced in r12823, plus added a test for this so it doesn't regress again. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12834 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-22 19:08:04 +00:00
Karen Tracey
2403f581b3 Fixed #12554: Silence exceptions that have specified silent_variable_failure=True. Thanks Thomas Steinacher, copelco, mlavin. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12823 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-20 20:27:57 +00:00
Karen Tracey
80e744945c Fixed #12787: Correctly identify the template that does not exist when a template being extended includes another template that does not exist. Thanks to trigeek38 for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12792 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-16 14:34:57 +00:00
Russell Keith-Magee
beca4b8109 Fixed #13114 -- Modified escapejs to produce output that is JSON compliant. Thanks to David Danier for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12780 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-15 07:22:20 +00:00
Luke Plant
960af90279 Fixed #13058 - "smart if" template tag doesn't support "if not in ..." condition 
Thanks to ramusus for the report.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@12732 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-08 23:25:37 +00:00
Karen Tracey
50e46c017e Fixed #11461: Ensured complete traceback is available on the debug page when an exception is encountered during template rendering, even when running on Python 2.6 or higher. Thanks Glenn. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12725 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-08 17:01:21 +00:00
Russell Keith-Magee
f034c79cbc Fixed #6510 -- Refactored the way child nodes are found in template nodes to avoid potential inconsistencies. Thanks to SmileyChris for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12654 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-02 07:42:51 +00:00
Karen Tracey
698410ab6f Fixed #12992: Adjusted the new template loader code so that the template 
file name is correctly reported on the debug page when a template syntax
error is raised.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@12643 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-01 23:05:35 +00:00
Joseph Kocherhans
fd233f40d1 Fixed #12070. Fixed a case where var._whatever wasn't raising a TemplateSyntaxError. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12539 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-23 18:50:57 +00:00
Justin Bronn
349827996b Fixed #12072 -- Certain characters no longer break url tag. Thanks, Alexander Dutton. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12503 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-23 05:17:39 +00:00
Jacob Kaplan-Moss
c1d795df45 Clarified a comment from [11687]. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12500 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-22 23:42:53 +00:00
Jacob Kaplan-Moss
49d6a82261 Fixed #11687: the add filter is now less failsome when faced with things that can't be coerced to integers. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12497 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-22 23:34:33 +00:00