From dff31de20aac85e4f4834c2466762cbf23fc0a7b Mon Sep 17 00:00:00 2001 From: Ramiro Morales Date: Thu, 9 Jun 2011 20:01:28 +0000 Subject: Fixed #16155 -- Removed Python 2.4 compatibility constructs from code and mentions from docs. Thanks Aymeric Augustin for the report and patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16349 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/internals/contributing/writing-code/branch-policy.txt | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'docs/internals/contributing/writing-code') diff --git a/docs/internals/contributing/writing-code/branch-policy.txt b/docs/internals/contributing/writing-code/branch-policy.txt index 08dfe8bc76..940b96f7ac 100644 --- a/docs/internals/contributing/writing-code/branch-policy.txt +++ b/docs/internals/contributing/writing-code/branch-policy.txt @@ -135,8 +135,8 @@ Pointing Python at the new Django version Once you've retrieved the branch's code, you'll need to change your Python ``site-packages`` directory so that it points to the branch version of the ``django`` directory. (The ``site-packages`` directory is somewhere such as -``/usr/lib/python2.4/site-packages`` or -``/usr/local/lib/python2.4/site-packages`` or ``C:\Python\site-packages``.) +``/usr/lib/python2.7/site-packages`` or +``/usr/local/lib/python2.7/site-packages`` or ``C:\Python\site-packages``.) The simplest way to do this is by renaming the old ``django`` directory to ``django.OLD`` and moving the trunk version of the code into the directory @@ -169,12 +169,5 @@ sure all other lines are commented:: # On windows a path may look like this: # C:/path/to/ -If you're using Django 0.95 or earlier and installed it using -``python setup.py install``, you'll have a directory called something like -``Django-0.95-py2.4.egg`` instead of ``django``. In this case, edit the file -``setuptools.pth`` and remove the line that references the Django ``.egg`` -file. Then copy the branch's version of the ``django`` directory into -``site-packages``. - .. _path file: http://docs.python.org/library/site.html .. _django-developers: http://groups.google.com/group/django-developers -- cgit v1.3