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
18,052 Commits 30 Branches 460 Tags
07c79252828c17b9b799d59a3bbbe45c62fe6d38
Commit Graph

112 Commits

Author SHA1 Message Date
Alasdair Nicol
a800036981 Fixed #21287 -- Fixed E123 pep8 warnings 2013-10-18 10:07:39 +01:00
Bouke Haarsma
2fb5a51fa3 Fixed #18659 -- Deprecated request.REQUEST and MergeDict 
Thanks Aymeric Augustin for the suggestion.
 2013-10-17 09:42:28 -04:00
Alex Gaynor
694d7da6c5 Merge pull request #1744 from unaizalakain/ticket_7261 
Fixed #7261 -- support for __html__ for library interoperability
 2013-10-15 14:43:35 -07:00
Unai Zalakain
af64429b99 Fixed #7261 -- support for __html__ for library interoperability 
The idea is that if an object implements __html__ which returns a string this is
used as HTML representation (eg: on escaping). If the object is a str or unicode
subclass and returns itself the object is a safe string type.

This is an updated patch based on jbalogh and ivank patches.
 2013-10-15 00:42:42 +02:00
Larry O'Neill
83b9bfea44 Fixed #21266 -- Fixed E201,E202 pep8 warnings. 2013-10-14 18:12:00 -04:00
Aymeric Augustin
589dc49e12 Fixed #21198 -- Prevented invalid use of @python_2_unicode_compatible. 
Thanks jpic for the report and chmodas for working on a patch.

Reverts 2ea80b94. Refs #19362.
 2013-10-13 18:14:04 +02: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
Jaap Roes
40b95a24ae Fixed #20568 -- truncatewords_html no longer splits words containing HTML entities. 
Thanks yann0 at hotmail.com for the report.
 2013-10-08 08:24:58 -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
Baptiste Mispelon
3754f4ad41 Fix #21185: Added tests for unescape_entities. 
Also fixed a py3 incompatibility.
Thanks to brutasse for the report.
 2013-09-27 17:00:42 +02:00
Tim Graham
4f40b97d97 Fixed #21118 -- Isolated a test that uses the database. 
Thanks rmboggs for the report.
 2013-09-18 09:42:47 -04:00
Tim Graham
893198509e Fixed #15625 -- Made message in MultiValueDictKeyError less verbose. 
Thanks margieroginski for the suggestion.
 2013-09-18 06:44:38 -04:00
Juan Catalano
6feb75129f Fixed #21060 -- Refactored admin's autodiscover method to make it reusable. 
We want to be able to use it for instance for discovering `tasks.py` modules
inside the INSTALLED_APPS.

This commit therefore moves the logic to `autodiscover_modules` method in
django.utils.module_loading.
 2013-09-13 20:09:41 -04:00
Aymeric Augustin
79ccd1a101 Fixed test that fails when pytz is installed. 
pytz' localize() method is the bane of my life.
 2013-09-10 18:07:29 +02:00
Aymeric Augustin
d9413d33b2 Refactored code and tests that relied on django.utils.tzinfo. 
Refs #17262.
 2013-09-09 22:32:52 +02:00
Aymeric Augustin
ec2778b445 Fixed #17262 -- Refactored tzinfo implementations. 
This commit deprecates django.utils.tzinfo in favor of the more recent
django.utils.timezone which was introduced when Django gained support
for time zones.
 2013-09-09 22:32:51 +02:00
Aymeric Augustin
c687bf0620 Further hardening. Refs #18766. 2013-09-08 20:43:04 +02:00
Aymeric Augustin
1a1e14786a Hardened the test introduced in ded11aa6. Refs #18766. 
Inputs acceptable to time.mktime are platform-dependent.
 2013-09-08 19:40:42 +02:00
Aymeric Augustin
ded11aa620 Fixed #18766 -- Pointed to pytz when LocalTimezone fails. 
Thanks void for the report.
 2013-09-08 02:04:43 -05:00
