Skip to content

Commit 2d0daa6

Browse files
author
DisposaBoy
committed
use relative imports everywhere to avoid more of Python's BS
depending on how you import a module, it might be imported multiple times leading to strange bugs if the module needs initialisation or is otherwise stateful
1 parent 257f749 commit 2d0daa6

14 files changed

+42
-42
lines changed

GoSublime.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
print("GoSublime: %s" % execErr)
2323

2424
def loadable_mods():
25-
from gosubl import gs
26-
from gosubl import sh
27-
from gosubl import margo
28-
from gosubl import mg9
25+
from .gosubl import gs
26+
from .gosubl import sh
27+
from .gosubl import margo
28+
from .gosubl import mg9
2929

3030
return [
3131
('gs', gs),
@@ -35,10 +35,10 @@ def loadable_mods():
3535
]
3636

3737
def plugin_loaded():
38-
from gosubl import about
39-
from gosubl import sh
40-
from gosubl import ev
41-
from gosubl import gs
38+
from .gosubl import about
39+
from .gosubl import sh
40+
from .gosubl import ev
41+
from .gosubl import gs
4242

4343
if VERSION != about.VERSION:
4444
gs.show_output('GoSublime-main', '\n'.join([

gosubl/gs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Sublime modelines - https://github.com/SublimeText/Modelines
22
# sublime: translate_tabs_to_spaces false; rulers [100,120]
33

4-
from gosubl import about
4+
from . import about
55
from subprocess import Popen, PIPE
66
import copy
77
import datetime

gosubl/gspatch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from gosubl import gs
1+
from . import gs
22
import sublime
33
import sys
44

gosubl/gsq.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from gosubl import gs
1+
from . import gs
22
import sublime
33
import threading
44

gosubl/gsshell.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from gosubl import gs
2-
from gosubl import sh
1+
from . import gs
2+
from . import sh
33
import hashlib
44
import os
55
import re

gosubl/mg9.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
from gosubl import about
2-
from gosubl import ev
3-
from gosubl import gs
4-
from gosubl import gsq
5-
from gosubl import sh
1+
from . import about
2+
from . import ev
3+
from . import gs
4+
from . import gsq
5+
from . import sh
66
import atexit
77
import base64
88
import glob

gs9o.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
from gosubl import about
2-
from gosubl import gs
3-
from gosubl import gsq
4-
from gosubl import gsshell
5-
from gosubl import mg9
6-
from gosubl import sh
1+
from .gosubl import about
2+
from .gosubl import gs
3+
from .gosubl import gsq
4+
from .gosubl import gsshell
5+
from .gosubl import mg9
6+
from .gosubl import sh
77
import datetime
88
import json
99
import os

gscommands.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
from gosubl import gs
2-
from gosubl import gspatch
3-
from gosubl import mg9
1+
from .gosubl import gs
2+
from .gosubl import gspatch
3+
from .gosubl import mg9
44
import datetime
55
import os
66
import sublime

gscomplete.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from gosubl import gs
2-
from gosubl import mg9
1+
from .gosubl import gs
2+
from .gosubl import mg9
33
from os.path import basename
44
from os.path import dirname
55
import json

gsdoc.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
from gosubl import gs
2-
from gosubl import gsq
3-
from gosubl import mg9
1+
from .gosubl import gs
2+
from .gosubl import gsq
3+
from .gosubl import mg9
44
import os
55
import re
66
import sublime

gsev.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from gosubl import gs
1+
from .gosubl import gs
22
from . import gstest
33
import sublime
44
import sublime_plugin

gslint.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from gosubl import gs
2-
from gosubl import gsq
3-
from gosubl import gsshell
4-
from gosubl import mg9
1+
from .gosubl import gs
2+
from .gosubl import gsq
3+
from .gosubl import gsshell
4+
from .gosubl import mg9
55
import os
66
import re
77
import sublime

gspalette.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
from gosubl import gs
2-
from gosubl import gspatch
3-
from gosubl import mg9
1+
from .gosubl import gs
2+
from .gosubl import gspatch
3+
from .gosubl import mg9
44
from os.path import dirname, basename, relpath
55
from . import gslint
66
import re

gstest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from gosubl import gs
2-
from gosubl import mg9
1+
from .gosubl import gs
2+
from .gosubl import mg9
33
import os
44
import re
55
import sublime

0 commit comments

Comments
 (0)