Fixed #20746 -- Removed Python 2.6 specific code/docs

This commit is contained in:
Tim Graham 2013-07-13 13:29:11 -04:00
parent 0d81fd0e5f
commit 2456ffa42c
14 changed files with 25 additions and 164 deletions

View file

@ -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

View file

@ -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