From ba2dcf16bda47ee3d346edf1d44632c7ef40bdca Mon Sep 17 00:00:00 2001
From: hpk <none@none>
Date: Wed, 31 Jan 2007 23:23:24 +0100
Subject: [PATCH] [svn r37699] removing py._dist export (only accessed from
 setup.py and py/bin/_makepyrelease.py)

--HG--
branch : trunk
---
 py/__init__.py           |  6 ++----
 py/bin/_makepyrelease.py | 19 ++++++++++---------
 setup.py                 |  5 +++--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/py/__init__.py b/py/__init__.py
index 75563709f..e965250c6 100644
--- a/py/__init__.py
+++ b/py/__init__.py
@@ -9,8 +9,8 @@ version = "0.8.80-alpha2"
 
 initpkg(__name__,
     description = "py.test and the py lib",
-    revision = int('$LastChangedRevision: 37696 $'.split(':')[1][:-1]),
-    lastchangedate = '$LastChangedDate: 2007-01-31 22:55:30 +0100 (Wed, 31 Jan 2007) $',
+    revision = int('$LastChangedRevision: 37699 $'.split(':')[1][:-1]),
+    lastchangedate = '$LastChangedDate: 2007-01-31 23:23:24 +0100 (Wed, 31 Jan 2007) $',
     version = version, 
     url = "http://codespeak.net/py",
     download_url = "http://codespeak.net/download/py/%s.tar.gz" %(version,), 
@@ -21,8 +21,6 @@ initpkg(__name__,
     long_description = globals()['__doc__'],
 
     exportdefs = {
-    '_dist.setup'            : ('./misc/_dist.py', 'setup'),
-
     # helpers for use from test functions or collectors
     'test.raises'            : ('./test/raises.py', 'raises'),
     'test.deprecated_call'   : ('./test/deprecate.py', 'deprecated_call'), 
diff --git a/py/bin/_makepyrelease.py b/py/bin/_makepyrelease.py
index 48845d580..0049b01a6 100755
--- a/py/bin/_makepyrelease.py
+++ b/py/bin/_makepyrelease.py
@@ -51,16 +51,17 @@ def make_distfiles(tmpdir):
     distdir = tmpdir.ensure('dist', dir=1)
     oldir = rootdir.chdir()
     try: 
+        from py.__.misc.dist import setup 
         trace("invoking sdist, generating into %s" % (distdir,)) 
-        py._dist.setup(py, script_name="setup.py", 
-                           script_args=('-q', 'sdist', '--no-prune', 
-                                        '-m', str(manifest), 
-                                        '--formats=gztar,zip',  
-                                        '-d', str(distdir)))
-        py._dist.setup(py, script_name="setup.py", 
-                           script_args=('-q', 'bdist_wininst', 
-                                        #'-m', str(manifest), 
-                                        '-d', str(distdir)))
+        setup(py, script_name="setup.py", 
+              script_args=('-q', 'sdist', '--no-prune', 
+                           '-m', str(manifest), 
+                           '--formats=gztar,zip',  
+                           '-d', str(distdir)))
+        setup(py, script_name="setup.py", 
+              script_args=('-q', 'bdist_wininst', 
+                           #'-m', str(manifest), 
+                           '-d', str(distdir)))
     finally: 
         oldir.chdir()
     return distdir 
diff --git a/setup.py b/setup.py
index dbd9af730..f01f0882a 100644
--- a/setup.py
+++ b/setup.py
@@ -1,2 +1,3 @@
-import py 
-py._dist.setup(py) 
+import py
+from py.__.misc._dist import setup
+setup(py)