Fix build for Cython 0.21

Conflicts:
	capnp/helpers/helpers.pxd
	capnp/lib/capnp.pyx
	requirements.txt
	setup.py

capnp/helpers/helpers.pxd

@@ -1,6 +1,6 @@
-from .capnp.includes.capnp_cpp cimport Maybe, DynamicStruct, Request, Response, PyPromise, VoidPromise, PyPromiseArray, RemotePromise, DynamicCapability, InterfaceSchema, EnumSchema, StructSchema, DynamicValue, Capability, RpcSystem, MessageBuilder, MessageReader, TwoPartyVatNetwork, PyRestorer, AnyPointer, DynamicStruct_Builder, WaitScope, AsyncIoContext, StringPtr, TaskSet, Timer
+from capnp.includes.capnp_cpp cimport Maybe, DynamicStruct, Request, Response, PyPromise, VoidPromise, PyPromiseArray, RemotePromise, DynamicCapability, InterfaceSchema, EnumSchema, StructSchema, DynamicValue, Capability, RpcSystem, MessageBuilder, MessageReader, TwoPartyVatNetwork, PyRestorer, AnyPointer, DynamicStruct_Builder, WaitScope, AsyncIoContext, StringPtr, TaskSet, Timer
 
-from .capnp.includes.schema_cpp cimport ByteArray
+from capnp.includes.schema_cpp cimport ByteArray
 
 from non_circular cimport reraise_kj_exception
 

capnp/includes/capnp_cpp.pxd

@@ -5,8 +5,8 @@ cdef extern from "capnp/helpers/checkCompiler.h":
     pass
 
 from schema_cpp cimport Node, Data, StructNode, EnumNode, InterfaceNode, MessageBuilder, MessageReader
-from .capnp.helpers.non_circular cimport PythonInterfaceDynamicImpl, reraise_kj_exception, PyRefCounter, PyRestorer, PyEventPort, ErrorHandler
+from capnp.helpers.non_circular cimport PythonInterfaceDynamicImpl, reraise_kj_exception, PyRefCounter, PyRestorer, PyEventPort, ErrorHandler
-from .capnp.includes.types cimport *
+from capnp.includes.types cimport *
 
 cdef extern from "capnp/common.h" namespace " ::capnp":
     enum Void:

capnp/includes/schema_cpp.pxd

@@ -5,9 +5,9 @@
 
 from libc.stdint cimport *
 from capnp_cpp cimport DynamicOrphan
-from .capnp.helpers.non_circular cimport reraise_kj_exception
+from capnp.helpers.non_circular cimport reraise_kj_exception
 
-from .capnp.includes.types cimport *
+from capnp.includes.types cimport *
 
 cdef extern from "capnp/dynamic.h" namespace " ::capnp":
     cdef cppclass DynamicValue:
@@ -34,7 +34,7 @@ cdef extern from "capnp/any.h" namespace " ::capnp":
             pass
         cppclass Builder:
             pass
-        
+
 cdef extern from "capnp/blob.h" namespace " ::capnp":
     cdef cppclass Data:
         cppclass Reader:
@@ -118,7 +118,7 @@ cdef extern from "capnp/schema.capnp.h" namespace " ::capnp::schema":
         _StructNode_Member_Body_fieldMember " ::capnp::schema::StructNode::Member::Body::Which::FIELD_MEMBER"
         _StructNode_Member_Body_unionMember " ::capnp::schema::StructNode::Member::Body::Which::UNION_MEMBER"
     cdef cppclass CodeGeneratorRequest
-    
+
     cdef cppclass InterfaceNode
     cdef cppclass Value
     cdef cppclass ConstNode
@@ -131,13 +131,13 @@ cdef extern from "capnp/schema.capnp.h" namespace " ::capnp::schema":
     cdef cppclass Annotation
     cdef cppclass CodeGeneratorRequest:
 
-    
+
         cppclass Reader:
-            
+
             List[CodeGeneratorRequest.Node].Reader getNodes()
             List[UInt64].Reader getRequestedFiles()
         cppclass Builder:
