flake8 clean up pass

Author: lod

setup.cfg

@@ -1,2 +1,6 @@
 [metadata]
 description-file = README.md
+
+[flake8]
+ignore = E203,E501,E251,E261
+exclude = env,.venv,.tox,dist,*egg,build

setup.py

@@ -1,15 +1,14 @@
-from setuptools import setup, find_packages
-import os
-
-long_description= (
-  'The Victoria State Emergency Service uses an online tool called Viper '
-  'to send Emergency Alerting System (EAS) pages. This online form based '
-  'system is difficult to extend and use in other tools.\n\n'
-  'This module hides the nasty work of interacting with Viper presenting '
-  'a simple interface for scripts to use.'
+from setuptools import setup
+
+long_description = (
+    'The Victoria State Emergency Service uses an online tool called Viper '
+    'to send Emergency Alerting System (EAS) pages. This online form based '
+    'system is difficult to extend and use in other tools.\n\n'
+    'This module hides the nasty work of interacting with Viper presenting '
+    'a simple interface for scripts to use.'
 )
 
-setup (
+setup(
     name='vicses.viper',
     version='1.0.1',
 

tests/test_viper.py

@@ -8,9 +8,9 @@
 import pytest
 from vicses.viper import Viper
 from requests import Response
-import requests
 import requests_mock
 
+
 def test_creation():
     # Initialisation basically takes login password details
     # Multiple creation options to try and leverage default SES values
@@ -31,7 +31,6 @@ def test_creation():
     assert(t2.viper_username == 'flubble')
     assert(t2.viper_password == 'duck')
 
-
     # Override some defaults
     t3 = Viper(ses_id='23', ses_password='alphabet', viper_username='donald', ses_username='duck')
     assert(type(t3) is Viper)
@@ -71,6 +70,7 @@ def test_creation():
     assert('viper_password' in str(e8))
     assert('ses_id' in str(e8))
 
+
 def test_send():
     ses_login_resp = Response()
     ses_login_resp.status_code = 302
@@ -93,6 +93,7 @@ def test_send():
     viper_login_url = 'https://viper.ses.vic.gov.au/ViperWeb/login.do'
 
     responses = []
+
     def send_handler(request):
         if request.path_url == '/ViperWeb/msg/sendMessage.do':
             try:
@@ -115,7 +116,7 @@ def send_handler(request):
     with requests_mock.mock() as m1:
         m1._adapter = adapter # Dodgy but nfi how it is meant to be done
         err1 = t1.send('111', 't1 send')
-    assert(err1 == False)
+    assert(err1 is False)
     assert(m1.request_history.pop(0).url == send_url)
     assert(m1.request_history.pop(0).url == ses_login_url)
     assert(m1.request_history.pop(0).url == send_url)
@@ -130,14 +131,14 @@ def send_handler(request):
     with requests_mock.mock() as m2:
         m2._adapter = adapter # Dodgy but nfi how it is meant to be done
         err2 = t2.send('111', 't1 send')
-    assert(err2 == False)
+    assert(err2 is False)
     assert(m2.request_history.pop(0).url == send_url)
     assert(len(m1.request_history) == 0)
     assert(len(responses) == 0)
 
     # SES auth unsuccessful
     t3 = Viper(ses_id='23', ses_password='alphabet')
-    responses = [ses_login_resp, ses_login_resp, ses_login_resp, ses_login_resp, ses_login_resp] 
+    responses = [ses_login_resp, ses_login_resp, ses_login_resp, ses_login_resp, ses_login_resp]
     with requests_mock.mock() as m3:
         m3._adapter = adapter # Dodgy but nfi how it is meant to be done
         err3 = t3.send('111', 't1 send')
@@ -157,7 +158,7 @@ def send_handler(request):
 
     # Viper auth unsuccessful
     t4 = Viper(ses_id='23', ses_password='alphabet')
-    responses = [ses_login_resp, viper_login_resp, viper_login_resp, viper_login_resp, viper_login_resp] 
+    responses = [ses_login_resp, viper_login_resp, viper_login_resp, viper_login_resp, viper_login_resp]
     with requests_mock.mock() as m4:
         m4._adapter = adapter # Dodgy but nfi how it is meant to be done
         err4 = t4.send('111', 't1 send')
@@ -177,7 +178,7 @@ def send_handler(request):
 
     # Garbage out
     t5 = Viper(ses_id='25', ses_password='alphabet')
-    responses = [basic_resp, basic_resp, basic_resp, basic_resp, basic_resp] 
+    responses = [basic_resp, basic_resp, basic_resp, basic_resp, basic_resp]
     with requests_mock.mock() as m5:
         m5._adapter = adapter # Dodgy but nfi how it is meant to be done
         err5 = t5.send('111', 't1 send')
@@ -192,11 +193,11 @@ def send_handler(request):
 
     # Weird flow
     t6 = Viper(ses_id='23', ses_password='alphabet')
-    responses = [viper_login_resp, basic_resp, ses_login_resp, viper_login_resp, success_resp] 
+    responses = [viper_login_resp, basic_resp, ses_login_resp, viper_login_resp, success_resp]
     with requests_mock.mock() as m6:
         m6._adapter = adapter # Dodgy but nfi how it is meant to be done
         err6 = t6.send('111', 't1 send')
-    assert(err6 == False)
+    assert(err6 is False)
     assert(m3.request_history.pop(0).url == send_url)
     assert(m3.request_history.pop(0).url == viper_login_url)
     assert(m3.request_history.pop(0).url == send_url)
@@ -207,4 +208,3 @@ def send_handler(request):
     assert(m3.request_history.pop(0).url == send_url)
     assert(len(m1.request_history) == 0)
     assert(len(responses) == 0)
-

vicses/viper/__init__.py

@@ -2,19 +2,21 @@
 import requests
 import logging
 
+
 def _str_response(res):
     return 'HTTP/1.1 {status_code}\n{headers}\n\n{body}'.format(
         status_code=res.status_code,
         headers='\n'.join('{}: {}'.format(k, v) for k, v in res.headers.items()),
         body=res.content,
     )
 
+
 class Viper:
     def __init__(self, ses_id=None, ses_password=None, ses_username=None, viper_username=None, viper_password=None):
         if ses_username is not None:
             self.ses_username = ses_username
         elif ses_id is not None:
-            self.ses_username = "ses_{}".format(ses_id) 
+            self.ses_username = "ses_{}".format(ses_id)
         else:
             raise(TypeError("missing required argument 'ses_username', provide either 'ses_username' or 'ses_id'"))
 
@@ -38,7 +40,7 @@ def __init__(self, ses_id=None, ses_password=None, ses_username=None, viper_user
             raise(TypeError("missing required argument 'viper_password', provide either 'viper_password' or 'ses_id'"))
 
         self.logger = logging.getLogger(__name__)
-        self.session = requests.Session() 
+        self.session = requests.Session()
 
     def _login_ses(self):
         r = self.session.post(
@@ -80,22 +82,21 @@ def _send_msg(self, to, msg, priority=3):
         self.logger.debug(_str_response(r))
         return r
 
-
     def send(self, to, msg):
         progress = None
         for i in range(5):
             self.logger.info("Sending page")
             r = self._send_msg(to, msg)
 
-            if (r.status_code == 302 and re.match(r"/_\w+_form", r.headers["Location"]) != None):
+            if (r.status_code == 302 and re.match(r"/_\w+_form", r.headers["Location"]) is not None):
                 self.logger.info("Logging in to SES network")
                 progress = "SES Login"
                 self._login_ses()
             elif (r.status_code == 302 and r.headers["Location"] == "https://viper.ses.vic.gov.au/ViperWeb/login.jsp"):
                 self.logger.info("Logging in to Viper")
                 progress = "Viper Login"
                 self._login_viper()
-            elif (r.status_code == 200 and re.search(r"<td>Message Accepted</td>", r.text) != None):
+            elif (r.status_code == 200 and re.search(r"<td>Message Accepted</td>", r.text) is not None):
                 self.logger.info("Message sent successfully")
                 return False
             else: