merged changes from 0.9.6.10

Demos/Setup.py

@@ -8,7 +8,20 @@ setup(
     Extension("primes",       ["primes.pyx"]),
     Extension("spam",         ["spam.pyx"]),
 #    Extension("numeric_demo", ["numeric_demo.pyx"]),
-    Extension("test", ["test.pyx"]),
+#    Extension("test", ["test.pyx"]),
+    Extension("func_pointers", ["func_pointers.pyx"]),
+#    Extension("inplace", ["inplace.pyx"]),
+#    Extension("withGIL", ["withGIL.pyx"]),
+    Extension("class_members", ["class_members.pyx"]),
+#    Extension("inherit_bug", ["inherit_bug.pyx"]),
+    Extension("override", ["override.pyx"]),
+    Extension("cond", ["cond.pyx"]),
+    Extension("submodule.test",       ["submodule/test.pyx"]),
+    Extension("errors",       ["errors.pyx"]),
+    Extension("cpdef",       ["cpdef.pyx"]),
+    Extension("range",       ["range.pyx"]),
+    Extension("ints",       ["ints.pyx"]),
+    Extension("detect_override",       ["detect_override.pyx"]),
     ],
   cmdclass = {'build_ext': build_ext},
 #  include_dirs = "/System/Library/Frameworks/Python.framework/Versions/2.3/include/python2.3/"

Demos/primes.pyx

+print "starting"
+
 def primes(int kmax):
     cdef int n, k, i
     cdef int p[1000]

Demos/spam.pyx

@@ -4,8 +4,6 @@
 
 cdef class Spam:
 
-  cdef int amount
-
   def __new__(self):
     self.amount = 0
 

MANIFEST.in

@@ -6,4 +6,6 @@ include bin/cython
 include cython.py
 include Cython/Compiler/Lexicon.pickle
 include Doc/*
-include Demos/*
+include Demos/*.p*
+include Demos/Makefile*
+include Cython/Compiler/Builtin.py

setup.py

@@ -52,6 +52,7 @@ setup(
     "License :: OSI Approved :: Python Software Foundation License",
     "Operating System :: OS Independent",
     "Programming Language :: Python",
+    "Programming Language :: C",
     "Topic :: Software Development :: Code Generators",
     "Topic :: Software Development :: Compilers",
     "Topic :: Software Development :: Libraries :: Python Modules"