From ec0c9edb74958a388e8bea279289995dbc9cf5e7 Mon Sep 17 00:00:00 2001 From: allfro Date: Tue, 25 Dec 2012 00:58:29 -0500 Subject: [PATCH] Changed relative imports to absolute imports for future jython support --- src/canari/commands/debug_transform.py | 6 +++--- src/canari/commands/generate_entities.py | 2 +- src/canari/commands/install_package.py | 4 ++-- src/canari/commands/run_server.py | 4 ++-- src/canari/commands/run_transform.py | 6 +++--- src/canari/commands/shell.py | 4 ++-- src/canari/maltego/configuration.py | 2 +- src/canari/maltego/html.py | 2 +- src/canari/maltego/message.py | 2 +- src/canari/xmltools/oxml.py | 6 +++--- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/canari/commands/debug_transform.py b/src/canari/commands/debug_transform.py index f20fdca..ae0f017 100644 --- 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 43ac44b..3a8e2a8 100644 --- 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 d0f1f0d..e4f2fbc 100644 --- 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 070a247..49aff4a 100755 --- 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 4ee420e..0aefa78 100644 --- 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 cc10045..835a00b 100644 --- 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 59d3a08..5bbfdc3 100644 --- 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 bad7017..bc7973c 100644 --- 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 904a893..6a51ddf 100644 --- 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 ea0d24c..4684eb6 100644 --- 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): -- 2.45.1