-            
+
             List[CodeGeneratorRequest.Node].Builder getNodes()
             List[CodeGeneratorRequest.Node].Builder initNodes(int)
             List[UInt64].Builder getRequestedFiles()
@@ -145,22 +145,22 @@ cdef extern from "capnp/schema.capnp.h" namespace " ::capnp::schema":
     cdef cppclass InterfaceNode:
         cppclass Method
 
-    
+
         cppclass Method:
             cppclass Param
-    
+
-        
+
             cppclass Param:
-        
+
-            
+
                 cppclass Reader:
-                    
+
                     Value getDefaultValue()
                     Type getType()
                     Text.Reader getName()
                     List[InterfaceNode.Method.Param.Annotation].Reader getAnnotations()
                 cppclass Builder:
-                    
+
                     Value getDefaultValue()
                     void setDefaultValue(Value)
                     Type getType()
@@ -170,7 +170,7 @@ cdef extern from "capnp/schema.capnp.h" namespace " ::capnp::schema":
                     List[InterfaceNode.Method.Param.Annotation].Builder getAnnotations()
                     List[InterfaceNode.Method.Param.Annotation].Builder initAnnotations(int)
             cppclass Reader:
-                
+
                 UInt16 getCodeOrder()
                 Text.Reader getName()
                 List[InterfaceNode.Method.InterfaceNode.Method.Param].Reader getParams()
@@ -178,7 +178,7 @@ cdef extern from "capnp/schema.capnp.h" namespace " ::capnp::schema":
                 Type getReturnType()
                 List[InterfaceNode.Method.Annotation].Reader getAnnotations()
             cppclass Builder:
-                
+
                 UInt16 getCodeOrder()
                 void setCodeOrder(UInt16)
                 Text.Builder getName()
@@ -192,19 +192,19 @@ cdef extern from "capnp/schema.capnp.h" namespace " ::capnp::schema":
                 List[InterfaceNode.Method.Annotation].Builder getAnnotations()
                 List[InterfaceNode.Method.Annotation].Builder initAnnotations(int)
         cppclass Reader:
-            
+
             List[InterfaceNode.InterfaceNode.Method].Reader getMethods()
         cppclass Builder:
-            
+
             List[InterfaceNode.InterfaceNode.Method].Builder getMethods()
             List[InterfaceNode.InterfaceNode.Method].Builder initMethods(int)
     cdef cppclass Value:
         cppclass Body
 
-    
+
         cppclass Body:
-    
+
-        
+
             cppclass Reader:
                 int which()
                 UInt32 getUint32Value()
@@ -267,21 +267,21 @@ cdef extern from "capnp/schema.capnp.h" namespace " ::capnp::schema":
                 Object getObjectValue()
                 void setObjectValue(Object)
         cppclass Reader:
-            
+
             Value.Body getBody()
         cppclass Builder:
-            
+
             Value.Body getBody()
             void setBody(Value.Body)
     cdef cppclass ConstNode:
 
-    
+
         cppclass Reader:
-            
+
             Type getType()
             Value getValue()
         cppclass Builder:
-            
+
             Type getType()
             void setType(Type)
             Value getValue()
@@ -289,10 +289,10 @@ cdef extern from "capnp/schema.capnp.h" namespace " ::capnp::schema":
     cdef cppclass Type:
         cppclass Body
 
-    
+
         cppclass Body:
-    
+
-        
+
             cppclass Reader:
                 int which()
                 Void getBoolType()
@@ -355,44 +355,44 @@ cdef extern from "capnp/schema.capnp.h" namespace " ::capnp::schema":
                 Void getInt16Type()
                 void setInt16Type(Void)
         cppclass Reader:
-            
+
             Type.Body getBody()
         cppclass Builder:
-            
+
             Type.Body getBody()
             void setBody(Type.Body)
     cdef cppclass FileNode:
         cppclass Import
 
-    
+
         cppclass Import:
-    
+
-        
+
             cppclass Reader:
