Restructured package files

src/__init__.py

@@ -0,0 +1,15 @@
+# -*- coding: UTF-8 -*-
+
+from __future__ import absolute_import
+
+import logging
+
+class NullHandler(logging.Handler):
+    def emit(self, record):
+        pass
+
+_log = logging.getLogger(__name__)
+_log.setLevel(logging.DEBUG)
+_log.addHandler(NullHandler())
+
+from . import lib

src/dmoz2db.py

@@ -32,7 +32,6 @@
 import optparse
 import logging
 import ConfigParser #for the database config file
-import handler
 import time
 from datetime import timedelta
 from xml.sax import parse
@@ -41,7 +40,8 @@
 from sqlalchemy.exc import OperationalError
 from sqlalchemy.sql.expression import bindparam
 
-from schemes import table_scheme
+from lib import handler
+from lib.schemes import table_scheme
 
 #the global logger
 LOG = logging.Logger(__name__)

src/lib/__init__.py

@@ -0,0 +1,17 @@
+# -*- coding: UTF-8 -*-
+
+from __future__ import absolute_import
+import logging
+
+class NullHandler(logging.Handler):
+    def emit(self, record):
+        pass
+
+_log = logging.getLogger(__name__)
+_log.setLevel(logging.DEBUG)
+_log.addHandler(NullHandler())
+
+from . import handler
+from . import content
+from . import structure
+from . import prepared_statements

src/handler.py → src/lib/handler.py

@@ -20,6 +20,7 @@
 """
 
 from __future__ import unicode_literals
+from __future__ import absolute_import
 
 __version__ = '0.1'
 __author__ = 'Johannes Knopp <johannes@informatik.uni-mannheim.de>'
@@ -32,11 +33,11 @@
 from xml.sax import handler
 from sqlalchemy.exc import IntegrityError
 
-import schemes.table_scheme as ts
-from schemes.xml_scheme import DmozStructure as DS
-from schemes.xml_scheme import DmozContent as DC
-from structure import Topic
-from content import Link
+from .schemes import table_scheme as ts
+from .schemes.xml_scheme import DmozStructure as DS
+from .schemes.xml_scheme import DmozContent as DC
+from .structure import Topic
+from .content import Link
 
 _log = logging.getLogger(__name__)
 

src/prepared_statements.py → src/lib/prepared_statements.py

@@ -21,14 +21,15 @@
 """
 
 from __future__ import unicode_literals
+from __future__ import absolute_import
 
 __version__ = '0.1'
 __author__ = 'Johannes Knopp <johannes@informatik.uni-mannheim.de>'
 __copyright__ = '© Copyright 2010 Johannes Knopp'
 
 from sqlalchemy.sql.expression import bindparam
 
-import schemes.table_scheme as ts
+from .schemes import table_scheme as ts
 
 at = ts.aliases_t
 ct = ts.categories_t