Changed relative imports to absolute imports for future jython support

diff --git a/src/canari/commands/debug_transform.py b/src/canari/commands/debug_transform.py
index f20fdca89411455ab34bcf4b540ebea746b200b3..ae0f01734f2f6f0e74a2f2de6b4901456be7ef4d 100644 (file)
--- a/src/canari/commands/debug_transform.py
+++ b/src/canari/commands/debug_transform.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
-from ..maltego.message import MaltegoException, MaltegoTransformResponseMessage
+from canari.maltego.message import MaltegoException, MaltegoTransformResponseMessage
 from common import croak, import_transform, cmd_name, console_message, fix_binpath
-from ..maltego.utils import onterminate, parseargs
-from ..config import config
+from canari.maltego.utils import onterminate, parseargs
+from canari.config import config
 
 from os import execvp, geteuid, name
 from argparse import ArgumentParser

diff --git a/src/canari/commands/generate_entities.py b/src/canari/commands/generate_entities.py
index 43ac44b70a7a1fc79a1da9ca1636e9d20c7d2667..3a8e2a8ce5fe99f9e5ca2f6eb26654ab1dd7de3d 100644 (file)
--- a/src/canari/commands/generate_entities.py
+++ b/src/canari/commands/generate_entities.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 from common import detect_settings_dir, cmd_name
-from ..maltego.entities import Entity
+from canari.maltego.entities import Entity
 
 from xml.etree.cElementTree import XML
 from argparse import ArgumentParser

diff --git a/src/canari/commands/install_package.py b/src/canari/commands/install_package.py
index d0f1f0d93e1b05c134dd04c10fd845d32155812d..e4f2fbc0b202f862596a2491820c0bbc0bf10281 100644 (file)
--- a/src/canari/commands/install_package.py
+++ b/src/canari/commands/install_package.py
@@ -1,11 +1,11 @@
 #!/usr/bin/env python
 
