# HG changeset patch
# User peterjc
# Date 1367508114 14400
# Node ID fb9cc7c43c222490d37b6dd16bfd63c931bf4c8d
# Parent  462d362d0b8bb2cb6998b073f335ec6241e203ea
Uploaded v0.0.20 preview 5, cElementTree fallback

diff -r 462d362d0b8b -r fb9cc7c43c22 tools/ncbi_blast_plus/blastxml_to_tabular.py
--- a/tools/ncbi_blast_plus/blastxml_to_tabular.py	Mon Apr 29 12:24:35 2013 -0400
+++ b/tools/ncbi_blast_plus/blastxml_to_tabular.py	Thu May 02 11:21:54 2013 -0400
@@ -63,11 +63,14 @@
 import re
 
 if "-v" in sys.argv or "--version" in sys.argv:
-    print "v0.0.11"
+    print "v0.0.12"
     sys.exit(0)
 
 if sys.version_info[:2] >= ( 2, 5 ):
-    import xml.etree.cElementTree as ElementTree
+    try:
+        from xml.etree import cElementTree as ElementTree
+    except ImportError:
+        from xml.etree import ElementTree as ElementTree
 else:
     from galaxy import eggs
     import pkg_resources; pkg_resources.require( "elementtree" )
diff -r 462d362d0b8b -r fb9cc7c43c22 tools/ncbi_blast_plus/ncbi_blast_plus.txt
--- a/tools/ncbi_blast_plus/ncbi_blast_plus.txt	Mon Apr 29 12:24:35 2013 -0400
+++ b/tools/ncbi_blast_plus/ncbi_blast_plus.txt	Thu May 02 11:21:54 2013 -0400
@@ -104,6 +104,7 @@
 v0.0.20 - Added unit tests for BLASTN and TBLASTX.
         - Automatic installation via the Tool Shed now uses the NCBI provided
           precompiled binaries for 64bit Linux, rather than compiling locally.
+        - Fallback on ElementTree if cElementTree missing in XML to tabular.
 
 
 Developers