IQ.Lvbs/pycapnp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor capnp.pyx to be in lib subdirectory

Browse Source
This commit is contained in:
Jason Paryani
2013-12-08 17:43:08 -08:00
parent 086994f9da
commit 1e87bed8c7
10 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -15,8 +15,6 @@ var
sdist sdist
develop-eggs develop-eggs
.installed.cfg .installed.cfg
lib
lib64
# Installer logs # Installer logs
pip-log.txt pip-log.txt

5
capnp/__init__.py
View File

@@ -32,8 +32,7 @@ Example Usage::
print(phone.type, ':', phone.number) print(phone.type, ':', phone.number)
""" """
from .version import version as __version__ from .version import version as __version__
from .capnp import * from .lib.capnp import *
from .capnp import _DynamicStructReader, _DynamicStructBuilder, _DynamicResizableListBuilder, _DynamicListReader, _DynamicListBuilder, _DynamicOrphan, _DynamicResizableListBuilder, _MallocMessageBuilder, _PackedFdMessageReader, _StreamFdMessageReader, _write_message_to_fd, _write_packed_message_to_fd, _StructModule, _InterfaceModule, _DynamicCapabilityClient, _CapabilityClient, _EventLoop from .lib.capnp import _DynamicStructReader, _DynamicStructBuilder, _DynamicResizableListBuilder, _DynamicListReader, _DynamicListBuilder, _DynamicOrphan, _DynamicResizableListBuilder, _MallocMessageBuilder, _PackedFdMessageReader, _StreamFdMessageReader, _write_message_to_fd, _write_packed_message_to_fd, _StructModule, _InterfaceModule, _DynamicCapabilityClient, _CapabilityClient, _EventLoop
del capnp
add_import_hook() # enable import hook by default add_import_hook() # enable import hook by default

6
capnp/helpers/helpers.pxd
View File

@@ -4,13 +4,13 @@ from non_circular cimport reraise_kj_exception
from cpython.ref cimport PyObject from cpython.ref cimport PyObject
cdef extern from "helpers/fixMaybe.h": cdef extern from "../helpers/fixMaybe.h":
EnumSchema.Enumerant fixMaybe(Maybe[EnumSchema.Enumerant]) except +reraise_kj_exception EnumSchema.Enumerant fixMaybe(Maybe[EnumSchema.Enumerant]) except +reraise_kj_exception
char * getEnumString(DynamicStruct.Reader val) char * getEnumString(DynamicStruct.Reader val)
char * getEnumString(DynamicStruct.Builder val) char * getEnumString(DynamicStruct.Builder val)
char * getEnumString(Request val) char * getEnumString(Request val)
cdef extern from "helpers/capabilityHelper.h": cdef extern from "../helpers/capabilityHelper.h":
# PyPromise evalLater(EventLoop &, PyObject * func) # PyPromise evalLater(EventLoop &, PyObject * func)
# PyPromise there(EventLoop & loop, PyPromise & promise, PyObject * func, PyObject * error_func) # PyPromise there(EventLoop & loop, PyPromise & promise, PyObject * func, PyObject * error_func)
PyPromise then(PyPromise & promise, PyObject * func, PyObject * error_func) PyPromise then(PyPromise & promise, PyObject * func, PyObject * error_func)
@@ -21,7 +21,7 @@ cdef extern from "helpers/capabilityHelper.h":
Capability.Client server_to_client(InterfaceSchema&, PyObject *) Capability.Client server_to_client(InterfaceSchema&, PyObject *)
PyPromise convert_to_pypromise(RemotePromise&) PyPromise convert_to_pypromise(RemotePromise&)
cdef extern from "helpers/rpcHelper.h": cdef extern from "../helpers/rpcHelper.h":
cdef cppclass PyRestorer: cdef cppclass PyRestorer:
PyRestorer(PyObject *, StructSchema&) PyRestorer(PyObject *, StructSchema&)
Capability.Client restoreHelper(RpcSystem&, MessageBuilder&) Capability.Client restoreHelper(RpcSystem&, MessageBuilder&)

4
capnp/helpers/non_circular.pxd
View File

@@ -1,8 +1,8 @@
from cpython.ref cimport PyObject from cpython.ref cimport PyObject
cdef extern from "helpers/capabilityHelper.h": cdef extern from "../helpers/capabilityHelper.h":
cppclass PythonInterfaceDynamicImpl: cppclass PythonInterfaceDynamicImpl:
PythonInterfaceDynamicImpl(PyObject *) PythonInterfaceDynamicImpl(PyObject *)
cdef extern from "helpers/capabilityHelper.h": cdef extern from "../helpers/capabilityHelper.h":
void reraise_kj_exception() void reraise_kj_exception()

8
capnp/includes/capnp_cpp.pxd
View File

