Pylint: remove unnecessary-semicolon

Reviewed-By: Petr Spacek <pspacek@redhat.com>
Reviewed-By: Lukas Slebodnik <lslebodn@redhat.com>

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)

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,

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):
         """

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)

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(

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.'

pylintrc

@@ -44,7 +44,6 @@ disable=
     super-init-not-called,
     undefined-loop-variable,
     unnecessary-lambda,
-    unnecessary-semicolon,
     unused-argument,
     unused-variable,
     useless-else-on-loop,