diff --git a/ipapython/install/util.py b/ipapython/install/util.py index 1e3d2b164..a7e3a03df 100644 --- a/ipapython/install/util.py +++ b/ipapython/install/util.py @@ -83,11 +83,11 @@ def run_generator_with_yield_from(gen): class InnerClassMeta(type): # pylint: disable=no-value-for-parameter - def __new__(mcs, name, bases, class_dict): + def __new__(cls, name, bases, class_dict): class_dict.pop('__outer_class__', None) class_dict.pop('__outer_name__', None) - return super(InnerClassMeta, mcs).__new__(mcs, name, bases, class_dict) + return super(InnerClassMeta, cls).__new__(cls, name, bases, class_dict) def __get__(cls, obj, obj_type): outer_class, outer_name = cls.__bind(obj_type) diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py index a9c8c02a6..e13cfbdf9 100644 --- a/ipapython/ipautil.py +++ b/ipapython/ipautil.py @@ -513,6 +513,7 @@ def run(args, stdin=None, raiseonerr=True, nolog=(), env=None, os.umask(umask) try: + # pylint: disable=subprocess-popen-preexec-fn p = subprocess.Popen(args, stdin=p_in, stdout=p_out, stderr=p_err, close_fds=True, env=env, cwd=cwd, preexec_fn=preexec_fn) diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index d3e2b29c3..c90940d73 100644 --- a/ipaserver/install/cainstance.py +++ b/ipaserver/install/cainstance.py @@ -1990,10 +1990,12 @@ class ExternalCAProfile(object): _oid = univ.ObjectIdentifier(parts[0]) # It is; construct a V2 template + # pylint: disable=too-many-function-args return MSCSTemplateV2.__new__(MSCSTemplateV2, s) except pyasn1.error.PyAsn1Error: # It is not an OID; treat as a template name + # pylint: disable=too-many-function-args return MSCSTemplateV1.__new__(MSCSTemplateV1, s) def __getstate__(self): diff --git a/ipaserver/plugins/automember.py b/ipaserver/plugins/automember.py index 1e29f3657..a502aea50 100644 --- a/ipaserver/plugins/automember.py +++ b/ipaserver/plugins/automember.py @@ -451,10 +451,7 @@ class automember_remove_condition(LDAPUpdate): # Define container key type_attr_default = {'group': 'manager', 'hostgroup': 'fqdn'} - if 'key' in options: - key = options['key'] - else: - key = type_attr_default[options['type']] + key = options.get('key', type_attr_default[options['type']]) key = '%s=' % key completed = 0 diff --git a/ipaserver/plugins/permission.py b/ipaserver/plugins/permission.py index 1e4a8b2aa..2127d8234 100644 --- a/ipaserver/plugins/permission.py +++ b/ipaserver/plugins/permission.py @@ -1299,10 +1299,9 @@ class permission_find(baseldap.LDAPSearch): self.obj.upgrade_permission(entry, output_only=True) if not truncated: - if 'sizelimit' in options: - max_entries = options['sizelimit'] - else: - max_entries = self.api.Backend.ldap2.size_limit + max_entries = options.get( + 'sizelimit', self.api.Backend.ldap2.size_limit + ) if max_entries > 0: # should we get more entries than current sizelimit, fail diff --git a/pylintrc b/pylintrc index d0f1378d6..9bc136ff8 100644 --- a/pylintrc +++ b/pylintrc @@ -18,6 +18,11 @@ extension-pkg-whitelist= gssapi, netifaces +[CLASSES] + +# List of valid names for the first argument in a metaclass class method. +# This can be removed after upgrading to pylint 2.0 +valid-metaclass-classmethod-first-arg=cls [MESSAGES CONTROL] @@ -93,7 +98,9 @@ disable= redefined-argument-from-local, # new in pylint 1.7 consider-merging-isinstance, # new in pylint 1.7 bad-option-value, # required to support upgrade to pylint 2.0 - + assignment-from-no-return, # new in pylint 2.0 + keyword-arg-before-vararg, # pylint 2.0, remove after dropping Python 2 + useless-object-inheritance, # pylint 2.0, remove after dropping Python 2 [REPORTS]