diff options
| author | Martin Basti <mbasti@redhat.com> | 2016-03-20 21:32:27 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-03-22 10:20:51 +0100 |
| commit | da0318d4d7dd369be136449e686b6fb46d0cc5d8 (patch) | |
| tree | 58980cecdefad1296cd51b4d8a53f1fb7b30a5c6 | |
| parent | b66028af1815fbf7666b82ebeaa81ad56996a74f (diff) | |
| download | freeipa-da0318d4d7dd369be136449e686b6fb46d0cc5d8.tar.gz freeipa-da0318d4d7dd369be136449e686b6fb46d0cc5d8.tar.xz freeipa-da0318d4d7dd369be136449e686b6fb46d0cc5d8.zip | |
Pylint: remove unnecessary-semicolon
Reviewed-By: Petr Spacek <pspacek@redhat.com>
Reviewed-By: Lukas Slebodnik <lslebodn@redhat.com>
| -rw-r--r-- | ipalib/plugins/aci.py | 4 | ||||
| -rw-r--r-- | ipalib/session.py | 2 | ||||
| -rw-r--r-- | ipapython/nsslib.py | 2 | ||||
| -rw-r--r-- | ipaserver/rpcserver.py | 2 | ||||
| -rw-r--r-- | ipatests/test_webui/test_automember.py | 4 | ||||
| -rw-r--r-- | ipatests/test_xmlrpc/test_dns_plugin.py | 2 | ||||
| -rw-r--r-- | pylintrc | 1 |
7 files changed, 8 insertions, 9 deletions
diff --git a/ipalib/plugins/aci.py b/ipalib/plugins/aci.py index 60dbcee7f..0c46359f9 100644 --- a/ipalib/plugins/aci.py +++ b/ipalib/plugins/aci.py @@ -344,7 +344,7 @@ def _aci_to_kw(ldap, a, test=False, pkey_only=False): if _type_map[k] == target: kw['type'] = unicode(k) found = True - break; + break if not found: if target.startswith('('): kw['filter'] = unicode(target) @@ -792,7 +792,7 @@ class aci_find(crud.Search): for k in _type_map.keys(): if _type_map[k] == target and kw['type'] == k: found = True - break; + break if not found: try: results.remove(a) diff --git a/ipalib/session.py b/ipalib/session.py index e84a355d7..35eb554b4 100644 --- a/ipalib/session.py +++ b/ipalib/session.py @@ -1079,7 +1079,7 @@ class MemcacheSessionManager(SessionManager): ''' if not expiration: # Catch zero unix timestamps - expiration = None; + expiration = None cookie = Cookie(self.session_cookie_name, session_id, domain=urlparse(api.env.xmlrpc_uri).netloc, diff --git a/ipapython/nsslib.py b/ipapython/nsslib.py index 335ac28f6..b5e5b6586 100644 --- a/ipapython/nsslib.py +++ b/ipapython/nsslib.py @@ -252,7 +252,7 @@ class NSSConnection(httplib.HTTPConnection, NSSAddressFamilyFallback): def password_callback(self, slot, retry, password): if not retry and password: return password - return getpass.getpass("Enter password for %s: " % slot.token_name); + return getpass.getpass("Enter password for %s: " % slot.token_name) def handshake_callback(self, sock): """ diff --git a/ipaserver/rpcserver.py b/ipaserver/rpcserver.py index 64620b4cc..14796b978 100644 --- a/ipaserver/rpcserver.py +++ b/ipaserver/rpcserver.py @@ -330,7 +330,7 @@ class WSGIExecutioner(Executioner): lang_reg = lang_reg_w_q.split(';')[0] lang_ = lang_reg.split('-')[0] if '-' in lang_reg: - reg = lang_reg.split('-')[1].upper(); + reg = lang_reg.split('-')[1].upper() else: reg = lang_.upper() os.environ['LANG'] = '%s_%s' % (lang_, reg) diff --git a/ipatests/test_webui/test_automember.py b/ipatests/test_webui/test_automember.py index 8d07c8c99..9f3da1e96 100644 --- a/ipatests/test_webui/test_automember.py +++ b/ipatests/test_webui/test_automember.py @@ -110,8 +110,8 @@ class test_automember(UI_driver): }) # Add hosts - self.add_record('host', host_util.get_data("web1", domain)); - self.add_record('host', host_util.get_data("web2", domain)); + self.add_record('host', host_util.get_data("web1", domain)) + self.add_record('host', host_util.get_data("web2", domain)) # Add an automember rule self.add_record( diff --git a/ipatests/test_xmlrpc/test_dns_plugin.py b/ipatests/test_xmlrpc/test_dns_plugin.py index ee0bc8ea7..eed816048 100644 --- a/ipatests/test_xmlrpc/test_dns_plugin.py +++ b/ipatests/test_xmlrpc/test_dns_plugin.py @@ -260,7 +260,7 @@ cnamerev_hostname = u'129.128/25.70.16.172.in-addr.arpa.' ptr_revzone3 = u'129' ptr_revzone3_dnsname = DNSName(ptr_revzone3) ptr_revzone3_dn = DN(('idnsname',cnamerev), revzone3_classless2_dn) -ptr_revzone3_hostname = zone3_ns2; +ptr_revzone3_hostname = zone3_ns2 relnxname = u'does-not-exist-test' absnxname = u'does.not.exist.test.' @@ -44,7 +44,6 @@ disable= super-init-not-called, undefined-loop-variable, unnecessary-lambda, - unnecessary-semicolon, unused-argument, unused-variable, useless-else-on-loop, |