gpiod 2.2.0__tar.gz → 2.2.2__tar.gz

{gpiod-2.2.0/gpiod.egg-info → gpiod-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gpiod
-Version: 2.2.0
+Version: 2.2.2
 Summary: Python bindings for libgpiod
 Home-page: https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git
 Author: Bartosz Golaszewski

{gpiod-2.2.0 → gpiod-2.2.2}/gpiod/chip.py

@@ -226,7 +226,7 @@ class Chip:
         config: dict[tuple[Union[int, str]], Optional[LineSettings]],
         consumer: Optional[str] = None,
         event_buffer_size: Optional[int] = None,
-        output_values: Optional[dict[tuple[Union[int, str]], Value]] = None,
+        output_values: Optional[dict[Union[int, str], Value]] = None,
     ) -> LineRequest:
         """
         Request a set of lines for exclusive usage.
@@ -279,11 +279,12 @@ class Chip:
         else:
             mapped_output_values = None
 
+        name_map = dict()
+        offset_map = dict()
+        global_output_values = list()
+
         for lines, settings in config.items():
             offsets = list()
-            name_map = dict()
-            offset_map = dict()
-            global_output_values = list()
 
             if isinstance(lines, int) or isinstance(lines, str):
                 lines = (lines,)

{gpiod-2.2.0 → gpiod-2.2.2}/gpiod/ext/chip.c

@@ -75,31 +75,34 @@ static PyObject *chip_get_info(chip_object *self, PyObject *Py_UNUSED(ignored))
 	struct gpiod_chip_info *info;
 	PyObject *type, *ret;
 
-	type = Py_gpiod_GetGlobalType("ChipInfo");
+	type = Py_gpiod_GetModuleAttrString("gpiod.chip_info", "ChipInfo");
 	if (!type)
 		return NULL;
 
 	info = gpiod_chip_get_info(self->chip);
-	if (!info)
+	if (!info) {
+		Py_DECREF(type);
 		return PyErr_SetFromErrno(PyExc_OSError);
+	}
 
-	 ret = PyObject_CallFunction(type, "ssI",
-				     gpiod_chip_info_get_name(info),
-				     gpiod_chip_info_get_label(info),
-				     gpiod_chip_info_get_num_lines(info));
-	 gpiod_chip_info_free(info);
-	 return ret;
+	ret = PyObject_CallFunction(type, "ssI",
+				    gpiod_chip_info_get_name(info),
+				    gpiod_chip_info_get_label(info),
+				    gpiod_chip_info_get_num_lines(info));
+	gpiod_chip_info_free(info);
+	Py_DECREF(type);
+	return ret;
 }
 
 static PyObject *make_line_info(struct gpiod_line_info *info)
 {
-	PyObject *type;
+	PyObject *type, *ret;
 
-	type = Py_gpiod_GetGlobalType("LineInfo");
+	type = Py_gpiod_GetModuleAttrString("gpiod.line_info", "LineInfo");
 	if (!type)
 		return NULL;
 
-	return PyObject_CallFunction(type, "IsOsiOiiiiOk",
+	ret = PyObject_CallFunction(type, "IsOsiOiiiiOk",
 				gpiod_line_info_get_offset(info),
 				gpiod_line_info_get_name(info),
 				gpiod_line_info_is_used(info) ?
@@ -115,6 +118,8 @@ static PyObject *make_line_info(struct gpiod_line_info *info)
 				gpiod_line_info_is_debounced(info) ?
 							Py_True : Py_False,
 				gpiod_line_info_get_debounce_period_us(info));
+	Py_DECREF(type);
+	return ret;
 }
 
 static PyObject *chip_get_line_info(chip_object *self, PyObject *args)
@@ -168,10 +173,6 @@ chip_read_info_event(chip_object *self, PyObject *Py_UNUSED(ignored))
 	struct gpiod_info_event *event;
 	struct gpiod_line_info *info;
 
-	type = Py_gpiod_GetGlobalType("InfoEvent");
-	if (!type)
-		return NULL;
-
 	Py_BEGIN_ALLOW_THREADS;
 	event = gpiod_chip_read_info_event(self->chip);
 	Py_END_ALLOW_THREADS;
@@ -186,11 +187,19 @@ chip_read_info_event(chip_object *self, PyObject *Py_UNUSED(ignored))
 		return NULL;
 	}
 
+	type = Py_gpiod_GetModuleAttrString("gpiod.info_event", "InfoEvent");
+	if (!type) {
+		Py_DECREF(info_obj);
+		gpiod_info_event_free(event);
+		return NULL;
+	}
+
 	event_obj = PyObject_CallFunction(type, "iKO",
 				gpiod_info_event_get_event_type(event),
 				gpiod_info_event_get_timestamp_ns(event),
 				info_obj);
 	Py_DECREF(info_obj);
+	Py_DECREF(type);
 	gpiod_info_event_free(event);
 	return event_obj;
 }
@@ -274,14 +283,16 @@ static PyObject *chip_request_lines(chip_object *self, PyObject *args)
 	Py_BEGIN_ALLOW_THREADS;
 	request = gpiod_chip_request_lines(self->chip, req_cfg, line_cfg);
 	Py_END_ALLOW_THREADS;
-	gpiod_request_config_free(req_cfg);
-	if (!request)
+	if (!request) {
+		gpiod_request_config_free(req_cfg);
 		return Py_gpiod_SetErrFromErrno();
+	}
 
 	req_obj = Py_gpiod_MakeRequestObject(request,
 			gpiod_request_config_get_event_buffer_size(req_cfg));
 	if (!req_obj)
 		gpiod_line_request_release(request);
+	gpiod_request_config_free(req_cfg);
 
 	return req_obj;
 }

{gpiod-2.2.0 → gpiod-2.2.2}/gpiod/ext/common.c

@@ -64,15 +64,19 @@ PyObject *Py_gpiod_SetErrFromErrno(void)
 	return PyErr_SetFromErrno(exc);
 }
 
-PyObject *Py_gpiod_GetGlobalType(const char *type_name)
+PyObject *Py_gpiod_GetModuleAttrString(const char *modname,
+				       const char *attrname)
 {
-	PyObject *globals;
+	PyObject *module, *attribute;
 
-	globals = PyEval_GetGlobals();
-	if (!globals)
+	module = PyImport_ImportModule(modname);
+	if (!module)
 		return NULL;
 
-	return PyDict_GetItemString(globals, type_name);
+	attribute = PyObject_GetAttrString(module, attrname);
+	Py_DECREF(module);
+
+	return attribute;
 }
 
 unsigned int Py_gpiod_PyLongAsUnsignedInt(PyObject *pylong)

{gpiod-2.2.0 → gpiod-2.2.2}/gpiod/ext/internal.h

@@ -8,7 +8,8 @@
 #include <Python.h>
 
 PyObject *Py_gpiod_SetErrFromErrno(void);
-PyObject *Py_gpiod_GetGlobalType(const char *type_name);
+PyObject *Py_gpiod_GetModuleAttrString(const char *modname,
+				       const char *attrname);
 unsigned int Py_gpiod_PyLongAsUnsignedInt(PyObject *pylong);
 void Py_gpiod_dealloc(PyObject *self);
 PyObject *Py_gpiod_MakeRequestObject(struct gpiod_line_request *request,

{gpiod-2.2.0 → gpiod-2.2.2}/gpiod/ext/line-settings.c

@@ -79,6 +79,10 @@ line_settings_init(line_settings_object *self, PyObject *args, PyObject *kwargs)
 	if (ret)
 		return set_error();
 
+	ret = gpiod_line_settings_set_event_clock(self->settings, event_clock);
+	if (ret)
+		return set_error();
+
 	return 0;
 }
 

{gpiod-2.2.0 → gpiod-2.2.2}/gpiod/ext/request.c

@@ -149,10 +149,6 @@ static PyObject *request_get_values(request_object *self, PyObject *args)
 	if (num_offsets < 0)
 		return NULL;
 
-	type = Py_gpiod_GetGlobalType("Value");
-	if (!type)
-		return NULL;
-
 	iter = PyObject_GetIter(offsets);
 	if (!iter)
 		return NULL;
@@ -183,18 +179,26 @@ static PyObject *request_get_values(request_object *self, PyObject *args)
 	if (ret)
 		return Py_gpiod_SetErrFromErrno();
 
+	type = Py_gpiod_GetModuleAttrString("gpiod.line", "Value");
+	if (!type)
+		return NULL;
+
 	for (pos = 0; pos < num_offsets; pos++) {
 		val = PyObject_CallFunction(type, "i", self->values[pos]);
-		if (!val)
+		if (!val) {
+			Py_DECREF(type);
 			return NULL;
+		}
 
 		ret = PyList_SetItem(values, pos, val);
 		if (ret) {
 			Py_DECREF(val);
+			Py_DECREF(type);
 			return NULL;
 		}
 	}
 
+	Py_DECREF(type);
 	Py_RETURN_NONE;
 }
 
@@ -279,10 +283,6 @@ static PyObject *request_read_edge_events(request_object *self, PyObject *args)
 		max_events = 64;
 	}
 
-	type = Py_gpiod_GetGlobalType("EdgeEvent");
-	if (!type)
-		return NULL;
-
 	Py_BEGIN_ALLOW_THREADS;
 	ret = gpiod_line_request_read_edge_events(self->request,
 						 self->buffer, max_events);
@@ -296,10 +296,17 @@ static PyObject *request_read_edge_events(request_object *self, PyObject *args)
 	if (!events)
 		return NULL;
 
+	type = Py_gpiod_GetModuleAttrString("gpiod.edge_event", "EdgeEvent");
+	if (!type) {
+		Py_DECREF(events);
+		return NULL;
+	}
+
 	for (i = 0; i < num_events; i++) {
 		event = gpiod_edge_event_buffer_get_event(self->buffer, i);
 		if (!event) {
 			Py_DECREF(events);
+			Py_DECREF(type);
 			return NULL;
 		}
 
@@ -311,6 +318,7 @@ static PyObject *request_read_edge_events(request_object *self, PyObject *args)
 				gpiod_edge_event_get_line_seqno(event));
 		if (!event_obj) {
 			Py_DECREF(events);
+			Py_DECREF(type);
 			return NULL;
 		}
 
@@ -318,10 +326,12 @@ static PyObject *request_read_edge_events(request_object *self, PyObject *args)
 		if (ret) {
 			Py_DECREF(event_obj);
 			Py_DECREF(events);
+			Py_DECREF(type);
 			return NULL;
 		}
 	}
 
+	Py_DECREF(type);
 	return events;
 }
 

{gpiod-2.2.0 → gpiod-2.2.2}/gpiod/line_settings.py

@@ -27,7 +27,7 @@ class LineSettings:
     # __repr__ generated by @dataclass uses repr for enum members resulting in
     # an unusable representation as those are of the form: <NAME: $value>
     def __repr__(self):
-        return "gpiod.LineSettings(direction={}, edge_detection={}, bias={}, drive={}, active_low={}, debounce_period={}, event_clock={}, output_value={})".format(
+        return "gpiod.LineSettings(direction=gpiod.line.{}, edge_detection=gpiod.line.{}, bias=gpiod.line.{}, drive=gpiod.line.{}, active_low={}, debounce_period={}, event_clock=gpiod.line.{}, output_value=gpiod.line.{})".format(
             str(self.direction),
             str(self.edge_detection),
             str(self.bias),

{gpiod-2.2.0 → gpiod-2.2.2}/gpiod/version.py

@@ -2,4 +2,4 @@
 # SPDX-FileCopyrightText: 2022 Linaro Ltd.
 # SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
 
-__version__ = "2.2.0"
+__version__ = "2.2.2"

{gpiod-2.2.0 → gpiod-2.2.2/gpiod.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gpiod
-Version: 2.2.0
+Version: 2.2.2
 Summary: Python bindings for libgpiod
 Home-page: https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git
 Author: Bartosz Golaszewski

{gpiod-2.2.0 → gpiod-2.2.2}/include/gpiod.h

@@ -246,7 +246,7 @@ int gpiod_chip_get_fd(struct gpiod_chip *chip);
  *        on the chip.
  * @param chip GPIO chip object.
  * @param timeout_ns Wait time limit in nanoseconds. If set to 0, the function
- *                   returns immediatelly. If set to a negative number, the
+ *                   returns immediately. If set to a negative number, the
  *                   function blocks indefinitely until an event becomes
  *                   available.
  * @return 0 if wait timed out, -1 if an error occurred, 1 if an event is
@@ -498,10 +498,10 @@ bool gpiod_line_info_is_used(struct gpiod_line_info *info);
  * @brief Get the name of the consumer of the line.
  * @param info GPIO line info object.
  * @return Name of the GPIO consumer as it is represented in the kernel.
- *        This function returns a valid pointer to a null-terminated string
- *        or NULL if the consumer name is not set.
- *        The string lifetime is tied to the line info object so the pointer
- *        must not be freed.
+ *         This function returns a valid pointer to a null-terminated string
+ *         or NULL if the consumer name is not set.
+ *         The string lifetime is tied to the line info object so the pointer
+ *         must not be freed.
  */
 const char *gpiod_line_info_get_consumer(struct gpiod_line_info *info);
 
@@ -509,7 +509,7 @@ const char *gpiod_line_info_get_consumer(struct gpiod_line_info *info);
  * @brief Get the direction setting of the line.
  * @param info GPIO line info object.
  * @return Returns ::GPIOD_LINE_DIRECTION_INPUT or
- *        ::GPIOD_LINE_DIRECTION_OUTPUT.
+ *         ::GPIOD_LINE_DIRECTION_OUTPUT.
  */
 enum gpiod_line_direction
 gpiod_line_info_get_direction(struct gpiod_line_info *info);
@@ -518,7 +518,7 @@ gpiod_line_info_get_direction(struct gpiod_line_info *info);
  * @brief Get the edge detection setting of the line.
  * @param info GPIO line info object.
  * @return Returns ::GPIOD_LINE_EDGE_NONE, ::GPIOD_LINE_EDGE_RISING,
- *        ::GPIOD_LINE_EDGE_FALLING or ::GPIOD_LINE_EDGE_BOTH.
+ *         ::GPIOD_LINE_EDGE_FALLING or ::GPIOD_LINE_EDGE_BOTH.
  */
 enum gpiod_line_edge
 gpiod_line_info_get_edge_detection(struct gpiod_line_info *info);
@@ -1164,7 +1164,7 @@ int gpiod_line_request_get_fd(struct gpiod_line_request *request);
  * @brief Wait for edge events on any of the requested lines.
  * @param request GPIO line request.
  * @param timeout_ns Wait time limit in nanoseconds. If set to 0, the function
- *                   returns immediatelly. If set to a negative number, the
+ *                   returns immediately. If set to a negative number, the
  *                   function blocks indefinitely until an event becomes
  *                   available.
  * @return 0 if wait timed out, -1 if an error occurred, 1 if an event is

{gpiod-2.2.0 → gpiod-2.2.2}/lib/chip-info.c

@@ -10,8 +10,8 @@
 
 struct gpiod_chip_info {
 	size_t num_lines;
-	char name[32];
-	char label[32];
+	char name[GPIO_MAX_NAME_SIZE + 1];
+	char label[GPIO_MAX_NAME_SIZE + 1];
 };
 
 GPIOD_API void gpiod_chip_info_free(struct gpiod_chip_info *info)

{gpiod-2.2.0 → gpiod-2.2.2}/lib/line-info.c

@@ -10,9 +10,9 @@
 
 struct gpiod_line_info {
 	unsigned int offset;
-	char name[GPIO_MAX_NAME_SIZE];
+	char name[GPIO_MAX_NAME_SIZE + 1];
 	bool used;
-	char consumer[GPIO_MAX_NAME_SIZE];
+	char consumer[GPIO_MAX_NAME_SIZE + 1];
 	enum gpiod_line_direction direction;
 	bool active_low;
 	enum gpiod_line_bias bias;

gpiod-2.2.2/libgpiod-version.txt

@@ -0,0 +1 @@
+2.2

{gpiod-2.2.0 → gpiod-2.2.2}/setup.py

@@ -70,6 +70,7 @@ def fetch_tarball(command):
     def wrapper(self):
         # Just-in-time import of tarfile and urllib.request so these are
         # not required for Yocto to build a vendored or linked package
+        import sys
         import tarfile
         from tempfile import TemporaryDirectory
         from urllib.request import urlretrieve
@@ -122,7 +123,10 @@ def fetch_tarball(command):
             # Unpack the downloaded tarball
             log.info(f"unpacking: {tarball_filename}")
             with tarfile.open(downloaded_tarball) as f:
-                f.extractall(temp_dir)
+                if sys.version_info < (3, 12):
+                    f.extractall(temp_dir)
+                else:
+                    f.extractall(temp_dir, filter=tarfile.fully_trusted_filter)
 
             # Copy the include and lib directories we need to build libgpiod
             base_dir = path.join(temp_dir, f"libgpiod-{LIBGPIOD_VERSION}")

{gpiod-2.2.0 → gpiod-2.2.2}/tests/tests_line_settings.py

@@ -69,7 +69,7 @@ class LineSettingsStringRepresentation(TestCase):
     def test_repr(self):
         self.assertEqual(
             repr(self.settings),
-            "gpiod.LineSettings(direction=Direction.OUTPUT, edge_detection=Edge.NONE, bias=Bias.AS_IS, drive=Drive.OPEN_SOURCE, active_low=True, debounce_period=datetime.timedelta(0), event_clock=Clock.MONOTONIC, output_value=Value.INACTIVE)",
+            "gpiod.LineSettings(direction=gpiod.line.Direction.OUTPUT, edge_detection=gpiod.line.Edge.NONE, bias=gpiod.line.Bias.AS_IS, drive=gpiod.line.Drive.OPEN_SOURCE, active_low=True, debounce_period=datetime.timedelta(0), event_clock=gpiod.line.Clock.MONOTONIC, output_value=gpiod.line.Value.INACTIVE)",
         )
 
         cmp = eval(repr(self.settings))

gpiod-2.2.0/libgpiod-version.txt

@@ -1 +0,0 @@
-2.1.2