use relative imports

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):

python/code/wypp/interactive.py

@@ -1,13 +1,12 @@
 
-import sys
-import os
 import code
 from dataclasses import dataclass
+import os
+import sys
 
-# local imports
-from constants import *
-from myLogging import *
-from exceptionHandler import handleCurrentException
+from .constants import *
+from .exceptionHandler import handleCurrentException
+from .myLogging import *
 
 HISTORY_SIZE = 1000
 

python/code/wypp/lang.py

@@ -1,6 +1,6 @@
-import os
-import locale
 from _collections_abc import MutableMapping
+import locale
+import os
 
 def _langFromEnv(env: MutableMapping) -> str | None:
  # 1) GNU LANGUAGE: colon-separated fallbacks (e.g., "de:en_US:en")

python/code/wypp/location.py

@@ -1,20 +1,21 @@
 from __future__ import annotations
-from typing import *
+import abc
+import ast
 from dataclasses import dataclass
+import dis
 import inspect
 import linecache
-import dis
-import ast
-import ansi
-import utils
-import myLogging
+import os
 import sys
-import abc
-import parsecache
-from parsecache import FunMatcher
-import paths
 import tokenize
-import os
+from typing import *
+
+from . import ansi
+from . import myLogging
+from . import parsecache
+from .parsecache import FunMatcher
+from . import paths
+from . import utils
 
 @dataclass
 class EncodedBytes:

python/code/wypp/myLogging.py

@@ -1,6 +1,7 @@
-import utils
 import sys
 
+from . import utils
+
 VERBOSE = False # set via commandline
 DEBUG = utils.getEnv("WYPP_DEBUG", bool, False)
 

python/code/wypp/myTypeguard.py

@@ -1,11 +1,11 @@
 # Wrapper module for typeguard. Do not import typeguard directly but always via myTypeguard
 from __future__ import annotations
-from typing import *
 from dataclasses import dataclass
-from myLogging import *
-
 # We externally adjust the PYTHONPATH so that the typeguard module can be resolved
-import typeguard # type: ignore
+import typeguard # type: ignore
+from typing import *
+
+from .myLogging import *
 
 @dataclass(frozen=True)
 class Namespaces:

python/code/wypp/parsecache.py

@@ -1,7 +1,7 @@
 import ast
-import os
-import linecache
 from dataclasses import dataclass
+import linecache
+import os
 from typing import *
 
 def _firstLineOfFun(node: ast.FunctionDef | ast.AsyncFunctionDef) -> int:

python/code/wypp/paths.py

@@ -1,6 +1,6 @@
+from contextlib import contextmanager
 import os
 from typing import *
-from contextlib import contextmanager
 
 _projectDir: Optional[str] = None
 

python/code/wypp/records.py

@@ -1,13 +1,14 @@
-import typing
 import dataclasses
-import utils
 import sys
-import myTypeguard
-import errors
-import typecheck
-import location
-import stacktrace
-from utils import _call_with_frames_removed
+import typing
+
+from . import errors
+from . import location
+from . import myTypeguard
+from . import stacktrace
+from . import typecheck
+from . import utils
+from .utils import _call_with_frames_removed
 
 EQ_ATTRS_ATTR = '__eqAttrs__'
 

python/code/wypp/renderTy.py

@@ -1,7 +1,8 @@
 import collections.abc
 import types
 from typing import *
-import myTypeguard
+
+from . import myTypeguard
 #def renderTy(t: Any) -> str:
 # if isinstance(t, str):
 # return t

python/code/wypp/replTester.py

@@ -1,8 +1,9 @@
-import sys
-import doctest
 from contextlib import contextmanager
-import ansi
-from myLogging import *
+import doctest
+import sys
+
+from . import ansi
+from .myLogging import *
 
 # We use our own DocTestParser to replace exception names in stacktraces
 

python/code/wypp/runCode.py

@@ -1,18 +1,17 @@
-import sys
-import os
+from contextlib import contextmanager
+from dataclasses import dataclass
 import importlib
+import os
 import runpy
-from dataclasses import dataclass
+import sys
 from typing import Optional
-from contextlib import contextmanager
 
-# local imports
-from constants import *
-import stacktrace
-import instrument
-from myLogging import *
-from exceptionHandler import handleCurrentException
-import utils
+from .constants import *
+from .exceptionHandler import handleCurrentException
+from . import instrument
+from .myLogging import *
+from . import stacktrace
+from . import utils
 
 class Lib:
  def __init__(self, mod, properlyImported):
@@ -87,11 +86,7 @@ def debugModule(name):
  print("Origin:", spec.origin)
  print("Loader:", type(spec.loader).__name__)
 
-import sys
-import os
-import contextlib
-
-@contextlib.contextmanager
+@contextmanager
 def freshModules():
  original_modules = sys.modules.copy()
  stdlib_path = os.path.dirname(os.__file__)

python/code/wypp/runYourProgram.py

@@ -13,5 +13,5 @@
  sys.exit(1)
 
 if __name__ == '__main__':
- import runner as r
+ import wypp.runner as r
  r.main(globals())

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):