-                
+
                 UInt64 getId()
                 Text.Reader getName()
             cppclass Builder:
-                
+
                 UInt64 getId()
                 void setId(UInt64)
                 Text.Builder getName()
                 void setName(Text)
         cppclass Reader:
-            
+
             List[FileNode.FileNode.Import].Reader getImports()
         cppclass Builder:
-            
+
             List[FileNode.FileNode.Import].Builder getImports()
             List[FileNode.FileNode.Import].Builder initImports(int)
     cdef cppclass Node:
         cppclass Body
         cppclass NestedNode
 
-    
+
         cppclass Body:
-    
+
-        
+
             cppclass Reader:
                 int which()
                 AnnotationNode getAnnotationNode()
@@ -416,20 +416,20 @@ cdef extern from "capnp/schema.capnp.h" namespace " ::capnp::schema":
                 FileNode getFileNode()
                 void setFileNode(FileNode)
         cppclass NestedNode:
-    
+
-        
+
             cppclass Reader:
-                
+
                 Text.Reader getName()
                 UInt64 getId()
             cppclass Builder:
-                
+
                 Text.Builder getName()
                 void setName(Text)
                 UInt64 getId()
                 void setId(UInt64)
         cppclass Reader:
-            
+
             Node.Body getBody()
             Text.Reader getDisplayName()
             List[Node.Annotation].Reader getAnnotations()
@@ -443,7 +443,7 @@ cdef extern from "capnp/schema.capnp.h" namespace " ::capnp::schema":
             bint isConst()
             bint isAnnotation()
         cppclass Builder:
-            
+
             Node.Body getBody()
             void setBody(Node.Body)
             Text.Builder getDisplayName()
@@ -464,9 +464,9 @@ cdef extern from "capnp/schema.capnp.h" namespace " ::capnp::schema":
             bint isAnnotation()
     cdef cppclass AnnotationNode:
 
-    
+
         cppclass Reader:
-            
+
             Bool getTargetsField()
             Bool getTargetsConst()
             Bool getTargetsFile()
@@ -480,7 +480,7 @@ cdef extern from "capnp/schema.capnp.h" namespace " ::capnp::schema":
             Bool getTargetsInterface()
             Bool getTargetsMethod()
         cppclass Builder:
-            
+
             Bool getTargetsField()
             void setTargetsField(Bool)
             Bool getTargetsConst()
@@ -508,17 +508,17 @@ cdef extern from "capnp/schema.capnp.h" namespace " ::capnp::schema":
     cdef cppclass EnumNode:
         cppclass Enumerant
 
-    
+
         cppclass Enumerant:
-    
+
-        
+
             cppclass Reader:
-                
+
                 UInt16 getCodeOrder()
                 Text.Reader getName()
                 List[EnumNode.Enumerant.Annotation].Reader getAnnotations()
             cppclass Builder:
-                
+
                 UInt16 getCodeOrder()
                 void setCodeOrder(UInt16)
                 Text.Builder getName()
@@ -526,10 +526,10 @@ cdef extern from "capnp/schema.capnp.h" namespace " ::capnp::schema":
                 List[EnumNode.Enumerant.Annotation].Builder getAnnotations()
                 List[EnumNode.Enumerant.Annotation].Builder initAnnotations(int)
         cppclass Reader:
-            
+
             List[EnumNode.EnumNode.Enumerant].Reader getEnumerants()
         cppclass Builder:
-            
+
             List[EnumNode.EnumNode.Enumerant].Builder getEnumerants()
             List[EnumNode.EnumNode.Enumerant].Builder initEnumerants(int)
     cdef cppclass StructNode:
@@ -537,27 +537,27 @@ cdef extern from "capnp/schema.capnp.h" namespace " ::capnp::schema":
         cppclass Member
         cppclass Field
 
-    
+
         cppclass Union:
-    
+
-        
+
             cppclass Reader:
-                
+
                 UInt32 getDiscriminantOffset()
                 List[StructNode.Union.StructNode.Member].Reader getMembers()
             cppclass Builder:
