[django/django] 3d74f1: [1.7.x] Fixed a deprecation warning on Python 3.

[GitHub]

Branch: refs/heads/stable/1.7.x
Home: https://github.com/django/django
Commit: 3d74f1f64a78e5aeebb91c76e44d8e318a1c0023
https://github.com/django/django/commit/3d74f1f64a78e5aeebb91c76e44d8e318a1c0023
Author: Tim Graham <timog...@gmail.com>
Date: 2014-03-27 (Thu, 27 Mar 2014)

Changed paths:
M tests/utils_tests/test_lazyobject.py

Log Message:
-----------
[1.7.x] Fixed a deprecation warning on Python 3.

Backport of c19bbefca2 from master


Commit: 0134d00be5446d9ae51a1a36e4e10289037f8782
https://github.com/django/django/commit/0134d00be5446d9ae51a1a36e4e10289037f8782
Author: Tim Graham <timog...@gmail.com>
Date: 2014-03-27 (Thu, 27 Mar 2014)

Changed paths:
M tests/serializers_regress/tests.py

Log Message:
-----------
[1.7.x] Skipped a test that errors rather than marked it as an expectedFailure.

The test throws an error which Python 3.4 doesn't seem to catch as an
expectedFailure.

refs 7476d96f83a004d674244aeb7a66289035427396

Backport of c170c3761b from master


Commit: e2e773c04abeab04866eac14c0040ef3aa653e1b
https://github.com/django/django/commit/e2e773c04abeab04866eac14c0040ef3aa653e1b
Author: Tim Martin <t...@asymptotic.co.uk>
Date: 2014-03-27 (Thu, 27 Mar 2014)

Changed paths:
M docs/ref/urls.txt
M docs/topics/http/urls.txt

Log Message:
-----------
[1.7.x] Fixed #21941 -- Documented the kwargs param of django.conf.urls.url().

Thanks cjerdonek for the report.

Backport of a779757706 from master


Compare: https://github.com/django/django/compare/fe61ba91c723...e2e773c04abe