🎨 Do not pass debug flag through class hierarchy

Author: jemrobinson

apricot/apricot_server.py

@@ -60,8 +60,6 @@ def __init__(
         @param tls_certificate: TLS certificate for LDAPS
         @param tls_private_key: TLS private key for LDAPS
         """
-        self.debug = debug
-
         # Set up Python root logger
         logging.basicConfig(
             level=logging.INFO,
@@ -102,7 +100,6 @@ def __init__(
             oauth_client = oauth_backend(
                 client_id=client_id,
                 client_secret=client_secret,
-                debug=debug,
                 uid_cache=uid_cache,
                 **{k: v for k, v in kwargs.items() if k in oauth_backend_args},
             )

apricot/ldap/oauth_ldap_server_factory.py

@@ -46,6 +46,6 @@ def buildProtocol(self: Self, addr: IAddress) -> Protocol:  # noqa: N802
         @param addr: an object implementing L{IAddress}
         """
         id(addr)  # ignore unused arguments
-        proto = ReadOnlyLDAPServer(debug=self.adaptor.debug)
+        proto = ReadOnlyLDAPServer()
         proto.factory = self.adaptor
         return proto

apricot/ldap/oauth_ldap_tree.py

@@ -37,7 +37,6 @@ def __init__(
         @param refresh_interval: Interval in seconds after which the tree must be refreshed
         """
         self.background_refresh = background_refresh
-        self.debug = oauth_client.debug
         self.last_update = time.monotonic()
         self.logger = Logger()
         self.oauth_adaptor = oauth_adaptor

apricot/ldap/read_only_ldap_server.py

@@ -30,14 +30,10 @@
 class ReadOnlyLDAPServer(LDAPServer):
     """A read-only LDAP server."""
 
-    def __init__(self: Self, *, debug: bool = False) -> None:
-        """Initialise a ReadOnlyLDAPServer.
-
-        @param debug: Enable debug output
-        """
-        self.logger = Logger()
+    def __init__(self: Self) -> None:
+        """Initialise a ReadOnlyLDAPServer."""
         super().__init__()
-        self.debug = debug
+        self.logger = Logger()
 
     def getRootDSE(  # noqa: N802
         self: Self,

apricot/oauth/oauth_client.py

@@ -27,7 +27,6 @@ def __init__(
         self: Self,
         client_id: str,
         client_secret: str,
-        debug: bool,  # noqa: FBT001
         redirect_uri: str,
         scopes_application: list[str],
         scopes_delegated: list[str],
@@ -38,7 +37,6 @@ def __init__(
 
         @param client_id: OAuth client ID
         @param client_secret: OAuth client secret
-        @param debug: Enable debug output
         @param redirect_uri: OAuth redirect URI
         @param scopes: OAuth scopes
         @param token_url: OAuth token URL
@@ -47,7 +45,6 @@ def __init__(
         # Set attributes
         self.bearer_token_: str | None = None
         self.client_secret = client_secret
-        self.debug = debug
         self.logger = Logger()
         self.token_url = token_url
         self.uid_cache = uid_cache

apricot/oauth/oauth_data_adaptor.py

@@ -43,7 +43,6 @@ def __init__(
         @param enable_user_domain_verification: Whether to verify users belong to the correct domain
         @param oauth_client: An OAuth client used to construct the LDAP tree
         """
-        self.debug = oauth_client.debug
         self.domain = domain
         self.enable_mirrored_groups = enable_mirrored_groups
         self.enable_primary_groups = enable_primary_groups