Fix lint false positives.

This commit is contained in:
Jan Cholasta
2011-04-07 16:53:52 +02:00
committed by Martin Kosek
parent fb329bc8b0
commit 1ac3ed2c27
12 changed files with 23 additions and 15 deletions

View File

@@ -179,7 +179,7 @@ class IPAChangeConf:
value = self.matchComment(line)
if value:
return {'name':'comment', 'type':'comment', 'value':value.rstrip()}
return {'name':'comment', 'type':'comment', 'value':value.rstrip()} #pylint: disable=E1103
parts = line.split(self.dassign, 1)
if len(parts) < 2:

View File

@@ -329,7 +329,7 @@ def read_realm_name(domain_name, unattended):
if unattended:
return domain_name.upper()
realm_name = user_input("Please provide a realm name", domain_name.upper())
upper_dom = realm_name.upper()
upper_dom = realm_name.upper() #pylint: disable=E1103
if upper_dom != realm_name:
print "An upper-case realm name is required."
if not user_input("Do you want to use " + upper_dom + " as realm name?", True):

View File

@@ -180,7 +180,7 @@ class IPAChangeConf:
value = self.matchComment(line)
if value:
return {'name':'comment', 'type':'comment', 'value':value.rstrip()}
return {'name':'comment', 'type':'comment', 'value':value.rstrip()} #pylint: disable=E1103
parts = line.split(self.dassign, 1)
if len(parts) < 2:

View File

@@ -139,4 +139,4 @@ class Executioner(Backend):
if error is None:
return result
assert isinstance(error, PublicError)
raise error
raise error #pylint: disable=E0702

View File

@@ -587,9 +587,9 @@ class textui(backend.Backend):
except EOFError:
return -2
if resp.lower() == "q":
if resp.lower() == "q": #pylint: disable=E1103
return -2
if resp.lower() == "a":
if resp.lower() == "a": #pylint: disable=E1103
return -1
try:
selection = int(resp) - 1

View File

@@ -75,7 +75,7 @@ else:
import simplejson as json
from cgi import parse_qs
try:
from hashlib import sha1, md5
from hashlib import sha1, md5 #pylint: disable=E0611
except ImportError:
from sha import new as sha1
from md5 import new as md5

View File

@@ -383,15 +383,15 @@ class Command(HasParam):
takes_options = tuple()
takes_args = tuple()
args = None
options = None
args = lambda: None
options = lambda: None
params = None
obj = None
use_output_validation = True
output = None
has_output = ('result',)
output_params = None
output_params = lambda: None
has_output_params = tuple()
msg_summary = None
@@ -1020,7 +1020,7 @@ class Object(HasParam):
backend = None
methods = None
properties = None
params = None
params = lambda: None
primary_key = None
params_minus_pk = None

View File

@@ -479,7 +479,7 @@ class Param(ReadOnly):
else:
value = self.convert(self.normalize(value))
if hasattr(self, 'env'):
self.validate(value, self.env.context)
self.validate(value, self.env.context) #pylint: disable=E1101
else:
self.validate(value)
return value
@@ -1007,6 +1007,7 @@ class Int(Number):
)
def __init__(self, name, *rules, **kw):
#pylint: disable=E1003
super(Number, self).__init__(name, *rules, **kw)
if (self.minvalue > self.maxvalue) and (self.minvalue is not None and self.maxvalue is not None):
@@ -1078,6 +1079,7 @@ class Float(Number):
)
def __init__(self, name, *rules, **kw):
#pylint: disable=E1003
super(Number, self).__init__(name, *rules, **kw)
if (self.minvalue > self.maxvalue) and (self.minvalue is not None and self.maxvalue is not None):

View File

@@ -439,6 +439,7 @@ class CallbackInterface(Method):
Callback registration interface
"""
def __init__(self):
#pylint: disable=E1003
if not hasattr(self.__class__, 'PRE_CALLBACKS'):
self.__class__.PRE_CALLBACKS = []
if not hasattr(self.__class__, 'POST_CALLBACKS'):
@@ -512,6 +513,7 @@ class LDAPCreate(CallbackInterface, crud.Create):
takes_options = _attr_options
def get_args(self):
#pylint: disable=E1003
for key in self.obj.get_ancestor_primary_keys():
yield key
if self.obj.primary_key:
@@ -645,6 +647,7 @@ class LDAPQuery(CallbackInterface, crud.PKQuery):
Base class for commands that need to retrieve an existing entry.
"""
def get_args(self):
#pylint: disable=E1003
for key in self.obj.get_ancestor_primary_keys():
yield key
if self.obj.primary_key:
@@ -665,6 +668,7 @@ class LDAPMultiQuery(LDAPQuery):
)
def get_args(self):
#pylint: disable=E1003
for key in self.obj.get_ancestor_primary_keys():
yield key
if self.obj.primary_key:
@@ -1268,6 +1272,7 @@ class LDAPSearch(CallbackInterface, crud.Search):
)
def get_args(self):
#pylint: disable=E1003
for key in self.obj.get_ancestor_primary_keys():
yield key
yield Str('criteria?')

View File

@@ -494,7 +494,7 @@ class cert_show(VirtualCommand):
if hostname:
# If we have a hostname we want to verify that the subject
# of the certificate matches it, otherwise raise an error
if hostname != cert.subject.common_name:
if hostname != cert.subject.common_name: #pylint: disable=E1101
raise acierr
return dict(result=result)

View File

@@ -131,6 +131,7 @@ def run(args, stdin=None, raiseonerr=True,
p = subprocess.Popen(args, stdin=p_in, stdout=p_out, stderr=p_err,
close_fds=True, env=env)
stdout,stderr = p.communicate(stdin)
stdout,stderr = str(stdout), str(stderr) # Make pylint happy
# The command and its output may include passwords that we don't want
# to log. Run through the nolog items.

View File

@@ -879,9 +879,9 @@ class ReplicationManager:
pass
except Exception, e:
if force and err:
raise err
raise err #pylint: disable=E0702
else:
raise e
if err:
raise err
raise err #pylint: disable=E0702