python/code/wypp/interactive.py

@@ -1,13 +1,12 @@
 
-import sys
-import os
 import code
 from dataclasses import dataclass
+import os
+import sys
 
-# local imports
-from constants import *
-from myLogging import *
-from exceptionHandler import handleCurrentException
+from .constants import *
+from .exceptionHandler import handleCurrentException
+from .myLogging import *
 
 HISTORY_SIZE = 1000
 

python/code/wypp/lang.py

@@ -1,6 +1,6 @@
-import os
-import locale
 from _collections_abc import MutableMapping
+import locale
+import os
 
 def _langFromEnv(env: MutableMapping) -> str | None:
  # 1) GNU LANGUAGE: colon-separated fallbacks (e.g., "de:en_US:en")

python/code/wypp/location.py

@@ -1,20 +1,21 @@
 from __future__ import annotations
-from typing import *
+import abc
+import ast
 from dataclasses import dataclass
+import dis
 import inspect
 import linecache
-import dis
-import ast
-import ansi
-import utils
-import myLogging
+import os
 import sys
-import abc
-import parsecache
-from parsecache import FunMatcher
-import paths
 import tokenize
-import os
+from typing import *
+
+from . import ansi
+from . import myLogging
+from . import parsecache
+from .parsecache import FunMatcher
+from . import paths
+from . import utils
 
 @dataclass
 class EncodedBytes:

python/code/wypp/myLogging.py

@@ -1,6 +1,7 @@
-import utils
 import sys
 
+from . import utils
+
 VERBOSE = False # set via commandline
 DEBUG = utils.getEnv("WYPP_DEBUG", bool, False)
 

python/code/wypp/myTypeguard.py

@@ -1,11 +1,11 @@
 # Wrapper module for typeguard. Do not import typeguard directly but always via myTypeguard
 from __future__ import annotations
-from typing import *
 from dataclasses import dataclass
-from myLogging import *
-
 # We externally adjust the PYTHONPATH so that the typeguard module can be resolved
-import typeguard # type: ignore
+import typeguard # type: ignore
+from typing import *
+
+from .myLogging import *
 
 @dataclass(frozen=True)
 class Namespaces:

python/code/wypp/parsecache.py

@@ -1,7 +1,7 @@
 import ast
-import os
-import linecache
 from dataclasses import dataclass
+import linecache
+import os
 from typing import *
 
 def _firstLineOfFun(node: ast.FunctionDef | ast.AsyncFunctionDef) -> int:

python/code/wypp/paths.py

@@ -1,6 +1,6 @@
+from contextlib import contextmanager
 import os
 from typing import *
-from contextlib import contextmanager
 
 _projectDir: Optional[str] = None
 

python/code/wypp/records.py

@@ -1,13 +1,14 @@
-import typing
 import dataclasses
-import utils
 import sys
-import myTypeguard
-import errors
-import typecheck
-import location
-import stacktrace
-from utils import _call_with_frames_removed
+import typing
+
+from . import errors
+from . import location
+from . import myTypeguard
+from . import stacktrace
+from . import typecheck
+from . import utils
+from .utils import _call_with_frames_removed
 
 EQ_ATTRS_ATTR = '__eqAttrs__'
 

python/code/wypp/renderTy.py

@@ -1,7 +1,8 @@
 import collections.abc
 import types
 from typing import *
-import myTypeguard
+
+from . import myTypeguard
 #def renderTy(t: Any) -> str:
 # if isinstance(t, str):
 # return t

python/code/wypp/replTester.py

@@ -1,8 +1,9 @@
-import sys
-import doctest
 from contextlib import contextmanager
-import ansi
-from myLogging import *
+import doctest
+import sys
+
+from . import ansi
+from .myLogging import *
 
 # We use our own DocTestParser to replace exception names in stacktraces
 

python/code/wypp/runCode.py

@@ -1,18 +1,17 @@
-import sys
-import os
+from contextlib import contextmanager
+from dataclasses import dataclass
 import importlib
+import os
 import runpy
-from dataclasses import dataclass
+import sys
 from typing import Optional
-from contextlib import contextmanager
 
-# local imports
-from constants import *
-import stacktrace
-import instrument
-from myLogging import *
-from exceptionHandler import handleCurrentException
-import utils
+from .constants import *
+from .exceptionHandler import handleCurrentException
+from . import instrument
+from .myLogging import *
+from . import stacktrace
+from . import utils
 
 class Lib:
  def __init__(self, mod, properlyImported):
@@ -87,11 +86,7 @@ def debugModule(name):
  print("Origin:", spec.origin)
  print("Loader:", type(spec.loader).__name__)
 
-import sys
-import os
-import contextlib
-
-@contextlib.contextmanager
+@contextmanager
 def freshModules():
  original_modules = sys.modules.copy()
  stdlib_path = os.path.dirname(os.__file__)

python/code/wypp/runYourProgram.py

@@ -13,5 +13,5 @@
  sys.exit(1)
 
 if __name__ == '__main__':
- import runner as r
+ import wypp.runner as r
  r.main(globals())

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):

