codacy

Author: d-w-moore

irods/auth/__init__.py

@@ -130,6 +130,10 @@ class REQUEST_IS_MISSING_KEY(Exception):
     pass
 
 
+class ClientAuthError(Exception):
+    pass
+
+
 def throw_if_request_message_is_missing_key(request, required_keys):
     for key in required_keys:
         if not key in request:
@@ -176,8 +180,11 @@ def call(self, next_operation, request):
         return resp
 
     def authenticate_client(
-        self, next_operation="auth_client_start", initial_request={}
+        self, next_operation="auth_client_start", initial_request=()
     ):
+        if not isinstance(initial_request, dict):
+            initial_request = dict(initial_request)
+
         to_send = initial_request.copy()
         to_send["scheme"] = self.scheme
 

irods/prc_write_irodsA.py

@@ -1,5 +1,4 @@
 import getopt
-import getpass
 import textwrap
 import sys
 

irods/session.py

@@ -1,6 +1,5 @@
 import ast
 import atexit
-import contextlib
 import copy
 import errno
 import json
@@ -383,10 +382,10 @@ def server_version_without_auth(self):
         """Returns the same version tuple as iRODSSession's server_version property, but
         does not require successful authentication.
         """
-        import irods.connection
+        from irods.connection import Connection
 
         with self.clone().pool.no_auto_authenticate() as pool:
-            return irods.connection.Connection(pool, pool.account).server_version
+            return Connection(pool, pool.account).server_version
 
     GET_SERVER_VERSION_WITHOUT_AUTH = staticmethod(
         lambda s: s.server_version_without_auth()

irods/test/connection_test.py

@@ -58,7 +58,7 @@ def test_server_version_without_authentication__issue_688(self):
 
         # Test that the older server_version property fails for the unauthorized session object.
         with self.assertRaises(CAT_INVALID_AUTHENTICATION):
-            non_authenticating_session.server_version
+            _ = non_authenticating_session.server_version
 
     def test_failed_connection(self):
         # Make sure no connections are cached in self.sess.pool.idle to be grabbed by get_connection().

irods/test/login_auth_test_must_run_manually.py

@@ -118,7 +118,7 @@ def pam_password_in_plaintext_4_3(allow=True):
     def new_init(self, *arg, **kw):
         old_init(self, *arg, **kw)
         self.set_auth_option_for_scheme(
-            "pam_password", irods.auth.pam_password.ENSURE_SSL_IS_ACTIVE, not (allow)
+            "pam_password", ENSURE_SSL_IS_ACTIVE, not (allow)
         )
 
     with irods.helpers.temporarily_assign_attribute(iRODSSession, "__init__", new_init):