diff options
| author | Claude Paroz <claude@2xlibre.net> | 2012-03-31 08:24:29 +0000 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2012-03-31 08:24:29 +0000 |
| commit | 23d34597615d8209de72bd819539a696ba0d1e7f (patch) | |
| tree | 6d77500c4a347ae495577ecf9e313c349c5df4e9 /docs/ref | |
| parent | 27322df99527ea2f0a3388261e736746430dcf98 (diff) | |
Fixed #17965 -- Definitely dropped support for Python 2.5. Thanks jonash for the initial patch and Aymeric Augustin for the review.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17834 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/contrib/gis/deployment.txt | 6 | ||||
| -rw-r--r-- | docs/ref/databases.txt | 11 |
2 files changed, 3 insertions, 14 deletions
diff --git a/docs/ref/contrib/gis/deployment.txt b/docs/ref/contrib/gis/deployment.txt index 4cea022815..c50a3782dc 100644 --- a/docs/ref/contrib/gis/deployment.txt +++ b/docs/ref/contrib/gis/deployment.txt @@ -37,8 +37,8 @@ Example:: WSGIProcessGroup geodjango WSGIScriptAlias / /home/geo/geodjango/world.wsgi - Alias /media/ "/usr/lib/python2.5/site-packages/django/contrib/admin/media/" - <Directory "/usr/lib/python2.5/site-packages/django/contrib/admin/media/"> + Alias /media/ "/usr/lib/python2.6/site-packages/django/contrib/admin/media/" + <Directory "/usr/lib/python2.6/site-packages/django/contrib/admin/media/"> Order allow,deny Options Indexes Allow from all @@ -77,7 +77,7 @@ Example:: PythonPath "['/var/www/apps'] + sys.path" </Location> - Alias /media/ "/usr/lib/python2.5/site-packages/django/contrib/admin/media/" + Alias /media/ "/usr/lib/python2.6/site-packages/django/contrib/admin/media/" <Location "/media"> SetHandler None </Location> diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt index f0b485fc97..59a0c36ad6 100644 --- a/docs/ref/databases.txt +++ b/docs/ref/databases.txt @@ -461,17 +461,6 @@ SQLite 3.3.6 was released in April 2006, so most current binary distributions for different platforms include newer version of SQLite usable from Python through either the ``pysqlite2`` or the ``sqlite3`` modules. -However, some platform/Python version combinations include older versions of -SQLite (e.g. the official binary distribution of Python 2.5 for Windows, 2.5.4 -as of this writing, includes SQLite 3.3.4). There are (as of Django 1.1) even -some tests in the Django test suite that will fail when run under this setup. - -As described :ref:`below<using-newer-versions-of-pysqlite>`, this can be solved -by downloading and installing a newer version of ``pysqlite2`` -(``pysqlite-2.x.x.win32-py2.5.exe`` in the described case) that includes and -uses a newer version of SQLite. Python 2.6 for Windows ships with a version of -SQLite that is not affected by these issues. - Version 3.5.9 ------------- |