python/code/wypp/interactive.py

@@ -1,13 +1,12 @@
 
-import sys
-import os
 import code
 from dataclasses import dataclass
+import os
+import sys
 
-# local imports
-from constants import *
-from myLogging import *
-from exceptionHandler import handleCurrentException
+from .constants import *
+from .exceptionHandler import handleCurrentException
+from .myLogging import *
 
 HISTORY_SIZE = 1000
 

python/code/wypp/lang.py

@@ -1,6 +1,6 @@
-import os
-import locale
 from _collections_abc import MutableMapping
+import locale
+import os
 
 def _langFromEnv(env: MutableMapping) -> str | None:
  # 1) GNU LANGUAGE: colon-separated fallbacks (e.g., "de:en_US:en")

python/code/wypp/location.py

@@ -1,20 +1,21 @@
 from __future__ import annotations
-from typing import *
+import abc
+import ast
 from dataclasses import dataclass
+import dis
 import inspect
 import linecache
-import dis
-import ast
-import ansi
-import utils
-import myLogging
+import os
 import sys
-import abc
-import parsecache
-from parsecache import FunMatcher
-import paths
 import tokenize
-import os
+from typing import *
+
+from . import ansi
+from . import myLogging
+from . import parsecache
+from .parsecache import FunMatcher
+from . import paths
+from . import utils
 
 @dataclass
 class EncodedBytes:

python/code/wypp/myLogging.py

@@ -1,6 +1,7 @@
-import utils
 import sys
 
+from . import utils
+
 VERBOSE = False # set via commandline
 DEBUG = utils.getEnv("WYPP_DEBUG", bool, False)
 

python/code/wypp/myTypeguard.py

@@ -1,11 +1,11 @@
 # Wrapper module for typeguard. Do not import typeguard directly but always via myTypeguard
 from __future__ import annotations
-from typing import *
 from dataclasses import dataclass
-from myLogging import *
-
 # We externally adjust the PYTHONPATH so that the typeguard module can be resolved
-import typeguard # type: ignore
+import typeguard # type: ignore
+from typing import *
+
+from .myLogging import *
 
 @dataclass(frozen=True)
 class Namespaces:

python/code/wypp/parsecache.py

@@ -1,7 +1,7 @@
 import ast
-import os
-import linecache
 from dataclasses import dataclass
+import linecache
+import os
 from typing import *
 
 def _firstLineOfFun(node: ast.FunctionDef | ast.AsyncFunctionDef) -> int:

python/code/wypp/paths.py

@@ -1,6 +1,6 @@
+from contextlib import contextmanager
 import os
 from typing import *
-from contextlib import contextmanager
 
 _projectDir: Optional[str] = None
 

python/code/wypp/records.py

@@ -1,13 +1,14 @@
-import typing
 import dataclasses
-import utils
 import sys
-import myTypeguard
-import errors
-import typecheck
-import location
-import stacktrace
-from utils import _call_with_frames_removed
+import typing
+
+from . import errors
+from . import location
+from . import myTypeguard
+from . import stacktrace
+from . import typecheck
+from . import utils
+from .utils import _call_with_frames_removed
 
 EQ_ATTRS_ATTR = '__eqAttrs__'
 

python/code/wypp/renderTy.py

@@ -1,7 +1,8 @@
 import collections.abc
 import types
 from typing import *
-import myTypeguard
+
+from . import myTypeguard
 #def renderTy(t: Any) -> str:
 # if isinstance(t, str):
 # return t

python/code/wypp/replTester.py

@@ -1,8 +1,9 @@
-import sys
-import doctest
 from contextlib import contextmanager
-import ansi
-from myLogging import *
+import doctest
+import sys
+
+from . import ansi
+from .myLogging import *
 
 # We use our own DocTestParser to replace exception names in stacktraces
 

python/code/wypp/runCode.py

@@ -1,18 +1,17 @@
-import sys
-import os
+from contextlib import contextmanager
+from dataclasses import dataclass
 import importlib
+import os
 import runpy
-from dataclasses import dataclass
+import sys
 from typing import Optional
-from contextlib import contextmanager
 
-# local imports
-from constants import *
-import stacktrace
-import instrument
-from myLogging import *
-from exceptionHandler import handleCurrentException
-import utils
+from .constants import *
+from .exceptionHandler import handleCurrentException
+from . import instrument
+from .myLogging import *
+from . import stacktrace
+from . import utils
 
 class Lib:
  def __init__(self, mod, properlyImported):
@@ -87,11 +86,7 @@ def debugModule(name):
  print("Origin:", spec.origin)
  print("Loader:", type(spec.loader).__name__)
 
-import sys
-import os
-import contextlib
-
-@contextlib.contextmanager
+@contextmanager
 def freshModules():
  original_modules = sys.modules.copy()
  stdlib_path = os.path.dirname(os.__file__)

python/code/wypp/runYourProgram.py

@@ -13,5 +13,5 @@
  sys.exit(1)
 
 if __name__ == '__main__':
- import runner as r
+ import wypp.runner as r
  r.main(globals())

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):

python/code/wypp/interactive.py

@@ -1,13 +1,12 @@
 
-import sys
-import os
 import code
 from dataclasses import dataclass
+import os
+import sys
 
-# local imports
-from constants import *
-from myLogging import *
-from exceptionHandler import handleCurrentException
+from .constants import *
+from .exceptionHandler import handleCurrentException
+from .myLogging import *
 
 HISTORY_SIZE = 1000
 

python/code/wypp/lang.py

@@ -1,6 +1,6 @@
-import os
-import locale
 from _collections_abc import MutableMapping
+import locale
+import os
 
 def _langFromEnv(env: MutableMapping) -> str | None:
  # 1) GNU LANGUAGE: colon-separated fallbacks (e.g., "de:en_US:en")

python/code/wypp/location.py

@@ -1,20 +1,21 @@
 from __future__ import annotations
-from typing import *
+import abc
+import ast
 from dataclasses import dataclass
+import dis
 import inspect
 import linecache
-import dis
-import ast
-import ansi
-import utils
-import myLogging
+import os
 import sys
-import abc
-import parsecache
-from parsecache import FunMatcher
-import paths
 import tokenize
-import os
+from typing import *
+
+from . import ansi
+from . import myLogging
+from . import parsecache
+from .parsecache import FunMatcher
+from . import paths
+from . import utils
 
 @dataclass
 class EncodedBytes:

python/code/wypp/myLogging.py

@@ -1,6 +1,7 @@
-import utils
 import sys
 
+from . import utils
+
 VERBOSE = False # set via commandline
 DEBUG = utils.getEnv("WYPP_DEBUG", bool, False)
 

python/code/wypp/myTypeguard.py

@@ -1,11 +1,11 @@
 # Wrapper module for typeguard. Do not import typeguard directly but always via myTypeguard
 from __future__ import annotations
-from typing import *
 from dataclasses import dataclass
-from myLogging import *
-
 # We externally adjust the PYTHONPATH so that the typeguard module can be resolved
-import typeguard # type: ignore
+import typeguard # type: ignore
+from typing import *
+
+from .myLogging import *
 
 @dataclass(frozen=True)
 class Namespaces:

python/code/wypp/parsecache.py

@@ -1,7 +1,7 @@
 import ast
-import os
-import linecache
 from dataclasses import dataclass
+import linecache
+import os
 from typing import *
 
 def _firstLineOfFun(node: ast.FunctionDef | ast.AsyncFunctionDef) -> int:

python/code/wypp/paths.py

@@ -1,6 +1,6 @@
+from contextlib import contextmanager
 import os
 from typing import *
-from contextlib import contextmanager
 
 _projectDir: Optional[str] = None
 

python/code/wypp/records.py

@@ -1,13 +1,14 @@
-import typing
 import dataclasses
-import utils
 import sys
-import myTypeguard
-import errors
-import typecheck
-import location
-import stacktrace
-from utils import _call_with_frames_removed
+import typing
+
+from . import errors
+from . import location
+from . import myTypeguard
+from . import stacktrace
+from . import typecheck
+from . import utils
+from .utils import _call_with_frames_removed
 
 EQ_ATTRS_ATTR = '__eqAttrs__'
 

python/code/wypp/renderTy.py

@@ -1,7 +1,8 @@
 import collections.abc
 import types
 from typing import *
-import myTypeguard
+
+from . import myTypeguard
 #def renderTy(t: Any) -> str:
 # if isinstance(t, str):
 # return t

python/code/wypp/replTester.py

@@ -1,8 +1,9 @@
-import sys
-import doctest
 from contextlib import contextmanager
-import ansi
-from myLogging import *
+import doctest
+import sys
+
+from . import ansi
+from .myLogging import *
 
 # We use our own DocTestParser to replace exception names in stacktraces
 

python/code/wypp/runCode.py

@@ -1,18 +1,17 @@
-import sys
-import os
+from contextlib import contextmanager
+from dataclasses import dataclass
 import importlib
+import os
 import runpy
-from dataclasses import dataclass
+import sys
 from typing import Optional
-from contextlib import contextmanager
 
-# local imports
-from constants import *
-import stacktrace
-import instrument
-from myLogging import *
-from exceptionHandler import handleCurrentException
-import utils
+from .constants import *
+from .exceptionHandler import handleCurrentException
+from . import instrument
+from .myLogging import *
+from . import stacktrace
+from . import utils
 
 class Lib:
  def __init__(self, mod, properlyImported):
@@ -87,11 +86,7 @@ def debugModule(name):
  print("Origin:", spec.origin)
  print("Loader:", type(spec.loader).__name__)
 
-import sys
-import os
-import contextlib
-
-@contextlib.contextmanager
+@contextmanager
 def freshModules():
  original_modules = sys.modules.copy()
  stdlib_path = os.path.dirname(os.__file__)

python/code/wypp/runYourProgram.py

@@ -13,5 +13,5 @@
  sys.exit(1)
 
 if __name__ == '__main__':
- import runner as r
+ import wypp.runner as r
  r.main(globals())

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):

