put basic/ and interface into pcbasic/ top-level package and reintrod…

…uce runner script
robhagemans · May 10, 2016 · 8c2fc13 · 8c2fc13
1 parent a2bd782
commit 8c2fc13
Show file tree

Hide file tree

Showing 150 changed files with 41 additions and 33 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "ansipipe"]
-	path = ansipipe
+	path = pcbasic/ansipipe
 	url = git://github.com/robhagemans/ansipipe.git
diff --git a/docsrc/makeusage.py b/docsrc/makeusage.py
@@ -61,7 +61,7 @@ def parse_element(e, blocklist):
 def makeusage():
     usage_html = open(basepath + '/options.html', mode='r').read()
     # output usage
-    with open(basepath + '/../USAGE.txt', 'w') as textfile:
+    with open(basepath + '/../pcbasic/USAGE.txt', 'w') as textfile:
         textfile.write(html_to_text(usage_html))
 
 if __name__ == '__main__':

diff --git a/pcbasic/__init__.py b/pcbasic/__init__.py
@@ -0,0 +1,6 @@
+"""
+PC-BASIC - GW-BASIC/BASICA/Cartridge BASIC compatible interpreter
+
+(c) 2013, 2014, 2015, 2016 Rob Hagemans
+This file is released under the GNU GPL version 3 or later.
+"""
diff --git a/pcbasic.py → pcbasic/__main__.py b/pcbasic.py → pcbasic/__main__.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python2
-
 """
 PC-BASIC - GW-BASIC/BASICA/Cartridge BASIC compatible interpreter
 
@@ -23,10 +21,10 @@
 # NOTE that this affects str.upper() etc.
 locale.setlocale(locale.LC_ALL, '')
 
-import ansipipe
-import basic
-import interface
-from interface import config
+from . import ansipipe
+from . import basic
+from . import interface
+from . import config
 
 
 def main():

diff --git a/ansipipe → pcbasic/ansipipe b/ansipipe → pcbasic/ansipipe
diff --git a/basic/__init__.py → pcbasic/basic/__init__.py b/basic/__init__.py → pcbasic/basic/__init__.py
diff --git a/basic/basictoken.py → pcbasic/basic/basictoken.py b/basic/basictoken.py → pcbasic/basic/basictoken.py
diff --git a/basic/bytestream.py → pcbasic/basic/bytestream.py b/basic/bytestream.py → pcbasic/basic/bytestream.py
diff --git a/basic/cassette.py → pcbasic/basic/cassette.py b/basic/cassette.py → pcbasic/basic/cassette.py
diff --git a/basic/codepage/1258.ucp → pcbasic/basic/codepage/1258.ucp b/basic/codepage/1258.ucp → pcbasic/basic/codepage/1258.ucp
diff --git a/basic/codepage/437.ucp → pcbasic/basic/codepage/437.ucp b/basic/codepage/437.ucp → pcbasic/basic/codepage/437.ucp
diff --git a/basic/codepage/720.ucp → pcbasic/basic/codepage/720.ucp b/basic/codepage/720.ucp → pcbasic/basic/codepage/720.ucp
diff --git a/basic/codepage/737.ucp → pcbasic/basic/codepage/737.ucp b/basic/codepage/737.ucp → pcbasic/basic/codepage/737.ucp
diff --git a/basic/codepage/775.ucp → pcbasic/basic/codepage/775.ucp b/basic/codepage/775.ucp → pcbasic/basic/codepage/775.ucp
diff --git a/basic/codepage/806.ucp → pcbasic/basic/codepage/806.ucp b/basic/codepage/806.ucp → pcbasic/basic/codepage/806.ucp
diff --git a/basic/codepage/850.ucp → pcbasic/basic/codepage/850.ucp b/basic/codepage/850.ucp → pcbasic/basic/codepage/850.ucp
diff --git a/basic/codepage/851.ucp → pcbasic/basic/codepage/851.ucp b/basic/codepage/851.ucp → pcbasic/basic/codepage/851.ucp
diff --git a/basic/codepage/852.ucp → pcbasic/basic/codepage/852.ucp b/basic/codepage/852.ucp → pcbasic/basic/codepage/852.ucp
diff --git a/basic/codepage/853.ucp → pcbasic/basic/codepage/853.ucp b/basic/codepage/853.ucp → pcbasic/basic/codepage/853.ucp
diff --git a/basic/codepage/855.ucp → pcbasic/basic/codepage/855.ucp b/basic/codepage/855.ucp → pcbasic/basic/codepage/855.ucp
diff --git a/basic/codepage/856.ucp → pcbasic/basic/codepage/856.ucp b/basic/codepage/856.ucp → pcbasic/basic/codepage/856.ucp
diff --git a/basic/codepage/857.ucp → pcbasic/basic/codepage/857.ucp b/basic/codepage/857.ucp → pcbasic/basic/codepage/857.ucp
diff --git a/basic/codepage/858.ucp → pcbasic/basic/codepage/858.ucp b/basic/codepage/858.ucp → pcbasic/basic/codepage/858.ucp
diff --git a/basic/codepage/860.ucp → pcbasic/basic/codepage/860.ucp b/basic/codepage/860.ucp → pcbasic/basic/codepage/860.ucp
diff --git a/basic/codepage/861.ucp → pcbasic/basic/codepage/861.ucp b/basic/codepage/861.ucp → pcbasic/basic/codepage/861.ucp
diff --git a/basic/codepage/862.ucp → pcbasic/basic/codepage/862.ucp b/basic/codepage/862.ucp → pcbasic/basic/codepage/862.ucp
diff --git a/basic/codepage/863.ucp → pcbasic/basic/codepage/863.ucp b/basic/codepage/863.ucp → pcbasic/basic/codepage/863.ucp
diff --git a/basic/codepage/864.ucp → pcbasic/basic/codepage/864.ucp b/basic/codepage/864.ucp → pcbasic/basic/codepage/864.ucp
diff --git a/basic/codepage/865.ucp → pcbasic/basic/codepage/865.ucp b/basic/codepage/865.ucp → pcbasic/basic/codepage/865.ucp
diff --git a/basic/codepage/866.ucp → pcbasic/basic/codepage/866.ucp b/basic/codepage/866.ucp → pcbasic/basic/codepage/866.ucp
diff --git a/basic/codepage/868.ucp → pcbasic/basic/codepage/868.ucp b/basic/codepage/868.ucp → pcbasic/basic/codepage/868.ucp
diff --git a/basic/codepage/869.ucp → pcbasic/basic/codepage/869.ucp b/basic/codepage/869.ucp → pcbasic/basic/codepage/869.ucp
diff --git a/basic/codepage/874.ucp → pcbasic/basic/codepage/874.ucp b/basic/codepage/874.ucp → pcbasic/basic/codepage/874.ucp
diff --git a/basic/codepage/932.ucp → pcbasic/basic/codepage/932.ucp b/basic/codepage/932.ucp → pcbasic/basic/codepage/932.ucp
diff --git a/basic/codepage/934.ucp → pcbasic/basic/codepage/934.ucp b/basic/codepage/934.ucp → pcbasic/basic/codepage/934.ucp
diff --git a/basic/codepage/936.ucp → pcbasic/basic/codepage/936.ucp b/basic/codepage/936.ucp → pcbasic/basic/codepage/936.ucp
diff --git a/basic/codepage/938.ucp → pcbasic/basic/codepage/938.ucp b/basic/codepage/938.ucp → pcbasic/basic/codepage/938.ucp
diff --git a/basic/codepage/949.ucp → pcbasic/basic/codepage/949.ucp b/basic/codepage/949.ucp → pcbasic/basic/codepage/949.ucp
diff --git a/basic/codepage/950.ucp → pcbasic/basic/codepage/950.ucp b/basic/codepage/950.ucp → pcbasic/basic/codepage/950.ucp
diff --git a/basic/codepage/__init__.py → pcbasic/basic/codepage/__init__.py b/basic/codepage/__init__.py → pcbasic/basic/codepage/__init__.py
diff --git a/basic/codepage/alternativnyj.ucp → pcbasic/basic/codepage/alternativnyj.ucp b/basic/codepage/alternativnyj.ucp → pcbasic/basic/codepage/alternativnyj.ucp
diff --git a/basic/codepage/armscii8a.ucp → pcbasic/basic/codepage/armscii8a.ucp b/basic/codepage/armscii8a.ucp → pcbasic/basic/codepage/armscii8a.ucp
diff --git a/basic/codepage/big5-2003.ucp → pcbasic/basic/codepage/big5-2003.ucp b/basic/codepage/big5-2003.ucp → pcbasic/basic/codepage/big5-2003.ucp
diff --git a/basic/codepage/big5-hkscs.ucp → pcbasic/basic/codepage/big5-hkscs.ucp b/basic/codepage/big5-hkscs.ucp → pcbasic/basic/codepage/big5-hkscs.ucp
diff --git a/basic/codepage/georgian-academy.ucp → pcbasic/basic/codepage/georgian-academy.ucp b/basic/codepage/georgian-academy.ucp → pcbasic/basic/codepage/georgian-academy.ucp
diff --git a/basic/codepage/georgian-ps.ucp → pcbasic/basic/codepage/georgian-ps.ucp b/basic/codepage/georgian-ps.ucp → pcbasic/basic/codepage/georgian-ps.ucp
diff --git a/basic/codepage/iransystem.ucp → pcbasic/basic/codepage/iransystem.ucp b/basic/codepage/iransystem.ucp → pcbasic/basic/codepage/iransystem.ucp
diff --git a/basic/codepage/iscii-as.ucp → pcbasic/basic/codepage/iscii-as.ucp b/basic/codepage/iscii-as.ucp → pcbasic/basic/codepage/iscii-as.ucp
diff --git a/basic/codepage/iscii-be.ucp → pcbasic/basic/codepage/iscii-be.ucp b/basic/codepage/iscii-be.ucp → pcbasic/basic/codepage/iscii-be.ucp
diff --git a/basic/codepage/iscii-de.ucp → pcbasic/basic/codepage/iscii-de.ucp b/basic/codepage/iscii-de.ucp → pcbasic/basic/codepage/iscii-de.ucp
diff --git a/basic/codepage/iscii-gu.ucp → pcbasic/basic/codepage/iscii-gu.ucp b/basic/codepage/iscii-gu.ucp → pcbasic/basic/codepage/iscii-gu.ucp
diff --git a/basic/codepage/iscii-ka.ucp → pcbasic/basic/codepage/iscii-ka.ucp b/basic/codepage/iscii-ka.ucp → pcbasic/basic/codepage/iscii-ka.ucp
diff --git a/basic/codepage/iscii-ma.ucp → pcbasic/basic/codepage/iscii-ma.ucp b/basic/codepage/iscii-ma.ucp → pcbasic/basic/codepage/iscii-ma.ucp
diff --git a/basic/codepage/iscii-or.ucp → pcbasic/basic/codepage/iscii-or.ucp b/basic/codepage/iscii-or.ucp → pcbasic/basic/codepage/iscii-or.ucp
diff --git a/basic/codepage/iscii-pa.ucp → pcbasic/basic/codepage/iscii-pa.ucp b/basic/codepage/iscii-pa.ucp → pcbasic/basic/codepage/iscii-pa.ucp
diff --git a/basic/codepage/iscii-ta.ucp → pcbasic/basic/codepage/iscii-ta.ucp b/basic/codepage/iscii-ta.ucp → pcbasic/basic/codepage/iscii-ta.ucp
diff --git a/basic/codepage/iscii-te.ucp → pcbasic/basic/codepage/iscii-te.ucp b/basic/codepage/iscii-te.ucp → pcbasic/basic/codepage/iscii-te.ucp
diff --git a/basic/codepage/kamenicky.ucp → pcbasic/basic/codepage/kamenicky.ucp b/basic/codepage/kamenicky.ucp → pcbasic/basic/codepage/kamenicky.ucp
diff --git a/basic/codepage/koi8-r.ucp → pcbasic/basic/codepage/koi8-r.ucp b/basic/codepage/koi8-r.ucp → pcbasic/basic/codepage/koi8-r.ucp
diff --git a/basic/codepage/koi8-ru.ucp → pcbasic/basic/codepage/koi8-ru.ucp b/basic/codepage/koi8-ru.ucp → pcbasic/basic/codepage/koi8-ru.ucp
diff --git a/basic/codepage/koi8-u.ucp → pcbasic/basic/codepage/koi8-u.ucp b/basic/codepage/koi8-u.ucp → pcbasic/basic/codepage/koi8-u.ucp
diff --git a/basic/codepage/mazovia.ucp → pcbasic/basic/codepage/mazovia.ucp b/basic/codepage/mazovia.ucp → pcbasic/basic/codepage/mazovia.ucp
diff --git a/basic/codepage/mik.ucp → pcbasic/basic/codepage/mik.ucp b/basic/codepage/mik.ucp → pcbasic/basic/codepage/mik.ucp
diff --git a/basic/codepage/osnovnoj.ucp → pcbasic/basic/codepage/osnovnoj.ucp b/basic/codepage/osnovnoj.ucp → pcbasic/basic/codepage/osnovnoj.ucp
diff --git a/basic/codepage/pascii.ucp → pcbasic/basic/codepage/pascii.ucp b/basic/codepage/pascii.ucp → pcbasic/basic/codepage/pascii.ucp
diff --git a/basic/codepage/ruscii.ucp → pcbasic/basic/codepage/ruscii.ucp b/basic/codepage/ruscii.ucp → pcbasic/basic/codepage/ruscii.ucp
diff --git a/basic/codepage/russup3.ucp → pcbasic/basic/codepage/russup3.ucp b/basic/codepage/russup3.ucp → pcbasic/basic/codepage/russup3.ucp
diff --git a/basic/codepage/russup4ac.ucp → pcbasic/basic/codepage/russup4ac.ucp b/basic/codepage/russup4ac.ucp → pcbasic/basic/codepage/russup4ac.ucp
diff --git a/basic/codepage/russup4na.ucp → pcbasic/basic/codepage/russup4na.ucp b/basic/codepage/russup4na.ucp → pcbasic/basic/codepage/russup4na.ucp
diff --git a/basic/codepage/viscii.ucp → pcbasic/basic/codepage/viscii.ucp b/basic/codepage/viscii.ucp → pcbasic/basic/codepage/viscii.ucp
diff --git a/basic/console.py → pcbasic/basic/console.py b/basic/console.py → pcbasic/basic/console.py
diff --git a/basic/debug.py → pcbasic/basic/debug.py b/basic/debug.py → pcbasic/basic/debug.py
diff --git a/basic/devices.py → pcbasic/basic/devices.py b/basic/devices.py → pcbasic/basic/devices.py
diff --git a/basic/disk.py → pcbasic/basic/disk.py b/basic/disk.py → pcbasic/basic/disk.py
diff --git a/basic/display.py → pcbasic/basic/display.py b/basic/display.py → pcbasic/basic/display.py
diff --git a/basic/draw_and_play.py → pcbasic/basic/draw_and_play.py b/basic/draw_and_play.py → pcbasic/basic/draw_and_play.py
diff --git a/basic/eascii.py → pcbasic/basic/eascii.py b/basic/eascii.py → pcbasic/basic/eascii.py
diff --git a/basic/error.py → pcbasic/basic/error.py b/basic/error.py → pcbasic/basic/error.py
diff --git a/basic/events.py → pcbasic/basic/events.py b/basic/events.py → pcbasic/basic/events.py
diff --git a/basic/files.py → pcbasic/basic/files.py b/basic/files.py → pcbasic/basic/files.py
diff --git a/basic/font/GPL2.txt → pcbasic/basic/font/GPL2.txt b/basic/font/GPL2.txt → pcbasic/basic/font/GPL2.txt
diff --git a/basic/font/LICENSE.md → pcbasic/basic/font/LICENSE.md b/basic/font/LICENSE.md → pcbasic/basic/font/LICENSE.md
diff --git a/basic/font/__init__.py → pcbasic/basic/font/__init__.py b/basic/font/__init__.py → pcbasic/basic/font/__init__.py
diff --git a/basic/font/cga_08.hex → pcbasic/basic/font/cga_08.hex b/basic/font/cga_08.hex → pcbasic/basic/font/cga_08.hex
diff --git a/basic/font/cgathin_08.hex → pcbasic/basic/font/cgathin_08.hex b/basic/font/cgathin_08.hex → pcbasic/basic/font/cgathin_08.hex
diff --git a/basic/font/freedos_08.hex → pcbasic/basic/font/freedos_08.hex b/basic/font/freedos_08.hex → pcbasic/basic/font/freedos_08.hex
diff --git a/basic/font/freedos_14.hex → pcbasic/basic/font/freedos_14.hex b/basic/font/freedos_14.hex → pcbasic/basic/font/freedos_14.hex
diff --git a/basic/font/freedos_16.hex → pcbasic/basic/font/freedos_16.hex b/basic/font/freedos_16.hex → pcbasic/basic/font/freedos_16.hex
diff --git a/basic/font/mda_14.hex → pcbasic/basic/font/mda_14.hex b/basic/font/mda_14.hex → pcbasic/basic/font/mda_14.hex
diff --git a/basic/font/olivetti_16.hex → pcbasic/basic/font/olivetti_16.hex b/basic/font/olivetti_16.hex → pcbasic/basic/font/olivetti_16.hex
diff --git a/basic/font/tandy1_08.hex → pcbasic/basic/font/tandy1_08.hex b/basic/font/tandy1_08.hex → pcbasic/basic/font/tandy1_08.hex
diff --git a/basic/font/tandy2_08.hex → pcbasic/basic/font/tandy2_08.hex b/basic/font/tandy2_08.hex → pcbasic/basic/font/tandy2_08.hex
diff --git a/basic/font/unifont_16.hex → pcbasic/basic/font/unifont_16.hex b/basic/font/unifont_16.hex → pcbasic/basic/font/unifont_16.hex
diff --git a/basic/font/univga_16.hex → pcbasic/basic/font/univga_16.hex b/basic/font/univga_16.hex → pcbasic/basic/font/univga_16.hex
diff --git a/basic/font/vga_08.hex → pcbasic/basic/font/vga_08.hex b/basic/font/vga_08.hex → pcbasic/basic/font/vga_08.hex
diff --git a/basic/font/vga_14.hex → pcbasic/basic/font/vga_14.hex b/basic/font/vga_14.hex → pcbasic/basic/font/vga_14.hex
diff --git a/basic/font/vga_16.hex → pcbasic/basic/font/vga_16.hex b/basic/font/vga_16.hex → pcbasic/basic/font/vga_16.hex
diff --git a/basic/fp.py → pcbasic/basic/fp.py b/basic/fp.py → pcbasic/basic/fp.py
diff --git a/basic/functions.py → pcbasic/basic/functions.py b/basic/functions.py → pcbasic/basic/functions.py
diff --git a/basic/graphics.py → pcbasic/basic/graphics.py b/basic/graphics.py → pcbasic/basic/graphics.py
diff --git a/basic/inputs.py → pcbasic/basic/inputs.py b/basic/inputs.py → pcbasic/basic/inputs.py
diff --git a/basic/interpreter.py → pcbasic/basic/interpreter.py b/basic/interpreter.py → pcbasic/basic/interpreter.py
diff --git a/basic/machine.py → pcbasic/basic/machine.py b/basic/machine.py → pcbasic/basic/machine.py
diff --git a/basic/memory.py → pcbasic/basic/memory.py b/basic/memory.py → pcbasic/basic/memory.py
diff --git a/basic/modes.py → pcbasic/basic/modes.py b/basic/modes.py → pcbasic/basic/modes.py
diff --git a/basic/operators.py → pcbasic/basic/operators.py b/basic/operators.py → pcbasic/basic/operators.py
diff --git a/basic/parser.py → pcbasic/basic/parser.py b/basic/parser.py → pcbasic/basic/parser.py
diff --git a/basic/ports.py → pcbasic/basic/ports.py b/basic/ports.py → pcbasic/basic/ports.py
diff --git a/basic/print_and_input.py → pcbasic/basic/print_and_input.py b/basic/print_and_input.py → pcbasic/basic/print_and_input.py
diff --git a/basic/printer.py → pcbasic/basic/printer.py b/basic/printer.py → pcbasic/basic/printer.py
diff --git a/basic/program.py → pcbasic/basic/program.py b/basic/program.py → pcbasic/basic/program.py
diff --git a/basic/programs/BASCODER.BAS → pcbasic/basic/programs/BASCODER.BAS b/basic/programs/BASCODER.BAS → pcbasic/basic/programs/BASCODER.BAS
diff --git a/basic/programs/LICENSE.md → pcbasic/basic/programs/LICENSE.md b/basic/programs/LICENSE.md → pcbasic/basic/programs/LICENSE.md
diff --git a/basic/programs/PCTERM.BAS → pcbasic/basic/programs/PCTERM.BAS b/basic/programs/PCTERM.BAS → pcbasic/basic/programs/PCTERM.BAS
diff --git a/basic/protect.py → pcbasic/basic/protect.py b/basic/protect.py → pcbasic/basic/protect.py
diff --git a/basic/redirect.py → pcbasic/basic/redirect.py b/basic/redirect.py → pcbasic/basic/redirect.py
diff --git a/basic/representation.py → pcbasic/basic/representation.py b/basic/representation.py → pcbasic/basic/representation.py
diff --git a/basic/rnd.py → pcbasic/basic/rnd.py b/basic/rnd.py → pcbasic/basic/rnd.py
diff --git a/basic/scancode.py → pcbasic/basic/scancode.py b/basic/scancode.py → pcbasic/basic/scancode.py
diff --git a/basic/shell.py → pcbasic/basic/shell.py b/basic/shell.py → pcbasic/basic/shell.py
diff --git a/basic/signals.py → pcbasic/basic/signals.py b/basic/signals.py → pcbasic/basic/signals.py
diff --git a/basic/sound.py → pcbasic/basic/sound.py b/basic/sound.py → pcbasic/basic/sound.py
diff --git a/basic/state.py → pcbasic/basic/state.py b/basic/state.py → pcbasic/basic/state.py
diff --git a/basic/statements.py → pcbasic/basic/statements.py b/basic/statements.py → pcbasic/basic/statements.py
diff --git a/basic/timedate.py → pcbasic/basic/timedate.py b/basic/timedate.py → pcbasic/basic/timedate.py
diff --git a/basic/tokenise.py → pcbasic/basic/tokenise.py b/basic/tokenise.py → pcbasic/basic/tokenise.py
diff --git a/basic/typeface.py → pcbasic/basic/typeface.py b/basic/typeface.py → pcbasic/basic/typeface.py
diff --git a/basic/unicodepage.py → pcbasic/basic/unicodepage.py b/basic/unicodepage.py → pcbasic/basic/unicodepage.py
diff --git a/basic/util.py → pcbasic/basic/util.py b/basic/util.py → pcbasic/basic/util.py
diff --git a/basic/var.py → pcbasic/basic/var.py b/basic/var.py → pcbasic/basic/var.py
diff --git a/basic/vartypes.py → pcbasic/basic/vartypes.py b/basic/vartypes.py → pcbasic/basic/vartypes.py
diff --git a/interface/config.py → pcbasic/config.py b/interface/config.py → pcbasic/config.py
@@ -21,7 +21,7 @@
     import ctypes
     import ctypes.wintypes
 
-from basic import __version__, codepages, fonts
+from .basic import __version__, codepages, fonts
 
 # get basepath (__file__ is undefined in pyinstaller packages)
 if hasattr(sys, 'frozen'):
@@ -46,7 +46,7 @@ def get_logger(logfile=None):
 
 def show_usage():
     """Show usage description."""
-    usage_file = os.path.join(basepath, '..', 'USAGE.txt')
+    usage_file = os.path.join(basepath, 'USAGE.txt')
     with open(usage_file) as f:
         for line in f:
             sys.stdout.write(line)

diff --git a/interface/__init__.py → pcbasic/interface/__init__.py b/interface/__init__.py → pcbasic/interface/__init__.py
@@ -26,7 +26,7 @@
 from .audio_sdl2 import AudioSDL2
 
 # create the window icon
-from basic import typeface
+from ..basic import typeface
 icon_hex = '00003CE066606666666C6678666C3CE67F007F007F007F007F007F007F000000'
 icon = typeface.Font(16, {'icon': icon_hex.decode('hex')}
                             ).build_glyph('icon', 16, 16, False, False)

diff --git a/interface/ansi.py → pcbasic/interface/ansi.py b/interface/ansi.py → pcbasic/interface/ansi.py
diff --git a/interface/audio_beep.py → pcbasic/interface/audio_beep.py b/interface/audio_beep.py → pcbasic/interface/audio_beep.py
@@ -10,7 +10,7 @@
 import subprocess
 import platform
 
-from basic import signals
+from ..basic import signals
 from . import base as audio
 
 

diff --git a/interface/audio_none.py → pcbasic/interface/audio_none.py b/interface/audio_none.py → pcbasic/interface/audio_none.py
@@ -9,7 +9,7 @@
 import datetime
 import Queue
 
-from basic import signals
+from ..basic import signals
 from . import base as audio
 
 

diff --git a/interface/audio_pygame.py → pcbasic/interface/audio_pygame.py b/interface/audio_pygame.py → pcbasic/interface/audio_pygame.py
@@ -25,7 +25,7 @@
 import logging
 import Queue
 
-from basic import signals
+from ..basic import signals
 from . import base as audio
 
 tick_ms = 24

diff --git a/interface/audio_sdl2.py → pcbasic/interface/audio_sdl2.py b/interface/audio_sdl2.py → pcbasic/interface/audio_sdl2.py
@@ -23,7 +23,7 @@
 except ImportError:
     numpy = None
 
-from basic import signals
+from ..basic import signals
 from . import base as audio
 
 tick_ms = 24

diff --git a/interface/base.py → pcbasic/interface/base.py b/interface/base.py → pcbasic/interface/base.py
@@ -8,7 +8,7 @@
 
 import Queue
 
-from basic import signals
+from ..basic import signals
 
 
 class InitFailed(Exception):

diff --git a/interface/clipboard.py → pcbasic/interface/clipboard.py b/interface/clipboard.py → pcbasic/interface/clipboard.py
diff --git a/interface/video_ansi.py → pcbasic/interface/video_ansi.py b/interface/video_ansi.py → pcbasic/interface/video_ansi.py
diff --git a/interface/video_cli.py → pcbasic/interface/video_cli.py b/interface/video_cli.py → pcbasic/interface/video_cli.py
@@ -16,9 +16,9 @@
 from . import base as video
 from . import ansi
 
-from basic import signals
-from basic import scancode
-from basic.eascii import as_unicode as uea
+from ..basic import signals
+from ..basic import scancode
+from ..basic.eascii import as_unicode as uea
 
 encoding = sys.stdin.encoding or 'utf-8'
 

diff --git a/interface/video_curses.py → pcbasic/interface/video_curses.py b/interface/video_curses.py → pcbasic/interface/video_curses.py
@@ -14,9 +14,9 @@
 except ImportError:
     curses = None
 
-from basic import scancode
-from basic.eascii import as_unicode as uea
-from basic import signals
+from ..basic import scancode
+from ..basic.eascii import as_unicode as uea
+from ..basic import signals
 
 from . import base as video
 # for a few ansi sequences not supported by curses

diff --git a/interface/video_graphical.py → pcbasic/interface/video_graphical.py b/interface/video_graphical.py → pcbasic/interface/video_graphical.py
@@ -25,8 +25,8 @@
 
 from . import base as video
 
-from basic import signals
-from basic import scancode
+from ..basic import signals
+from ..basic import scancode
 
 # percentage of the screen to leave unused for window decorations etc.
 display_slack = 15

diff --git a/interface/video_none.py → pcbasic/interface/video_none.py b/interface/video_none.py → pcbasic/interface/video_none.py
@@ -11,7 +11,7 @@
 
 from . import base as video
 
-from basic import signals
+from ..basic import signals
 
 if platform.system() == 'Windows':
     from msvcrt import kbhit

diff --git a/interface/video_pygame.py → pcbasic/interface/video_pygame.py b/interface/video_pygame.py → pcbasic/interface/video_pygame.py
@@ -19,9 +19,9 @@
 except ImportError:
     numpy = None
 
-from basic import signals
-from basic import scancode
-from basic.eascii import as_unicode as uea
+from ..basic import signals
+from ..basic import scancode
+from ..basic.eascii import as_unicode as uea
 
 from . import clipboard
 from . import base as video

diff --git a/interface/video_sdl2.py → pcbasic/interface/video_sdl2.py b/interface/video_sdl2.py → pcbasic/interface/video_sdl2.py
@@ -24,9 +24,9 @@
 except ImportError:
     numpy = None
 
-from basic import signals
-from basic import scancode
-from basic.eascii import as_unicode as uea
+from ..basic import signals
+from ..basic import scancode
+from ..basic.eascii import as_unicode as uea
 from . import clipboard
 from . import base as video
 from . import video_graphical

diff --git a/run-pcbasic.py b/run-pcbasic.py
@@ -0,0 +1,4 @@
+#!/usr/bin/env python2
+
+from pcbasic.__main__ import main
+main()
diff --git a/test/lint.sh b/test/lint.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-for file in ../basic/*.py ../interface/*.py ../pcbasic.py; do pylint -E --ignored-modules=pygame,numpy,pygame.mixer --enable=cyclic-import,relative-import --disable=too-many-function-args $file; done
+for file in ../pcbasic/*.py ../pcbasic/*/*.py; do pylint -E --ignored-modules=pygame,numpy,pygame.mixer --enable=cyclic-import,relative-import --disable=too-many-function-args $file; done
diff --git a/test/test.sh b/test/test.sh
@@ -24,7 +24,7 @@ do
     mkdir "$name/output"
     cp "$name"/* "$name/output" 2>/dev/null
     pushd "$name/output" > /dev/null
-    ../../../pcbasic.py --interface=none >/dev/null
+    ../../../run-pcbasic.py --interface=none >/dev/null
     popd > /dev/null
     pass=1
     known=1