[Python-checkins] r73525 - in distutils/trunk: EXTERNALS.txt MANIFEST.in distutils distutils.pth distutils/EXTERNALS.txt setup.py

[tarek.ziade]

Author: tarek.ziade
Date: Tue Jun 23 15:48:23 2009
New Revision: 73525

Log:
using a placeholder for the distribution so we don't mess with sys.path more than required

Added:
   distutils/trunk/distutils/   (props changed)
   distutils/trunk/distutils/EXTERNALS.txt
      - copied unchanged from r73521, /distutils/trunk/EXTERNALS.txt
Removed:
   distutils/trunk/EXTERNALS.txt
Modified:
   distutils/trunk/MANIFEST.in
   distutils/trunk/distutils.pth
   distutils/trunk/setup.py

Deleted: distutils/trunk/EXTERNALS.txt
==============================================================================
--- distutils/trunk/EXTERNALS.txt	Tue Jun 23 15:48:23 2009
+++ (empty file)
@@ -1 +0,0 @@
-distutils http://svn.python.org/projects/python/trunk/Lib/distutils/

Modified: distutils/trunk/MANIFEST.in
==============================================================================
--- distutils/trunk/MANIFEST.in	(original)
+++ distutils/trunk/MANIFEST.in	Tue Jun 23 15:48:23 2009
@@ -1,4 +1,4 @@
 include README.txt
-include distutils/README
-recursive-include distutils *.py
+include distutils/distutils/README
+recursive-include distutils/distutils *.py
 include distutils.pth

Modified: distutils/trunk/distutils.pth
==============================================================================
--- distutils/trunk/distutils.pth	(original)
+++ distutils/trunk/distutils.pth	Tue Jun 23 15:48:23 2009
@@ -1,4 +1,3 @@
 import sys; sys.__plen = len(sys.path)
 ./distutils
-import sys, os; new=sys.path[sys.__plen:]; new[0] = os.path.split(new[0])[0];del sys.path[sys.__plen:]; p=getattr(sys,'__egginsert',0); sys.path[p:p]=new; sys.__egginsert = p+len(new)
-
+import sys, os; new=sys.path[sys.__plen:]; del sys.path[sys.__plen:]; p=getattr(sys,'__egginsert',0); sys.path[p:p]=new; sys.__egginsert = p+len(new)

Modified: distutils/trunk/setup.py
==============================================================================
--- distutils/trunk/setup.py	(original)
+++ distutils/trunk/setup.py	Tue Jun 23 15:48:23 2009
@@ -80,7 +80,7 @@
        url="http://www.python.org/sigs/distutils-sig",
        license="Python",
        long_description=description,
-       packages=['distutils', 'distutils.command'],
+       packages=['distutils.distutils', 'distutils.distutils.command'],
        data_files=[(site_package, ['distutils.pth'])]
        )