File tree Expand file tree Collapse file tree 1 file changed +6
-14
lines changed Expand file tree Collapse file tree 1 file changed +6
-14
lines changed Original file line number Diff line number Diff line change 2121
2222# Try whatever etree implementations are available from a list that are
2323#"supposed" to work
24- try :
25- import xml .etree .ElementTree as ElementTree
26- treeTypes ['ElementTree' ] = treebuilders .getTreeBuilder ("etree" , ElementTree , fullTree = True )
27- except ImportError :
28- try :
29- import elementtree .ElementTree as ElementTree
30- treeTypes ['ElementTree' ] = treebuilders .getTreeBuilder ("etree" , ElementTree , fullTree = True )
31- except ImportError :
32- pass
24+ import xml .etree .ElementTree as ElementTree
25+ treeTypes ['ElementTree' ] = treebuilders .getTreeBuilder ("etree" , ElementTree , fullTree = True )
3326
3427try :
3528 import xml .etree .cElementTree as cElementTree
36- treeTypes ['cElementTree' ] = treebuilders .getTreeBuilder ("etree" , cElementTree , fullTree = True )
3729except ImportError :
38- try :
39- import cElementTree
30+ pass
31+ else :
32+ # On Python 3.3 and above cElementTree is an alias, don't run them twice.
33+ if cElementTree .Element is not ElementTree .Element :
4034 treeTypes ['cElementTree' ] = treebuilders .getTreeBuilder ("etree" , cElementTree , fullTree = True )
41- except ImportError :
42- pass
4335
4436try :
4537 import lxml .etree as lxml # flake8: noqa
You can’t perform that action at this time.
0 commit comments