Merge pull request #204 from skogsbaer/sw/relative-imports

use relative imports

Author: skogsbaer

python/.vscode/settings.json

@@ -1,10 +1,3 @@
 {
-    "python.analysis.diagnosticMode": "workspace",
-    "python.analysis.diagnosticSeverityOverrides": {
-        "reportWildcardImportFromLibrary": "none"
-    },
-    "python.analysis.extraPaths": [
-        "/Users/swehr/.vscode/extensions/stefanwehr.write-your-python-program-2.0.7/python/code/"
-    ],
-    "python.analysis.typeCheckingMode": "off"
+    "python.analysis.diagnosticMode": "workspace"
 }

python/code/wypp/__init__.py

@@ -1,14 +1,10 @@
-try:
-    from . import writeYourProgram as w
-except (ImportError, ModuleNotFoundError):
-    import writeYourProgram as w
-
+from dataclasses import dataclass
 import typing
-
 # Exported names that are available for star imports (mostly in alphabetic order)
 from typing import Any, Callable, Generator, Iterable, Iterator, Literal, Mapping, Optional, \
     Protocol, Sequence, Union
-from dataclasses import dataclass
+
+from . import writeYourProgram as w
 
 check = w.check
 checkFail = w.checkFail

python/code/wypp/ansi.py

@@ -1,6 +1,6 @@
+import os
 import re
 import sys
-import os
 
 RESET         = "\u001b[0;0m"
 BOLD          = "\u001b[1m"

python/code/wypp/cmdlineArgs.py

@@ -1,7 +1,8 @@
 import argparse
 import sys
-import utils
-from myLogging import *
+
+from .myLogging import *
+from . import utils
 
 def parseCmdlineArgs(argList):
     parser = argparse.ArgumentParser(description='Run Your Program!',

python/code/wypp/debug.py

@@ -1,5 +1,6 @@
 import sys
-import runner
+
+from . import runner
 
 # Use this file if you want to the some test file under the debugger
 if __name__ == '__main__':

python/code/wypp/drawingLib.py

@@ -1,8 +1,9 @@
-import time
 import threading
-import writeYourProgram as _w
+import time
 from typing import Literal, Sequence
 
+from . import writeYourProgram as _w
+
 # Do not import tkinter at the top-level. Someone with no installation of tkinter should
 # be able to user WYPP without drawing support.
 

python/code/wypp/errors.py

@@ -1,10 +1,11 @@
 from __future__ import annotations
-from typing import *
 import abc
 import inspect
-import location
-import i18n
-from renderTy import renderTy
+from typing import *
+
+from . import i18n
+from . import location
+from .renderTy import renderTy
 
 class WyppError(abc.ABC):
     def __init__(self, extraFrames: list[inspect.FrameInfo] = []):

python/code/wypp/exceptionHandler.py

@@ -1,15 +1,14 @@
+from dataclasses import dataclass
+import re
 import sys
 import traceback
-import re
-from dataclasses import dataclass
 
-# local imports
-from constants import *
-import stacktrace
-import paths
-from myLogging import *
-import errors
-import utils
+from .constants import *
+from . import errors
+from .myLogging import *
+from . import paths
+from . import stacktrace
+from . import utils
 
 _tbPattern = re.compile(r'(\s*File\s+")([^"]+)(".*)')
 def _rewriteFilenameInTracebackLine(s: str) -> str:

python/code/wypp/i18n.py

@@ -1,9 +1,10 @@
+from contextlib import contextmanager
 from dataclasses import dataclass
-import location
 from typing import *
-from contextlib import contextmanager
-import lang
-import utils
+
+from . import lang
+from . import location
+from . import utils
 
 type Lang = Literal['en', 'de']
 

python/code/wypp/instrument.py

@@ -1,19 +1,20 @@
-from typing import *
-import os
 import ast
+from collections.abc import Buffer
+from contextlib import contextmanager
 import importlib
 import importlib.abc
-from importlib.machinery import ModuleSpec, SourceFileLoader
 import importlib.machinery
+from importlib.machinery import ModuleSpec, SourceFileLoader
 from importlib.util import decode_source, spec_from_file_location
-from collections.abc import Buffer
-import types
+import os
 from os import PathLike
-import utils
-from myLogging import *
-from contextlib import contextmanager
-import errors
-import location
+import types
+from typing import *
+
+from . import errors
+from . import location
+from .myLogging import *
+from . import utils
 
 def parseExp(s: str) -> ast.expr:
     match ast.parse(s):