@@ -1,7 +1,7 @@
# schema.capnp.cpp.pyx # schema.capnp.cpp.pyx
# distutils: language = c++ # distutils: language = c++
# distutils: extra_compile_args = --std=c++11 # distutils: extra_compile_args = --std=c++11
cdef extern from "helpers/checkCompiler.h": cdef extern from "../helpers/checkCompiler.h":
pass pass
from schema_cpp cimport Node, Data, StructNode, EnumNode, InterfaceNode, MessageBuilder, MessageReader from schema_cpp cimport Node, Data, StructNode, EnumNode, InterfaceNode, MessageBuilder, MessageReader
@@ -253,13 +253,13 @@ cdef extern from "capnp/any.h" namespace " ::capnp":
Builder(Builder) Builder(Builder)
DynamicStruct.Builder getAs"getAs< ::capnp::DynamicStruct>"(StructSchema) DynamicStruct.Builder getAs"getAs< ::capnp::DynamicStruct>"(StructSchema)
cdef extern from "helpers/fixMaybe.h": cdef extern from "../helpers/fixMaybe.h":
EnumSchema.Enumerant fixMaybe(Maybe[EnumSchema.Enumerant]) except +reraise_kj_exception EnumSchema.Enumerant fixMaybe(Maybe[EnumSchema.Enumerant]) except +reraise_kj_exception
char * getEnumString(DynamicStruct.Reader val) char * getEnumString(DynamicStruct.Reader val)
char * getEnumString(DynamicStruct.Builder val) char * getEnumString(DynamicStruct.Builder val)
char * getEnumString(Request val) char * getEnumString(Request val)
cdef extern from "helpers/capabilityHelper.h": cdef extern from "../helpers/capabilityHelper.h":
# PyPromise evalLater(EventLoop &, PyObject * func) # PyPromise evalLater(EventLoop &, PyObject * func)
# PyPromise there(EventLoop & loop, PyPromise & promise, PyObject * func, PyObject * error_func) # PyPromise there(EventLoop & loop, PyPromise & promise, PyObject * func, PyObject * error_func)
PyPromise then(PyPromise & promise, PyObject * func, PyObject * error_func) PyPromise then(PyPromise & promise, PyObject * func, PyObject * error_func)
@@ -270,7 +270,7 @@ cdef extern from "helpers/capabilityHelper.h":
Capability.Client server_to_client(InterfaceSchema&, PyObject *) Capability.Client server_to_client(InterfaceSchema&, PyObject *)
PyPromise convert_to_pypromise(RemotePromise&) PyPromise convert_to_pypromise(RemotePromise&)
cdef extern from "helpers/rpcHelper.h": cdef extern from "../helpers/rpcHelper.h":
cdef cppclass PyRestorer: cdef cppclass PyRestorer:
PyRestorer(PyObject *, StructSchema&) PyRestorer(PyObject *, StructSchema&)
Capability.Client restoreHelper(RpcSystem&, MessageBuilder&) Capability.Client restoreHelper(RpcSystem&, MessageBuilder&)

4
capnp/includes/schema_cpp.pxd
View File

@@ -5,6 +5,7 @@
from libc.stdint cimport * from libc.stdint cimport *
from capnp_cpp cimport DynamicOrphan from capnp_cpp cimport DynamicOrphan
from .capnp.helpers.non_circular cimport reraise_kj_exception
ctypedef unsigned int uint ctypedef unsigned int uint
ctypedef uint8_t byte ctypedef uint8_t byte
ctypedef uint8_t UInt8 ctypedef uint8_t UInt8
@@ -718,9 +719,6 @@ cdef extern from "kj/array.h" namespace " ::kj":
word* begin() word* begin()
size_t size() size_t size()
cdef extern from "helpers/capabilityHelper.h":
void reraise_kj_exception()
cdef extern from "kj/array.h" namespace " ::kj": cdef extern from "kj/array.h" namespace " ::kj":
cdef cppclass InputStream: cdef cppclass InputStream:
void read(void* buffer, size_t bytes) except +reraise_kj_exception void read(void* buffer, size_t bytes) except +reraise_kj_exception

0
capnp/lib/__init__.pxd Normal file
View File

0
capnp/lib/__init__.py Normal file
View File

0
capnp/capnp.pyx → capnp/lib/capnp.pyx
View File

4
setup.py
View File

@@ -48,8 +48,8 @@ setup(
name="pycapnp", name="pycapnp",
packages=["capnp"], packages=["capnp"],
version=VERSION, version=VERSION,
package_data={'capnp': ['*.pxd', '*.pyx', '*.h', 'helpers/*.pxd', 'helpers/*.h', 'includes/*.pxd']}, package_data={'capnp': ['*.pxd', '*.h', 'helpers/*.pxd', 'helpers/*.h', 'includes/*.pxd', 'lib/*.pxd', 'lib/*.py']},
ext_modules=cythonize('capnp/*.pyx', language="c++"), ext_modules=cythonize('capnp/lib/*.pyx', language="c++"),
install_requires=[ install_requires=[
'cython > 0.19', 'cython > 0.19',
'setuptools >= 0.8'], 'setuptools >= 0.8'],