From 854f6a98ae99fd0c288bea6082d92723dbbae9f9 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Sun, 10 Oct 2010 15:52:13 +0200
Subject: [PATCH] remove some more cruft

--HG--
branch : trunk
---
 bin/_findpy.py                    | 39 -------------------------------
 bin/env.cmd                       |  2 --
 bin/env.py                        | 33 --------------------------
 bin/py.cleanup                    |  3 ---
 bin/py.convert_unittest           |  3 ---
 bin/py.countloc                   |  3 ---
 bin/py.lookup                     |  3 ---
 bin/py.svnwcrevert                |  3 ---
 bin/py.test                       |  3 ---
 bin/py.which                      |  3 ---
 bin/win32/py.cleanup.cmd          |  2 --
 bin/win32/py.convert_unittest.cmd |  2 --
 bin/win32/py.countloc.cmd         |  2 --
 bin/win32/py.lookup.cmd           |  2 --
 bin/win32/py.svnwcrevert.cmd      |  2 --
 bin/win32/py.test.cmd             |  2 --
 bin/win32/py.which.cmd            |  2 --
 testing/pip-reqs1.txt             |  4 ----
 testing/pip-reqs2.txt             |  5 ----
 19 files changed, 118 deletions(-)
 delete mode 100755 bin/_findpy.py
 delete mode 100644 bin/env.cmd
 delete mode 100644 bin/env.py
 delete mode 100755 bin/py.cleanup
 delete mode 100755 bin/py.convert_unittest
 delete mode 100755 bin/py.countloc
 delete mode 100755 bin/py.lookup
 delete mode 100755 bin/py.svnwcrevert
 delete mode 100755 bin/py.test
 delete mode 100755 bin/py.which
 delete mode 100644 bin/win32/py.cleanup.cmd
 delete mode 100644 bin/win32/py.convert_unittest.cmd
 delete mode 100644 bin/win32/py.countloc.cmd
 delete mode 100644 bin/win32/py.lookup.cmd
 delete mode 100644 bin/win32/py.svnwcrevert.cmd
 delete mode 100644 bin/win32/py.test.cmd
 delete mode 100644 bin/win32/py.which.cmd
 delete mode 100644 testing/pip-reqs1.txt
 delete mode 100644 testing/pip-reqs2.txt

