Commit bf1dcaec authored by Bryan Forbes's avatar Bryan Forbes Committed by Nikias Bassen

Changed bool to bint in Cython functions. Added some more type qualifiers.

parent 89900d6d
...@@ -5,7 +5,7 @@ cdef extern from "plist/plist.h": ...@@ -5,7 +5,7 @@ cdef extern from "plist/plist.h":
cdef class Node: cdef class Node:
cdef plist_t _c_node cdef plist_t _c_node
cdef bool _c_managed cdef bint _c_managed
cpdef object __deepcopy__(self, memo=*) cpdef object __deepcopy__(self, memo=*)
cpdef unicode to_xml(self) cpdef unicode to_xml(self)
cpdef bytes to_bin(self) cpdef bytes to_bin(self)
...@@ -59,5 +59,5 @@ cdef class Array(Node): ...@@ -59,5 +59,5 @@ cdef class Array(Node):
cpdef object from_xml(xml) cpdef object from_xml(xml)
cpdef object from_bin(bytes bin) cpdef object from_bin(bytes bin)
cdef object plist_t_to_node(plist_t c_plist, bool managed=*) cdef object plist_t_to_node(plist_t c_plist, bint managed=*)
cdef plist_t native_to_plist_t(object native) cdef plist_t native_to_plist_t(object native)
...@@ -171,7 +171,7 @@ cdef class Bool(Node): ...@@ -171,7 +171,7 @@ cdef class Bool(Node):
plist_get_bool_val(self._c_node, &value) plist_get_bool_val(self._c_node, &value)
return bool(value) return bool(value)
cdef Bool Bool_factory(plist_t c_node, bool managed=True): cdef Bool Bool_factory(plist_t c_node, bint managed=True):
cdef Bool instance = Bool.__new__(Bool) cdef Bool instance = Bool.__new__(Bool)
instance._c_managed = managed instance._c_managed = managed
instance._c_node = c_node instance._c_node = c_node
...@@ -217,7 +217,7 @@ cdef class Integer(Node): ...@@ -217,7 +217,7 @@ cdef class Integer(Node):
plist_get_uint_val(self._c_node, &value) plist_get_uint_val(self._c_node, &value)
return value return value
cdef Integer Integer_factory(plist_t c_node, bool managed=True): cdef Integer Integer_factory(plist_t c_node, bint managed=True):
cdef Integer instance = Integer.__new__(Integer) cdef Integer instance = Integer.__new__(Integer)
instance._c_managed = managed instance._c_managed = managed
instance._c_node = c_node instance._c_node = c_node
...@@ -263,7 +263,7 @@ cdef class Real(Node): ...@@ -263,7 +263,7 @@ cdef class Real(Node):
plist_get_real_val(self._c_node, &value) plist_get_real_val(self._c_node, &value)
return value return value
cdef Real Real_factory(plist_t c_node, bool managed=True): cdef Real Real_factory(plist_t c_node, bint managed=True):
cdef Real instance = Real.__new__(Real) cdef Real instance = Real.__new__(Real)
instance._c_managed = managed instance._c_managed = managed
instance._c_node = c_node instance._c_node = c_node
...@@ -285,7 +285,7 @@ cdef class String(Node): ...@@ -285,7 +285,7 @@ cdef class String(Node):
value.decode('ascii') # trial decode value.decode('ascii') # trial decode
utf8_data = value.decode('ascii') utf8_data = value.decode('ascii')
else: else:
raise ValueError("requires text input, got %s" % type(value)) raise ValueError("Requires unicode input, got %s" % type(value))
c_utf8_data = utf8_data c_utf8_data = utf8_data
self._c_node = plist_new_string(c_utf8_data) self._c_node = plist_new_string(c_utf8_data)
...@@ -321,7 +321,7 @@ cdef class String(Node): ...@@ -321,7 +321,7 @@ cdef class String(Node):
value.decode('ascii') # trial decode value.decode('ascii') # trial decode
utf8_data = value.decode('ascii') utf8_data = value.decode('ascii')
else: else:
raise ValueError("requires text input, got %s" % type(value)) raise ValueError("Requires unicode input, got %s" % type(value))
c_utf8_data = utf8_data c_utf8_data = utf8_data
plist_set_string_val(self._c_node, c_utf8_data) plist_set_string_val(self._c_node, c_utf8_data)
...@@ -334,7 +334,7 @@ cdef class String(Node): ...@@ -334,7 +334,7 @@ cdef class String(Node):
finally: finally:
stdlib.free(c_value) stdlib.free(c_value)
cdef String String_factory(plist_t c_node, bool managed=True): cdef String String_factory(plist_t c_node, bint managed=True):
cdef String instance = String.__new__(String) cdef String instance = String.__new__(String)
instance._c_managed = managed instance._c_managed = managed
instance._c_node = c_node instance._c_node = c_node
...@@ -386,7 +386,7 @@ cdef class Date(Node): ...@@ -386,7 +386,7 @@ cdef class Date(Node):
plist_get_date_val(self._c_node, &secs, &usecs) plist_get_date_val(self._c_node, &secs, &usecs)
return ints_to_datetime(secs, usecs) return ints_to_datetime(secs, usecs)
cpdef set_value(self, value): cpdef set_value(self, object value):
cdef int32_t secs cdef int32_t secs
cdef int32_t usecs cdef int32_t usecs
if not check_datetime(value): if not check_datetime(value):
...@@ -394,7 +394,7 @@ cdef class Date(Node): ...@@ -394,7 +394,7 @@ cdef class Date(Node):
datetime_to_ints(value, &secs, &usecs) datetime_to_ints(value, &secs, &usecs)
plist_set_date_val(self._c_node, secs, usecs) plist_set_date_val(self._c_node, secs, usecs)
cdef Date Date_factory(plist_t c_node, bool managed=True): cdef Date Date_factory(plist_t c_node, bint managed=True):
cdef Date instance = Date.__new__(Date) cdef Date instance = Date.__new__(Date)
instance._c_managed = managed instance._c_managed = managed
instance._c_node = c_node instance._c_node = c_node
...@@ -440,13 +440,13 @@ cdef class Data(Node): ...@@ -440,13 +440,13 @@ cdef class Data(Node):
cpdef set_value(self, bytes value): cpdef set_value(self, bytes value):
plist_set_data_val(self._c_node, value, len(value)) plist_set_data_val(self._c_node, value, len(value))
cdef Data Data_factory(plist_t c_node, bool managed=True): cdef Data Data_factory(plist_t c_node, bint managed=True):
cdef Data instance = Data.__new__(Data) cdef Data instance = Data.__new__(Data)
instance._c_managed = managed instance._c_managed = managed
instance._c_node = c_node instance._c_node = c_node
return instance return instance
cdef plist_t create_dict_plist(value=None): cdef plist_t create_dict_plist(object value=None):
cdef plist_t node = NULL cdef plist_t node = NULL
cdef plist_t c_node = NULL cdef plist_t c_node = NULL
node = plist_new_dict() node = plist_new_dict()
...@@ -565,14 +565,14 @@ cdef class Dict(Node): ...@@ -565,14 +565,14 @@ cdef class Dict(Node):
python_dict.PyDict_DelItem(self._map, key) python_dict.PyDict_DelItem(self._map, key)
plist_dict_remove_item(self._c_node, key) plist_dict_remove_item(self._c_node, key)
cdef Dict Dict_factory(plist_t c_node, bool managed=True): cdef Dict Dict_factory(plist_t c_node, bint managed=True):
cdef Dict instance = Dict.__new__(Dict) cdef Dict instance = Dict.__new__(Dict)
instance._c_managed = managed instance._c_managed = managed
instance._c_node = c_node instance._c_node = c_node
instance._init() instance._init()
return instance return instance
cdef plist_t create_array_plist(value=None): cdef plist_t create_array_plist(object value=None):
cdef plist_t node = NULL cdef plist_t node = NULL
cdef plist_t c_node = NULL cdef plist_t c_node = NULL
node = plist_new_array() node = plist_new_array()
...@@ -666,7 +666,7 @@ cdef class Array(Node): ...@@ -666,7 +666,7 @@ cdef class Array(Node):
plist_array_append_item(self._c_node, n._c_node) plist_array_append_item(self._c_node, n._c_node)
self._array.append(n) self._array.append(n)
cdef Array Array_factory(plist_t c_node, bool managed=True): cdef Array Array_factory(plist_t c_node, bint managed=True):
cdef Array instance = Array.__new__(Array) cdef Array instance = Array.__new__(Array)
instance._c_managed = managed instance._c_managed = managed
instance._c_node = c_node instance._c_node = c_node
...@@ -707,7 +707,7 @@ cdef plist_t native_to_plist_t(object native): ...@@ -707,7 +707,7 @@ cdef plist_t native_to_plist_t(object native):
if check_datetime(native): if check_datetime(native):
return create_date_plist(native) return create_date_plist(native)
cdef object plist_t_to_node(plist_t c_plist, bool managed=True): cdef object plist_t_to_node(plist_t c_plist, bint managed=True):
cdef plist_type t = plist_get_node_type(c_plist) cdef plist_type t = plist_get_node_type(c_plist)
if t == PLIST_BOOLEAN: if t == PLIST_BOOLEAN:
return Bool_factory(c_plist, managed) return Bool_factory(c_plist, managed)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment