Try cElementTree

Author: kasemir

scan/client/data.py

@@ -3,7 +3,10 @@
 
 @author: Yongxiang Qiu, Kay Kasemir
 '''
-import xml.etree.ElementTree as ET
+try:
+    import xml.etree.cElementTree as ET
+except:
+    import xml.etree.ElementTree as ET
 from datetime import  datetime
 
 def getTimeSeries(data, name, convert='plain'):

scan/client/logdata.py

@@ -1,7 +1,10 @@
 """Log Data Support
 """
 
-import xml.etree.ElementTree as ET
+try:
+    import xml.etree.cElementTree as ET
+except:
+    import xml.etree.ElementTree as ET
 
 from datetime import  datetime
 

scan/client/scanclient.py

@@ -5,7 +5,10 @@
 '''
 
 import time
-import xml.etree.ElementTree as ET
+try:
+    import xml.etree.cElementTree as ET
+except:
+    import xml.etree.ElementTree as ET
 import urllib
 from scan.client.logdata import parseXMLData
 from scan.commands.commandsequence import CommandSequence

scan/commands/commandsequence.py

@@ -3,7 +3,10 @@
 
 @author: qiuyx
 '''
-import xml.etree.ElementTree as ET
+try:
+    import xml.etree.cElementTree as ET
+except:
+    import xml.etree.ElementTree as ET
 
 from scan.commands.command import Command
 from scan.util.xml_helper import indent

scan/commands/comment.py

@@ -4,7 +4,10 @@
 @author: qiuyx
 '''
 from scan.commands.command import Command
-import xml.etree.ElementTree as ET
+try:
+    import xml.etree.cElementTree as ET
+except:
+    import xml.etree.ElementTree as ET
 
 class Comment(Command):
     """Comment
@@ -26,4 +29,4 @@ def __repr__(self):
         return "Comment('%s')" % self.__text
 
 
-        
+        

scan/commands/configlog.py

@@ -4,7 +4,10 @@
 '''
 from string import lower
 from scan.commands.command import Command
-import xml.etree.ElementTree as ET 
+try:
+    import xml.etree.cElementTree as ET
+except:
+    import xml.etree.ElementTree as ET
 
 class ConfigLog(Command):
     """Config automatic logging.

scan/commands/delay.py

@@ -4,7 +4,10 @@
 @author: qiuyx
 '''
 from scan.commands.command import Command
-import xml.etree.ElementTree as ET 
+try:
+    import xml.etree.cElementTree as ET
+except:
+    import xml.etree.ElementTree as ET
 
 class Delay(Command):
     """Delay for a fixed amount of time

scan/commands/iff.py

@@ -1,5 +1,8 @@
 from scan.commands.command import Command
-import xml.etree.ElementTree as ET 
+try:
+    import xml.etree.cElementTree as ET
+except:
+    import xml.etree.ElementTree as ET
 
 class If(Command):
     """Conditionally execute commands.

scan/commands/include.py

@@ -4,7 +4,10 @@
 @author: qiuyx
 '''
 from scan.commands.command import Command
-import xml.etree.ElementTree as ET
+try:
+    import xml.etree.cElementTree as ET
+except:
+    import xml.etree.ElementTree as ET
 
 class Include(Command):
     """Include another scan.
@@ -45,4 +48,4 @@ def __repr__(self):
             result += ", errhandler='%s'" % self.__errHandler
         result += ")"
         return result
-            
+            

scan/commands/log.py

@@ -4,7 +4,10 @@
 @author: qiuyx
 '''
 from scan.commands.command import Command
-import xml.etree.ElementTree as ET
+try:
+    import xml.etree.cElementTree as ET
+except:
+    import xml.etree.ElementTree as ET
 
 class Log(Command):
     """Log current value of one or more devices.
@@ -59,4 +62,4 @@ def __repr__(self):
             result += ", errhandler='%s'" % self.__errHandler
         result += ')'
         return result
-    
+