Skip to content

Commit

Permalink
pylint fixes
Browse files Browse the repository at this point in the history
- ignore false positive for signature-differs when the method
is overriden with *args, **kwargs
- remove unused variable

Signed-off-by: Florence Blanc-Renaud <flo@redhat.com>
  • Loading branch information
flo-renaud authored and abbra committed May 25, 2021
1 parent 666e2a1 commit 111311f
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 16 deletions.
16 changes: 8 additions & 8 deletions ipaplatform/redhat/services.py
Original file line number Diff line number Diff line change
Expand Up @@ -167,35 +167,35 @@ def _update_instance_name(self, args, kwargs):
if 'instance_name' not in kwargs:
kwargs['instance_name'] = 'GLOBAL-CATALOG'

def start(self, *args, **kwargs):
def start(self, *args, **kwargs): # pylint: disable=W0222
self._update_instance_name(args, kwargs)
super(RedHatGCService, self).start(*args, **kwargs)

def stop(self, *args, **kwargs):
def stop(self, *args, **kwargs): # pylint: disable=W0222
self._update_instance_name(args, kwargs)
super(RedHatGCService, self).stop(*args, **kwargs)

def reload_or_restart(self, *args, **kwargs):
def reload_or_restart(self, *args, **kwargs): # pylint: disable=W0222
self._update_instance_name(args, kwargs)
super(RedHatGCService, self).reload_or_restart(*args, **kwargs)

def restart(self, *args, **kwargs):
def restart(self, *args, **kwargs): # pylint: disable=W0222
self._update_instance_name(args, kwargs)
super(RedHatGCService, self).restart(*args, **kwargs)

def enable(self, *args, **kwargs):
def enable(self, *args, **kwargs): # pylint: disable=W0222
self._update_instance_name(args, kwargs)
super(RedHatGCService, self).enable(*args, **kwargs)

def disable(self, *args, **kwargs):
def disable(self, *args, **kwargs): # pylint: disable=W0222
self._update_instance_name(args, kwargs)
super(RedHatGCService, self).disable(*args, **kwargs)

def is_running(self, *args, **kwargs):
def is_running(self, *args, **kwargs): # pylint: disable=W0222
self._update_instance_name(args, kwargs)
return super(RedHatGCService, self).is_running(*args, **kwargs)

def is_enabled(self, *args, **kwargs):
def is_enabled(self, *args, **kwargs): # pylint: disable=W0222
self._update_instance_name(args, kwargs)
return super(RedHatGCService, self).is_enabled(*args, **kwargs)

Expand Down
10 changes: 2 additions & 8 deletions ipaserver/install/gcinstance.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@
from ipapython import ipautil, ipaldap
from ipapython import dogtag
from ipapython.admintool import ScriptError
from ipapython.certdb import (IPA_CA_TRUST_FLAGS,
EXTERNAL_CA_TRUST_FLAGS)
from ipapython.dn import DN
from ipapython.kerberos import Principal
from ipaserver.dns_data_management import IPA_DEFAULT_GC_SRV_REC
Expand Down Expand Up @@ -469,12 +467,12 @@ def __add_default_schemas(self):
os.chmod(target_fname, 0o440) # read access for dirsrv user/group
os.chown(target_fname, pent.pw_uid, pent.pw_gid)

def start(self, *args, **kwargs):
def start(self, *args, **kwargs): # pylint: disable=W0222
super(GCInstance, self).start(*args, **kwargs)
self.conn = ipaldap.LDAPClient(self.ldap_uri)
self.conn.external_bind()

def stop(self, *args, **kwargs):
def stop(self, *args, **kwargs): # pylint: disable=W0222
if self.conn:
self.conn.close()
self.conn = None
Expand Down Expand Up @@ -562,10 +560,6 @@ def __enable_ssl(self):
create=True
)
if self.pkcs12_info:
if self.ca_is_configured:
trust_flags = IPA_CA_TRUST_FLAGS
else:
trust_flags = EXTERNAL_CA_TRUST_FLAGS
dsdb.import_pkcs12(
self.pkcs12_info[0],
self.pkcs12_info[1],
Expand Down

0 comments on commit 111311f

Please sign in to comment.