diff --git a/src/chat_control.py b/src/chat_control.py
index 93489437a334538e24ad11fb43fbfbbf20b14d30..62d9e8cfe15427a66060f4b64c884df21b2e29ed 100644
--- a/src/chat_control.py
+++ b/src/chat_control.py
@@ -152,7 +152,7 @@ class ChatControlBase(MessageControl):
 				contact = c
 
 		MessageControl.__init__(self, type_id, parent_win, widget_name,
-			contact, acct, resource = resource);
+			contact, acct, resource = resource)
 
 		widget = self.xml.get_widget('history_button')
 		id = widget.connect('clicked', self._on_history_menuitem_activate)
@@ -956,7 +956,7 @@ class ChatControlBase(MessageControl):
 			conv_buf.set_text(self.sent_history[self.sent_history_pos])
 		elif direction == 'down':
 			if self.sent_history_pos >= size - 1:
-				conv_buf.set_text(self.orig_msg);
+				conv_buf.set_text(self.orig_msg)
 				self.orig_msg = None
 				self.sent_history_pos = size
 				return
diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py
index 86004fa7b5cfd9da0f44ddd3a17bb639cc9cd020..4dd6e808789e1fbab95db609222b179bf65f5838 100644
--- a/src/common/connection_handlers.py
+++ b/src/common/connection_handlers.py
@@ -1414,7 +1414,7 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
 			method = iq_obj.getTagAttr('confirm', 'method')
 			url = iq_obj.getTagAttr('confirm', 'url')
 			msg = iq_obj.getTagData('body') # In case it's a message with a body
-			self.dispatch('HTTP_AUTH', (method, url, id, iq_obj, msg));
+			self.dispatch('HTTP_AUTH', (method, url, id, iq_obj, msg))
 		raise common.xmpp.NodeProcessed
 
 	def _ErrorCB(self, con, iq_obj):
@@ -1518,7 +1518,7 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
 		iq_obj = iq_obj.buildReply('result')
 		qp = iq_obj.getTag('query')
 		if not HAS_IDLE:
-			qp.attrs['seconds'] = '0';
+			qp.attrs['seconds'] = '0'
 		else:
 			qp.attrs['seconds'] = idle.getIdleSec()
 		
diff --git a/src/common/logger.py b/src/common/logger.py
index c7f79b39626168324a539972a8165b140587d368..d4bb61f84d811a2029567fe4cfd0ea2fe66343d9 100644
--- a/src/common/logger.py
+++ b/src/common/logger.py
@@ -708,7 +708,7 @@ class Logger:
 		# the data field contains binary object (gzipped data), this is a hack
 		# to get that data without trying to convert it to unicode
 		try:
-			self.cur.execute('SELECT hash_method, hash, data FROM caps_cache;');
+			self.cur.execute('SELECT hash_method, hash, data FROM caps_cache;')
 		except sqlite.OperationalError:
 			# might happen when there's no caps_cache table yet
 			# -- there's no data to read anyway then
diff --git a/src/common/zeroconf/client_zeroconf.py b/src/common/zeroconf/client_zeroconf.py
index c1e550006cd64df0fe437a0bdfe7b5e7e5620595..e06e07949bfa360a04859bd2f76bd3bd9a57f9c3 100644
--- a/src/common/zeroconf/client_zeroconf.py
+++ b/src/common/zeroconf/client_zeroconf.py
@@ -94,7 +94,7 @@ class ZeroconfListener(IdleObject):
 			entry = self.conn_holder.getRoster().getItem(jid)
 			if (entry['address'] == ipaddr):
 				from_jid = jid
-				break;
+				break
 		P2PClient(sock[0], ipaddr, sock[1][1], self.conn_holder, [], from_jid)
 
 	def disconnect(self):
diff --git a/src/groupchat_control.py b/src/groupchat_control.py
index fc97e27db2acccb779b6ec61447caeab5e76e023..767f0849c3b7a9d3d7fd9e9a4038676198448efb 100644
--- a/src/groupchat_control.py
+++ b/src/groupchat_control.py
@@ -175,7 +175,7 @@ class GroupchatControl(ChatControlBase):
 
 	def __init__(self, parent_win, contact, acct, is_continued=False):
 		ChatControlBase.__init__(self, self.TYPE_ID, parent_win,
-					'muc_child_vbox', contact, acct);
+					'muc_child_vbox', contact, acct)
 
 		self.is_continued=is_continued
 		self.is_anonymous = True