More fixes, goal is code quality of 6

Author: beneschtech

picorpcserver/httprequest.py

@@ -6,7 +6,6 @@
 import socket
 from .netmgr import NetMgr
 class HTTPRequest:
-    
     raw_msg = ""
     hsock = None
     nmgr = None
@@ -16,7 +15,7 @@ class HTTPRequest:
     method = ""
     uri = ""
     protocol = ""
-    
+
     def __init__(self,nm,sock):
         """
         Initializes the http server, it requires the following parameters
@@ -30,25 +29,25 @@ def __init__(self,nm,sock):
             print("HTTPRequest::__init__")
         self.raw_msg = nm.read_all(sock)
         self._parse()
-        
+
     def socket(self):
         """
         Returns the listening socket used to create this object
         """
         return self.hsock
-    
+
     def net_manager(self):
         """
         Returns the connected NetMgr object used to construct the object
         """
         return self.nmgr
-    
+
     def raw_message(self):
         """
         Returns the raw message read from the socket to process
         """
         return self.raw_msg
-    
+
     def _parse(self):
         """
         Parses the message filling in the method, url, headers, and raw message sent.
@@ -79,7 +78,7 @@ def _parse(self):
         if self.verbose:
             print(self.headers)
         return True
-        
+
     def method(self):
         """
         The method used for this request, usually POST or GET
@@ -103,14 +102,14 @@ def payload(self):
         The raw data sent after the headers. Will be blank if its a get request
         """
         return self.payload
-    
+
     def headerval(self,key):
         """
         Returns a case insensitive match for a header and retrieve its value
         """
         if self.verbose:
             print(f"HTTPRequest::headerval ({key})")
-        
+
         cmpkey = key.lower()
         for k in self.headers:
             if k.lower() == cmpkey:

picorpcserver/netmgr.py

@@ -1,12 +1,16 @@
-import network
+"""
+The network manager class, manages reads/writes/connections, etc..
+It supports static addresses and dhcp, but only supports ipv4
+That is due to the underlying micropython methods
+"""
 import socket
 from time import sleep
 import machine
+import network
 
 WIFI_TIMEOUT = 10
 
 class NetMgr:
-    
     led = None
     wlan = None
     ssid = ""
@@ -15,7 +19,7 @@ class NetMgr:
     connection = None
     PAGE_SIZE = 4096
     verbose = False    
-    
+
     def __init__(self,ssid,passwd,ifconfig=None,verbose=False):
         self.ssid = ssid
         self.passw = passwd
@@ -30,17 +34,17 @@ def __init__(self,ssid,passwd,ifconfig=None,verbose=False):
         self.wlan.connect(ssid,passwd)
         if verbose:
             print("NetMgr::__init__")
-            
+
     def __del__(self):
         if verbose:
             print("NetMgr::__del__")        
         self.connection.close()
         self.wlan.disconnect()
         self.led.off()
-        
+
     def is_connected(self):
         return self.wlan.isconnected()
-    
+
     def if_config(self):
         return self.wlan.ifconfig()
 
@@ -64,7 +68,7 @@ def wait_for_connected(self):
                 self.net_fail()
 
         return self.wlan.isconnected()
-                
+
     def bind_to_port(self,port):
         if self.verbose:
             print(f"NetMgr::bind_to_port({port})")
@@ -94,7 +98,7 @@ def next_request(self):
         if self.verbose:
             print(f"NetMgr::next_request Connection from {acc[1]}")
         return acc[0]
-    
+
     def read_all(self,sock):
         rv = ""
         inbytes = sock.recv(NetMgr.PAGE_SIZE)
@@ -105,7 +109,7 @@ def read_all(self,sock):
         if self.verbose:
             print(f"NetMgr::read_all Read {len(rv)} bytes")
         return rv
-    
+
     def read(self,sock,sz):
         if sz == -1:
             return self.read_all(sock)
@@ -118,7 +122,7 @@ def read(self,sock,sz):
         if self.verbose:
             print(f"NetMgr::read Read {len(rv)} bytes")
         return rv
-            
+
     def write(self,sock: socket.socket,data: bytes):
         sz = len(data)
         sent = sock.write(data)
@@ -127,7 +131,7 @@ def write(self,sock: socket.socket,data: bytes):
         if self.verbose:
             print(f"NetMgr::write Wrote {sent} bytes")
         return sent
-        
+
     def close(self):
         if self.verbose:
             print("NetMgr::close")
@@ -136,7 +140,7 @@ def close(self):
             self.connection = None
         self.wlan.disconnect()
         self.led.off()
-        
+
     def net_fail(self):
       while ( 1 == 1 ):
         sleep(0.25)