[GNUnet-SVN] r742 - Extractor/src/main

[grothoff]

Author: grothoff
Date: 2005-05-06 03:39:09 -0700 (Fri, 06 May 2005)
New Revision: 742

Modified:
   Extractor/src/main/Extractor.py
   Extractor/src/main/libextractor_python.c
Log:
up

Modified: Extractor/src/main/Extractor.py
===================================================================
--- Extractor/src/main/Extractor.py     2005-05-06 10:30:57 UTC (rev 741)
+++ Extractor/src/main/Extractor.py     2005-05-06 10:39:09 UTC (rev 742)
@@ -16,19 +16,19 @@
     """
     
     def __init__(self):
-        self.plugins = _extractor.loadDefaultLibraries()
+        self.__plugins = _extractor.loadDefaultLibraries()
     def __del__(self):
-        _extractor.removeAll(self.plugins)
+        _extractor.removeAll(self.__plugins)
 #    def load(plugs):
-#        self.plugins = _extractor.load(self.plugins, plugs)
+#        self.__plugins = _extractor.load(self.__plugins, plugs)
 #        return None
 #    def unload(plugs):
-#        self.plugins = _extractor.unload(self.plugins, plugs)
+#        self.__plugins = _extractor.unload(self.__plugins, plugs)
 #        return None
     def extract(self,filename):
         """Pass a filename to extract keywords.
         """
-        return _extractor.extract(self.plugins, filename, Keyword)
+        return _extractor.extract(self.__plugins, filename, Keyword)
 
 class Keyword(object):
     def __init__(self,type,value):

Modified: Extractor/src/main/libextractor_python.c
===================================================================
--- Extractor/src/main/libextractor_python.c    2005-05-06 10:30:57 UTC (rev 
741)
+++ Extractor/src/main/libextractor_python.c    2005-05-06 10:39:09 UTC (rev 
742)
@@ -65,8 +65,12 @@
                   &filename,
                   &py_clzz);
   ex = PyCObject_AsVoidPtr(py_exts);
+
+  Py_BEGIN_ALLOW_THREADS;
   keys = EXTRACTOR_getKeywords(ex,
                               filename);
+  Py_END_ALLOW_THREADS;
+
   ret = PyList_New(0);
   pos = keys;
   while (pos != NULL) {