diff options
Diffstat (limited to 'ipaclient')
| -rw-r--r-- | ipaclient/ipachangeconf.py | 12 | ||||
| -rw-r--r-- | ipaclient/ipadiscovery.py | 4 |
2 files changed, 2 insertions, 14 deletions
diff --git a/ipaclient/ipachangeconf.py b/ipaclient/ipachangeconf.py index b6cbc9bba..b7d8ffc33 100644 --- a/ipaclient/ipachangeconf.py +++ b/ipaclient/ipachangeconf.py @@ -24,8 +24,6 @@ import shutil import six -# pylint: disable=unused-variable - if six.PY3: unicode = str @@ -303,7 +301,7 @@ class IPAChangeConf(object): for o in oldopts: if o['type'] == "section" or o['type'] == "subsection": - (num, no) = self.findOpts(newopts, o['type'], o['name']) + _num, no = self.findOpts(newopts, o['type'], o['name']) if not no: opts.append(o) continue @@ -327,7 +325,7 @@ class IPAChangeConf(object): continue if o['type'] == "option": - (num, no) = self.findOpts(newopts, 'option', o['name'], True) + _num, no = self.findOpts(newopts, 'option', o['name'], True) if not no: opts.append(o) continue @@ -482,9 +480,6 @@ class IPAChangeConf(object): # [{'name': 'foo', 'value': 'bar', 'action': 'set/comment'}] # section is a section name like 'global' def changeConf(self, file, newopts): - autosection = False - savedsection = None - done = False output = "" f = None try: @@ -517,9 +512,6 @@ class IPAChangeConf(object): # options is a set of dictionaries in the form: # [{'name': 'foo', 'value': 'bar', 'action': 'set/comment'}] def newConf(self, file, options): - autosection = False - savedsection = None - done = False output = "" f = None try: diff --git a/ipaclient/ipadiscovery.py b/ipaclient/ipadiscovery.py index e051bc722..2075c3374 100644 --- a/ipaclient/ipadiscovery.py +++ b/ipaclient/ipadiscovery.py @@ -30,8 +30,6 @@ from ipaplatform.paths import paths from ipapython.ipautil import valid_ip, realm_to_suffix from ipapython.dn import DN -# pylint: disable=unused-variable - NOT_FQDN = -1 NO_LDAP_SERVER = -2 REALM_NOT_FOUND = -3 @@ -376,8 +374,6 @@ class IPADiscovery(object): lrealms = [] - i = 0 - #now verify the server is really an IPA server try: root_logger.debug("Init LDAP connection to: %s", thost) |