mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-25 18:46:22 +00:00
Code Issues 25 Releases Wiki Activity
19,665 Commits 28 Branches 426 Tags 667 MiB
9f51d0c86d
Commit Graph

146 Commits

Author SHA1 Message Date
Claude Paroz
e520a73eee Harmonized some PEP 0263 coding preambles 2014-05-15 19:58:41 +02:00
Alex Gaynor
2bcb8bfc8d Fix many many typos in comments throughout the codebase 2014-04-26 10:18:45 -07:00
chriscauley
66ec9ee441 Fixed #22378 -- Updated \d to [0-9]+ in urlpatterns of docs and tests. 
Thanks tomwys for the suggestion.
 2014-04-16 20:36:29 -04:00
e0ne
2aaa045c61 Fixed #13408 -- Deprecated silent unpacking exception passing in for template tag. 
Thanks peterbe for the suggestion.
 2014-04-08 13:55:17 -04:00
Anubhav Joshi
cd914e31c9 Fixed #21977 -- Deprecated SimpleTestCase.urls 2014-04-06 17:33:43 -04:00
Tim Graham
d73d0e071c Fixed #22218 -- Deprecated django.conf.urls.patterns. 
Thanks Carl Meyer for the suggestion and Alex Gaynor and Carl for reviews.
 2014-04-03 07:28:10 -04:00
Alex Gaynor
778ce245dd Corrected many style guide violations that the newest version of flake8 catches 2014-03-30 12:11:05 -07:00
Maxime Turcotte
5e4e0b6fe9 Fixed #22306 -- Deprecated future versions of cycle and firstof template tags. 2014-03-28 18:55:06 -04:00
Claude Paroz
bc315266c8 Fixed #22294 -- Prevented converting length filter output to string 
Thanks Steve Pike for the report.
 2014-03-22 16:39:46 +01:00
Aymeric Augustin
ad3942d325 The cycle and firstof tags no longer raise warnings. 
Refs #17906.
 2014-03-21 21:40:04 +01:00
Tim Graham
1ea44a3abd Switched {% cycle %} and {% firstof %} tags to auto-escape their variables per deprecation timeline. 
refs #17906.
 2014-03-21 13:17:10 -04:00
Tim Graham
8b81dee60c Removed fix_ampersands template filter per deprecation timeline. 
Also removed related utility functions:
* django.utils.html.fix_ampersands
* django.utils.html.clean_html
 2014-03-21 08:50:43 -04:00
Tim Graham
35f46ec7a9 Fixed flake8 warnings. 2014-03-21 06:24:45 -04:00
Anubhav Joshi
659b5678fc Fixed #22184 -- Allowed template_tests.tests to be run isolated 2014-03-15 12:34:11 +01:00
Aymeric Augustin
3a34f71d4d Removed obsolete hack to run template tests. 2014-03-09 11:07:21 +01:00
Claude Paroz
210d0489c5 Fixed #21188 -- Introduced subclasses for to-be-removed-in-django-XX warnings 
Thanks Anssi Kääriäinen for the idea and Simon Charette for the
review.
 2014-03-08 09:57:40 +01: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
Erik Romijn
775975f15d Fixed #22130 -- Deprecated fix_ampersands, removed utils.clean_html() 2014-03-01 14:07:57 +01:00
Tim Graham
72b080c2c8 Removed Django 1.5 upgrade hints for {% url %} tag. 
Refs #19280 and Refs #19392.
 2014-02-28 07:18:45 -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
Baptiste Mispelon
81cd3a7460 Use assertEqual instead of assertEquals. 2014-02-17 04:58:31 +01:00
Marek Wywiał
8274fa60f8 Made the new template.Context.flatten() method a public API. 
That method was introduced in 9db4271bd1.

Refs #21765.
 2014-02-16 15:18:45 +01:00
Zbigniew Siciarz
74d4d58b62 Fixed #21939 -- Deprecated loading ssi/url tags from future. 2014-02-16 13:25:21 +01:00
Baptiste Mispelon
9db4271bd1 Fixed bad comparison logic introduced in d97bf2e9c8. 
Refs #21765.

Thanks to kezabelle for the quick report and to onjin
for providing the patch.
 2014-02-15 22:58:03 +01:00
Marek Wywiał
d97bf2e9c8 Fixed #21765 -- Added support for comparing Context instances 2014-02-15 17:14:28 +01:00
Aymeric Augustin
07ae47f7f8 Fixed #21959 -- Handled Inf/NaN in widthratio tag. 
Thanks rmoe for the report and the patch.
 2014-02-08 21:01:55 +01:00
Claude Paroz
02add43568 Fixed #21417 -- Expanded TEMPLATE_STRING_IF_INVALID in blocktrans 
Thanks keturn for the reporti, Chris Medrela for details and
Tim Graham for the review.
Refs #19915.
 2014-02-08 11:06:54 +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
Aymeric Augustin
b951a7fbc1 Removed superfluous uses of TransRealMixin. 
The translation.override context manager cleans up after itself. As a
consequence this mixin isn't needed any more in many cases.
 2014-01-27 22:01:22 +01:00
Carl Meyer
ca95f8e435 Moved sys.path-extending decorator to django.test.utils and used throughout test suite. 
Thanks Aymeric for the suggestion.
 2014-01-25 22:50:40 -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
Marc Tamlyn
2607fa9016 Fixed #21774 -- Isolate all test urls from eachother. 
This (nearly) completes the work to isolate all the test modules from
each other. This is now more important as importing models from another
module will case PendingDeprecationWarnings if those modules are not in
INSTALLED_APPS. The only remaining obvious dependencies are:

- d.c.auth depends on d.c.admin (because of the is_admin flag to some
  views), but this is not so important and d.c.admin is in
  always_installed_apps
- test_client_regress depends on test_client. Eventually these should
  become a single module, as the split serves no useful purpose.
 2014-01-14 15:43:27 +00:00
Aymeric Augustin
e32095616c Imported override_settings from its new location. 2013-12-23 21:37:56 +01: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
Alex Hill
832ab0dbaa Fixed #21639 -- Implemented RenderContext.__getitem__ 
It's now consistent with RenderContext.get.
 2013-12-20 01:02:50 +01:00
Aymeric Augustin
6e895f9e06 Removed superfluous models.py files. 
Added comments in the three empty models.py files that are still needed.

Adjusted the test runner to add applications corresponding to test
labels to INSTALLED_APPS even when they don't have a models module.
 2013-12-17 11:16:48 +01:00
Loic Bistuer
a2814846ca Fixed E124 pep8 warnings. 2013-12-10 15:12:48 -05:00
Unai Zalakain
2688462f91 Refs #21230 -- removed direct settings manipulation from template tests 2013-11-30 13:47:16 -05:00
Curtis Maloney
ffc37e2343 Fixed #21012 -- New API to access cache backends. 
Thanks Curtis Malony and Florian Apolloner.

Squashed commit of the following:

commit 3380495e93
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date:   Sat Nov 23 14:18:07 2013 +0100

    Looked up the template_fragments cache at runtime.

commit 905a74f52b
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date:   Sat Nov 23 14:19:48 2013 +0100

    Removed all uses of create_cache.

    Refactored the cache tests significantly.

    Made it safe to override the CACHES setting.

commit 35e289fe92
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date:   Sat Nov 23 12:23:57 2013 +0100

    Removed create_cache function.

commit 8e274f747a
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date:   Sat Nov 23 12:04:52 2013 +0100

    Updated docs to describe a simplified cache backend API.

commit ee7eb0f73e
Author: Curtis Maloney <curtis@tinbrain.net>
Date:   Sat Oct 19 09:49:24 2013 +1100

    Fixed #21012 -- Thread-local caches, like databases.
 2013-11-23 15:06:59 +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
coagulant
8eec2d93b6 Fixed all E261 warnings 2013-11-02 23:50:33 -05:00
Jason Myers
c3791463a5 Fixing E302 Errors 
Signed-off-by: Jason Myers <jason@jasonamyers.com>
 2013-11-02 23:48:47 -05:00
