Simple (failing) doctest test

with some minor changes to try to get it working

from_cpython/Lib/types.py

@@ -64,20 +64,18 @@ ModuleType = type(sys)
 FileType = file
 XRangeType = xrange
 
-# Pyston change: we don't support sys.exc_info yet
-"""
 try:
     raise TypeError
 except TypeError:
     tb = sys.exc_info()[2]
     TracebackType = type(tb)
-    FrameType = type(tb.tb_frame)
+    # Pyston change (we don't support tb_frame yet):
+    FrameType = type(sys._getframe(0))
+    # FrameType = type(tb.tb_frame)
     del tb
-"""
 
 SliceType = slice
-# Pyston change: don't support this yet
-# EllipsisType = type(Ellipsis)
+EllipsisType = type(Ellipsis)
 
 # Pyston change: don't support this yet
 # DictProxyType = type(TypeType.__dict__)

src/runtime/builtin_modules/sys.cpp

@@ -278,6 +278,9 @@ void setupSys() {
     sys_module->giveAttr("stdout", new BoxedFile(stdout, "<stdout>", "w"));
     sys_module->giveAttr("stdin", new BoxedFile(stdin, "<stdin>", "r"));
     sys_module->giveAttr("stderr", new BoxedFile(stderr, "<stderr>", "w"));
+    sys_module->giveAttr("__stdout__", sys_module->getattr("stdout"));
+    sys_module->giveAttr("__stdin__", sys_module->getattr("stdin"));
+    sys_module->giveAttr("__stderr__", sys_module->getattr("stderr"));
 
     sys_module->giveAttr(
         "exc_info", new BoxedBuiltinFunctionOrMethod(boxRTFunction((void*)sysExcInfo, BOXED_TUPLE, 0), "exc_info"));

test/tests/doctest_test.py

+# expected: fail
+# requires:
+# - code.co_firstlineno
+# - sys.dysplayhook
+# - exec compile(foo) in globals_
+
+# This is copied from the Python docs for doctest:
+
+"""
+This is the "example" module.
+
+The example module supplies one function, factorial().  For example,
+
+>>> factorial(5)
+120
+"""
+
+def factorial(n):
+    """Return the factorial of n, an exact integer >= 0.
+
+    If the result is small enough to fit in an int, return an int.
+    Else return a long.
+
+    >>> [factorial(n) for n in range(6)]
+    [1, 1, 2, 6, 24, 120]
+    >>> [factorial(long(n)) for n in range(6)]
+    [1, 1, 2, 6, 24, 120]
+    >>> factorial(30)
+    265252859812191058636308480000000L
+    >>> factorial(30L)
+    265252859812191058636308480000000L
+    >>> factorial(-1)
+    Traceback (most recent call last):
+        ...
+    ValueError: n must be >= 0
+
+    Factorials of floats are OK, but the float must be an exact integer:
+    >>> factorial(30.1)
+    Traceback (most recent call last):
+        ...
+    ValueError: n must be exact integer
+    >>> factorial(30.0)
+    265252859812191058636308480000000L
+
+    It must also not be ridiculously large:
+    >>> factorial(1e100)
+    Traceback (most recent call last):
+        ...
+    OverflowError: n too large
+    """
+
+    import math
+    if not n >= 0:
+        raise ValueError("n must be >= 0")
+    if math.floor(n) != n:
+        raise ValueError("n must be exact integer")
+    if n+1 == n:  # catch a value like 1e300
+        raise OverflowError("n too large")
+    result = 1
+    factor = 2
+    while factor <= n:
+        result *= factor
+        factor += 1
+    return result
+
+
+if __name__ == "__main__":
+    import doctest
+    doctest.testmod()

test/tests/sys_test.py

@@ -8,3 +8,6 @@ print sys.byteorder
 print sys.getdefaultencoding()
 print sys.getfilesystemencoding()
 print type(sys.maxsize)
+print sys.stdout is sys.__stdout__
+print sys.stderr is sys.__stderr__
+print sys.stdin is sys.__stdin__