[Freevo-cvslog] Kaa r3220 - trunk/metadata/src

[Jason T. <ta...@ur...>]

Author: tack
Date: Sun Mar 23 14:26:31 2008
New Revision: 3220

Log:
Use kaa.utils.Singleton.


Modified:
   trunk/metadata/src/factory.py

Modified: trunk/metadata/src/factory.py
==============================================================================
--- trunk/metadata/src/factory.py	(original)
+++ trunk/metadata/src/factory.py	Sun Mar 23 14:26:31 2008
@@ -40,6 +40,9 @@
 import urllib
 import logging
 
+# kaa imports
+import kaa.utils
+
 # kaa.metadata imports
 import core
 
@@ -56,18 +59,6 @@
 R_EXTENTION = 1
 R_CLASS     = 2
 
-def Factory():
-    """
-    Create or return global unique factory object.
-    """
-    global _factory
-
-    # One-time init
-    if _factory == None:
-        _factory = _Factory()
-    return _factory
-
-
 def register(mimetype, extensions, c, magic=None):
     """
     Register a parser to the factory.
@@ -387,3 +378,5 @@
             if info[R_MIMETYPE] == mimetype and info[R_EXTENSION] == extensions:
                 return self.get_class(info[R_CLASS])
         return None
+
+Factory = kaa.utils.Singleton(_Factory)