From: Robert Bradshaw <robertwb@math.washington.edu>
Date: Sun, 30 Mar 2008 10:14:26 +0000 (-0700)
Subject: merge
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bcb920752092a163b5861b15a8a1be4cd5d589a0;p=cython.git

merge
---

diff --git a/Demos/Setup.py b/Demos/Setup.py
index a9de16ad..18e05820 100644
--- a/Demos/Setup.py
+++ b/Demos/Setup.py
@@ -16,7 +16,7 @@ setup(
 #    Extension("inherit_bug", ["inherit_bug.pyx"]),
     Extension("override", ["override.pyx"]),
     Extension("cond", ["cond.pyx"]),
-    Extension("submodule.test",       ["submodule/test.pyx"]),
+#    Extension("submodule.test",       ["submodule/test.pyx"]),
     Extension("errors",       ["errors.pyx"]),
     Extension("cpdef",       ["cpdef.pyx"]),
     Extension("range",       ["range.pyx"]),
@@ -24,6 +24,7 @@ setup(
     Extension("ints",       ["ints.pyx"]),
     Extension("clear",       ["clear.pyx"]),
     Extension("detect_override",       ["detect_override.pyx"]),
+    Extension("fixes",       ["fixes.pyx"]),
     ],
   cmdclass = {'build_ext': build_ext},
 #  include_dirs = "/System/Library/Frameworks/Python.framework/Versions/2.3/include/python2.3/"
diff --git a/runtests.py b/runtests.py
index 53f2412b..d5bf75dc 100644
--- a/runtests.py
+++ b/runtests.py
@@ -2,8 +2,12 @@
 
 import os, sys, unittest, doctest
 
-from Cython.Distutils.build_ext import build_ext
-from Cython.Distutils.extension import Extension
+#from Cython.Distutils.build_ext import build_ext
+#from Cython.Distutils.extension import Extension
+
+from distutils.extension import Extension
+from Cython.Distutils import build_ext
+
 
 from distutils.dist import Distribution
 distutils_distro = Distribution()
diff --git a/tests/run/unpacklistcomp.pyx b/tests/run/unpacklistcomp.pyx
index ada61923..00c2f7cb 100644
--- a/tests/run/unpacklistcomp.pyx
+++ b/tests/run/unpacklistcomp.pyx
@@ -1,30 +1,21 @@
 __doc__ = """
     >>> unpack_normal([1,2])
     (1, 2)
-    >>> unpack_normal([1,2,3])
+    >>> unpack_normal([1,2,3]) # doctest: +ELLIPSIS
     Traceback (most recent call last):
-    ValueError: too many values to unpack
-    >>> unpack_normal([1])
-    Traceback (most recent call last):
-    ValueError: need more than 1 values to unpack
+    ValueError: ...
 
     >>> unpack_comp([1,2])
     (1, 2)
-    >>> unpack_comp([1,2,3])
-    Traceback (most recent call last):
-    ValueError: too many values to unpack
-    >>> unpack_comp([1])
+    >>> unpack_comp([1,2,3]) # doctest: +ELLIPSIS
     Traceback (most recent call last):
-    ValueError: need more than 1 values to unpack
+    ValueError: ...
 
     >>> unpack_expr([1,2])
     (1, 4)
-    >>> unpack_expr([1,2,3])
-    Traceback (most recent call last):
-    ValueError: too many values to unpack
-    >>> unpack_expr([1])
+    >>> unpack_expr([1,2,3]) # doctest: +ELLIPSIS
     Traceback (most recent call last):
-    ValueError: need more than 1 values to unpack
+    ValueError: ...
 """
 
 def unpack_normal(l):