[py-svn] r32167 - in py/dist/py: c-extension/greenlet code path/local

[cfbolz at codespeak.net]

Author: cfbolz
Date: Mon Sep 11 17:29:46 2006
New Revision: 32167

Modified:
   py/dist/py/c-extension/greenlet/test_generator_nested.py
   py/dist/py/c-extension/greenlet/test_greenlet.py
   py/dist/py/c-extension/greenlet/test_remote.py
   py/dist/py/c-extension/greenlet/test_throw.py
   py/dist/py/code/traceback2.py
   py/dist/py/path/local/common.py
Log:
fix some 2.2 issues and issues if greenlets are not compileable


Modified: py/dist/py/c-extension/greenlet/test_generator_nested.py
==============================================================================
--- py/dist/py/c-extension/greenlet/test_generator_nested.py	(original)
+++ py/dist/py/c-extension/greenlet/test_generator_nested.py	Mon Sep 11 17:29:46 2006
@@ -1,7 +1,8 @@
+from __future__ import generators
 import py
 try:
     from py.magic import greenlet
-except RuntimeError, e:
+except (ImportError, RuntimeError), e:
     py.test.skip(str(e))
 
 class genlet(greenlet):

Modified: py/dist/py/c-extension/greenlet/test_greenlet.py
==============================================================================
--- py/dist/py/c-extension/greenlet/test_greenlet.py	(original)
+++ py/dist/py/c-extension/greenlet/test_greenlet.py	Mon Sep 11 17:29:46 2006
@@ -1,7 +1,7 @@
 import py
 try:
     from py.magic import greenlet
-except RuntimeError, e:
+except (ImportError, RuntimeError), e:
     py.test.skip(str(e))
 
 import sys, thread, threading

Modified: py/dist/py/c-extension/greenlet/test_remote.py
==============================================================================
--- py/dist/py/c-extension/greenlet/test_remote.py	(original)
+++ py/dist/py/c-extension/greenlet/test_remote.py	Mon Sep 11 17:29:46 2006
@@ -1,7 +1,7 @@
 import py
 try:
     from py.magic import greenlet
-except RuntimeError, e:
+except (ImportError, RuntimeError), e:
     py.test.skip(str(e))
 
 

Modified: py/dist/py/c-extension/greenlet/test_throw.py
==============================================================================
--- py/dist/py/c-extension/greenlet/test_throw.py	(original)
+++ py/dist/py/c-extension/greenlet/test_throw.py	Mon Sep 11 17:29:46 2006
@@ -1,7 +1,7 @@
 import py
 try:
     from py.magic import greenlet
-except RuntimeError, e:
+except (ImportError, RuntimeError), e:
     py.test.skip(str(e))
 
 def switch(*args):

Modified: py/dist/py/code/traceback2.py
==============================================================================
--- py/dist/py/code/traceback2.py	(original)
+++ py/dist/py/code/traceback2.py	Mon Sep 11 17:29:46 2006
@@ -95,7 +95,7 @@
 
     def __getitem__(self, key):
         val = super(Traceback, self).__getitem__(key)
-        if isinstance(key, slice):
+        if isinstance(key, type(slice(0))):
             val = self.__class__(val)
         return val 
 

Modified: py/dist/py/path/local/common.py
==============================================================================
--- py/dist/py/path/local/common.py	(original)
+++ py/dist/py/path/local/common.py	Mon Sep 11 17:29:46 2006
@@ -7,7 +7,8 @@
 
     for name in ('atime blksize blocks ctime dev gid ' 
                  'ino mode mtime nlink rdev size uid'.split()):
-        exec """if 1:
+        
+        code = """if 1:
             def fget(self):
                 return getattr(self._osstatresult, "st_%(name)s", None)
             %(name)s = property(fget)
@@ -16,7 +17,9 @@
                                      "statresult.%(name)s instead.", 
                                      DeprecationWarning, stacklevel=2)
                 return getattr(self._osstatresult, "st_%(name)s", None)
-            st_%(name)s = property(fget_deprecated)""" % locals()
+            st_%(name)s = property(fget_deprecated)
+""" % locals()
+        exec code
     del fget 
     del fget_deprecated