-from ..maltego.configuration import  (MaltegoTransform, CmdCwdTransformProperty, CmdDbgTransformProperty,
+from canari.maltego.configuration import  (MaltegoTransform, CmdCwdTransformProperty, CmdDbgTransformProperty,
                                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, fix_etree
-from ..maltego.message import ElementTree
+from canari.maltego.message import ElementTree
 
 from pkg_resources import resource_filename, resource_listdir
 from xml.etree.cElementTree import XML, SubElement

diff --git a/src/canari/commands/run_server.py b/src/canari/commands/run_server.py
index 070a247f3c9fc5e3360c078b5933429401297b44..49aff4aa55d1c31ebc5c94a9b85fa87094a67395 100755 (executable)
--- a/src/canari/commands/run_server.py
+++ b/src/canari/commands/run_server.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
-from ..maltego.message import (MaltegoTransformResponseMessage, MaltegoException,
+from canari.maltego.message import (MaltegoTransformResponseMessage, MaltegoException,
                                MaltegoTransformExceptionMessage, MaltegoMessage, Message)
 from common import cmd_name, import_transform, fix_binpath, fix_pypath, import_package
-from ..config import config
+from canari.config import config
 
 from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler
 from os import execvp, geteuid, name, path, fork

diff --git a/src/canari/commands/run_transform.py b/src/canari/commands/run_transform.py
index 4ee420e628e14100bb9229e318d98a93105dfa69..0aefa78f887b83cb18d13767497c6f4ce56b5397 100644 (file)
--- a/src/canari/commands/run_transform.py
+++ b/src/canari/commands/run_transform.py
@@ -1,13 +1,13 @@
 #!/usr/bin/env python
 
-from ..maltego.message import MaltegoException, MaltegoTransformResponseMessage
+from canari.maltego.message import MaltegoException, MaltegoTransformResponseMessage
 from common import cmd_name, import_transform, fix_binpath, get_bin_dir
-from ..maltego.utils import onterminate, parseargs, croak, message
+from canari.maltego.utils import onterminate, parseargs, croak, message
 
 from os import execvp, geteuid, name, path
 from argparse import ArgumentParser
 from traceback import format_exc
-from ..config import config
+from canari.config import config
 from sys import argv
 
 

diff --git a/src/canari/commands/shell.py b/src/canari/commands/shell.py
index cc10045af619ccd9cb62fab87df969a233374359..835a00b38c01f6585cc744d52c3f0083d2f7d46c 100644 (file)
--- a/src/canari/commands/shell.py
+++ b/src/canari/commands/shell.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 from common import console_message, cmd_name, highlight, fix_pypath, fix_binpath, import_package
-from ..maltego.message import MaltegoTransformResponseMessage
-from ..config import config
+from canari.maltego.message import MaltegoTransformResponseMessage
+from canari.config import config
 
 from os import path, name, geteuid, execvp
 from code import InteractiveConsole

diff --git a/src/canari/maltego/configuration.py b/src/canari/maltego/configuration.py
index 59d3a08e6b0a02a3163cf1b0cc329f0c38f5510e..5bbfdc35c3d3eb88e8dee8ccaa6b28e2cc3b9f1f 100644 (file)
--- a/src/canari/maltego/configuration.py
+++ b/src/canari/maltego/configuration.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from ..xmltools.oxml import XMLAttribute, XSAttributeType, XMLSubElement, XSSubElementType
+from canari.xmltools.oxml import XMLAttribute, XSAttributeType, XMLSubElement, XSSubElementType
 from message import MaltegoElement
 
 

diff --git a/src/canari/maltego/html.py b/src/canari/maltego/html.py
index bad7017aff66fbd55690503f4ae9f002a64d3ee9..bc7973c8f87f39dc626ea478edd0b34d7c80f760 100644 (file)
--- a/src/canari/maltego/html.py
+++ b/src/canari/maltego/html.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from ..xmltools.oxml import ElementTree, Element
+from canari.xmltools.oxml import ElementTree, Element
 
 from cStringIO import StringIO
 from copy import deepcopy

diff --git a/src/canari/maltego/message.py b/src/canari/maltego/message.py
index 904a893aced5298a8b4c978815dbe574eb85507e..6a51ddf5bf06f9f598fc98e5967d77a1ca7b9028 100644 (file)
--- a/src/canari/maltego/message.py
+++ b/src/canari/maltego/message.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from ..xmltools.oxml import *
+from canari.xmltools.oxml import *
 
 from numbers import Number
 from re import sub

diff --git a/src/canari/xmltools/oxml.py b/src/canari/xmltools/oxml.py
index ea0d24cbdf997ca1987971adfb80ddd688e23d05..4684eb68724b3b72d78569ffd6116fae3f5368e0 100644 (file)
--- a/src/canari/xmltools/oxml.py
+++ b/src/canari/xmltools/oxml.py
@@ -4,7 +4,7 @@ import xml.etree.ElementTree as ET
 from numbers import Number
 from copy import deepcopy
 from pickle import dumps
-from sys import stdout, version_info
+from sys import stdout
 from re import sub
 
 __author__ = 'Nadeem Douba'
@@ -307,7 +307,7 @@ class XMLSubElement(object):
 
 
 class ElementTree(ET.ElementTree):
-    if (2, 6) <= version_info < (2, 7):
+    if hasattr(ET.ElementTree, '_write'):
         def _write(self, file, node, encoding, namespaces):
             if node.tag is 'CDATA':
                 if node.text is not None:
@@ -319,7 +319,7 @@ class ElementTree(ET.ElementTree):
     def write(self, file=stdout, encoding='us-ascii'):
         _eto.write(self, file, encoding)
 
-if version_info >= (2, 7):
+if hasattr(ET, '_serialize_xml'):
     _orig_serialize_xml = ET._serialize_xml
 
     def _serialize_xml(write, elem, encoding, qnames, namespaces):