mirrors/pycapnp
1
0
Fork 0
mirror of https://github.com/capnproto/pycapnp.git synced 2025-03-04 08:24:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove the option to create servers through _new_server.

Browse source 
Inheritance is required now to create a server
This commit is contained in:
Lasse Blaauwbroek 2023-06-11 04:03:28 +02:00
parent 5edf700548
commit 1e94f2e321
1 changed files with 4 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
capnp/lib/capnp.pyx
View file

@ -785,7 +785,7 @@ cdef _setDynamicField(_DynamicSetterClasses thisptr, field, value, parent):
thisptr.set(field, _extract_dynamic_struct_reader(value)) thisptr.set(field, _extract_dynamic_struct_reader(value))
elif value_type is _DynamicCapabilityClient: elif value_type is _DynamicCapabilityClient:
thisptr.set(field, _extract_dynamic_client(value)) thisptr.set(field, _extract_dynamic_client(value))
elif value_type is _DynamicCapabilityServer or isinstance(value, _DynamicCapabilityServer): elif isinstance(value, _DynamicCapabilityServer):
thisptr.set(field, _extract_dynamic_server(value)) thisptr.set(field, _extract_dynamic_server(value))
elif value_type is _DynamicEnum: elif value_type is _DynamicEnum:
thisptr.set(field, _extract_dynamic_enum(value)) thisptr.set(field, _extract_dynamic_enum(value))
@ -834,7 +834,7 @@ cdef _setDynamicFieldWithField(DynamicStruct_Builder thisptr, _StructSchemaField
thisptr.setByField(field.thisptr, _extract_dynamic_struct_reader(value)) thisptr.setByField(field.thisptr, _extract_dynamic_struct_reader(value))
elif value_type is _DynamicCapabilityClient: elif value_type is _DynamicCapabilityClient:
thisptr.setByField(field.thisptr, _extract_dynamic_client(value)) thisptr.setByField(field.thisptr, _extract_dynamic_client(value))
elif value_type is _DynamicCapabilityServer or isinstance(value, _DynamicCapabilityServer): elif isinstance(value, _DynamicCapabilityServer):
thisptr.setByField(field.thisptr, _extract_dynamic_server(value)) thisptr.setByField(field.thisptr, _extract_dynamic_server(value))
elif value_type is _DynamicEnum: elif value_type is _DynamicEnum:
thisptr.setByField(field.thisptr, _extract_dynamic_enum(value)) thisptr.setByField(field.thisptr, _extract_dynamic_enum(value))
@ -883,7 +883,7 @@ cdef _setDynamicFieldStatic(DynamicStruct_Builder thisptr, field, value, parent)
thisptr.set(field, _extract_dynamic_struct_reader(value)) thisptr.set(field, _extract_dynamic_struct_reader(value))
elif value_type is _DynamicCapabilityClient: elif value_type is _DynamicCapabilityClient:
thisptr.set(field, _extract_dynamic_client(value)) thisptr.set(field, _extract_dynamic_client(value))
elif value_type is _DynamicCapabilityServer or isinstance(value, _DynamicCapabilityServer): elif isinstance(value, _DynamicCapabilityServer):
thisptr.set(field, _extract_dynamic_server(value)) thisptr.set(field, _extract_dynamic_server(value))
elif value_type is _DynamicEnum: elif value_type is _DynamicEnum:
thisptr.set(field, _extract_dynamic_enum(value)) thisptr.set(field, _extract_dynamic_enum(value))
@ -2015,25 +2015,7 @@ cdef class _Response(_DynamicStructReader):
return self return self
cdef class _DynamicCapabilityServer: cdef class _DynamicCapabilityServer:
cdef public _InterfaceSchema schema pass
cdef public object server
def __init__(self, schema, server):
cdef _InterfaceSchema s
if hasattr(schema, 'schema'):
s = schema.schema
else:
s = schema
self.schema = s
self.server = server
def __getattr__(self, field):
try:
return getattr(self.server, field)
except KjException as e:
raise e._to_python(), None, _sys.exc_info()[2]
cdef class _DynamicCapabilityClient: cdef class _DynamicCapabilityClient:
cdef C_DynamicCapability.Client thisptr cdef C_DynamicCapability.Client thisptr
@ -3228,10 +3210,6 @@ class _InterfaceModule(object):
C_DEFAULT_EVENT_LOOP_GETTER() # Make sure that the event loop has been initialized C_DEFAULT_EVENT_LOOP_GETTER() # Make sure that the event loop has been initialized
return _DynamicCapabilityClient()._init_vals(self.schema, server) return _DynamicCapabilityClient()._init_vals(self.schema, server)
def _new_server(self, server):
C_DEFAULT_EVENT_LOOP_GETTER() # Make sure that the event loop has been initialized
return _DynamicCapabilityServer(self.schema, server)
class _EnumModule(object): class _EnumModule(object):
def __init__(self, schema, name): def __init__(self, schema, name):