Package restructuring.

Author: raidoz

bin/motexml-from-xml

@@ -1,3 +1,3 @@
 #!/usr/local/bin/python
-from motexml.xmltomlhex import main
+from motexml.tools.xmltomlhex import main
 main()

bin/motexml-generate

@@ -1,3 +1,3 @@
 #!/usr/local/bin/python
-from motexml.gentypes import main
+from motexml.tools.gentypes import main
 main()

bin/motexml-to-xml

@@ -1,3 +1,3 @@
 #!/usr/local/bin/python
-from motexml.mlhextoxml import main
+from motexml.tools.mlhextoxml import main
 main()

motexml/__init__.py

@@ -3,4 +3,4 @@
 __author__ = "Raido Pahtma"
 __license__ = "MIT"
 
-version = "0.1.1"
+version = "0.1.2"

motexml/motexml.py

@@ -1,6 +1,8 @@
 """motexml.py: MoteXML."""
+from __future__ import absolute_import
+
 import re
-from . import mle
+from motexml import mle
 from xml.etree import ElementTree
 from xml.dom import minidom
 

motexml/tools/__init__.py

@@ -10,7 +10,7 @@ def main():
     import argparse
     parser = argparse.ArgumentParser(description="print hex as XML")
     parser.add_argument("hexdata", default=None, nargs="+", help="Input data")
-    parser.add_argument("--types", default="../../dt_types.txt", help="dt_types text file")
+    parser.add_argument("--types", default="dt_types.txt", help="dt_types text file")
     args = parser.parse_args()
 
     hexdata = "".join(args.hexdata)

motexml/gentypes.py motexml/tools/gentypes.pymotexml/gentypes.py renamed to motexml/tools/gentypes.py

@@ -10,7 +10,7 @@ def main():
     import argparse
     parser = argparse.ArgumentParser(description="print hex as XML")
     parser.add_argument("filename", default=None, help="Input file name")
-    parser.add_argument("--types", default="../../dt_types.txt", help="dt_types text file")
+    parser.add_argument("--types", default="dt_types.txt", help="dt_types text file")
     args = parser.parse_args()
 
     trans = motexml.MoteXMLTranslator(args.types)

motexml/mlhextoxml.py motexml/tools/mlhextoxml.pymotexml/mlhextoxml.py renamed to motexml/tools/mlhextoxml.py

@@ -3,7 +3,7 @@
 Warpper around shared library for python.
 """
 
-from setuptools import setup
+from setuptools import setup, find_packages
 from os.path import join as pjoin
 
 import motexml
@@ -19,7 +19,7 @@
       author_email='raido.pahtma@ttu.ee',
       license='MIT',
       platforms=['any'],
-      packages=['motexml'],
+      packages=find_packages(),
       install_requires=["lxml"],
       test_suite='nose.collector',
       tests_require=['nose'],