-                
+
                 UInt32 getDiscriminantOffset()
                 void setDiscriminantOffset(UInt32)
                 List[StructNode.Union.StructNode.Member].Builder getMembers()
                 List[StructNode.Union.StructNode.Member].Builder initMembers(int)
         cppclass Member:
             cppclass Body
-    
+
-        
+
             cppclass Body:
-        
+
-            
+
                 cppclass Reader:
                     int which()
                     Field getFieldMember()
@@ -569,14 +569,14 @@ cdef extern from "capnp/schema.capnp.h" namespace " ::capnp::schema":
                     Union getUnionMember()
                     void setUnionMember(Union)
             cppclass Reader:
-                
+
                 UInt16 getOrdinal()
                 StructNode.Member.Body getBody()
                 UInt16 getCodeOrder()
                 Text.Reader getName()
                 List[StructNode.Member.Annotation].Reader getAnnotations()
             cppclass Builder:
-                
+
                 UInt16 getOrdinal()
                 void setOrdinal(UInt16)
                 StructNode.Member.Body getBody()
@@ -588,15 +588,15 @@ cdef extern from "capnp/schema.capnp.h" namespace " ::capnp::schema":
                 List[StructNode.Member.Annotation].Builder getAnnotations()
                 List[StructNode.Member.Annotation].Builder initAnnotations(int)
         cppclass Field:
-    
+
-        
+
             cppclass Reader:
-                
+
                 Value getDefaultValue()
                 Type getType()
                 UInt32 getOffset()
             cppclass Builder:
-                
+
                 Value getDefaultValue()
                 void setDefaultValue(Value)
                 Type getType()
@@ -604,12 +604,12 @@ cdef extern from "capnp/schema.capnp.h" namespace " ::capnp::schema":
                 UInt32 getOffset()
                 void setOffset(UInt32)
         cppclass Reader:
-            
+
             UInt16 getDataSectionWordSize()
             List[StructNode.StructNode.Member].Reader getMembers()
             UInt16 getPointerSectionSize()
         cppclass Builder:
-            
+
             UInt16 getDataSectionWordSize()
             void setDataSectionWordSize(UInt16)
             List[StructNode.StructNode.Member].Builder getMembers()
@@ -618,13 +618,13 @@ cdef extern from "capnp/schema.capnp.h" namespace " ::capnp::schema":
             void setPointerSectionSize(UInt16)
     cdef cppclass Annotation:
 
-    
+
         cppclass Reader:
-            
+
             UInt64 getId()
             Value getValue()
         cppclass Builder:
-            
+
             UInt64 getId()
             void setId(UInt64)
             Value getValue()
@@ -658,7 +658,7 @@ cdef extern from "capnp/message.h" namespace " ::capnp":
         StructNode.Builder initRootStructNode'initRoot< ::capnp::schema::StructNode>'()
         Annotation.Builder getRootAnnotation'getRoot< ::capnp::schema::Annotation>'()
         Annotation.Builder initRootAnnotation'initRoot< ::capnp::schema::Annotation>'()
-        
+
         DynamicStruct_Builder getRootDynamicStruct'getRoot< ::capnp::DynamicStruct>'(StructSchema)
         DynamicStruct_Builder initRootDynamicStruct'initRoot< ::capnp::DynamicStruct>'(StructSchema)
         void setRootDynamicStruct'setRoot< ::capnp::DynamicStruct::Reader>'(DynamicStruct.Reader)
@@ -682,7 +682,7 @@ cdef extern from "capnp/message.h" namespace " ::capnp":
 
         DynamicStruct.Reader getRootDynamicStruct'getRoot< ::capnp::DynamicStruct>'(StructSchema)
         AnyPointer.Reader getRootAnyPointer'getRoot< ::capnp::AnyPointer>'()
-    
+
     cdef cppclass MallocMessageBuilder(MessageBuilder):
         MallocMessageBuilder()
         MallocMessageBuilder(int)

capnp/lib/capnp.pxd

