dbservice: clean unused imports, make rest available on top-level

diff --git a/python/skytools/__init__.py b/python/skytools/__init__.py
index b816cd76eb9b2e2bd1dcf1c8296a8693ceb4253e..51d4e26cf9fd57343054f685553f062dad40f04c 100644 (file)
--- a/python/skytools/__init__.py
+++ b/python/skytools/__init__.py
@@ -6,6 +6,14 @@ _symbols = {
     'AdminScript': 'skytools.adminscript:AdminScript',
     # skytools.config
     'Config': 'skytools.config:Config',
+    # skytools.dbservice
+    'DBService': 'skytools.dbservice:DBService',
+    'ServiceContext': 'skytools.dbservice:ServiceContext',
+    'TableAPI': 'skytools.dbservice:TableAPI',
+    'get_record': 'skytools.dbservice:get_record',
+    'get_record_list': 'skytools.dbservice:get_record_list',
+    'make_record': 'skytools.dbservice:make_record',
+    'make_record_array': 'skytools.dbservice:make_record_array',
     # skytools.dbstruct
     'SeqStruct': 'skytools.dbstruct:SeqStruct',
     'TableStruct': 'skytools.dbstruct:TableStruct',

diff --git a/python/skytools/dbservice.py b/python/skytools/dbservice.py
index 4a64555fac94d0206318a43e5dfdf7d7aa1b47ab..f42cd2d953ea5ded3207b14c68ee3866e16e9a08 100755 (executable)
--- a/python/skytools/dbservice.py
+++ b/python/skytools/dbservice.py
@@ -7,10 +7,13 @@ import re, skytools
 
 from skytools import dbdict
 
-__all__ = ['DBService',  'dbdict',
+__all__ = ['DBService',
     'get_record', 'get_record_list',
-    'make_record', 'make_record_array', 'log_result', 'transform_fields',
-    'ServiceContext', 'TableAPI']
+    'make_record', 'make_record_array',
+    #'log_result', 'transform_fields',
+    'ServiceContext',
+    #'TableAPI',
+]
 
 try:
     import plpy