Static analysis fixes

Author: steinbach

weconnect/weconnect.py

@@ -136,14 +136,14 @@ def fillCacheFromJson(self, filename):
             self.__cache = json.load(file)
         LOG.info('Reading cachefile %s', filename)
 
-    def login(self):  # noqa: C901
+    def login(self):  # noqa: C901 # pylint: disable=R0914, R0912
         # Try to access page to be redirected to login form
         tryLoginUrl = f'https://login.apps.emea.vwapps.io/authorize?nonce=' \
             f'{"".join(random.choices(string.ascii_uppercase + string.ascii_lowercase + string.digits, k=16))}' \
             '&redirect_uri=weconnect://authenticated'
 
         tryLoginResponse = self.__session.get(tryLoginUrl, allow_redirects=False)
-        if tryLoginResponse.status_code != requests.codes.see_other:  # pylint: disable=E1101
+        if tryLoginResponse.status_code != requests.codes['see_other']:
             raise APICompatibilityError('Forwarding to login page expected (status code 303),'
                                         f' but got status code {tryLoginResponse.status_code}')
         if 'Location' not in tryLoginResponse.headers:
@@ -153,7 +153,7 @@ def login(self):  # noqa: C901
 
         # Retrieve login page
         loginResponse = self.__session.get(loginUrl, headers=self.DEFAULT_OPTIONS['loginHeaders'], allow_redirects=True)
-        if loginResponse.status_code != requests.codes.ok:  # pylint: disable=E1101
+        if loginResponse.status_code != requests.codes['ok']:
             raise APICompatibilityError('Retrieving login page was not successfull,'
                                         f' status code: {loginResponse.status_code}')
 
@@ -186,7 +186,7 @@ def login(self):  # noqa: C901
 
         # Post form content and retrieve credentials page
         login2Response = self.__session.post(login2Url, headers=loginHeadersForm, data=formData, allow_redirects=True)
-        if login2Response.status_code != requests.codes.ok:  # pylint: disable=E1101
+        if login2Response.status_code != requests.codes['ok']:  # pylint: disable=E1101
             raise APICompatibilityError('Retrieving credentials page was not successfull,'
                                         f' status code: {login2Response.status_code}')
 
@@ -200,14 +200,14 @@ def login(self):  # noqa: C901
             errorMatch = re.search(formErrorRegex, login2Response.text, flags=re.DOTALL)
             if errorMatch is not None:
                 raise AuthentificationError(errorMatch.groupdict()['errorMessage'])
-            else:
-                accountNotFoundRegex = r'<div\sid=\"title\"\sclass=\"title\">.*<div class=\"sub-title\">.*<div>' \
-                    r'(?P<errorMessage>.+?(?=</div>))</div>.*</div>.*</div>'
-                errorMatch = re.search(accountNotFoundRegex, login2Response.text, flags=re.DOTALL)
-                if errorMatch is not None:
-                    errorMessage = re.sub('<[^<]+?>', '', errorMatch.groupdict()['errorMessage'])
-                    raise AuthentificationError(errorMessage)
-                raise APICompatibilityError('No credentials form found')
+
+            accountNotFoundRegex = r'<div\sid=\"title\"\sclass=\"title\">.*<div class=\"sub-title\">.*<div>' \
+                r'(?P<errorMessage>.+?(?=</div>))</div>.*</div>.*</div>'
+            errorMatch = re.search(accountNotFoundRegex, login2Response.text, flags=re.DOTALL)
+            if errorMatch is not None:
+                errorMessage = re.sub('<[^<]+?>', '', errorMatch.groupdict()['errorMessage'])
+                raise AuthentificationError(errorMessage)
+            raise APICompatibilityError('No credentials form found')
         # retrieve target url from form
         target = match.groupdict()['formAction']
 
@@ -226,8 +226,8 @@ def login(self):  # noqa: C901
 
         # Post form content and retrieve userId in forwarding Location
         login3Response = self.__session.post(login3Url, headers=loginHeadersForm, data=form2Data, allow_redirects=False)
-        if login3Response.status_code != requests.codes.found \
-                and login3Response.status_code != requests.codes.see_other:  # pylint: disable=E1101
+        if login3Response.status_code != requests.codes['found'] \
+                and login3Response.status_code != requests.codes['see_other']:
             raise APICompatibilityError('Forwarding expected (status code 302),'
                                         f' but got status code {login3Response.status_code}')
         if 'Location' not in login3Response.headers:
@@ -317,7 +317,7 @@ def __refreshToken(self):
         url = 'https://login.apps.emea.vwapps.io/refresh/v1'
 
         refreshResponse = self.__session.get(url, allow_redirects=False, auth=BearerAuth(self.__rToken['token']))
-        if refreshResponse.status_code == requests.codes.ok:  # pylint: disable=E1101
+        if refreshResponse.status_code == requests.codes['ok']:
             data = refreshResponse.json()
             if 'accessToken' in data:
                 self.__aToken['type'] = 'Bearer'
@@ -361,7 +361,7 @@ def update(self):
             data = self.__cache[url]
         else:
             vehiclesResponse = self.__session.get(url, allow_redirects=False)
-            if vehiclesResponse.status_code == requests.codes.ok:  # pylint: disable=E1101
+            if vehiclesResponse.status_code == requests.codes['ok']:
                 data = vehiclesResponse.json()
             else:
                 raise RetrievalError(f'Status Code from WeConnect server was: {vehiclesResponse.status_code}')