python/code/wypp/interactive.py

@@ -1,13 +1,12 @@
 
-import sys
-import os
 import code
 from dataclasses import dataclass
+import os
+import sys
 
-# local imports
-from constants import *
-from myLogging import *
-from exceptionHandler import handleCurrentException
+from .constants import *
+from .exceptionHandler import handleCurrentException
+from .myLogging import *
 
 HISTORY_SIZE = 1000
 

python/code/wypp/lang.py

@@ -1,6 +1,6 @@
-import os
-import locale
 from _collections_abc import MutableMapping
+import locale
+import os
 
 def _langFromEnv(env: MutableMapping) -> str | None:
  # 1) GNU LANGUAGE: colon-separated fallbacks (e.g., "de:en_US:en")

python/code/wypp/location.py

@@ -1,20 +1,21 @@
 from __future__ import annotations
-from typing import *
+import abc
+import ast
 from dataclasses import dataclass
+import dis
 import inspect
 import linecache
-import dis
-import ast
-import ansi
-import utils
-import myLogging
+import os
 import sys
-import abc
-import parsecache
-from parsecache import FunMatcher
-import paths
 import tokenize
-import os
+from typing import *
+
+from . import ansi
+from . import myLogging
+from . import parsecache
+from .parsecache import FunMatcher
+from . import paths
+from . import utils
 
 @dataclass
 class EncodedBytes:

python/code/wypp/myLogging.py

@@ -1,6 +1,7 @@
-import utils
 import sys
 
+from . import utils
+
 VERBOSE = False # set via commandline
 DEBUG = utils.getEnv("WYPP_DEBUG", bool, False)
 

python/code/wypp/myTypeguard.py

@@ -1,11 +1,11 @@
 # Wrapper module for typeguard. Do not import typeguard directly but always via myTypeguard
 from __future__ import annotations
-from typing import *
 from dataclasses import dataclass
-from myLogging import *
-
 # We externally adjust the PYTHONPATH so that the typeguard module can be resolved
-import typeguard # type: ignore
+import typeguard # type: ignore
+from typing import *
+
+from .myLogging import *
 
 @dataclass(frozen=True)
 class Namespaces:

python/code/wypp/parsecache.py

@@ -1,7 +1,7 @@
 import ast
-import os
-import linecache
 from dataclasses import dataclass
+import linecache
+import os
 from typing import *
 
 def _firstLineOfFun(node: ast.FunctionDef | ast.AsyncFunctionDef) -> int:

python/code/wypp/paths.py

@@ -1,6 +1,6 @@
+from contextlib import contextmanager
 import os
 from typing import *
-from contextlib import contextmanager
 
 _projectDir: Optional[str] = None
 

python/code/wypp/records.py

@@ -1,13 +1,14 @@
-import typing
 import dataclasses
-import utils
 import sys
-import myTypeguard
-import errors
-import typecheck
-import location
-import stacktrace
-from utils import _call_with_frames_removed
+import typing
+
+from . import errors
+from . import location
+from . import myTypeguard
+from . import stacktrace
+from . import typecheck
+from . import utils
+from .utils import _call_with_frames_removed
 
 EQ_ATTRS_ATTR = '__eqAttrs__'
 

python/code/wypp/renderTy.py

@@ -1,7 +1,8 @@
 import collections.abc
 import types
 from typing import *
-import myTypeguard
+
+from . import myTypeguard
 #def renderTy(t: Any) -> str:
 # if isinstance(t, str):
 # return t

python/code/wypp/replTester.py

@@ -1,8 +1,9 @@
-import sys
-import doctest
 from contextlib import contextmanager
-import ansi
-from myLogging import *
+import doctest
+import sys
+
+from . import ansi
+from .myLogging import *
 
 # We use our own DocTestParser to replace exception names in stacktraces
 

python/code/wypp/runCode.py

@@ -1,18 +1,17 @@
-import sys
-import os
+from contextlib import contextmanager
+from dataclasses import dataclass
 import importlib
+import os
 import runpy
-from dataclasses import dataclass
+import sys
 from typing import Optional
-from contextlib import contextmanager
 
-# local imports
-from constants import *
-import stacktrace
-import instrument
-from myLogging import *
-from exceptionHandler import handleCurrentException
-import utils
+from .constants import *
+from .exceptionHandler import handleCurrentException
+from . import instrument
+from .myLogging import *
+from . import stacktrace
+from . import utils
 
 class Lib:
  def __init__(self, mod, properlyImported):
@@ -87,11 +86,7 @@ def debugModule(name):
  print("Origin:", spec.origin)
  print("Loader:", type(spec.loader).__name__)
 
-import sys
-import os
-import contextlib
-
-@contextlib.contextmanager
+@contextmanager
 def freshModules():
  original_modules = sys.modules.copy()
  stdlib_path = os.path.dirname(os.__file__)

python/code/wypp/runYourProgram.py

@@ -13,5 +13,5 @@
  sys.exit(1)
 
 if __name__ == '__main__':
- import runner as r
+ import wypp.runner as r
  r.main(globals())

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):

