Sex Out 7 21:50:45 BRT 2016

Author: mtxr

SQLTools.py

@@ -3,18 +3,14 @@
 import sys
 import os
 
-dirpath = os.path.dirname(__file__)
-if dirpath not in sys.path:
-    sys.path.append(dirpath)
-
 import sublime
 from sublime_plugin import WindowCommand, EventListener, TextCommand
 
-from SQLToolsAPI import Utils
-from SQLToolsAPI.Log import Log, Logger
-from SQLToolsAPI.Storage import Storage, Settings
-from SQLToolsAPI.Connection import Connection
-from SQLToolsAPI.History import History
+from .SQLToolsAPI import Utils
+from .SQLToolsAPI.Log import Log, Logger
+from .SQLToolsAPI.Storage import Storage, Settings
+from .SQLToolsAPI.Connection import Connection
+from .SQLToolsAPI.History import History
 
 USER_FOLDER                  = None
 DEFAULT_FOLDER               = None
@@ -466,13 +462,14 @@ def reload():
     try:
         # python 3.0 to 3.3
         import imp
-        imp.reload(sys.modules["SQLToolsAPI"])
-        imp.reload(sys.modules["SQLToolsAPI.Utils"])
-        imp.reload(sys.modules["SQLToolsAPI.Storage"])
-        imp.reload(sys.modules["SQLToolsAPI.History"])
-        imp.reload(sys.modules["SQLToolsAPI.Log"])
-        imp.reload(sys.modules["SQLToolsAPI.Command"])
-        imp.reload(sys.modules["SQLToolsAPI.Connection"])
+        print (__package__, sys.modules.keys())
+        imp.reload(sys.modules[__package__ + ".SQLToolsAPI"])
+        imp.reload(sys.modules[__package__ + ".SQLToolsAPI.Utils"])
+        imp.reload(sys.modules[__package__ + ".SQLToolsAPI.Storage"])
+        imp.reload(sys.modules[__package__ + ".SQLToolsAPI.History"])
+        imp.reload(sys.modules[__package__ + ".SQLToolsAPI.Log"])
+        imp.reload(sys.modules[__package__ + ".SQLToolsAPI.Command"])
+        imp.reload(sys.modules[__package__ + ".SQLToolsAPI.Connection"])
     except Exception as e:
         raise (e)
         pass

SQLToolsAPI/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.0.2
+current_version = 0.1.0
 files = __init__.py README.md
 commit = True
 tag = True

SQLToolsAPI/.gitignore

@@ -0,0 +1,3 @@
+*.pyc
+tests/
+.travis.yml

SQLToolsAPI/README.md

@@ -1,3 +1,3 @@
-## SQLTools API for plugins - v0.0.2
+## SQLTools API for plugins - v0.1.0
 
 Docs will be ready soon

SQLToolsAPI/Storage.py

@@ -1,5 +1,5 @@
 import os
-from SQLToolsAPI import Utils as U
+from . import Utils as U
 
 __version__ = "v0.1.0"
 

SQLToolsAPI/Utils.py

@@ -1,10 +1,14 @@
-import re
+__version__ = "v0.1.0"
+
 import json
-import sqlparse
+import os
+import re
+import sys
 
-__version__ = "v0.1.0"
+if os.path.dirname(__file__) not in sys.path:
+    sys.path.append(os.path.dirname(__file__))
 
-from .Log import Log
+from .sqlparse import format
 
 # Regular expression for comments
 comment_re = re.compile(
@@ -57,7 +61,7 @@ def getResultAsList(results):
 
 def formatSql(raw, settings):
     try:
-        result = sqlparse.format(raw, **settings)
+        result = format(raw, **settings)
 
         return result
     except Exception:

SQLToolsAPI/__init__.py

@@ -1,14 +1,12 @@
-__version__ = "v0.0.2"
+__version__ = "v0.1.0"
 
-from SQLToolsAPI.Log import Log
 
 __all__ = [
+    'Log',
+    'Utils',
     'Command',
     'Connection',
     'History',
-    'Log',
-    'Log',
     'Settings',
     'Storage',
-    'Utils'
 ]