From 9ebaed0882a8314316fc20733a1c1c43c4b539be Mon Sep 17 00:00:00 2001 From: brentru Date: Thu, 29 Aug 2019 12:32:47 -0400 Subject: [PATCH 1/4] switch write to send, reflecting socket module --- adafruit_esp32spi/adafruit_esp32spi_socket.py | 2 +- adafruit_esp32spi/adafruit_esp32spi_wsgiserver.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/adafruit_esp32spi/adafruit_esp32spi_socket.py b/adafruit_esp32spi/adafruit_esp32spi_socket.py index f5c288b..22cc55d 100644 --- a/adafruit_esp32spi/adafruit_esp32spi_socket.py +++ b/adafruit_esp32spi/adafruit_esp32spi_socket.py @@ -84,7 +84,7 @@ def connect(self, address, conntype=None): raise RuntimeError("Failed to connect to host", host) self._buffer = b'' - def write(self, data): # pylint: disable=no-self-use + def send(self, data): # pylint: disable=no-self-use """Send some data to the socket""" _the_interface.socket_write(self._socknum, data) gc.collect() diff --git a/adafruit_esp32spi/adafruit_esp32spi_wsgiserver.py b/adafruit_esp32spi/adafruit_esp32spi_wsgiserver.py index 8bd15b4..eb1b906 100644 --- a/adafruit_esp32spi/adafruit_esp32spi_wsgiserver.py +++ b/adafruit_esp32spi/adafruit_esp32spi_wsgiserver.py @@ -115,12 +115,12 @@ def finish_response(self, result): for header in self._response_headers: response += "{0}: {1}\r\n".format(*header) response += "\r\n" - self._client_sock.write(response.encode("utf-8")) + self._client_sock.send(response.encode("utf-8")) for data in result: if isinstance(data, bytes): - self._client_sock.write(data) + self._client_sock.send(data) else: - self._client_sock.write(data.encode("utf-8")) + self._client_sock.send(data.encode("utf-8")) gc.collect() finally: print("closing") From 8a1455d4d6befe7fb0132efd66aea8ee8ce950b0 Mon Sep 17 00:00:00 2001 From: brentru Date: Thu, 29 Aug 2019 13:30:49 -0400 Subject: [PATCH 2/4] add write method --- adafruit_esp32spi/adafruit_esp32spi_socket.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/adafruit_esp32spi/adafruit_esp32spi_socket.py b/adafruit_esp32spi/adafruit_esp32spi_socket.py index 22cc55d..07e394d 100644 --- a/adafruit_esp32spi/adafruit_esp32spi_socket.py +++ b/adafruit_esp32spi/adafruit_esp32spi_socket.py @@ -89,6 +89,9 @@ def send(self, data): # pylint: disable=no-self-use _the_interface.socket_write(self._socknum, data) gc.collect() + def write(self, data): + self.send(data) + def readline(self): """Attempt to return as many bytes as we can up to but not including '\r\n'""" #print("Socket readline") From bbc3004866cd467d80ed70a26363b1636b16b964 Mon Sep 17 00:00:00 2001 From: brentru Date: Thu, 29 Aug 2019 13:35:42 -0400 Subject: [PATCH 3/4] add docstring --- adafruit_esp32spi/adafruit_esp32spi_socket.py | 1 + 1 file changed, 1 insertion(+) diff --git a/adafruit_esp32spi/adafruit_esp32spi_socket.py b/adafruit_esp32spi/adafruit_esp32spi_socket.py index 07e394d..69d1a1d 100644 --- a/adafruit_esp32spi/adafruit_esp32spi_socket.py +++ b/adafruit_esp32spi/adafruit_esp32spi_socket.py @@ -90,6 +90,7 @@ def send(self, data): # pylint: disable=no-self-use gc.collect() def write(self, data): + """Sends data to the socket.""" self.send(data) def readline(self): From 1cfeb40103451675293513de32d8ad36af4ecffd Mon Sep 17 00:00:00 2001 From: brentru Date: Thu, 29 Aug 2019 13:39:00 -0400 Subject: [PATCH 4/4] add deprecated note to docstring --- adafruit_esp32spi/adafruit_esp32spi_socket.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/adafruit_esp32spi/adafruit_esp32spi_socket.py b/adafruit_esp32spi/adafruit_esp32spi_socket.py index 69d1a1d..a9dd2cf 100644 --- a/adafruit_esp32spi/adafruit_esp32spi_socket.py +++ b/adafruit_esp32spi/adafruit_esp32spi_socket.py @@ -90,7 +90,9 @@ def send(self, data): # pylint: disable=no-self-use gc.collect() def write(self, data): - """Sends data to the socket.""" + """Sends data to the socket. + NOTE: This method is deprecated and will be removed. + """ self.send(data) def readline(self):