Boryslav Larin
e737c009b8 Fixed flake8 E241 2013-11-02 21:45:40 +02:00
Tim Graham
36ded01527 Fixed #21302 -- Fixed unused imports and import *. 2013-11-02 15:24:56 -04:00
Alex Gaynor
b35ff0d920 Fixed all the E203 violations 2013-10-26 18:27:42 -07:00
Alex Gaynor
9d740eb8b1 Fix all violators of E231 2013-10-26 12:15:03 -07:00
Curtis Maloney
8688f03eef Fixed #20945 -- Allowed cache tag to use a specific cache. 2013-10-23 19:27:08 -04:00
Alasdair Nicol
c3aa2948c6 Fixed #21298 -- Fixed E301 pep8 warnings 2013-10-23 13:45:03 +01:00
Ramiro Morales
51d2e1fb23 Fixed #21307 -- Moved TransRealMixin to django.test.utils. 2013-10-22 22:19:56 -03: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
Tim Graham
96d1d4e292 Removed unused local variables in tests. 2013-10-19 08:31:38 -04:00
Alasdair Nicol
a800036981 Fixed #21287 -- Fixed E123 pep8 warnings 2013-10-18 10:07:39 +01:00
Alasdair Nicol
bab9123daa Fixed #21268 -- Fixed E303 pep8 warnings 2013-10-18 01:46:24 +01:00
Alasdair Nicol
dfb4cb9970 Fixed #21285 -- Fixed E121,E122 pep8 warnings 2013-10-17 20:20:11 -04:00
Larry O'Neill
83b9bfea44 Fixed #21266 -- Fixed E201,E202 pep8 warnings. 2013-10-14 18:12:00 -04:00
Tim Graham
1dae4ac177 Whitespace cleanup. 
* Removed trailing whitespace.
* Added newline to EOF if missing.
* Removed blank lines at EOF.
* Removed some stray tabs.
 2013-10-10 16:49:20 -04:00
Aymeric Augustin
671757b507 Fixed #21161 -- Timezone-related tests on Windows. 
Thanks Xelnor for the patch.
 2013-10-05 18:50:20 +02:00
Tim Graham
7fec5a2240 Fixed #7557 -- Added type checking to Variable initialization. 
Thanks tobias for the suggestion and boblefrag and saz for work on the
patch.
 2013-09-19 09:27:19 -04: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
Tim Graham
7fe5b656c9 Prevented arbitrary file inclusion with {% ssi %} tag and relative paths. 
Thanks Rainer Koirikivi for the report and draft patch.

This is a security fix; disclosure to follow shortly.
 2013-09-10 21:02:48 -04:00
Aymeric Augustin
d9413d33b2 Refactored code and tests that relied on django.utils.tzinfo. 
Refs #17262.
 2013-09-09 22:32:52 +02:00
Curtis Maloney
7c6f2ddcd9 Simplify FilterExpression.args_check 2013-09-09 09:03:50 -04:00
Baptiste Mispelon
28a571348b Fix #20745: Don't silence TypeError raised inside templates. 
Thanks to robin for the report and claudep for the review.
 2013-09-08 22:05:35 +02:00
Preston Timmons
8625c7aab3 Fixed #16096 -- Added origin attribute to template instances. 
Thanks jdunck for the suggestion.
 2013-09-06 09:14:52 -04:00
Aymeric Augustin
6a6428a36f Took advantage of django.utils.six.moves.urllib.*. 2013-09-05 14:39:23 -05:00
Simon Charette
11cd7388f7 Fixed #20989 -- Removed useless explicit list comprehensions. 2013-08-30 10:57:51 -04:00
Curtis Maloney
e2f06226ea Improved {% include %} implementation 
Merged BaseIncludeNode, ConstantIncludeNode and Include node.

This avoids raising TemplateDoesNotExist at parsing time, allows recursion
when passing a literal template name, and should make TEMPLATE_DEBUG behavior
consistant.

