[pypy-svn] r21153 - pypy/dist/pypy/objspace/std

mwh at codespeak.net mwh at codespeak.net
Wed Dec 14 12:08:32 CET 2005


Author: mwh
Date: Wed Dec 14 12:08:31 2005
New Revision: 21153

Modified:
   pypy/dist/pypy/objspace/std/fake.py
Log:
this fixes the 'failing socket tests kill traceback printing' issue.
i'm not 100% sure about the whys and wheres, but at this point in fake.py's
life i'm not sure it's worth worrying over.  it doesn't break any more
tests and it doesn't break translation...


Modified: pypy/dist/pypy/objspace/std/fake.py
==============================================================================
--- pypy/dist/pypy/objspace/std/fake.py	(original)
+++ pypy/dist/pypy/objspace/std/fake.py	Wed Dec 14 12:08:31 2005
@@ -80,7 +80,7 @@
     else:
         for s, v in cpy_type.__dict__.items():
             if not (cpy_type is unicode and s in ['__add__', '__contains__']):
-                if s != '__getattribute__' or cpy_type is type(sys):
+                if s != '__getattribute__' or cpy_type is type(sys) or cpy_type is type(Exception):
                     kw[s] = v
 
     kw['__module__'] = cpy_type.__module__



More information about the Pypy-commit mailing list