Replace __call__ in dir(*) with callable(*) for performance gain

svn: r10856

src/BasicUtils/_UpdateCallback.py

@@ -53,7 +53,7 @@ class UpdateCallback:
         @param interval: number of seconds at most between the updates
         @type interval: int
         """
-        if '__call__' in dir(callback): # callback is really callable
+        if callable(callback): # callback is really callable
             self.update = self.update_real
             self.callback = callback
             self.interval = interval

src/plugins/ExportCSV.py

@@ -237,7 +237,7 @@ class CSVWriter:
         self.cl = cl
         self.filename = filename
         self.callback = callback
-        if '__call__' in dir(self.callback): # callback is really callable
+        if callable(self.callback): # callback is really callable
             self.update = self.update_real
         else:
             self.update = self.update_empty

src/plugins/ExportVCalendar.py

@@ -136,7 +136,7 @@ class CalendarWriter:
         self.cl = cl
         self.filename = filename
         self.callback = callback
-        if '__call__' in dir(self.callback): # callback is really callable
+        if callable(self.callback): # callback is really callable
             self.update = self.update_real
         else:
             self.update = self.update_empty

src/plugins/ExportVCard.py

@@ -133,7 +133,7 @@ class CardWriter:
         self.cl = cl
         self.filename = filename
         self.callback = callback
-        if '__call__' in dir(self.callback): # callback is really callable
+        if callable(self.callback): # callback is really callable
             self.update = self.update_real
         else:
             self.update = self.update_empty

src/plugins/WriteFtree.py

@@ -141,7 +141,7 @@ class FtreeWriter:
         self.cl = cl
         self.filename = filename
         self.callback = callback
-        if '__call__' in dir(self.callback): # callback is really callable
+        if callable(self.callback): # callback is really callable
             self.update = self.update_real
         else:
             self.update = self.update_empty

src/plugins/WriteGeneWeb.py

@@ -162,7 +162,7 @@ class GeneWebWriter:
         self.cl = cl
         self.filename = filename
         self.callback = callback
-        if '__call__' in dir(self.callback): # callback is really callable
+        if callable(self.callback): # callback is really callable
             self.update = self.update_real
         else:
             self.update = self.update_empty