From 3575a0e005f32bb40dcbbd42e749a84189617bb6 Mon Sep 17 00:00:00 2001 From: Justin Myers Date: Mon, 20 May 2024 15:53:49 -0700 Subject: [PATCH 1/2] Remove SocketPoolContants --- adafruit_esp32spi/adafruit_esp32spi_socketpool.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/adafruit_esp32spi/adafruit_esp32spi_socketpool.py b/adafruit_esp32spi/adafruit_esp32spi_socketpool.py index 65226fe..1540c88 100644 --- a/adafruit_esp32spi/adafruit_esp32spi_socketpool.py +++ b/adafruit_esp32spi/adafruit_esp32spi_socketpool.py @@ -29,8 +29,8 @@ _global_socketpool = {} -class SocketPoolContants: # pylint: disable=too-few-public-methods - """Helper class for the constants that are needed everywhere""" +class SocketPool: + """ESP32SPI SocketPool library""" SOCK_STREAM = const(0) SOCK_DGRAM = const(1) @@ -39,10 +39,6 @@ class SocketPoolContants: # pylint: disable=too-few-public-methods MAX_PACKET = const(4000) - -class SocketPool(SocketPoolContants): - """ESP32SPI SocketPool library""" - def __new__(cls, iface: ESP_SPIcontrol): # We want to make sure to return the same pool for the same interface if iface not in _global_socketpool: @@ -60,12 +56,12 @@ def getaddrinfo( # pylint: disable=too-many-arguments,unused-argument if not isinstance(port, int): raise ValueError("Port must be an integer") ipaddr = self._interface.get_host_by_name(host) - return [(SocketPoolContants.AF_INET, socktype, proto, "", (ipaddr, port))] + return [(SocketPool.AF_INET, socktype, proto, "", (ipaddr, port))] def socket( # pylint: disable=redefined-builtin self, - family=SocketPoolContants.AF_INET, - type=SocketPoolContants.SOCK_STREAM, + family=AF_INET, + type=SOCK_STREAM, proto=0, fileno=None, ): From b16026756861facfb7fc2c362f8a0ea276590162 Mon Sep 17 00:00:00 2001 From: Justin Myers Date: Mon, 20 May 2024 22:31:10 -0700 Subject: [PATCH 2/2] Remove timeout Exception --- adafruit_esp32spi/adafruit_esp32spi_socketpool.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/adafruit_esp32spi/adafruit_esp32spi_socketpool.py b/adafruit_esp32spi/adafruit_esp32spi_socketpool.py index 1540c88..6d8a32e 100644 --- a/adafruit_esp32spi/adafruit_esp32spi_socketpool.py +++ b/adafruit_esp32spi/adafruit_esp32spi_socketpool.py @@ -21,6 +21,7 @@ pass +import errno import time import gc from micropython import const @@ -181,7 +182,7 @@ def recv_into(self, buffer, nbytes: int = 0): break # No bytes yet, or more bytes requested. if self._timeout > 0 and time.monotonic() - last_read_time > self._timeout: - raise timeout("timed out") + raise OSError(errno.ETIMEDOUT) return num_read def settimeout(self, value): @@ -223,11 +224,3 @@ def _connected(self): def close(self): """Close the socket, after reading whatever remains""" self._interface.socket_close(self._socknum) - - -class timeout(TimeoutError): # pylint: disable=invalid-name - """TimeoutError class. An instance of this error will be raised by recv_into() if - the timeout has elapsed and we haven't received any data yet.""" - - def __init__(self, msg): - super().__init__(msg) pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy