mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-27 19:46:22 +00:00
Code Issues 30 Releases Wiki Activity
11,263 Commits 28 Branches 426 Tags 677 MiB
287565779d
Commit Graph

158 Commits

Author SHA1 Message Date
Aymeric Augustin
a4e516b593 Fixed #11166 -- {% widthratio %} should return 0 when the maximum is 0, no matter the value. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17224 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-17 10:27:14 +00:00
Aymeric Augustin
19cbdf8c8f Fixed #17348 -- Implemented {% elif %}. Refs #3100. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17187 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-09 22:13:27 +00:00
Adrian Holovaty
9b93f1c01c Added a test that 'firstof' template filter doesn't auto-escape. cycle tag already has such a test (cycle20). Refs #10912 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17176 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-09 19:52:20 +00:00
Aymeric Augustin
c5a899b190 Fixed #16787 -- Restored the ability to {% load %} template tags libraries 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-21 10:28:12 +00:00
Aymeric Augustin
4cfb7632e0 Removed remains from times when tests could be run outside of runtests.py. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17040 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-26 21:03:18 +00:00
Alex Gaynor
8c0eefd066 Convert the remainder of the relative imports in the tests to be absolute imports. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16981 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-13 21:34:56 +00:00
Carl Meyer
4397c587a4 Fixed #16770 -- Eliminated TemplateSyntaxError wrapping of exceptions. Thanks to Justin Myles-Holmes for report and draft patch. 
Exceptions raised in templates were previously wrapped in TemplateSyntaxError
(in TEMPLATE_DEBUG mode only) in order to provide template source details on
the debug 500 page. The same debug information is now provided by annotating
exceptions rather than wrapping them. This makes catching exceptions raised
from templates more sane, as it's consistent in or out of DEBUG, and you can
catch the specific exception(s) you care about rather than having to also catch
TemplateSyntaxError and unwrap it.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16833 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-16 01:16:25 +00:00
Russell Keith-Magee
dc3b2a0fdf Fixed #16780 -- Removed a timing sensitive test from the template test suite. Thanks to Alex for the lend of his eyeballs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16735 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-09 17:54:04 +00:00
Jannis Leidel
3256862f5f Fixed #16717 -- Added ability to store result of trans template tag in context variable. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16712 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-30 12:09:45 +00:00
Julien Phalip
bf9ba45f6b Fixed #16677 -- Fixed the future version of the ssi template tag to work with template file names that contain spaces. Note that this fix cannot be applied to the currently deprecated version of the ssi tag since it requires an unquoted literal as parameter. Many thanks to Aymeric Augustin for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16687 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-25 23:02:15 +00:00
Jannis Leidel
958e049d4d Fixed #5831 -- Made sure the ForNode reports the correct source of an exception happening in one of the loops. Thanks, Charmless and vladmos. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16605 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-12 14:15:17 +00:00
Jannis Leidel
24f4764a48 Fixed #16225 -- Removed unused imports. Many thanks to Aymeric Augustin for 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-07-13 09:35:51 +00:00
Jannis Leidel
38a2444277 Fixed #16050 -- BACKWARDS-INCOMPATIBLE CHANGE: Moved static files of the admin to conventional file system location. 
This also removes the need for ADMIN_MEDIA_PREFIX and replaces it with the convention to find admin's static files at STATIC_URL + 'admin/'.

Thanks to Jacob for the review and general help.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16487 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-30 09:06:19 +00:00
Jannis Leidel
d27f909d2e Fixed #12847 -- Added name parameter to simple_tag, assignment_tag and inclusion_tag helpers. Thanks, vladmos. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16373 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-11 16:05:28 +00:00
Luke Plant
430b819967 Fixed #16196 - Redundant or incorrect code in tests 
Thanks to intelliyole and melinath for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16354 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-10 10:18:06 +00:00
Ramiro Morales
0638ba5bba Enhanced a bit the documentation and docstring for the url template tag. Also, added a test for it. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16331 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-05 23:44:34 +00:00
Luke Plant
d41a25ebc6 Fixed import error that was causing EggLoader tests not to be run 
Also improved ImportError handling that was causing this fact to be missed.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16323 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-04 14:32:55 +00:00
Chris Beaven
fcf7fbc68c Fixes #8593 -- better handling of safe_join case sensitivity on windows. Thanks for the initial patch, ramiro. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16267 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-22 23:56:42 +00:00
Jannis Leidel
0322f2b653 Fixed #15263 -- Added support for format localization to the now template tag. Thanks to danielr and dmclain. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16172 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-07 16:58:45 +00:00
Luke Plant
1286d78311 Fixed #15791 - method to signal that callable objects should not be called 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-04-19 22:06:19 +00:00
Chris Beaven
d59baa07f0 Fixes #15721 -- Make {% include %} and RequestContext work together again. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16031 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-17 04:52:31 +00:00
Chris Beaven
89e25403ae Fixes #15814 -- Added a test util to abstract the process of using a test template loader 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16030 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-17 04:52:17 +00:00
Russell Keith-Magee
4c468800ee Updates to the test suite to allow for newly deprecated and removed features 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15990 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-02 08:44:47 +00:00
Adrian Holovaty
4e25bc71b1 Fixed #15609 -- Fixed some 'raise' statements to use the newer style syntax. Thanks, DaNmarner 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15811 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-14 23:00:03 +00:00
Luke Plant
e9d2763947 Fixed #15572 - include with "only" option discards context properties (such as autoescape) 
Thanks to dfoerster for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15795 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-10 18:42:24 +00:00
Russell Keith-Magee
c260c533e1 Fixed #15570 -- Corrected a flaw in the design of the silent flag on {% cycle %}. Thanks to Brian Neal for the report, and to Andrew and Jannis for the design consult. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15773 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-08 13:43:53 +00:00
Russell Keith-Magee
afd040d4d3 Updated test assertions that have been deprecated by the move to unittest2. In summary, this means: 
assert_ -> assertTrue
 assertEquals -> assertEqual
 failUnless -> assertTrue

For full details, see http://www.voidspace.org.uk/python/articles/unittest2.shtml#deprecations

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15728 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-03 15:04:39 +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
Jannis Leidel
93cd8442fc Fixed #15535 -- Stopped the blocktrans template tag from raising a KeyError if an included variable can't be found in the context. Thanks, melinath. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15709 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-02 21:36:41 +00:00
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
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
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
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
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
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
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