From 6573e284be278ef5f8f2d78c53011c74179c27d0 Mon Sep 17 00:00:00 2001 From: Dom Amato Date: Tue, 24 Mar 2020 17:28:10 -0500 Subject: [PATCH] remove extraneous parenthesis --- Hologram/Api/Api.py | 2 +- Hologram/Authentication/AES/AESCipher.py | 2 +- Hologram/Authentication/Authentication.py | 2 +- Hologram/Cloud.py | 2 +- Hologram/Event/Event.py | 2 +- Hologram/Network/Modem/DriverLoader.py | 7 +------ Hologram/Network/Modem/IModem.py | 2 +- Hologram/Network/Modem/ModemMode/ModemMode.py | 2 +- Hologram/Network/Modem/ModemMode/pppd.py | 2 +- Hologram/Network/Network.py | 2 +- Hologram/Network/NetworkManager.py | 2 +- Hologram/Network/Route.py | 2 +- UtilClasses/UtilClasses.py | 6 +++--- tests/Authentication/test_CSRPSKAuthentication.py | 2 +- tests/Authentication/test_HologramAuthentication.py | 2 +- tests/Event/test_Event.py | 2 +- tests/MessageMode/test_Cloud.py | 2 +- tests/MessageMode/test_CustomCloud.py | 2 +- tests/MessageMode/test_HologramCloud.py | 2 +- tests/Modem/test_Modem.py | 2 +- tests/ModemMode/test_ModemMode.py | 2 +- tests/ModemMode/test_PPP.py | 2 +- tests/Network/test_Cellular.py | 2 +- tests/Network/test_Ethernet.py | 2 +- tests/Network/test_Network.py | 2 +- tests/Network/test_NetworkManager.py | 2 +- 26 files changed, 28 insertions(+), 33 deletions(-) diff --git a/Hologram/Api/Api.py b/Hologram/Api/Api.py index dc49edb..acb28e0 100644 --- a/Hologram/Api/Api.py +++ b/Hologram/Api/Api.py @@ -14,7 +14,7 @@ HOLOGRAM_REST_API_BASEURL = 'https://dashboard.hologram.io/api/1' -class Api(): +class Api: def __init__(self, apikey='', username='', password=''): # Logging setup. diff --git a/Hologram/Authentication/AES/AESCipher.py b/Hologram/Authentication/AES/AESCipher.py index 3ddccd4..7032112 100644 --- a/Hologram/Authentication/AES/AESCipher.py +++ b/Hologram/Authentication/AES/AESCipher.py @@ -12,7 +12,7 @@ from cryptography.hazmat.primitives import padding from cryptography.hazmat.backends import default_backend -class AESCipher(): +class AESCipher: # EFFECTS: Constructor that sets the IV to def __init__(self, iv, key): diff --git a/Hologram/Authentication/Authentication.py b/Hologram/Authentication/Authentication.py index 0261815..ed324b5 100644 --- a/Hologram/Authentication/Authentication.py +++ b/Hologram/Authentication/Authentication.py @@ -10,7 +10,7 @@ import logging from logging import NullHandler -class Authentication(): +class Authentication: def __init__(self, credentials): self.credentials = credentials diff --git a/Hologram/Cloud.py b/Hologram/Cloud.py index 9907444..680dfcb 100644 --- a/Hologram/Cloud.py +++ b/Hologram/Cloud.py @@ -15,7 +15,7 @@ __version__ = '0.9.0' -class Cloud(): +class Cloud: def __repr__(self): return type(self).__name__ diff --git a/Hologram/Event/Event.py b/Hologram/Event/Event.py index 1b87109..340ee3b 100644 --- a/Hologram/Event/Event.py +++ b/Hologram/Event/Event.py @@ -8,7 +8,7 @@ # LICENSE: Distributed under the terms of the MIT License import logging -class Event(): +class Event: _funcLookupTable = {} def __init__(self): self.__dict__ = self._funcLookupTable diff --git a/Hologram/Network/Modem/DriverLoader.py b/Hologram/Network/Modem/DriverLoader.py index 68aaf67..cd29212 100644 --- a/Hologram/Network/Modem/DriverLoader.py +++ b/Hologram/Network/Modem/DriverLoader.py @@ -13,7 +13,7 @@ import subprocess -class DriverLoader(): +class DriverLoader: # I would much rather use python-kmod for all this # but it doesn't seem to build properly on the Pi and # hasn't been updated in years. It's possible we need to update @@ -37,8 +37,3 @@ def load_module(self, module): def force_driver_for_device(self, syspath, vid, pid): with open(syspath, "w") as f: f.write("%s %s"%(vid, pid)) - - - - - diff --git a/Hologram/Network/Modem/IModem.py b/Hologram/Network/Modem/IModem.py index 80b86d1..654dd75 100644 --- a/Hologram/Network/Modem/IModem.py +++ b/Hologram/Network/Modem/IModem.py @@ -17,7 +17,7 @@ MODEM_TIMEOUT = -1 MODEM_OK = 0 -class IModem(): +class IModem: usb_ids = [] # module needed by modem diff --git a/Hologram/Network/Modem/ModemMode/ModemMode.py b/Hologram/Network/Modem/ModemMode/ModemMode.py index 08489cd..7ce6f2b 100644 --- a/Hologram/Network/Modem/ModemMode/ModemMode.py +++ b/Hologram/Network/Modem/ModemMode/ModemMode.py @@ -11,7 +11,7 @@ from logging import NullHandler from Hologram.Event import Event -class ModemMode(): +class ModemMode: def __repr__(self): return type(self).__name__ diff --git a/Hologram/Network/Modem/ModemMode/pppd.py b/Hologram/Network/Modem/ModemMode/pppd.py index 2cc6518..f33f7e8 100644 --- a/Hologram/Network/Modem/ModemMode/pppd.py +++ b/Hologram/Network/Modem/ModemMode/pppd.py @@ -23,7 +23,7 @@ __version__ = '1.0.3' DEFAULT_CONNECT_TIMEOUT = 200 -class PPPConnection(): +class PPPConnection: def __repr__(self): return type(self).__name__ diff --git a/Hologram/Network/Network.py b/Hologram/Network/Network.py index b3b5634..9f99fee 100644 --- a/Hologram/Network/Network.py +++ b/Hologram/Network/Network.py @@ -19,7 +19,7 @@ class NetworkScope(Enum): HOLOGRAM = 2 -class Network(): +class Network: def __repr__(self): return type(self).__name__ diff --git a/Hologram/Network/NetworkManager.py b/Hologram/Network/NetworkManager.py index 28c845e..e086647 100644 --- a/Hologram/Network/NetworkManager.py +++ b/Hologram/Network/NetworkManager.py @@ -17,7 +17,7 @@ DEFAULT_NETWORK_TIMEOUT = 200 -class NetworkManager(): +class NetworkManager: _networkHandlers = { 'wifi' : Wifi.Wifi, diff --git a/Hologram/Network/Route.py b/Hologram/Network/Route.py index 892aaa1..b7338ba 100644 --- a/Hologram/Network/Route.py +++ b/Hologram/Network/Route.py @@ -18,7 +18,7 @@ DEFAULT_DESTINATION = '0.0.0.0/0' -class Route(): +class Route: def __init__(self): self.ipr = IPRoute() self.logger = logging.getLogger(__name__) diff --git a/UtilClasses/UtilClasses.py b/UtilClasses/UtilClasses.py index 99c44fa..3c05c90 100644 --- a/UtilClasses/UtilClasses.py +++ b/UtilClasses/UtilClasses.py @@ -11,7 +11,7 @@ import threading -class Location(): +class Location: def __init__(self, date=None, time=None, latitude=None, longitude=None, altitude=None, uncertainty=None): @@ -25,7 +25,7 @@ def __init__(self, date=None, time=None, latitude=None, longitude=None, def __repr__(self): return type(self).__name__ -class SMS(): +class SMS: def __init__(self, sender, timestamp, message): self.sender = sender @@ -48,7 +48,7 @@ class ModemResult: Timeout = 'Timeout' OK = 'OK' -class RWLock(): +class RWLock: def __init__(self): self.mutex = threading.Condition() diff --git a/tests/Authentication/test_CSRPSKAuthentication.py b/tests/Authentication/test_CSRPSKAuthentication.py index 34b0a8d..9f71a87 100644 --- a/tests/Authentication/test_CSRPSKAuthentication.py +++ b/tests/Authentication/test_CSRPSKAuthentication.py @@ -15,7 +15,7 @@ sys.path.append("../..") from Hologram.Authentication.CSRPSKAuthentication import CSRPSKAuthentication -class TestCSRPSKAuthentication(): +class TestCSRPSKAuthentication: def test_create(self): credentials = {'devicekey': '12345678'} diff --git a/tests/Authentication/test_HologramAuthentication.py b/tests/Authentication/test_HologramAuthentication.py index aeb0c5e..a69bf4d 100644 --- a/tests/Authentication/test_HologramAuthentication.py +++ b/tests/Authentication/test_HologramAuthentication.py @@ -17,7 +17,7 @@ credentials = {'devicekey': '12345678'} -class TestHologramAuthentication(): +class TestHologramAuthentication: def test_create(self): auth = HologramAuthentication(credentials) diff --git a/tests/Event/test_Event.py b/tests/Event/test_Event.py index 175b264..8229117 100644 --- a/tests/Event/test_Event.py +++ b/tests/Event/test_Event.py @@ -14,7 +14,7 @@ sys.path.append("../..") from Hologram.Event import Event -class TestEvent(): +class TestEvent: def test_create(self): event = Event() diff --git a/tests/MessageMode/test_Cloud.py b/tests/MessageMode/test_Cloud.py index 4b5b4ef..c7dbda1 100644 --- a/tests/MessageMode/test_Cloud.py +++ b/tests/MessageMode/test_Cloud.py @@ -14,7 +14,7 @@ from Hologram.Authentication import * from Hologram.Cloud import Cloud -class TestCloud(): +class TestCloud: def test_create_send(self): cloud = Cloud(None, send_host = '127.0.0.1', send_port = 9999) diff --git a/tests/MessageMode/test_CustomCloud.py b/tests/MessageMode/test_CustomCloud.py index 14ffd2c..d7cd9e4 100644 --- a/tests/MessageMode/test_CustomCloud.py +++ b/tests/MessageMode/test_CustomCloud.py @@ -14,7 +14,7 @@ from Hologram.Authentication import * from Hologram.CustomCloud import CustomCloud -class TestCustomCloud(): +class TestCustomCloud: def test_create_send(self): customCloud = CustomCloud(None, send_host='127.0.0.1', diff --git a/tests/MessageMode/test_HologramCloud.py b/tests/MessageMode/test_HologramCloud.py index 86e627f..e2d328d 100644 --- a/tests/MessageMode/test_HologramCloud.py +++ b/tests/MessageMode/test_HologramCloud.py @@ -16,7 +16,7 @@ credentials = {'devicekey':'12345678'} -class TestHologramCloud(): +class TestHologramCloud: def test_create(self): hologram = HologramCloud(credentials, enable_inbound = False) diff --git a/tests/Modem/test_Modem.py b/tests/Modem/test_Modem.py index 4d18b58..b303e50 100644 --- a/tests/Modem/test_Modem.py +++ b/tests/Modem/test_Modem.py @@ -177,7 +177,7 @@ def test_command_result(no_serial_port): # These are static methods that can be tested independently. # We decided to wrap it all here under this test object -class TestModemProtectedStaticMethods(): +class TestModemProtectedStaticMethods: def test_check_registered_string(self): result = '+CREG: 2,5,"5585","404C790",6' diff --git a/tests/ModemMode/test_ModemMode.py b/tests/ModemMode/test_ModemMode.py index 5eebfd2..c942e02 100644 --- a/tests/ModemMode/test_ModemMode.py +++ b/tests/ModemMode/test_ModemMode.py @@ -12,7 +12,7 @@ sys.path.append("../..") from Hologram.Network.Modem.ModemMode.ModemMode import ModemMode -class TestModemMode(): +class TestModemMode: def test_modem_mode_create(self): modem_mode = ModemMode(device_name='/dev/ttyUSB0', baud_rate='9600') diff --git a/tests/ModemMode/test_PPP.py b/tests/ModemMode/test_PPP.py index a3932f4..1f68c8a 100644 --- a/tests/ModemMode/test_PPP.py +++ b/tests/ModemMode/test_PPP.py @@ -13,7 +13,7 @@ sys.path.append("../..") from Hologram.Network.Modem.ModemMode.MockPPP import MockPPP -class TestPPP(): +class TestPPP: def test_ppp_create(self): ppp = MockPPP(chatscript_file='test') diff --git a/tests/Network/test_Cellular.py b/tests/Network/test_Cellular.py index a74d6d1..52f6e95 100644 --- a/tests/Network/test_Cellular.py +++ b/tests/Network/test_Cellular.py @@ -14,7 +14,7 @@ sys.path.append("../..") from Hologram.Network import Cellular -class TestCellular(): +class TestCellular: def test_invalid_cellular_type(self): pass diff --git a/tests/Network/test_Ethernet.py b/tests/Network/test_Ethernet.py index 5fa053d..f68634e 100644 --- a/tests/Network/test_Ethernet.py +++ b/tests/Network/test_Ethernet.py @@ -14,7 +14,7 @@ sys.path.append("../..") from Hologram.Network import Ethernet -class TestEthernet(): +class TestEthernet: def test_Ethernet(self): ethernet = Ethernet.Ethernet() diff --git a/tests/Network/test_Network.py b/tests/Network/test_Network.py index 48980ab..ce36fdf 100644 --- a/tests/Network/test_Network.py +++ b/tests/Network/test_Network.py @@ -14,7 +14,7 @@ sys.path.append("../..") from Hologram.Network import Network -class TestNetwork(): +class TestNetwork: def test_create_network(self): network = Network() diff --git a/tests/Network/test_NetworkManager.py b/tests/Network/test_NetworkManager.py index 07a3db2..d941a45 100644 --- a/tests/Network/test_NetworkManager.py +++ b/tests/Network/test_NetworkManager.py @@ -14,7 +14,7 @@ sys.path.append("../..") from Hologram.Network import NetworkManager -class TestNetworkManager(): +class TestNetworkManager: def test_create_non_network(self): networkManager = NetworkManager.NetworkManager(None, '')