[py-svn] r57551 - in py/trunk/py: . bin bin/win32 cmdline cmdline/testing

[hpk at codespeak.net]

Author: hpk
Date: Thu Aug 21 15:25:29 2008
New Revision: 57551

Added:
   py/trunk/py/bin/win32/py.which.cmd
   py/trunk/py/cmdline/pywhich.py
      - copied, changed from r57550, py/trunk/py/bin/py.which
Modified:
   py/trunk/py/__init__.py
   py/trunk/py/bin/py.which
   py/trunk/py/cmdline/testing/test_generic.py
Log:
normalizing py.which cmdline script


Modified: py/trunk/py/__init__.py
==============================================================================
--- py/trunk/py/__init__.py	(original)
+++ py/trunk/py/__init__.py	Thu Aug 21 15:25:29 2008
@@ -59,6 +59,7 @@
     'cmdline.pylookup'       : ('./cmdline/pylookup.py', 'main',),
     'cmdline.pycountloc'     : ('./cmdline/pycountloc.py', 'main',),
     'cmdline.pycleanup'      : ('./cmdline/pycleanup.py', 'main',),
+    'cmdline.pywhich'        : ('./cmdline/pywhich.py', 'main',),
 
     # helpers for use from test functions or collectors
     'test.__doc__'           : ('./test/__init__.py', '__doc__'),

Modified: py/trunk/py/bin/py.which
==============================================================================
--- py/trunk/py/bin/py.which	(original)
+++ py/trunk/py/bin/py.which	Thu Aug 21 15:25:29 2008
@@ -1,23 +1,3 @@
-#!/usr/bin/env python 
-
-"""\
-py.which [name]
-
-print the location of the given python module or package name 
-"""
-
-import sys
-
-if __name__ == '__main__':
-    name = sys.argv[1]
-    try:
-        mod = __import__(name)
-    except ImportError:
-        print >>sys.stderr, "could not import:", name 
-    else:
-        try:
-            location = mod.__file__ 
-        except AttributeError:
-            print >>sys.stderr, "module (has no __file__):", mod
-        else:
-            print location
+#!/usr/bin/env python
+from _findpy import py
+py.cmdline.pywhich()
\ No newline at end of file

Added: py/trunk/py/bin/win32/py.which.cmd
==============================================================================
--- (empty file)
+++ py/trunk/py/bin/win32/py.which.cmd	Thu Aug 21 15:25:29 2008
@@ -0,0 +1,2 @@
+ at echo off
+python "%~dp0\..\py.which" %*
\ No newline at end of file

Copied: py/trunk/py/cmdline/pywhich.py (from r57550, py/trunk/py/bin/py.which)
==============================================================================
--- py/trunk/py/bin/py.which	(original)
+++ py/trunk/py/cmdline/pywhich.py	Thu Aug 21 15:25:29 2008
@@ -8,7 +8,7 @@
 
 import sys
 
-if __name__ == '__main__':
+def main():
     name = sys.argv[1]
     try:
         mod = __import__(name)

Modified: py/trunk/py/cmdline/testing/test_generic.py
==============================================================================
--- py/trunk/py/cmdline/testing/test_generic.py	(original)
+++ py/trunk/py/cmdline/testing/test_generic.py	Thu Aug 21 15:25:29 2008
@@ -25,8 +25,9 @@
         else:
             cmd = "%s" %(script, )
 
-        if script.basename.startswith("py.lookup"):
-            cmd += " hello"
+        if script.basename.startswith("py.lookup") or \
+           script.basename.startswith("py.which"):
+            cmd += " sys"
         print "executing", script
         try:
             py.process.cmdexec(cmd)