diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/howto/deployment/checklist.txt | 6 | ||||
| -rw-r--r-- | docs/howto/jython.txt | 9 | ||||
| -rw-r--r-- | docs/intro/reusable-apps.txt | 4 | ||||
| -rw-r--r-- | docs/releases/1.7.txt | 13 |
4 files changed, 18 insertions, 14 deletions
diff --git a/docs/howto/deployment/checklist.txt b/docs/howto/deployment/checklist.txt index 1a235673e8..7d382401a0 100644 --- a/docs/howto/deployment/checklist.txt +++ b/docs/howto/deployment/checklist.txt @@ -217,9 +217,9 @@ This setting is required if you're using the :ttag:`ssi` template tag. Python Options ============== -If you're using Python 2.6.8+, it's strongly recommended that you invoke the -Python process running your Django application using the `-R`_ option or with -the :envvar:`PYTHONHASHSEED` environment variable set to ``random``. +It's strongly recommended that you invoke the Python process running your +Django application using the `-R`_ option or with the +:envvar:`PYTHONHASHSEED` environment variable set to ``random``. These options help protect your site from denial-of-service (DoS) attacks triggered by carefully crafted inputs. Such an attack can diff --git a/docs/howto/jython.txt b/docs/howto/jython.txt index 461a5d3804..96a3d64251 100644 --- a/docs/howto/jython.txt +++ b/docs/howto/jython.txt @@ -4,13 +4,6 @@ Running Django on Jython .. index:: Jython, Java, JVM -.. admonition:: Python 2.6 support - - Django 1.5 has dropped support for Python 2.5. Therefore, you have to use - a Jython 2.7 alpha release if you want to use Django 1.5 with Jython. - Please use Django 1.4 if you want to keep using Django on a stable Jython - version. - Jython_ is an implementation of Python that runs on the Java platform (JVM). Django runs cleanly on Jython version 2.5 or later, which means you can deploy Django on any Java platform. @@ -22,7 +15,7 @@ This document will get you up and running with Django on top of Jython. Installing Jython ================= -Django works with Jython versions 2.5b3 and higher. Download Jython at +Django works with Jython versions 2.5b3 and higher. Download Jython at http://www.jython.org/. Creating a servlet container diff --git a/docs/intro/reusable-apps.txt b/docs/intro/reusable-apps.txt index 879cda913a..7fa1ffc8d9 100644 --- a/docs/intro/reusable-apps.txt +++ b/docs/intro/reusable-apps.txt @@ -255,9 +255,7 @@ working. We'll now fix this by installing our new ``django-polls`` package. installs have a lot of advantages over installing the package system-wide, such as being usable on systems where you don't have administrator access as well as preventing the package from affecting system services and other - users of the machine. Python 2.6 added support for user libraries, so if - you are using an older version this won't work, but Django 1.5 requires - Python 2.6 or newer anyway. + users of the machine. Note that per-user installations can still affect the behavior of system tools that run as that user, so ``virtualenv`` is a more robust solution diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt index f3defb37a3..296150334b 100644 --- a/docs/releases/1.7.txt +++ b/docs/releases/1.7.txt @@ -14,6 +14,19 @@ deprecation process for some features`_. .. _`backwards incompatible changes`: `Backwards incompatible changes in 1.7`_ .. _`begun the deprecation process for some features`: `Features deprecated in 1.7`_ +Python compatibility +==================== + +Django 1.7 requires Python 2.7 or above, though we **highly recommend** +the latest minor release. Support for Python 2.6 has been dropped. + +This change should affect only a small number of Django users, as most +operating-system vendors today are shipping Python 2.7 or newer as their default +version. If you're still using Python 2.6, however, you'll need to stick to +Django 1.6 until you can upgrade your Python version. Per :doc:`our support +policy </internals/release-process>`, Django 1.6 will continue to receive +security support until the release of Django 1.8. + What's new in Django 1.7 ======================== |