[pypy-commit] pypy default: Tweaks.

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r50274:831d216b57f0
Date: 2011-12-07 18:06 +0100
http://bitbucket.org/pypy/pypy/changeset/831d216b57f0/

Log:	Tweaks.

diff --git a/pypy/bin/checkmodule.py b/pypy/bin/checkmodule.py
--- a/pypy/bin/checkmodule.py
+++ b/pypy/bin/checkmodule.py
@@ -23,8 +23,16 @@
         print >> sys.stderr, "Bad command line"
         print >> sys.stderr, __doc__
         sys.exit(1)
-    checkmodule(modname)
-    print 'Passed.'
+    try:
+        checkmodule(modname)
+    except Exception, e:
+        import traceback, pdb
+        traceback.print_exc()
+        pdb.post_mortem(sys.exc_info()[2])
+        return 1
+    else:
+        print 'Passed.'
+        return 0
 
 if __name__ == '__main__':
-    main(sys.argv)
+    sys.exit(main(sys.argv))
diff --git a/pypy/objspace/fake/objspace.py b/pypy/objspace/fake/objspace.py
--- a/pypy/objspace/fake/objspace.py
+++ b/pypy/objspace/fake/objspace.py
@@ -258,7 +258,7 @@
                  ObjSpace.ExceptionTable +
                  ['int', 'str', 'float', 'long', 'tuple', 'list',
                   'dict', 'unicode', 'complex', 'slice', 'bool',
-                  'type']):
+                  'type', 'basestring']):
         setattr(FakeObjSpace, 'w_' + name, w_some_obj())
     #
     for (name, _, arity, _) in ObjSpace.MethodTable:
@@ -297,3 +297,4 @@
         name + "xx"   # check that it's a string
         return w_some_obj()
 FakeObjSpace.sys = FakeModule()
+FakeObjSpace.sys.filesystemencoding = 'foobar'