python/code/wypp/interactive.py

@@ -1,13 +1,12 @@
 
-import sys
-import os
 import code
 from dataclasses import dataclass
+import os
+import sys
 
-# local imports
-from constants import *
-from myLogging import *
-from exceptionHandler import handleCurrentException
+from .constants import *
+from .exceptionHandler import handleCurrentException
+from .myLogging import *
 
 HISTORY_SIZE = 1000
 

python/code/wypp/lang.py

@@ -1,6 +1,6 @@
-import os
-import locale
 from _collections_abc import MutableMapping
+import locale
+import os
 
 def _langFromEnv(env: MutableMapping) -> str | None:
  # 1) GNU LANGUAGE: colon-separated fallbacks (e.g., "de:en_US:en")

python/code/wypp/location.py

@@ -1,20 +1,21 @@
 from __future__ import annotations
-from typing import *
+import abc
+import ast
 from dataclasses import dataclass
+import dis
 import inspect
 import linecache
-import dis
-import ast
-import ansi
-import utils
-import myLogging
+import os
 import sys
-import abc
-import parsecache
-from parsecache import FunMatcher
-import paths
 import tokenize
-import os
+from typing import *
+
+from . import ansi
+from . import myLogging
+from . import parsecache
+from .parsecache import FunMatcher
+from . import paths
+from . import utils
 
 @dataclass
 class EncodedBytes:

python/code/wypp/myLogging.py

@@ -1,6 +1,7 @@
-import utils
 import sys
 
+from . import utils
+
 VERBOSE = False # set via commandline
 DEBUG = utils.getEnv("WYPP_DEBUG", bool, False)
 

python/code/wypp/myTypeguard.py

@@ -1,11 +1,11 @@
 # Wrapper module for typeguard. Do not import typeguard directly but always via myTypeguard
 from __future__ import annotations
-from typing import *
 from dataclasses import dataclass
-from myLogging import *
-
 # We externally adjust the PYTHONPATH so that the typeguard module can be resolved
-import typeguard # type: ignore
+import typeguard # type: ignore
+from typing import *
+
+from .myLogging import *
 
 @dataclass(frozen=True)
 class Namespaces:

python/code/wypp/parsecache.py

@@ -1,7 +1,7 @@
 import ast
-import os
-import linecache
 from dataclasses import dataclass
+import linecache
+import os
 from typing import *
 
 def _firstLineOfFun(node: ast.FunctionDef | ast.AsyncFunctionDef) -> int:

python/code/wypp/paths.py

@@ -1,6 +1,6 @@
+from contextlib import contextmanager
 import os
 from typing import *
-from contextlib import contextmanager
 
 _projectDir: Optional[str] = None
 

python/code/wypp/records.py

@@ -1,13 +1,14 @@
-import typing
 import dataclasses
-import utils
 import sys
-import myTypeguard
-import errors
-import typecheck
-import location
-import stacktrace
-from utils import _call_with_frames_removed
+import typing
+
+from . import errors
+from . import location
+from . import myTypeguard
+from . import stacktrace
+from . import typecheck
+from . import utils
+from .utils import _call_with_frames_removed
 
 EQ_ATTRS_ATTR = '__eqAttrs__'
 

python/code/wypp/renderTy.py

@@ -1,7 +1,8 @@
 import collections.abc
 import types
 from typing import *
-import myTypeguard
+
+from . import myTypeguard
 #def renderTy(t: Any) -> str:
 # if isinstance(t, str):
 # return t

python/code/wypp/replTester.py

@@ -1,8 +1,9 @@
-import sys
-import doctest
 from contextlib import contextmanager
-import ansi
-from myLogging import *
+import doctest
+import sys
+
+from . import ansi
+from .myLogging import *
 
 # We use our own DocTestParser to replace exception names in stacktraces
 

python/code/wypp/runCode.py

@@ -1,18 +1,17 @@
-import sys
-import os
+from contextlib import contextmanager
+from dataclasses import dataclass
 import importlib
+import os
 import runpy
-from dataclasses import dataclass
+import sys
 from typing import Optional
-from contextlib import contextmanager
 
-# local imports
-from constants import *
-import stacktrace
-import instrument
-from myLogging import *
-from exceptionHandler import handleCurrentException
-import utils
+from .constants import *
+from .exceptionHandler import handleCurrentException
+from . import instrument
+from .myLogging import *
+from . import stacktrace
+from . import utils
 
 class Lib:
  def __init__(self, mod, properlyImported):
@@ -87,11 +86,7 @@ def debugModule(name):
  print("Origin:", spec.origin)
  print("Loader:", type(spec.loader).__name__)
 
-import sys
-import os
-import contextlib
-
-@contextlib.contextmanager
+@contextmanager
 def freshModules():
  original_modules = sys.modules.copy()
  stdlib_path = os.path.dirname(os.__file__)

python/code/wypp/runYourProgram.py

@@ -13,5 +13,5 @@
  sys.exit(1)
 
 if __name__ == '__main__':
- import runner as r
+ import wypp.runner as r
  r.main(globals())

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):

