From 07c420ee130055e8fda03aec4b113c79b3e41edf Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Sun, 23 Aug 2020 11:01:52 -0500 Subject: [PATCH 1/3] remove bad-whitespace pylint directive --- adafruit_wiznet5k/adafruit_wiznet5k.py | 2 -- adafruit_wiznet5k/adafruit_wiznet5k_dhcp.py | 2 -- adafruit_wiznet5k/adafruit_wiznet5k_dns.py | 2 -- adafruit_wiznet5k/adafruit_wiznet5k_socket.py | 2 -- 4 files changed, 8 deletions(-) diff --git a/adafruit_wiznet5k/adafruit_wiznet5k.py b/adafruit_wiznet5k/adafruit_wiznet5k.py index db71c7c..5c4aa6e 100755 --- a/adafruit_wiznet5k/adafruit_wiznet5k.py +++ b/adafruit_wiznet5k/adafruit_wiznet5k.py @@ -53,7 +53,6 @@ __version__ = "0.0.0-auto.0" __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_Wiznet5k.git" -# pylint: disable=bad-whitespace # Wiznet5k Registers REG_MR = const(0x0000) # Mode @@ -124,7 +123,6 @@ SNMR_MACRAW = const(0x04) SNMR_PPPOE = const(0x05) -# pylint: enable=bad-whitespace MAX_PACKET = const(4000) LOCAL_PORT = const(0x400) # Default hardware MAC address diff --git a/adafruit_wiznet5k/adafruit_wiznet5k_dhcp.py b/adafruit_wiznet5k/adafruit_wiznet5k_dhcp.py index a52d4d1..b435b73 100755 --- a/adafruit_wiznet5k/adafruit_wiznet5k_dhcp.py +++ b/adafruit_wiznet5k/adafruit_wiznet5k_dhcp.py @@ -36,7 +36,6 @@ import adafruit_wiznet5k.adafruit_wiznet5k_socket as socket from adafruit_wiznet5k.adafruit_wiznet5k_socket import htonl, htons -# pylint: disable=bad-whitespace # DHCP State Machine STATE_DHCP_START = const(0x00) @@ -87,7 +86,6 @@ OPT_END = 255 -# pylint: enable=bad-whitespace _BUFF = bytearray(317) diff --git a/adafruit_wiznet5k/adafruit_wiznet5k_dns.py b/adafruit_wiznet5k/adafruit_wiznet5k_dns.py index 5f02592..f7ed657 100755 --- a/adafruit_wiznet5k/adafruit_wiznet5k_dns.py +++ b/adafruit_wiznet5k/adafruit_wiznet5k_dns.py @@ -36,7 +36,6 @@ import adafruit_wiznet5k.adafruit_wiznet5k_socket as socket from adafruit_wiznet5k.adafruit_wiznet5k_socket import htons -# pylint: disable=bad-whitespace QUERY_FLAG = const(0x00) OPCODE_STANDARD_QUERY = const(0x00) @@ -54,7 +53,6 @@ INVALID_RESPONSE = const(-4) DNS_PORT = const(0x35) # port used for DNS request -# pylint: enable=bad-whitespace class DNS: diff --git a/adafruit_wiznet5k/adafruit_wiznet5k_socket.py b/adafruit_wiznet5k/adafruit_wiznet5k_socket.py index fd13919..35fea21 100755 --- a/adafruit_wiznet5k/adafruit_wiznet5k_socket.py +++ b/adafruit_wiznet5k/adafruit_wiznet5k_socket.py @@ -58,13 +58,11 @@ def htons(x): return (((x) << 8) & 0xFF00) | (((x) >> 8) & 0xFF) -# pylint: disable=bad-whitespace SOCK_STREAM = const(0x21) # TCP TCP_MODE = 80 SOCK_DGRAM = const(0x02) # UDP AF_INET = const(3) NO_SOCKET_AVAIL = const(255) -# pylint: enable=bad-whitespace # keep track of sockets we allocate SOCKETS = [] From 0da46209640dbee95e252956c36072992d247a67 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Mon, 24 Aug 2020 16:00:07 -0500 Subject: [PATCH 2/3] address pylint raise-missing-from diagnostics --- examples/wiznet5k_cheerlights.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/wiznet5k_cheerlights.py b/examples/wiznet5k_cheerlights.py index fcdeb1b..8c86496 100755 --- a/examples/wiznet5k_cheerlights.py +++ b/examples/wiznet5k_cheerlights.py @@ -51,7 +51,7 @@ raise AssertionError( "Failed to resolve hostname, \ please check your router's DNS configuration." - ) + ) from error continue if not value: continue From 18e9648f0bb4976ef5ebb6d92a10c173504eb3a8 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Mon, 24 Aug 2020 16:08:54 -0500 Subject: [PATCH 3/3] try to address wrong-import-order diagnostics --- examples/wiznet5k_aio_post.py | 2 +- examples/wiznet5k_cheerlights.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/wiznet5k_aio_post.py b/examples/wiznet5k_aio_post.py index 5634677..c1c5e3c 100644 --- a/examples/wiznet5k_aio_post.py +++ b/examples/wiznet5k_aio_post.py @@ -2,9 +2,9 @@ import board import busio from digitalio import DigitalInOut +import adafruit_requests as requests from adafruit_wiznet5k.adafruit_wiznet5k import WIZNET5K import adafruit_wiznet5k.adafruit_wiznet5k_socket as socket -import adafruit_requests as requests # Get Adafruit.io details from a secrets.py file try: diff --git a/examples/wiznet5k_cheerlights.py b/examples/wiznet5k_cheerlights.py index 8c86496..89bcc78 100755 --- a/examples/wiznet5k_cheerlights.py +++ b/examples/wiznet5k_cheerlights.py @@ -3,12 +3,12 @@ import busio from digitalio import DigitalInOut -from adafruit_wiznet5k.adafruit_wiznet5k import WIZNET5K -import adafruit_wiznet5k.adafruit_wiznet5k_socket as socket import adafruit_requests as requests import neopixel import adafruit_fancyled.adafruit_fancyled as fancy +from adafruit_wiznet5k.adafruit_wiznet5k import WIZNET5K +import adafruit_wiznet5k.adafruit_wiznet5k_socket as socket cs = DigitalInOut(board.D10) spi_bus = busio.SPI(board.SCK, MOSI=board.MOSI, MISO=board.MISO)