From 92d482069c95f39aa7654b13cd626fc8ead8ee7f Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Thu, 29 Oct 2009 16:53:02 +0100
Subject: [PATCH] moving py/bin to rootlevel bin/ and fixing tests

--HG--
branch : trunk
---
 _py/test/plugin/pytest_pytester.py            | 2 +-
 {py/bin => bin}/_findpy.py                    | 0
 {py/bin => bin}/env.cmd                       | 0
 {py/bin => bin}/env.py                        | 0
 {py/bin => bin}/py.cleanup                    | 0
 {py/bin => bin}/py.convert_unittest           | 0
 {py/bin => bin}/py.countloc                   | 0
 {py/bin => bin}/py.lookup                     | 0
 {py/bin => bin}/py.svnwcrevert                | 0
 {py/bin => bin}/py.test                       | 0
 {py/bin => bin}/py.which                      | 0
 {py/bin => bin}/win32/py.cleanup.cmd          | 0
 {py/bin => bin}/win32/py.convert_unittest.cmd | 0
 {py/bin => bin}/win32/py.countloc.cmd         | 0
 {py/bin => bin}/win32/py.lookup.cmd           | 0
 {py/bin => bin}/win32/py.svnwcrevert.cmd      | 0
 {py/bin => bin}/win32/py.test.cmd             | 0
 {py/bin => bin}/win32/py.which.cmd            | 0
 testing/cmdline/test_generic.py               | 6 ++++--
 19 files changed, 5 insertions(+), 3 deletions(-)
 rename {py/bin => bin}/_findpy.py (100%)
 rename {py/bin => bin}/env.cmd (100%)
 rename {py/bin => bin}/env.py (100%)
 rename {py/bin => bin}/py.cleanup (100%)
 rename {py/bin => bin}/py.convert_unittest (100%)
 rename {py/bin => bin}/py.countloc (100%)
 rename {py/bin => bin}/py.lookup (100%)
 rename {py/bin => bin}/py.svnwcrevert (100%)
 rename {py/bin => bin}/py.test (100%)
 rename {py/bin => bin}/py.which (100%)
 rename {py/bin => bin}/win32/py.cleanup.cmd (100%)
 rename {py/bin => bin}/win32/py.convert_unittest.cmd (100%)
 rename {py/bin => bin}/win32/py.countloc.cmd (100%)
 rename {py/bin => bin}/win32/py.lookup.cmd (100%)
 rename {py/bin => bin}/win32/py.svnwcrevert.cmd (100%)
 rename {py/bin => bin}/win32/py.test.cmd (100%)
 rename {py/bin => bin}/win32/py.which.cmd (100%)

diff --git a/_py/test/plugin/pytest_pytester.py b/_py/test/plugin/pytest_pytester.py
index 901eecac4..15ceafa93 100644
--- a/_py/test/plugin/pytest_pytester.py
+++ b/_py/test/plugin/pytest_pytester.py
@@ -301,7 +301,7 @@ class TmpTestdir:
         return self.run(*fullargs)
 
     def _getpybinargs(self, scriptname):
-        bindir = py.path.local(py.__file__).dirpath("bin")
+        bindir = py._impldir.dirpath('bin')
         script = bindir.join(scriptname)
         assert script.check()
         return py.std.sys.executable, script
diff --git a/py/bin/_findpy.py b/bin/_findpy.py
similarity index 100%
rename from py/bin/_findpy.py
rename to bin/_findpy.py
diff --git a/py/bin/env.cmd b/bin/env.cmd
similarity index 100%
rename from py/bin/env.cmd
rename to bin/env.cmd
diff --git a/py/bin/env.py b/bin/env.py
similarity index 100%
rename from py/bin/env.py
rename to bin/env.py
diff --git a/py/bin/py.cleanup b/bin/py.cleanup
similarity index 100%
rename from py/bin/py.cleanup
rename to bin/py.cleanup
diff --git a/py/bin/py.convert_unittest b/bin/py.convert_unittest
similarity index 100%
rename from py/bin/py.convert_unittest
rename to bin/py.convert_unittest
diff --git a/py/bin/py.countloc b/bin/py.countloc
similarity index 100%
rename from py/bin/py.countloc
rename to bin/py.countloc
diff --git a/py/bin/py.lookup b/bin/py.lookup
similarity index 100%
rename from py/bin/py.lookup
rename to bin/py.lookup
diff --git a/py/bin/py.svnwcrevert b/bin/py.svnwcrevert
similarity index 100%
rename from py/bin/py.svnwcrevert
rename to bin/py.svnwcrevert
diff --git a/py/bin/py.test b/bin/py.test
similarity index 100%
rename from py/bin/py.test
rename to bin/py.test
diff --git a/py/bin/py.which b/bin/py.which
similarity index 100%
rename from py/bin/py.which
rename to bin/py.which
diff --git a/py/bin/win32/py.cleanup.cmd b/bin/win32/py.cleanup.cmd
similarity index 100%
rename from py/bin/win32/py.cleanup.cmd
rename to bin/win32/py.cleanup.cmd
diff --git a/py/bin/win32/py.convert_unittest.cmd b/bin/win32/py.convert_unittest.cmd
similarity index 100%
rename from py/bin/win32/py.convert_unittest.cmd
rename to bin/win32/py.convert_unittest.cmd
diff --git a/py/bin/win32/py.countloc.cmd b/bin/win32/py.countloc.cmd
similarity index 100%
rename from py/bin/win32/py.countloc.cmd
rename to bin/win32/py.countloc.cmd
diff --git a/py/bin/win32/py.lookup.cmd b/bin/win32/py.lookup.cmd
similarity index 100%
rename from py/bin/win32/py.lookup.cmd
rename to bin/win32/py.lookup.cmd
diff --git a/py/bin/win32/py.svnwcrevert.cmd b/bin/win32/py.svnwcrevert.cmd
similarity index 100%
rename from py/bin/win32/py.svnwcrevert.cmd
rename to bin/win32/py.svnwcrevert.cmd
diff --git a/py/bin/win32/py.test.cmd b/bin/win32/py.test.cmd
similarity index 100%
rename from py/bin/win32/py.test.cmd
rename to bin/win32/py.test.cmd
diff --git a/py/bin/win32/py.which.cmd b/bin/win32/py.which.cmd
similarity index 100%
rename from py/bin/win32/py.which.cmd
rename to bin/win32/py.which.cmd
diff --git a/testing/cmdline/test_generic.py b/testing/cmdline/test_generic.py
index 616bf6d74..08ae43dce 100644
--- a/testing/cmdline/test_generic.py
+++ b/testing/cmdline/test_generic.py
@@ -1,10 +1,12 @@
 import py
 import sys
 
-binpath = py.path.local(py.__file__).dirpath("bin")
-binwinpath = binpath.join("win32")
 
 def setup_module(mod):
+    mod.binpath = py._impldir.dirpath('bin')
+    if not mod.binpath.check():
+        py.test.skip("bin-source scripts not installed")
+    mod.binwinpath = binpath.join("win32")
     mod.tmpdir = py.test.ensuretemp(__name__)
     mod.iswin32 = sys.platform == "win32"