Create odml.tools.converters

- Created the 'odml.tools.converters' directory.
- Moved format_converter and version_converter to
  new directory.
- Updated setup.py and imports in all affected files.

Author: mpsonntag

odml/scripts/odml_convert.py

@@ -35,7 +35,7 @@
 
 import odml
 
-from odml.tools.version_converter import VersionConverter as VerConf
+from odml.tools.converters.version_converter import VersionConverter as VerConf
 
 try:
     unicode = unicode

odml/scripts/odml_to_rdf.py

@@ -37,7 +37,7 @@
 import odml
 
 from odml.tools.odmlparser import ODMLReader, ODMLWriter
-from odml.tools.version_converter import VersionConverter as VerConf
+from odml.tools.converters.version_converter import VersionConverter as VerConf
 
 try:
     unicode = unicode

odml/tools/converters/__init__.py

@@ -4,9 +4,9 @@
 import sys
 
 import odml
-from .rdf_converter import RDFWriter
+from ..rdf_converter import RDFWriter
 from .version_converter import VersionConverter
-from .utils import ConversionFormats
+from ..utils import ConversionFormats
 
 try:
     unicode = unicode
@@ -21,13 +21,13 @@ def convert(cls, args=None):
         """
         Enable usage of the argparse for calling convert_dir(...)
         Example:
-            1) >> python format_converter.py ./..path../input_dir v1_1 -out ./..path../output_dir -r
+            1) >> python -m odml.tools.converters.format_converter ./..path../input_dir v1_1 -out ./..path../output_dir -r
             
                Convert files from the path <./..path../input_dir> to .xml odml version 1.1,
                writes them into <./..path../output_dir> including subdirectories 
                and its files from the input path.
             
-            2) >> python format_converter.py ./..path../input_dir odml
+            2) >> python -m odml.tools.converters.format_converter ./..path../input_dir odml
             
                Converts files from path <./..path../input_dir> to .odml,
                writes them into <./..path../input_dir_odml> not including subdirectories.

odml/tools/format_converter.py odml/tools/converters/format_converter.pyodml/tools/format_converter.py renamed to odml/tools/converters/format_converter.py

@@ -5,9 +5,10 @@
 import yaml
 
 from lxml import etree as ET
-from .. import format
-from ..info import FORMAT_VERSION
-from ..terminology import Terminologies, REPOSITORY_BASE
+
+from ... import format
+from ...info import FORMAT_VERSION
+from ...terminology import Terminologies, REPOSITORY_BASE
 
 import uuid
 

odml/tools/version_converter.py …ml/tools/converters/version_converter.pyodml/tools/version_converter.py renamed to odml/tools/converters/version_converter.py odml/tools/version_converter.py renamed to odml/tools/converters/version_converter.py

@@ -22,6 +22,7 @@
 packages = [
     'odml',
     'odml.tools',
+    'odml.tools.converters',
     'odml.scripts'
 ]
 

setup.py

@@ -3,7 +3,7 @@
 import unittest
 from contextlib import contextmanager
 
-from odml.tools.format_converter import FormatConverter
+from odml.tools.converters.format_converter import FormatConverter
 
 FC = FormatConverter
 

test/test_format_converter.py

@@ -13,7 +13,7 @@
 from contextlib import contextmanager
 from lxml import etree as ET
 from odml.terminology import REPOSITORY_BASE
-from odml.tools.version_converter import VersionConverter
+from odml.tools.converters.version_converter import VersionConverter
 
 try:
     unicode = unicode

test/test_version_converter.py

@@ -9,7 +9,7 @@
 import unittest
 
 from odml import load
-from odml.tools.version_converter import VersionConverter as VC
+from odml.tools.converters.version_converter import VersionConverter as VC
 
 
 class TestVersionConverterIntegration(unittest.TestCase):