diff --git a/bin/_findpy.py b/bin/_findpy.py
deleted file mode 100755
index 56005153d..000000000
--- a/bin/_findpy.py
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env python
-
-#
-# find and import a version of 'py' that exists in a parent dir
-# of the current working directory. fall back to import a
-# globally available version
-#
-import sys
-import os
-from os.path import dirname as opd, exists, join, basename, abspath
-
-def searchpy(current):
-    while 1:
-        last = current
-        initpy = join(current, '__init__.py')
-        if not exists(initpy):
-            pydir = join(current, 'py')
-            # recognize py-package and ensure it is importable
-            if exists(pydir) and exists(join(pydir, '__init__.py')):
-                #for p in sys.path:
-                #    if p == current:
-                #        return True
-                if current != sys.path[0]:  # if we are already first, then ok
-                    sys.stderr.write("inserting into sys.path: %s\n" % current)
-                    sys.path.insert(0, current)
-                return True
-        current = opd(current)
-        if last == current:
-            return False
-
-if not searchpy(abspath(os.curdir)):
-    if not searchpy(opd(abspath(sys.argv[0]))):
-        if not searchpy(opd(__file__)):
-            pass # let's hope it is just on sys.path
-
-import py
-
-if __name__ == '__main__':
-    print ("py lib is at %s" % py.__file__)
diff --git a/bin/env.cmd b/bin/env.cmd
deleted file mode 100644
index 1a59b4075..000000000
--- a/bin/env.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-for /F "usebackq delims=" %%i in (`python "%~dp0\env.py"`) do %%i
diff --git a/bin/env.py b/bin/env.py
deleted file mode 100644
index 09c6c7de3..000000000
--- a/bin/env.py
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env python
-
-import sys, os, os.path
-
-progpath = sys.argv[0]
-packagedir = os.path.dirname(os.path.dirname(os.path.abspath(progpath)))
-packagename = os.path.basename(packagedir)
-bindir = os.path.join(packagedir, 'bin')
-if sys.platform == 'win32':
-    bindir = os.path.join(bindir, 'win32')
-rootdir = os.path.dirname(packagedir)
-
-def prepend_path(name, value):
-    sep = os.path.pathsep
-    curpath = os.environ.get(name, '')
-    newpath = [value] + [ x for x in curpath.split(sep) if x and x != value ]
-    return setenv(name, sep.join(newpath))
-
-def setenv(name, value):
-    shell = os.environ.get('SHELL', '')
-    comspec = os.environ.get('COMSPEC', '')
-    if shell.endswith('csh'):
-        cmd = 'setenv %s "%s"' % (name, value)
-    elif shell.endswith('sh'):
-        cmd = '%s="%s"; export %s' % (name, value, name)
-    elif comspec.endswith('cmd.exe'):
-        cmd = 'set %s=%s' % (name, value)
-    else:
-        assert False, 'Shell not supported.'
-    return cmd
-
-print(prepend_path('PATH', bindir))
-print(prepend_path('PYTHONPATH', rootdir))
diff --git a/bin/py.cleanup b/bin/py.cleanup
deleted file mode 100755
index b28510028..000000000
--- a/bin/py.cleanup
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env python
-from _findpy import py
-py.cmdline.pycleanup()
\ No newline at end of file
diff --git a/bin/py.convert_unittest b/bin/py.convert_unittest
deleted file mode 100755
index 3d1382ac7..000000000
--- a/bin/py.convert_unittest
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env python
-from _findpy import py
-py.cmdline.pyconvert_unittest()
\ No newline at end of file
diff --git a/bin/py.countloc b/bin/py.countloc
deleted file mode 100755
index cf06529b9..000000000
--- a/bin/py.countloc
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env python
-from _findpy import py
-py.cmdline.pycountloc()
\ No newline at end of file
diff --git a/bin/py.lookup b/bin/py.lookup
deleted file mode 100755
index c4af1cfbf..000000000
--- a/bin/py.lookup
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env python
-from _findpy import py
-py.cmdline.pylookup()
\ No newline at end of file
diff --git a/bin/py.svnwcrevert b/bin/py.svnwcrevert
deleted file mode 100755
index 67a1ec7f6..000000000
--- a/bin/py.svnwcrevert
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env python
-from _findpy import py
-py.cmdline.pysvnwcrevert()
\ No newline at end of file
diff --git a/bin/py.test b/bin/py.test
deleted file mode 100755
index 81ee54297..000000000
--- a/bin/py.test
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env python
-from _findpy import py
-py.cmdline.pytest()
\ No newline at end of file
diff --git a/bin/py.which b/bin/py.which
deleted file mode 100755
index f2b30cfff..000000000
--- a/bin/py.which
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env python
-from _findpy import py
-py.cmdline.pywhich()
\ No newline at end of file
diff --git a/bin/win32/py.cleanup.cmd b/bin/win32/py.cleanup.cmd
deleted file mode 100644
index e5d97b998..000000000
--- a/bin/win32/py.cleanup.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-python "%~dp0\..\py.cleanup" %*
\ No newline at end of file
diff --git a/bin/win32/py.convert_unittest.cmd b/bin/win32/py.convert_unittest.cmd
deleted file mode 100644
index 08ef4543d..000000000
--- a/bin/win32/py.convert_unittest.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-python "%~dp0\..\py.convert_unittest" %*
\ No newline at end of file
diff --git a/bin/win32/py.countloc.cmd b/bin/win32/py.countloc.cmd
deleted file mode 100644
index 82a1f3239..000000000
--- a/bin/win32/py.countloc.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-python "%~dp0\..\py.countloc" %*
\ No newline at end of file
diff --git a/bin/win32/py.lookup.cmd b/bin/win32/py.lookup.cmd
deleted file mode 100644
index a8fa51728..000000000
--- a/bin/win32/py.lookup.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-python "%~dp0\..\py.lookup" %*
\ No newline at end of file
diff --git a/bin/win32/py.svnwcrevert.cmd b/bin/win32/py.svnwcrevert.cmd
deleted file mode 100644
index d681b9c0e..000000000
--- a/bin/win32/py.svnwcrevert.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-python "%~dp0\..\py.svnwcrevert" %*
\ No newline at end of file
diff --git a/bin/win32/py.test.cmd b/bin/win32/py.test.cmd
deleted file mode 100644
index 36a1b9dae..000000000
--- a/bin/win32/py.test.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-python "%~dp0\..\py.test" %*
\ No newline at end of file
diff --git a/bin/win32/py.which.cmd b/bin/win32/py.which.cmd
deleted file mode 100644
index 27af42fa6..000000000
--- a/bin/win32/py.which.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-python "%~dp0\..\py.which" %*
\ No newline at end of file
diff --git a/testing/pip-reqs1.txt b/testing/pip-reqs1.txt
deleted file mode 100644
index 09023a38d..000000000
--- a/testing/pip-reqs1.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-docutils
-pygments
-pexpect
-hg+http://bitbucket.org/hpk42/execnet#egg=execnet
diff --git a/testing/pip-reqs2.txt b/testing/pip-reqs2.txt
deleted file mode 100644
index 2543f5095..000000000
--- a/testing/pip-reqs2.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-docutils
-pygments
-pexpect
-figleaf
-execnet