Added fix to xml.etree.ElementPath for Python 2.6

diff --git a/setup.py b/setup.py
index 3aa74afbc91c95d9215f7e6dbfb275194a2e67df..99f8d08073ae85bc9b396299cef793d25309d8ca 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ if name == 'nt':
 setup(
     name='canari',
     author='Nadeem Douba',
-    version='0.3',
+    version='0.4',
     author_email='ndouba@gmail.com',
     description='Rapid transform development and transform execution framework for Maltego.',
     license='GPL',

diff --git a/src/canari/commands/common.py b/src/canari/commands/common.py
index 1433cdaf32ba1c5de58296b1d31d760565b599ca..6e74b3f0ba16a2d4a02fa40c8e71f308f6bd32dd 100644 (file)
--- a/src/canari/commands/common.py
+++ b/src/canari/commands/common.py
@@ -21,6 +21,13 @@ __maintainer__ = 'Nadeem Douba'
 __email__ = 'ndouba@gmail.com'
 __status__ = 'Development'
 
+def fix_etree():
+    try:
+        from xml.etree.cElementTree import XML
+        e = XML('<test><t a="1"/></test>')
+        e.find('t[@a="1"]')
+    except SyntaxError:
+        import canari.xmltools.fixetree
 
 def get_bin_dir():
     d = install(Distribution())

diff --git a/src/canari/commands/install_package.py b/src/canari/commands/install_package.py
index 2d457e4ac875a03f474865b7c22c9b5c40c37077..1238eb675f9d09d389ba5fcd37aa83c8418a2547 100644 (file)
--- a/src/canari/commands/install_package.py
+++ b/src/canari/commands/install_package.py
@@ -4,7 +4,7 @@ from ..maltego.configuration import  (MaltegoTransform, CmdCwdTransformProperty,
                                CmdLineTransformProperty, CmdParmTransformProperty, InputConstraint, TransformSet,
                                TransformSettings, CmdCwdTransformPropertySetting, CmdDbgTransformPropertySetting,
                                CmdLineTransformPropertySetting, CmdParmTransformPropertySetting)
-from common import detect_settings_dir, cmd_name, fix_pypath, get_bin_dir, import_transform, import_package
+from common import detect_settings_dir, cmd_name, fix_pypath, get_bin_dir, import_transform, import_package, fix_etree
 from ..maltego.message import ElementTree
 
 from pkg_resources import resource_filename, resource_listdir
@@ -271,7 +271,7 @@ def run(args):
     opts = parse_args(args)
 
     fix_pypath()
-
+    fix_etree()
 
     if opts.package.endswith('.transforms'):
         opts.package = opts.package.replace('.transforms', '')

diff --git a/src/canari/commands/uninstall_package.py b/src/canari/commands/uninstall_package.py
index c360f432054432b2e20743f79a691c77ba32489c..58583ba1f600a216c4736df2aee72668efd4baac 100644 (file)
--- a/src/canari/commands/uninstall_package.py
+++ b/src/canari/commands/uninstall_package.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from common import detect_settings_dir, cmd_name, fix_pypath, import_package, import_transform
+from common import detect_settings_dir, cmd_name, fix_pypath, import_package, import_transform, fix_etree
 
 from xml.etree.cElementTree import ElementTree, XML
 from os import path, mkdir, listdir, unlink, rmdir
@@ -120,6 +120,8 @@ def run(args):
 
     fix_pypath()
 
+    fix_etree()
+
     m = import_package('%s.transforms' % opts.package)
 
     for t in m.__all__: