summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-01-05 13:13:34 -0500
committerTim Graham <timograham@gmail.com>2015-01-05 13:41:06 -0500
commit2fd8054fda5b8ec304d675f82f4bd80c16e3fd95 (patch)
tree0bf0ef738637720228a3fc058d7daa869acbd349 /docs
parent032ffade8acf6f79ff4cc7632d10df4619c32b72 (diff)
[1.4.x] Fixed #24081 -- Downgraded six to 1.8.0.
This reverts commit a25c444bc701b496f2b05f57fc3ec42cdac9dd85. six 1.9+ requires Python 2.6 so this commit restores Python 2.5 compatibility.
Diffstat (limited to 'docs')
-rw-r--r--docs/releases/1.4.18.txt14
-rw-r--r--docs/releases/index.txt1
2 files changed, 15 insertions, 0 deletions
diff --git a/docs/releases/1.4.18.txt b/docs/releases/1.4.18.txt
new file mode 100644
index 0000000000..f328be24c3
--- /dev/null
+++ b/docs/releases/1.4.18.txt
@@ -0,0 +1,14 @@
+===========================
+Django 1.4.18 release notes
+===========================
+
+*Under development*
+
+Django 1.4.18 fixes a regression on Python 2.5 in the 1.4.17 release.
+
+Bugfixes
+========
+
+* To maintain compatibility with Python 2.5, Django's vendored version of six,
+ :mod:`django.utils.six`, has been downgraded to 1.8.0 which is the last
+ version to support Python 2.5.
diff --git a/docs/releases/index.txt b/docs/releases/index.txt
index 7c598a5388..98f69adc20 100644
--- a/docs/releases/index.txt
+++ b/docs/releases/index.txt
@@ -19,6 +19,7 @@ Final releases
.. toctree::
:maxdepth: 1
+ 1.4.18
1.4.17
1.4.16
1.4.15