[py-svn] r8249 - in py/dist/py: execnet path/local

[hpk at codespeak.net]

Author: hpk
Date: Wed Jan 12 19:28:14 2005
New Revision: 8249

Modified:
   py/dist/py/execnet/register.py
   py/dist/py/path/local/local.py
Log:
minor hacks


Modified: py/dist/py/execnet/register.py
==============================================================================
--- py/dist/py/execnet/register.py	(original)
+++ py/dist/py/execnet/register.py	Wed Jan 12 19:28:14 2005
@@ -67,10 +67,14 @@
 
     def remote_bootstrap_gateway(self, io, extra=''):
         # XXX the following hack helps us to import the same version
-        #     of the py lib, but only works for PopenGateways
-        #     --> we need proper remote imports working
+        #     of the py lib and other dependcies, but only works for 
+        #     PopenGateways because we can assume to have access to 
+        #     the same filesystem 
+        #     --> we definitely need proper remote imports working
         #         across any kind of gateway!
+        x = py.path.local(py.__file__).dirpath().dirpath()
         plist = os.environ.get('PYTHONPATH', '').split(':')
+        plist.insert(0, str(x)) 
         s = "import sys ; sys.path[:0] = %r" % (plist,)
         s = "\n".join([extra, s])
         super(PopenGateway, self).remote_bootstrap_gateway(io, s)

Modified: py/dist/py/path/local/local.py
==============================================================================
--- py/dist/py/path/local/local.py	(original)
+++ py/dist/py/path/local/local.py	Wed Jan 12 19:28:14 2005
@@ -472,7 +472,7 @@
                 if num is not None and num <= (maxnum - keep):
                     try:
                         path.remove(rec=1)
-                    except (py.error.ENOENT, py.error.EACCES):
+                    except py.error.Error: 
                         pass
         return udir
     make_numbered_dir = classmethod(make_numbered_dir)