pylintize!!!

sugar/p2p/Buddy.py

@@ -1,7 +1,7 @@
 import pwd
 import os
 
-from Service import *
+from Service import Service
 
 PRESENCE_SERVICE_TYPE = "_olpc_presence._tcp"
 PRESENCE_SERVICE_PORT = 6000

sugar/p2p/Group.py

@@ -1,17 +1,17 @@
-import avahi
-
-import presence
-from Buddy import *
-from Service import *
+from Buddy import Buddy
+from Buddy import Owner
+from Buddy import PRESENCE_SERVICE_TYPE
+from Service import Service
 import Model
-
-SERVICE_ADDED = "service_added"
-SERVICE_REMOVED = "service_removed"
-
-BUDDY_JOIN = "buddy_join"
-BUDDY_LEAVE = "buddy_leave"
+import presence
 
 class Group:
+	SERVICE_ADDED = "service_added"
+	SERVICE_REMOVED = "service_removed"
+
+	BUDDY_JOIN = "buddy_join"
+	BUDDY_LEAVE = "buddy_leave"
+
 	def __init__(self):
 		self._service_listeners = []
 		self._presence_listeners = []
@@ -20,7 +20,7 @@ class Group:
 	def get_store(self):
 		return self._store
 	
-	def join(self, buddy):
+	def join(self):
 		pass
 	
 	def add_service_listener(self, listener):
@@ -31,19 +31,19 @@ class Group:
 		
 	def _notify_service_added(self, service):
 		for listener in self._service_listeners:
-			listener(SERVICE_ADDED, buddy)
+			listener(Group.SERVICE_ADDED, service)
 	
-	def _notify_service_removed(self, service):
+	def _notify_service_removed(self, service_id):
 		for listener in self._service_listeners:
-			listener(SERVICE_REMOVED,buddy)
+			listener(Group.SERVICE_REMOVED, service_id)
 
 	def _notify_buddy_join(self, buddy):
 		for listener in self._presence_listeners:
-			listener(BUDDY_JOIN, buddy)
+			listener(Group.BUDDY_JOIN, buddy)
 	
 	def _notify_buddy_leave(self, buddy):
 		for listener in self._presence_listeners:
-			listener(BUDDY_LEAVE, buddy)
+			listener(Group.BUDDY_LEAVE, buddy)
 
 class LocalGroup(Group):
 	def __init__(self):
@@ -64,9 +64,9 @@ class LocalGroup(Group):
 		self._services[sid] = service
 		self._notify_service_added(service)
 
-	def remove_service(self, sid):
-		self._notify_service_removed(service)
-		del self._services[sid]
+	def remove_service(self, service_id):
+		self._notify_service_removed(service_id)
+		del self._services[service_id]
 
 	def join(self):
 		self._owner = Owner(self)
@@ -103,8 +103,8 @@ class LocalGroup(Group):
 						
 	def _on_service_resolved(self, interface, protocol, name, stype, domain,
 							 host, aprotocol, address, port, txt, flags):
-			service = Service(name, stype, address, port)
-			if stype == PRESENCE_SERVICE_TYPE:
-				self._add_buddy(Buddy(service, name))
-			elif stype.startswith("_olpc"):
-				self.add_service(service)
+		service = Service(name, stype, address, port)
+		if stype == PRESENCE_SERVICE_TYPE:
+			self._add_buddy(Buddy(service, name))
+		elif stype.startswith("_olpc"):
+			self.add_service(service)

sugar/p2p/Makefile.am

@@ -3,6 +3,7 @@ sugar_PYTHON =			\
 	__init__.py		\
 	Buddy.py		\
 	Group.py		\
+	Model.py		\
 	Service.py		\
 	StreamReader.py		\
 	StreamWriter.py		\

sugar/p2p/Model.py

@@ -1,6 +1,7 @@
 MODEL_SERVICE_TYPE = "_olpc_model._tcp"
 MODEL_SERVICE_PORT = 6300
 
+import socket
 import xmlrpclib
 
 from sugar.p2p.Service import Service
@@ -59,7 +60,7 @@ class LocalModel:
 				p2p_server = network.GlibXMLRPCServer(("", port))
 				p2p_server.register_instance(ModelRequestHandler(self))
 				started = True
-			except:
+			except(socket.error):
 				port = port + 1
 				tries = tries - 1
 		service.set_port(port)

sugar/p2p/StreamReader.py

@@ -1,3 +1,5 @@
+import socket
+
 import network
 
 class StreamReaderRequestHandler(object):
@@ -5,7 +7,6 @@ class StreamReaderRequestHandler(object):
 		self._reader = reader
 
 	def message(self, nick_name, message):
-		address = network.get_authinfo()
 		self._reader.recv(nick_name, message)
 		return True
 
@@ -37,7 +38,7 @@ class StreamReader:
 				p2p_server = network.GlibXMLRPCServer(("", port))
 				p2p_server.register_instance(StreamReaderRequestHandler(self))
 				started = True
-			except:
+			except(socket.error):
 				port = port + 1
 				tries = tries - 1
 		self._service.set_port(port)

sugar/p2p/StreamWriter.py

@@ -31,7 +31,7 @@ class StreamWriter:
 			nick_name = self._group.get_owner().get_nick_name()
 			self._uclient.message(nick_name, data)
 			return True
-		except (socket.error, xmlrpclib.Fault, xmlrpclib.ProtocolError), e:
+		except (socket.error, xmlrpclib.Fault, xmlrpclib.ProtocolError):
 			traceback.print_exc()
 			return False
 

sugar/p2p/network.py

@@ -1,10 +1,6 @@
-# -*- tab-width: 4; indent-tabs-mode: t -*- 
-
 import socket
 import threading
 import traceback
-import select
-import time
 import xmlrpclib
 import sys
 
@@ -133,10 +129,6 @@ class GroupServer(object):
 
 		# Set some options to make it multicast-friendly
 		self._listen_sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-		try:
-			self._listen_sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1)
-		except:
-			pass
 		self._listen_sock.setsockopt(socket.SOL_IP, socket.IP_MULTICAST_TTL, 20)
 		self._listen_sock.setsockopt(socket.SOL_IP, socket.IP_MULTICAST_LOOP, 1)
 

sugar/p2p/presence.py

@@ -65,7 +65,7 @@ class PresenceDiscovery(object):
 
 		self._service_type_browsers[(interface, protocol, domain)] = b
 
-	def new_domain(self,interface, protocol, domain, flags):
+	def new_domain(self, interface, protocol, domain, flags):
 		if domain != "local":
 			return
 		self.browse_domain(interface, protocol, domain)
@@ -84,7 +84,7 @@ class PresenceAnnounce(object):
 				self._hostname = "%s:%s" % (self.server.GetHostName(), rs_port)
 				rs_name = self._hostname
 
-		info = ["%s=%s" % (k,v) for k,v in kwargs.items()]
+		info = ["%s=%s" % (k, v) for k, v in kwargs.items()]
 		g.AddService(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, 0, rs_name, rs_service,
 				"", "", # domain, host (let the system figure it out)
 				dbus.UInt16(rs_port), info,)