@@ -1,10 +1,10 @@
-from .capnp.includes cimport capnp_cpp as capnp
+from capnp.includes cimport capnp_cpp as capnp
-from .capnp.includes cimport schema_cpp
+from capnp.includes cimport schema_cpp
-from .capnp.includes.capnp_cpp cimport Schema as C_Schema, StructSchema as C_StructSchema, InterfaceSchema as C_InterfaceSchema, EnumSchema as C_EnumSchema, DynamicStruct as C_DynamicStruct, DynamicValue as C_DynamicValue, Type as C_Type, DynamicList as C_DynamicList, SchemaParser as C_SchemaParser, ParsedSchema as C_ParsedSchema, VOID, ArrayPtr, StringPtr, String, StringTree, DynamicOrphan as C_DynamicOrphan, AnyPointer as C_DynamicObject, DynamicCapability as C_DynamicCapability, Request, Response, RemotePromise, PyPromise, VoidPromise, CallContext, PyRestorer, RpcSystem, makeRpcServer, makeRpcClient, Capability as C_Capability, TwoPartyVatNetwork as C_TwoPartyVatNetwork, Side, AsyncIoStream, Own, makeTwoPartyVatNetwork, PromiseFulfillerPair as C_PromiseFulfillerPair, copyPromiseFulfillerPair, newPromiseAndFulfiller, PyArray, DynamicStruct_Builder
+from capnp.includes.capnp_cpp cimport Schema as C_Schema, StructSchema as C_StructSchema, InterfaceSchema as C_InterfaceSchema, EnumSchema as C_EnumSchema, DynamicStruct as C_DynamicStruct, DynamicValue as C_DynamicValue, Type as C_Type, DynamicList as C_DynamicList, SchemaParser as C_SchemaParser, ParsedSchema as C_ParsedSchema, VOID, ArrayPtr, StringPtr, String, StringTree, DynamicOrphan as C_DynamicOrphan, AnyPointer as C_DynamicObject, DynamicCapability as C_DynamicCapability, Request, Response, RemotePromise, PyPromise, VoidPromise, CallContext, PyRestorer, RpcSystem, makeRpcServer, makeRpcClient, Capability as C_Capability, TwoPartyVatNetwork as C_TwoPartyVatNetwork, Side, AsyncIoStream, Own, makeTwoPartyVatNetwork, PromiseFulfillerPair as C_PromiseFulfillerPair, copyPromiseFulfillerPair, newPromiseAndFulfiller, PyArray, DynamicStruct_Builder
-from .capnp.includes.schema_cpp cimport Node as C_Node, EnumNode as C_EnumNode
+from capnp.includes.schema_cpp cimport Node as C_Node, EnumNode as C_EnumNode
-from .capnp.includes.types cimport *
+from capnp.includes.types cimport *
-from .capnp.helpers.non_circular cimport reraise_kj_exception
+from capnp.helpers.non_circular cimport reraise_kj_exception
-from .capnp.helpers cimport helpers
+from capnp.helpers cimport helpers
 
 
 cdef class _StructSchemaField:

requirements.txt

@@ -1,5 +1,5 @@
 jinja2 >= 2.7.3
-cython > 0.19
+cython >= 0.21
 setuptools >= 0.8
 pytest
 tox

setup.py

@@ -54,10 +54,9 @@ setup(
     packages=["capnp"],
     version=VERSION,
     package_data={'capnp': ['*.pxd', '*.h', '*.capnp', 'helpers/*.pxd', 'helpers/*.h', 'includes/*.pxd', 'lib/*.pxd', 'lib/*.py', 'lib/*.pyx', 'templates/*']},
-    ext_modules=cythonize('capnp/lib/*.pyx', language="c++"),
+    ext_modules=cythonize('capnp/lib/*.pyx'),
     install_requires=[
-        'jinja2 >= 2.7.3',
+        'cython >= 0.21',
-        'cython > 0.19',
         'setuptools >= 0.8'],
     entry_points={
         'console_scripts' : ['capnpc-cython = capnp._gen:main']