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
20,323 Commits 30 Branches 460 Tags
ae1d663b7913f6da233c55409c4973248372d302
Commit Graph

33 Commits

Author SHA1 Message Date
Tim Graham
ae1d663b79 [1.8.x] Renamed RemovedInDjango20Warning to RemovedInDjango110Warning. 2015-06-23 07:22:16 -04:00
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
Adam Taylor
45aaced91e [1.8.x] Fixed typos in code comments. 
Backport of 039465a6a7 from master
 2015-01-20 12:18:29 -05:00
Aymeric Augustin
cf0fd65ed4 Deprecated TEMPLATE_LOADERS. 2014-12-28 17:02:30 +01:00
Tim Graham
b6ea059b4a Fixed #23957 -- Started deprecation toward requiring session verification. 
Thanks Carl Meyer for review.
 2014-12-05 07:37:34 -05:00
Aymeric Augustin
87f187b960 Adjusted tests for previous commit. 
The test was testing a use case that doesn't happen in real world
projects: developers don't assign settings at run time (and Django
explicitly doesn't support it).
 2014-11-17 23:26:04 +01:00
Thomas Chaumeny
d89f56dc4d Fixed #21281 -- Made override_settings act at class level when used as a TestCase decorator. 2014-11-03 14:14:39 -05:00
Berker Peksag
f7969b0920 Fixed #23620 -- Used more specific assertions in the Django test suite. 2014-11-03 11:56:37 -05:00
Aymeric Augustin
9562ffea97 Avoid the word "stupid". 
There's always a better word.
 2014-09-09 20:55:57 +02:00
Claude Paroz
885ff6845e Revert "Fixed #23384 -- Allowed overriding part of a dictionary-type setting" 
This reverts commit 66757fee7e.
Discussions have led to think that this functionality does not
bring significant benefits to justify the added complexity.
Read also discussions on ticket #22734.
 2014-09-05 20:06:02 +02:00
Claude Paroz
66757fee7e Fixed #23384 -- Allowed overriding part of a dictionary-type setting 
This change is needed for upcoming changes where settings might be
grouped in a parent dictionary.
Thanks Tim Graham for the review.
 2014-08-30 12:37:10 +02:00
Alex Gaynor
e163a3d17b Removed an unused local variable, fixes a flake8 error 2014-06-11 00:22:30 -07:00
Tim Schaffer
a1c6cd6a16 Fixed #22780 -- Checked that LOCALE_PATHS is really a tuple 2014-06-10 23:04:24 +02:00
Claude Paroz
3417ba0309 Also allowed a non-overridden setting to be deleted 
Refs #20032, #18824. Thanks ztorstri at gmail.com for the report.
 2014-04-12 15:33:22 +02: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
Alex Gaynor
8482ab6633 Removed some stray newlines which caused flake8 issues 2014-01-20 22:58:05 -06:00
Carl Meyer
6070a5d6a6 Fixes #21833 -- Fix UserSettingsHolder.is_overridden() and add tests. 2014-01-20 20:25:33 -07:00
Aymeric Augustin
553500133c Removed an obsolete unicity check. 
It doesn't account for app configs.

Refs #21679.
 2013-12-31 17:29:04 +01:00
Aymeric Augustin
e32095616c Imported override_settings from its new location. 2013-12-23 21:37:56 +01:00
Aymeric Augustin
5241763c81 Added modify_settings to alter settings containing lists of values. 2013-12-23 21:37:43 +01:00
Aymeric Augustin
3a30b9c575 Fixed a flaky test. 2013-12-22 20:22:56 +01:00
Aymeric Augustin
eabc3b6c8d Set stacklevel for the override_settings warning. 
Refs #19031.
 2013-12-20 11:09:06 +01:00
Jason Myers
c3791463a5 Fixing E302 Errors 
Signed-off-by: Jason Myers <jason@jasonamyers.com>
 2013-11-02 23:48:47 -05:00
Tim Graham
36ded01527 Fixed #21302 -- Fixed unused imports and import *. 2013-11-02 15:24:56 -04:00
Claude Paroz
949076eb11 Fixed #21263 -- Fixed issue with override_settings in inherited classes 
When both parent and child classes are decorated with override_settings,
child class settings should take precedence.
Thanks Sephi for the report and Marc Tamlyn for the review.
 2013-10-15 15:38:27 +02:00
Tim Graham
9c711ee3a6 Fixed test failures on Python 3 - refs #12288 2013-08-09 09:12:15 -04:00
SusanTan
2ac89012d8 Fixed #12288 -- Added unique validation for INSTALLED_APPS 2013-08-09 08:08:34 -04:00
Julien Phalip
47c755327b Fixed a number of minor misspellings. 2013-07-27 18:46:03 -07:00
Joeri Bekker
66f3d57b79 Fixed #19031 -- Added a warning when using override_settings with 'DATABASES' 2013-07-12 07:10:18 -04:00
Aymeric Augustin
cfcf4b3605 Stopped using django.utils.unittest in the test suite. 
Refs #20680.
 2013-07-01 14:29:33 +02:00
Oliver Beattie
552a90b444 Fixed #20290 -- Allow override_settings to be nested 
Refactored override_settings to store the underlying settings._wrapped
value seen at runtime, not instantiation time.
 2013-06-21 16:57:47 +02:00
Aymeric Augustin
c6e6d4eeb7 Defined available_apps in relevant tests. 
Fixed #20483.
 2013-06-10 11:30:01 +02:00
Florian Apolloner
89f40e3624 Merged regressiontests and modeltests into the test root. 2013-02-26 14:36:57 +01:00