Changeset 9842

Timestamp:

06/26/08 13:30:13 (5 months ago)

Author:

asterix

Message:

remove duplicate function, simplify logic

Files:

• trunk/src/common/xmpp/debug.py (modified) (2 diffs)

trunk/src/common/xmpp/debug.py

@@ -284 +284 @@
             self._fh.write( '%s%s%s' % ( pre, s, suf ))
         self._fh.flush()
-            
                 
-    def is_active( self, flag ):
-        'If given flag(s) should generate output.'
-
-        # try to abort early to quicken code
-        if not self.active:
-            return 0
-        if not flag or flag in self.active:
-            return 1
-        else:
-            # check for multi flag type:
-            if type( flag ) in ( type(()), type([]) ):
-                for s in flag:
-                    if s in self.active:
-                        return 1
-        return 0
-
-    
     def active_set( self, active_flags = None ):
         "returns 1 if any flags where actually set, otherwise 0."
@@ -412 +394 @@
     def is_active( self, flag ):
         if not self.active: return 0
-        if not flag or flag in self.active and DBG_ALWAYS not in self.active or flag not in self.active and DBG_ALWAYS in self.active : return 1
+        if not flag or ((flag in self.active) ^ (DBG_ALWAYS in self.active)) : return 1
         return 0