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
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
fdd7a355bf
Deprecated django.utils.importlib
...
This was a shim for pre-Python 2.7 support.
2013-07-29 17:10:22 +02:00
b70c371fc1
Simplified smart_urlquote and added some basic tests.
2013-07-28 10:05:39 +02:00
b1e0ec06f0
Merge branch 'master' into schema-alteration
2013-07-02 10:49:53 +01:00
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
cfcf4b3605
Stopped using django.utils.unittest in the test suite.
...
Refs #20680 .
2013-07-01 14:29:33 +02:00
7379d9acea
Removed insert(), value_for_insert() SortedDict methods deprecated in Django 1.5.
2013-06-28 22:38:13 -03:00
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
52d2a8b311
Add test for new __ne__ method on Promise.
2013-05-29 17:52:17 +01:00
2ee447fb5f
Fixed #20296 -- Allowed SafeData and EscapeData to be lazy
2013-05-25 16:06:44 +02:00
b664cb818d
Fixed #19237 (again) - Made strip_tags consistent between Python versions
2013-05-23 14:01:27 +02:00
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
b1ac241ddc
Fixed test failures from 09f8652765.
2013-05-21 13:03:25 +02:00
09f8652765
Use assertIsInstance in tests.
...
Gives much nicer errors when it fails.
2013-05-21 10:42:15 +01:00
e24d486fbc
Fixed #20212 - __reduce__ should only be defined for Py3+.
2013-05-21 00:49:21 -07:00
7d77e9786a
Fixed #20246 -- Added non-breaking spaces between values an units
2013-05-18 23:01:48 +02:00
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
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
714161c864
Fix != operations on lazy objects.
2013-04-19 10:58:29 -07:00
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
612ef3e5c9
Modified utils_tests for unittest2 discovery.
2013-04-12 15:31:58 -06:00
edc782b7b5
Relaxed time frame check in test_strip_tags
2013-04-01 22:53:04 +02:00
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
a01361b5ae
Added more tests for strip_tags utility
...
Refs #19237 .
2013-04-01 16:48:47 +02:00
2d0db67813
Fixed #20167 -- Preserve the traceback of `ImportError`s in `import_by_path`.
...
Thanks @carljm for the review.
2013-03-31 23:00:06 -04:00
164528acc8
Fixed #20108 -- Fixed filepath_to_uri decoding error
...
This was a regression due to unicode_literals usage. Thanks Ivan
Virabyan for the report and the initial patch.
2013-03-22 17:55:12 +01:00
829dc3c5a6
Fixed #20094 - Be more careful when checking for Iterator
...
Python 2.6 has some different behaviour when checking
isinstance(foo, collections.Iterator).
2013-03-22 17:31:29 +01:00
9dc5702932
Fixed #19456 -- Avoid infinite recursion when tracing LazyObject.__init__.
...
Thanks blaze33 for the patch.
2013-03-18 11:22:43 +01:00
0efafa4c54
Fixed #18447 -- Made LazyObject unwrap on dict access.
...
Thanks Roman Gladkov and Zbigniew Siciarz.
2013-03-18 11:10:19 +01:00
c31a9793c6
Merge pull request #882 from loic/testfix
...
Fixed minor warnings in tests.
2013-03-06 16:22:06 -08:00
876fc39128
PEP8 cleanup of functional.py
2013-03-06 16:14:46 -08:00
0ea5bf88dd
Fixed #19543 -- implemented SimpleLazyObject.__repr__
...
Thanks to Florian Hahn for the patch
2013-03-06 16:13:12 -08:00
9ba0e4e4ee
Fixed minor warnings in tests.
2013-03-06 01:13:36 +07:00
21189cb80b
Made dateformat tests reactivate original language
2013-02-27 23:48:17 +02:00
33836cf88d
Renamed some tests and removed references to modeltests/regressiontests.
2013-02-26 14:36:57 +01:00
Andrew Godwin
Claude Paroz
Florian Apolloner
Aymeric Augustin
Ramiro Morales
Baptiste Mispelon
Marc Tamlyn
Daniel Lindsley
Emil Stenström
Carl Meyer
Alex Gaynor
Anton Baklanov
Preston Timmons
Joe Friedl
Preston Holmes
Loic Bistuer
Anssi Kääriäinen