From fb47e48e4a064990cdd72193144ecbb683a1178d Mon Sep 17 00:00:00 2001
From: kris <kris.kennaway@gmail.com>
Date: Thu, 21 Mar 2019 16:24:40 +0000
Subject: [PATCH] Fix imports and point to player debug symbols

---
 transcoder/main.py              |  2 +-
 transcoder/movie.py             |  4 +++-
 transcoder/opcodes.py           |  8 +++++---
 transcoder/opcodes_test.py      |  2 +-
 transcoder/symbol_table_test.py |  2 +-
 transcoder/video.py             | 11 ++++++-----
 transcoder/video_test.py        |  2 +-
 7 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/transcoder/main.py b/transcoder/main.py
index 1856c45..bdc3857 100644
--- a/transcoder/main.py
+++ b/transcoder/main.py
@@ -2,7 +2,7 @@
 
 import argparse
 
-from transcoder import movie
+import movie
 
 parser = argparse.ArgumentParser(
     description='Transcode videos to ][Vision format.')
diff --git a/transcoder/movie.py b/transcoder/movie.py
index 29892e1..a9aee81 100644
--- a/transcoder/movie.py
+++ b/transcoder/movie.py
@@ -2,7 +2,9 @@
 
 from typing import Iterable, Iterator
 
-from transcoder import video, opcodes, audio
+import audio
+import opcodes
+import video
 
 
 class Movie:
diff --git a/transcoder/opcodes.py b/transcoder/opcodes.py
index d5a456e..1d54fca 100644
--- a/transcoder/opcodes.py
+++ b/transcoder/opcodes.py
@@ -1,8 +1,10 @@
 import enum
-import numpy as np
 from typing import Iterator, Tuple
 
-from transcoder import screen, symbol_table
+import numpy as np
+
+import screen
+import symbol_table
 
 
 class CycleCounter:
@@ -159,7 +161,7 @@ def _ParseSymbolTable():
 
     opcode_data = {}
     for name, data in symbol_table.SymbolTable(
-            "audiotest/audiotest/audiotest.dbg").parse().items():
+            "player/iivision.dbg").parse().items():
         if name.startswith("\"op_"):
             op_name = name[4:-1]
             start_addr = int(data["val"], 16)
diff --git a/transcoder/opcodes_test.py b/transcoder/opcodes_test.py
index 795422e..beb0199 100644
--- a/transcoder/opcodes_test.py
+++ b/transcoder/opcodes_test.py
@@ -1,6 +1,6 @@
 import unittest
 
-from transcoder import opcodes
+import opcodes
 
 
 class TestOpcodes(unittest.TestCase):
diff --git a/transcoder/symbol_table_test.py b/transcoder/symbol_table_test.py
index 64a924d..965b36c 100644
--- a/transcoder/symbol_table_test.py
+++ b/transcoder/symbol_table_test.py
@@ -1,7 +1,7 @@
 import io
 import unittest
 
-from transcoder import symbol_table
+import symbol_table
 
 DEBUG_FILE = """
 version major=2,minor=0
diff --git a/transcoder/video.py b/transcoder/video.py
index 3d961ab..3162937 100644
--- a/transcoder/video.py
+++ b/transcoder/video.py
@@ -1,18 +1,19 @@
 import heapq
-import random
 import os
-import threading
 import queue
+import random
 import subprocess
-
+import threading
 from typing import List, Iterator, Tuple
 
-from PIL import Image
 # import hitherdither
 import numpy as np
 import skvideo.io
+from PIL import Image
 
-from transcoder import opcodes, screen, edit_distance
+import edit_distance
+import opcodes
+import screen
 
 
 class Video:
diff --git a/transcoder/video_test.py b/transcoder/video_test.py
index c6fe6d4..2bd4eb2 100644
--- a/transcoder/video_test.py
+++ b/transcoder/video_test.py
@@ -1,6 +1,6 @@
 import unittest
 
-from transcoder import video
+import video
 
 
 class TestHammingWeight(unittest.TestCase):