Florian Apolloner
2326dedde8 Fixed #20812 -- Error out if __unicode__/__str__ doesn't return a text type. 2013-09-06 19:24:18 +02:00
Aymeric Augustin
e492ab8e7e Fixed #18719 -- Made force_bytes more consistent with force_text. 2013-09-06 10:28:28 -05:00
Tim Graham
ec784c486b Silenced deprecation warnings in SortedDict tests; refs [07876cf02b] 2013-09-03 09:48:46 -04:00
Aymeric Augustin
365c3e8b73 Replaced "not PY3" by "PY2", new in six 1.4.0. 2013-09-02 12:11:02 +02: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
Andrew Godwin
b6a957f0ba Merge remote-tracking branch 'core/master' into schema-alteration 
Conflicts:
	docs/ref/django-admin.txt
 2013-08-19 18:30:48 +01:00
Nick Bruun
b9ef96e73c Regression test and patch for ticket #20924. 2013-08-15 20:59:58 +02:00
Andrew Godwin
de64c4d6e9 Merge remote-tracking branch 'core/master' into schema-alteration 
Conflicts:
	django/core/management/commands/flush.py
	django/core/management/commands/syncdb.py
	django/db/models/loading.py
	docs/internals/deprecation.txt
	docs/ref/django-admin.txt
	docs/releases/1.7.txt
 2013-08-09 14:17:30 +01: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
Claude Paroz
fdd7a355bf Deprecated django.utils.importlib 
This was a shim for pre-Python 2.7 support.
 2013-07-29 17:10:22 +02:00
Florian Apolloner
b70c371fc1 Simplified smart_urlquote and added some basic tests. 2013-07-28 10:05:39 +02:00
Andrew Godwin
b1e0ec06f0 Merge branch 'master' into schema-alteration 2013-07-02 10:49:53 +01:00
Aymeric Augustin
e021b87c00 Fixed a few more imports of django.utils.unittest. 
One import per line please! Refs #20680.
 2013-07-01 22:49:07 +02:00
Aymeric Augustin
cfcf4b3605 Stopped using django.utils.unittest in the test suite. 
Refs #20680.
 2013-07-01 14:29:33 +02:00
Ramiro Morales
7379d9acea Removed insert(), value_for_insert() SortedDict methods deprecated in Django 1.5. 2013-06-28 22:38:13 -03:00
Andrew Godwin
3c296382b8 Merge remote-tracking branch 'core/master' into schema-alteration 
Conflicts:
	django/db/models/fields/related.py
 2013-06-07 11:15:34 +01:00
Andrew Godwin
52d2a8b311 Add test for new __ne__ method on Promise. 2013-05-29 17:52:17 +01:00
Baptiste Mispelon
2ee447fb5f Fixed #20296 -- Allowed SafeData and EscapeData to be lazy 2013-05-25 16:06:44 +02:00
Claude Paroz
b664cb818d Fixed #19237 (again) - Made strip_tags consistent between Python versions 2013-05-23 14:01:27 +02:00
Claude Paroz
dc51ec8bc2 Fixed #19237 -- Used HTML parser to strip tags 
The regex method used until now for the strip_tags utility is fast,
but subject to flaws and security issues. Consensus and good
practice lead use to use a slower but safer method.
 2013-05-22 17:34:02 +02:00
Florian Apolloner
b1ac241ddc Fixed test failures from 09f8652765. 2013-05-21 13:03:25 +02:00
Marc Tamlyn
09f8652765 Use assertIsInstance in tests. 
Gives much nicer errors when it fails.
 2013-05-21 10:42:15 +01:00
Daniel Lindsley
e24d486fbc Fixed #20212 - __reduce__ should only be defined for Py3+. 2013-05-21 00:49:21 -07: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
Claude Paroz
4769db6b5f Fixed #20321 -- Added missing key name in MergeDict KeyError message 
Thanks mark.harviston et gmail.com for the report.
 2013-04-26 08:59:34 +02:00
Alex Gaynor
714161c864 Fix != operations on lazy objects. 2013-04-19 10:58:29 -07:00
Anton Baklanov
59d127e45f Fixed #20276 -- Implemented __bool__ for MergeDict 
MergeDict evaluates now to False if all contained dicts are empty.
Thanks til for the report and the initial patch.
 2013-04-19 10:08:16 +02:00
Preston Timmons
612ef3e5c9 Modified utils_tests for unittest2 discovery. 2013-04-12 15:31:58 -06:00
Claude Paroz
edc782b7b5 Relaxed time frame check in test_strip_tags 2013-04-01 22:53:04 +02:00
Claude Paroz
2817a29d90 Imported unittest from django.utils in util_tests 
Without this, the 'new' assertion methods are not present with
Python 2.6.
 2013-04-01 19:59:57 +02:00