[py-svn] r57485 - in py/release/0.9.x: . py

[hpk at codespeak.net]

Author: hpk
Date: Wed Aug 20 00:39:45 2008
New Revision: 57485

Modified:
   py/release/0.9.x/MANIFEST
   py/release/0.9.x/py/__init__.py
   py/release/0.9.x/setup.py
Log:
few fixes, another try


Modified: py/release/0.9.x/MANIFEST
==============================================================================
--- py/release/0.9.x/MANIFEST	(original)
+++ py/release/0.9.x/MANIFEST	Wed Aug 20 00:39:45 2008
@@ -69,11 +69,11 @@
 py/bin/py.lookup
 py/bin/py.rest
 py/bin/py.test
-py/bin/win/py.cleanup.cmd
-py/bin/win/py.countloc.cmd
-py/bin/win/py.lookup.cmd
-py/bin/win/py.rest.cmd
-py/bin/win/py.test.cmd
+py/bin/win32/py.cleanup.cmd
+py/bin/win32/py.countloc.cmd
+py/bin/win32/py.lookup.cmd
+py/bin/win32/py.rest.cmd
+py/bin/win32/py.test.cmd
 py/builtin/__init__.py
 py/builtin/enumerate.py
 py/builtin/exception.py

Modified: py/release/0.9.x/py/__init__.py
==============================================================================
--- py/release/0.9.x/py/__init__.py	(original)
+++ py/release/0.9.x/py/__init__.py	Wed Aug 20 00:39:45 2008
@@ -7,7 +7,7 @@
 """
 from initpkg import initpkg
 
-version = "0.9.2a9"
+version = "0.9.2a10"
 
 initpkg(__name__,
     description = "py lib: agile development and test support library",

Modified: py/release/0.9.x/setup.py
==============================================================================
--- py/release/0.9.x/setup.py	(original)
+++ py/release/0.9.x/setup.py	Wed Aug 20 00:39:45 2008
@@ -18,7 +18,7 @@
     setup(cmdclass=cmdclass,
         name='py',
         description='py lib: agile development and test support library',
-        version='0.9.2a9', 
+        version='0.9.2a10', 
         url='http://pylib.org', 
         license='MIT license',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], 
@@ -113,11 +113,11 @@
                              'bin/py.lookup',
                              'bin/py.rest',
                              'bin/py.test',
-                             'bin/win/py.cleanup.cmd',
-                             'bin/win/py.countloc.cmd',
-                             'bin/win/py.lookup.cmd',
-                             'bin/win/py.rest.cmd',
-                             'bin/win/py.test.cmd',
+                             'bin/win32/py.cleanup.cmd',
+                             'bin/win32/py.countloc.cmd',
+                             'bin/win32/py.lookup.cmd',
+                             'bin/win32/py.rest.cmd',
+                             'bin/win32/py.test.cmd',
                              'c-extension/greenlet/README.txt',
                              'c-extension/greenlet/dummy_greenlet.py',
                              'c-extension/greenlet/greenlet.c',
@@ -204,6 +204,7 @@
     l = []
     for name in ['py.rest', 'py.countloc', 'py.lookup', 'py.test', 'py.cleanup']:
         l.append(base + name + ext)
+    return l 
         
 # if this is an sdist install we might have the unix
 # scripts and need to replace them with windows ones. 
@@ -226,7 +227,7 @@
                 f = open(newname, 'w')
                 f.write("@echo off\n")
                 name = "py" + basename[3:] 
-                f.write('python -c "from _findpy import py; py.cmdline.%s"' % name)
+                f.write('python -c "from _findpy import py; py.cmdline.%s()"' % name)
                 f.close()
 if sys.platform == "win32":
     cmdclass = {'install_scripts': my_install_scripts}