Thanks loic84 for help with the tests.

Fixed #3544, fixed #12064, fixed #16147
 2013-08-30 10:36:36 +03:00
Curtis Maloney
8d473b2c54 Fixed #7116 -- Optimize RequestContext construction 2013-08-29 10:25:56 +03:00
Curtis Maloney
5cdacbda03 Fixed #17356 -- Allowed {% include %} to render compiled templates 
Reviewed by Loic Bistuer and Tim Graham.
 2013-08-29 10:22:24 +03:00
Warren Smith
dd3a883894 Fixed #20693 -- Add timezone support to built-in time filter. 
Modified django.utils.dateformat module, moving __init__() method and
timezone-related format methods from DateFormat class to TimeFormat
base class. Modified timezone-related format methods to return an
empty string when timezone is inappropriate for input value.
 2013-08-26 16:15:53 -05: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
Jonathan Slenders
ff410565bf Fixed #20709 -- Allowed {% widthratio %} to accept an "as" parameter. 
Thanks clay.evil@ for the suggestion.
 2013-08-14 12:40:19 -04:00
Tim Graham
71b5617c24 Fixed #17778 -- Prevented class attributes on context from resolving as template variables. 
Thanks KyleMac for the report, regebro for the patch, and Aymeric for the test.
 2013-08-12 12:41:39 -04:00
Claude Paroz
5c1143910e Removed most of absolute_import imports 
Should be unneeded with Python 2.7 and up.
Added some unicode_literals along the way.
 2013-07-29 20:28:13 +02:00
Julien Phalip
47c755327b Fixed a number of minor misspellings. 2013-07-27 18:46:03 -07: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
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
Aymeric Augustin
cfcf4b3605 Stopped using django.utils.unittest in the test suite. 
Refs #20680.
 2013-07-01 14:29:33 +02:00
Aymeric Augustin
acd7b34aaf Advanced deprecation warnings for Django 1.7. 2013-06-29 18:49:37 +02:00
Baptiste Mispelon
ec371ace00 Fixed #20650 -- Fixed {% filter %} incorrectly accepting 'escape' as argument 
Thanks to grzesiof for the report and to loic84 and Alex Gaynor
for the review.
 2013-06-25 20:28:35 +02:00
Claude Paroz
b67f2ac8e6 Fixed #20502 (again) -- More i18n cache flush in tests 
Thanks Timo Graham for noticing the failures.
 2013-06-06 14:28:58 +02:00
Anssi Kääriäinen
369b6fab25 Fixed #18169 -- NoReverseMatch not silenced if from block.super 2013-06-01 00:59:04 +03:00
Emil Stenström
7d77e9786a Fixed #20246 -- Added non-breaking spaces between values an units 2013-05-18 23:01:48 +02:00
Carl Meyer
9012833af8 Fixed #17365, #17366, #18727 -- Switched to discovery test runner. 
Thanks to Preston Timmons for the bulk of the work on the patch, especially
updating Django's own test suite to comply with the requirements of the new
runner. Thanks also to Jannis Leidel and Mahdi Yusuf for earlier work on the
patch and the discovery runner.

Refs #11077, #17032, and #18670.
 2013-05-10 23:08:45 -04: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
Baptiste Mispelon
5080311998 Fixed #20130 -- Regression in {% cache %} template tag. 2013-03-30 12:13:08 +01:00
Aymeric Augustin
31b5275235 Fixed #13260 -- Quoted arguments interpolated in URLs in reverse. 2013-03-18 23:58:22 +01:00
matiasb
804366327d Fixed #19915 - Made blocktrans tag honor TEMPLATE_STRING_IF_INVALID. 
Thanks Natalia Bidart for the report and Matías Bordese for the fix.
 2013-03-03 16:10:11 -03:00
Aymeric Augustin
b2c697b029 Fixed a PendingDeprecationWarning in template_tests. 2013-02-27 21:09:27 +01:00
Florian Apolloner
33836cf88d Renamed some tests and removed references to modeltests/regressiontests. 2013-02-26 14:36:57 +01:00