2fb5a51fa3
Fixed #18659 -- Deprecated request.REQUEST and MergeDict
...
Thanks Aymeric Augustin for the suggestion.
2013-10-17 09:42:28 -04:00
eb214452c3
Fixed #21270 -- Fixed E701 pep8 warnings
2013-10-17 12:12:40 +01:00
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
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
83b9bfea44
Fixed #21266 -- Fixed E201,E202 pep8 warnings.
2013-10-14 18:12:00 -04:00
d9b6fb8f61
Fixed #21256 -- Error in datetime_safe.datetime.combine.
2013-10-13 19:09:26 +02:00
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#19362 .
2013-10-13 18:14:04 +02:00
b67ab75e82
Fixed assorted flake8 errors.
2013-10-11 07:25:14 -04:00
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
ff9e8eccf8
Removed unnecessary semicolons.
2013-10-10 08:50:32 -04:00
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
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
6c06adad1d
Fixed #20364 -- Changed urlize regexes to include quotation marks as punctation.
...
Thanks to EmilStenstrom for raising this, and to Chris Piwoński for all of the fixes and most of the tests.
2013-09-25 22:17:22 +02:00
68540fe4df
Fixed #21138 -- Increased the performance of our PBKDF2 implementation.
...
Thanks go to Michael Gebetsroither for pointing out this issue and help on
the patch.
2013-09-24 21:06:26 +02:00
a5b062576b
Removed a few trailing backslashes.
...
We have always been at war with trailing backslashes.
2013-09-22 14:04:10 +02:00
a075e2ad0d
Increase default PBKDF2 iterations
...
Increases the default PBKDF2 iterations, since computers have gotten
faster since 2011. In the future, we plan to increment by 10% per
major version.
2013-09-19 18:02:25 +01:00
893198509e
Fixed #15625 -- Made message in MultiValueDictKeyError less verbose.
...
Thanks margieroginski for the suggestion.
2013-09-18 06:44:38 -04:00
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
ad6fcdb8d2
Fixed #20844 -- Made AdminEmailHandler respect LOGGING 'formatter' setting.
2013-09-13 07:27:54 -04:00
b2b763448f
Fixed #20841 -- Added messages to NotImplementedErrors
...
Thanks joseph at vertstudios.com for the suggestion.
2013-09-10 11:09:59 -04:00
d9413d33b2
Refactored code and tests that relied on django.utils.tzinfo.
...
Refs #17262 .
2013-09-09 22:32:52 +02:00
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
a52cc1c088
Fixed #21078 -- Handled additional bad Accept-Language header
2013-09-09 15:19:09 -04:00
ded11aa620
Fixed #18766 -- Pointed to pytz when LocalTimezone fails.
...
Thanks void for the report.
2013-09-08 02:04:43 -05:00
2530735d2d
Fixed a number of flake8 errors -- particularly around unused imports and local variables
2013-09-06 21:56:40 -07:00
e844e10b4f
Moved a settings usage up the stack in utils/formats.py #unsettings
2013-09-06 17:01:36 -05:00
559cb826b8
Fixed #21049 -- Fixed autoreload for Python 3
...
Changed th system module values check to return a list.
In Python 3 it returns a dict_view which could occassionally produce
a runtime error of "dictionary changed size during iteration".
2013-09-06 14:37:43 -05:00
2326dedde8
Fixed #20812 -- Error out if __unicode__/__str__ doesn't return a text type.
2013-09-06 19:24:18 +02:00
b80be68e08
Fixed #21052 -- Small performance optimization.
2013-09-06 10:34:32 -05:00
e492ab8e7e
Fixed #18719 -- Made force_bytes more consistent with force_text.
2013-09-06 10:28:28 -05:00
6a6428a36f
Took advantage of django.utils.six.moves.urllib.*.
2013-09-05 14:39:23 -05:00
7b623247e8
Updated six to version 1.4.1.
2013-09-04 15:21:24 -05:00
5649c0af9d
Fixed "indentation is not a multiple of four" pep8 issues.
2013-09-03 14:22:21 -04:00
365c3e8b73
Replaced "not PY3" by "PY2", new in six 1.4.0.
2013-09-02 12:11:02 +02:00
4292097078
Updated the bundled version of six to 1.4.0.
2013-09-02 12:07:03 +02:00
11cd7388f7
Fixed #20989 -- Removed useless explicit list comprehensions.
2013-08-30 10:57:51 -04:00
c7d0ff0cad
Fixed #20989 -- Removed explicit list comprehension inside dict() and tuple()
...
Thanks jeroen.pulles at redslider.net for the suggestion and
helper script.
2013-08-29 12:11:03 -04:00
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
eadecf0cdb
Avoid importing the deprecated `django.utils.importlib` package.
2013-08-21 22:30:02 +01:00
e9b703f5a5
Correctly format missing Pillow/PIL exceptions messages. refs #19934
2013-08-21 22:30:02 +01:00
b6a957f0ba
Merge remote-tracking branch 'core/master' into schema-alteration
...
Conflicts:
docs/ref/django-admin.txt
2013-08-19 18:30:48 +01:00
4090982617
Some code simplification
2013-08-18 09:43:41 -07:00
7a698c05b5
Update LazyObject method proxy declarations to simpler form.
2013-08-18 15:58:55 +02:00
b9ef96e73c
Regression test and patch for ticket #20924 .
2013-08-15 20:59:58 +02:00
ae3535169a
Fixed is_safe_url() to reject URLs that use a scheme other than HTTP/S.
...
This is a security fix; disclosure to follow shortly.
2013-08-13 11:06:22 -05:00
7970d97a70
Docs tweaks (thanks timgraham)
2013-08-10 20:00:12 +01:00
3c3d308ea3
Back SortedSet onto OrderedDict, rename it, and a few typo fixes
2013-08-10 19:50:06 +01:00
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
8a160d5de1
Use `usegmt` flag in formatdate
...
Slightly cleaner and faster than string manipulation.
This flag has been available since Python 2.4:
http://docs.python.org/2/library/email.util.html#email.utils.formatdate
2013-08-07 12:00:39 +01:00
07876cf02b
Deprecated SortedDict (replaced with collections.OrderedDict)
...
Thanks Loic Bistuer for the review.
2013-08-04 07:09:39 -04: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
d5ca169334
Fix "OK" alignment in migrate output
2013-07-26 16:52:17 +01:00
03ec3219a0
Merge branch 'master' into schema-alteration
...
Conflicts:
django/db/backends/mysql/introspection.py
django/db/backends/oracle/creation.py
django/db/backends/postgresql_psycopg2/creation.py
django/db/models/base.py
django/db/models/loading.py
2013-07-22 19:04:25 +01:00
a269ea4fe0
Fixed #14656 -- Added Atom1Feed `published` element
...
Some feed aggregators make use of the `published` element as well as
the `updated` element (within the Atom standard -- http://bit.ly/2YySb ).
The standard allows for these two elements to be present in the same
entry. `Atom1Feed` had implemented the `updated` element which was
incorrectly taking the date from `pubdate`.
2013-07-19 10:38:34 -04:00
2456ffa42c
Fixed #20746 -- Removed Python 2.6 specific code/docs
2013-07-14 13:02:55 -04:00
b4c61c2665
Added clarification comments to django.utils.image; refs #19934
2013-07-12 12:38:00 +02:00
d63327d843
Fixed #20711 -- Fixed broken link in timesince.py docstring
2013-07-07 12:40:05 -04:00
b1e0ec06f0
Merge branch 'master' into schema-alteration
2013-07-02 10:49:53 +01:00
6c66a41c3d
Relied on NullHandler from the logging stdlib module.
2013-07-01 23:16:25 +02:00
72c65fea41
Deprecated django.utils.dictconfig.
...
The module still exists for whoever uses it in its current state, but it
isn't imported by Django anywhere.
2013-07-01 22:50:58 +02:00
09b446dfe8
This doesn't need to be a package any more.
...
Refs #20680 .
2013-07-01 22:46:35 +02:00
7f264e02f4
Fixed #20680 -- Deprecated django.utils.unittest.
...
Refs #19204 .
2013-07-01 14:29:33 +02:00
acd7b34aaf
Advanced deprecation warnings for Django 1.7.
2013-06-29 18:49:37 +02:00
24bbf1367a
Removed django.utils.encoding.StrAndUnicode class, deprecated in Django 1.5.
2013-06-28 23:16:28 -03:00
7379d9acea
Removed insert(), value_for_insert() SortedDict methods deprecated in Django 1.5.
2013-06-28 22:38:13 -03:00
bb33ee5e7b
Removed django.utils.itercompat.product() as per deprecation TL.
2013-06-28 21:48:16 -03:00
da6d303df4
Removed django.utils.simplejson as per deprecation TL.
2013-06-28 21:48:16 -03:00
7a47ba6f6a
Merge remote-tracking branch 'core/master' into schema-alteration
...
Conflicts:
django/db/backends/__init__.py
django/db/models/fields/related.py
tests/field_deconstruction/tests.py
2013-06-28 17:32:57 +01:00
1184d07789
Fixed #14881 -- Modified password reset to work with a non-integer UserModel.pk.
...
uid is now base64 encoded in password reset URLs/views. A backwards compatible
password_reset_confirm view/URL will allow password reset links generated before
this change to continue to work. This view will be removed in Django 1.7.
Thanks jonash for the initial patch and claudep for the review.
2013-06-26 13:11:47 -04:00
ffcf24c9ce
Removed several unused imports.
2013-06-19 17:18:40 +02:00
9daf81b94e
Merge remote-tracking branch 'core/master' into schema-alteration
...
Conflicts:
django/db/models/loading.py
2013-06-19 12:05:23 +01:00
ee77d4b253
Fixed #20199 -- Allow ModelForm fields to override error_messages from model fields
2013-06-18 08:01:17 -04:00
315ab41e41
Initial stab at a migrate command, it's probably quite a way off.
2013-06-07 18:47:17 +01: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
c9d07d251f
Fixed loaddata for Django checkouts with non ASCII chars in the name.
2013-06-03 13:18:16 +02:00
09d0568697
Switched to using some constants the hmac module exposes.
2013-06-02 10:31:38 -07:00
127d9b2792
Added minor splitting optimization in django.utils.ipv6._unpack_ipv4
2013-06-01 07:08:13 -04:00
0fa8d43e74
Replaced `and...or...` constructs with PEP 308 conditional expressions.
2013-05-26 23:47:50 -03:00
d228c1192e
Fixed #19866 -- Added security logger and return 400 for SuspiciousOperation.
...
SuspiciousOperations have been differentiated into subclasses, and
are now logged to a 'django.security.*' logger. SuspiciousOperations
that reach django.core.handlers.base.BaseHandler will now return a 400
instead of a 500.
Thanks to tiwoc for the report, and Carl Meyer and Donald Stufft
for review.
2013-05-25 16:27:34 -07:00
2ee447fb5f
Fixed #20296 -- Allowed SafeData and EscapeData to be lazy
2013-05-25 16:06:44 +02:00
b7cf44dde8
Fixed some minor translation-related issues
2013-05-25 14:32:44 +02:00
c0439b6210
Removed obsolete attribute of DjangoTranslation
2013-05-25 14:01:52 +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
fd961941cc
Imported copyreg from six.moves
2013-05-21 14:41:39 +02:00
e24d486fbc
Fixed #20212 - __reduce__ should only be defined for Py3+.
2013-05-21 00:49:21 -07:00
26e3e7ecb5
Fixed #11915 : generic Accept-Language matches country-specific variants
2013-05-19 12:50:09 +02:00
d58c98d73c
Fix proxy objects to respect !=
2013-05-19 12:27:17 +02:00
413735b239
Fix a typo in a comment.
2013-05-19 11:24:36 +02:00
7d77e9786a
Fixed #20246 -- Added non-breaking spaces between values an units
2013-05-18 23:01:48 +02:00
acd0bb39df
Fixed #14894 -- Ensure that activating a translation doesn't run into threading issues.
...
Thanks to maxbublis for the report and sergeykolosov for the patch.
2013-05-18 17:36:31 +02:00
92ebb29c53
Fixes #19919 : get_language_from_request() disregards "en-us" and "en" languages
...
when matching Accept-Language
2013-05-18 14:37:04 +02:00
051cb1f4c6
Fixed #20411 -- Don't let invalid referers blow up CSRF same origin checks.
...
Thanks to edevil for the report and saz for the patch.
2013-05-18 12:32:47 +02:00
b31eea069c
Merge branch 'master' into schema-alteration
2013-05-18 10:21:31 +02:00
9c487b5974
Replaced an antiquated pattern.
...
Thanks Lennart Regebro for pointing it out.
2013-05-17 18:08:58 +02:00
4ecc6da20b
Removed unicode literals from PIL compat.
2013-05-15 09:00:09 +02:00
33793f7c3e
Fixed #19934 - Use of Pillow is now preferred over PIL.
...
This starts the deprecation period for PIL (support to end in 1.8).
2013-05-14 19:32:04 -07: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
cb4b0de49e
Merge branch 'master' into schema-alteration
2013-05-10 12:55:30 +01:00
Bouke Haarsma
Alasdair Nicol
Alex Gaynor
Unai Zalakain
Larry O'Neill
Aymeric Augustin
Tim Graham
Jaap Roes
Baptiste Mispelon
Giles Richard Greenway
Florian Apolloner
Paul McMillan
Juan Catalano
Daniel Sokolowski
Gregor MacGregor
Josh Mize
Adrian Holovaty
Max Burstein
Simon Charette
Warren Smith
Andrew Godwin
Nick Bruun
Jacob Kaplan-Moss
David Evans
Curtis Maloney
Claude Paroz
Matt Deacalion Stevens
Christopher Medrela
SusanTan
Ramiro Morales
Loic Bistuer
Danilo Bargen
Preston Holmes
Daniel Lindsley
Łukasz Langa
Marc Tamlyn
Emil Stenström
Carl Meyer