python/code/wypp/interactive.py

@@ -1,13 +1,12 @@
 
-import sys
-import os
 import code
 from dataclasses import dataclass
+import os
+import sys
 
-# local imports
-from constants import *
-from myLogging import *
-from exceptionHandler import handleCurrentException
+from .constants import *
+from .exceptionHandler import handleCurrentException
+from .myLogging import *
 
 HISTORY_SIZE = 1000
 

python/code/wypp/lang.py

@@ -1,6 +1,6 @@
-import os
-import locale
 from _collections_abc import MutableMapping
+import locale
+import os
 
 def _langFromEnv(env: MutableMapping) -> str | None:
  # 1) GNU LANGUAGE: colon-separated fallbacks (e.g., "de:en_US:en")

python/code/wypp/location.py

@@ -1,20 +1,21 @@
 from __future__ import annotations
-from typing import *
+import abc
+import ast
 from dataclasses import dataclass
+import dis
 import inspect
 import linecache
-import dis
-import ast
-import ansi
-import utils
-import myLogging
+import os
 import sys
-import abc
-import parsecache
-from parsecache import FunMatcher
-import paths
 import tokenize
-import os
+from typing import *
+
+from . import ansi
+from . import myLogging
+from . import parsecache
+from .parsecache import FunMatcher
+from . import paths
+from . import utils
 
 @dataclass
 class EncodedBytes:

python/code/wypp/myLogging.py

@@ -1,6 +1,7 @@
-import utils
 import sys
 
+from . import utils
+
 VERBOSE = False # set via commandline
 DEBUG = utils.getEnv("WYPP_DEBUG", bool, False)
 

python/code/wypp/myTypeguard.py

@@ -1,11 +1,11 @@
 # Wrapper module for typeguard. Do not import typeguard directly but always via myTypeguard
 from __future__ import annotations
-from typing import *
 from dataclasses import dataclass
-from myLogging import *
-
 # We externally adjust the PYTHONPATH so that the typeguard module can be resolved
-import typeguard # type: ignore
+import typeguard # type: ignore
+from typing import *
+
+from .myLogging import *
 
 @dataclass(frozen=True)
 class Namespaces:

python/code/wypp/parsecache.py

@@ -1,7 +1,7 @@
 import ast
-import os
-import linecache
 from dataclasses import dataclass
+import linecache
+import os
 from typing import *
 
 def _firstLineOfFun(node: ast.FunctionDef | ast.AsyncFunctionDef) -> int:

python/code/wypp/paths.py

@@ -1,6 +1,6 @@
+from contextlib import contextmanager
 import os
 from typing import *
-from contextlib import contextmanager
 
 _projectDir: Optional[str] = None
 

python/code/wypp/records.py

@@ -1,13 +1,14 @@
-import typing
 import dataclasses
-import utils
 import sys
-import myTypeguard
-import errors
-import typecheck
-import location
-import stacktrace
-from utils import _call_with_frames_removed
+import typing
+
+from . import errors
+from . import location
+from . import myTypeguard
+from . import stacktrace
+from . import typecheck
+from . import utils
+from .utils import _call_with_frames_removed
 
 EQ_ATTRS_ATTR = '__eqAttrs__'
 

python/code/wypp/renderTy.py

@@ -1,7 +1,8 @@
 import collections.abc
 import types
 from typing import *
-import myTypeguard
+
+from . import myTypeguard
 #def renderTy(t: Any) -> str:
 # if isinstance(t, str):
 # return t

python/code/wypp/replTester.py

@@ -1,8 +1,9 @@
-import sys
-import doctest
 from contextlib import contextmanager
-import ansi
-from myLogging import *
+import doctest
+import sys
+
+from . import ansi
+from .myLogging import *
 
 # We use our own DocTestParser to replace exception names in stacktraces
 

python/code/wypp/runCode.py

@@ -1,18 +1,17 @@
-import sys
-import os
+from contextlib import contextmanager
+from dataclasses import dataclass
 import importlib
+import os
 import runpy
-from dataclasses import dataclass
+import sys
 from typing import Optional
-from contextlib import contextmanager
 
-# local imports
-from constants import *
-import stacktrace
-import instrument
-from myLogging import *
-from exceptionHandler import handleCurrentException
-import utils
+from .constants import *
+from .exceptionHandler import handleCurrentException
+from . import instrument
+from .myLogging import *
+from . import stacktrace
+from . import utils
 
 class Lib:
  def __init__(self, mod, properlyImported):
@@ -87,11 +86,7 @@ def debugModule(name):
  print("Origin:", spec.origin)
  print("Loader:", type(spec.loader).__name__)
 
-import sys
-import os
-import contextlib
-
-@contextlib.contextmanager
+@contextmanager
 def freshModules():
  original_modules = sys.modules.copy()
  stdlib_path = os.path.dirname(os.__file__)

python/code/wypp/runYourProgram.py

@@ -13,5 +13,5 @@
  sys.exit(1)
 
 if __name__ == '__main__':
- import runner as r
+ import wypp.runner as r
  r.main(globals())

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):

