From: Ed Page <eopage@byu.net>
Date: Sat, 3 Oct 2009 20:07:07 +0000 (-0500)
Subject: Fixing a deprecation warning and some bugs
X-Git-Url: http://git.maemo.org/git/?p=theonering;a=commitdiff_plain;h=662a95ad50d99c99e78b7e5207834c14ac91ec2c

Fixing a deprecation warning and some bugs
---

diff --git a/src/handle.py b/src/handle.py
index 057ddf3..bcce9d5 100644
--- a/src/handle.py
+++ b/src/handle.py
@@ -7,37 +7,11 @@ import telepathy
 _moduleLogger = logging.getLogger("handle")
 
 
-class MetaMemoize(type):
-	"""
-	Allows a class to cache off instances for reuse
-	"""
-
-	def __call__(cls, connection, *args):
-		obj, newlyCreated = cls.__new__(cls, connection, *args)
-		if newlyCreated:
-			obj.__init__(connection, connection.get_handle_id(), *args)
-			_moduleLogger.info("New Handle %r" % obj)
-		return obj
-
-
 class TheOneRingHandle(telepathy.server.Handle):
 	"""
 	Instances are memoized
 	"""
 
-	__metaclass__ = MetaMemoize
-
-	_instances = weakref.WeakValueDictionary()
-
-	def __new__(cls, connection, *args):
-		key = cls, connection.username, args
-		if key in cls._instances.keys():
-			return cls._instances[key], False
-		else:
-			instance = object.__new__(cls, connection, *args)
-			cls._instances[key] = instance # TRICKY: instances is a weakdict
-			return instance, True
-
 	def __init__(self, connection, id, handleType, name):
 		telepathy.server.Handle.__init__(self, id, handleType, name)
 		self._conn = weakref.proxy(connection)
@@ -54,8 +28,6 @@ class TheOneRingHandle(telepathy.server.Handle):
 
 class ConnectionHandle(TheOneRingHandle):
 
-	instance = None
-
 	def __init__(self, connection, id):
 		handleType = telepathy.HANDLE_TYPE_CONTACT
 		handleName = connection.username
@@ -97,7 +69,26 @@ _HANDLE_TYPE_MAPPING = {
 }
 
 
-def create_handle(connection, type, *args):
-	handle = _HANDLE_TYPE_MAPPING[type](connection, *args)
-	connection._handles[handle.get_type(), handle.get_id()] = handle
-	return handle
+def create_handle_factory():
+
+	cache = weakref.WeakValueDictionary()
+
+	def create_handle(connection, type, *args):
+		Handle = _HANDLE_TYPE_MAPPING[type]
+		key = Handle, connection.username, args
+		try:
+			handle = cache[key]
+			isNewHandle = False
+		except KeyError:
+			handle = Handle(connection, connection.get_handle_id(), *args)
+			cache[key] = handle
+			isNewHandle = True
+		connection._handles[handle.get_type(), handle.get_id()] = handle
+		handleStatus = "Is New!" if isNewHandle else "From Cache"
+		_moduleLogger.info("Created Handle: %r (%s)" % (handle, handleStatus))
+		return handle
+
+	return create_handle
+
+
+create_handle = create_handle_factory()