python/code/wypp/interactive.py

@@ -1,13 +1,12 @@
 
-import sys
-import os
 import code
 from dataclasses import dataclass
+import os
+import sys
 
-# local imports
-from constants import *
-from myLogging import *
-from exceptionHandler import handleCurrentException
+from .constants import *
+from .exceptionHandler import handleCurrentException
+from .myLogging import *
 
 HISTORY_SIZE = 1000
 

python/code/wypp/lang.py

@@ -1,6 +1,6 @@
-import os
-import locale
 from _collections_abc import MutableMapping
+import locale
+import os
 
 def _langFromEnv(env: MutableMapping) -> str | None:
  # 1) GNU LANGUAGE: colon-separated fallbacks (e.g., "de:en_US:en")

python/code/wypp/location.py

@@ -1,20 +1,21 @@
 from __future__ import annotations
-from typing import *
+import abc
+import ast
 from dataclasses import dataclass
+import dis
 import inspect
 import linecache
-import dis
-import ast
-import ansi
-import utils
-import myLogging
+import os
 import sys
-import abc
-import parsecache
-from parsecache import FunMatcher
-import paths
 import tokenize
-import os
+from typing import *
+
+from . import ansi
+from . import myLogging
+from . import parsecache
+from .parsecache import FunMatcher
+from . import paths
+from . import utils
 
 @dataclass
 class EncodedBytes:

python/code/wypp/myLogging.py

@@ -1,6 +1,7 @@
-import utils
 import sys
 
+from . import utils
+
 VERBOSE = False # set via commandline
 DEBUG = utils.getEnv("WYPP_DEBUG", bool, False)
 

python/code/wypp/myTypeguard.py

@@ -1,11 +1,11 @@
 # Wrapper module for typeguard. Do not import typeguard directly but always via myTypeguard
 from __future__ import annotations
-from typing import *
 from dataclasses import dataclass
-from myLogging import *
-
 # We externally adjust the PYTHONPATH so that the typeguard module can be resolved
-import typeguard # type: ignore
+import typeguard # type: ignore
+from typing import *
+
+from .myLogging import *
 
 @dataclass(frozen=True)
 class Namespaces:

python/code/wypp/parsecache.py

@@ -1,7 +1,7 @@
 import ast
-import os
-import linecache
 from dataclasses import dataclass
+import linecache
+import os
 from typing import *
 
 def _firstLineOfFun(node: ast.FunctionDef | ast.AsyncFunctionDef) -> int:

python/code/wypp/paths.py

@@ -1,6 +1,6 @@
+from contextlib import contextmanager
 import os
 from typing import *
-from contextlib import contextmanager
 
 _projectDir: Optional[str] = None
 

python/code/wypp/records.py

@@ -1,13 +1,14 @@
-import typing
 import dataclasses
-import utils
 import sys
-import myTypeguard
-import errors
-import typecheck
-import location
-import stacktrace
-from utils import _call_with_frames_removed
+import typing
+
+from . import errors
+from . import location
+from . import myTypeguard
+from . import stacktrace
+from . import typecheck
+from . import utils
+from .utils import _call_with_frames_removed
 
 EQ_ATTRS_ATTR = '__eqAttrs__'
 

python/code/wypp/renderTy.py

@@ -1,7 +1,8 @@
 import collections.abc
 import types
 from typing import *
-import myTypeguard
+
+from . import myTypeguard
 #def renderTy(t: Any) -> str:
 # if isinstance(t, str):
 # return t

python/code/wypp/replTester.py

@@ -1,8 +1,9 @@
-import sys
-import doctest
 from contextlib import contextmanager
-import ansi
-from myLogging import *
+import doctest
+import sys
+
+from . import ansi
+from .myLogging import *
 
 # We use our own DocTestParser to replace exception names in stacktraces
 

python/code/wypp/runCode.py

@@ -1,18 +1,17 @@
-import sys
-import os
+from contextlib import contextmanager
+from dataclasses import dataclass
 import importlib
+import os
 import runpy
-from dataclasses import dataclass
+import sys
 from typing import Optional
-from contextlib import contextmanager
 
-# local imports
-from constants import *
-import stacktrace
-import instrument
-from myLogging import *
-from exceptionHandler import handleCurrentException
-import utils
+from .constants import *
+from .exceptionHandler import handleCurrentException
+from . import instrument
+from .myLogging import *
+from . import stacktrace
+from . import utils
 
 class Lib:
  def __init__(self, mod, properlyImported):
@@ -87,11 +86,7 @@ def debugModule(name):
  print("Origin:", spec.origin)
  print("Loader:", type(spec.loader).__name__)
 
-import sys
-import os
-import contextlib
-
-@contextlib.contextmanager
+@contextmanager
 def freshModules():
  original_modules = sys.modules.copy()
  stdlib_path = os.path.dirname(os.__file__)

python/code/wypp/runYourProgram.py

@@ -13,5 +13,5 @@
  sys.exit(1)
 
 if __name__ == '__main__':
- import runner as r
+ import wypp.runner as r
  r.main(globals())