some python3-specific changes

tests/bootstrapping.py

@@ -2,7 +2,7 @@
 Functions to bootstrap the emulator state
 """
 
-from setup_vba import (
+from tests.setup_vba import (
     vba,
     autoplayer,
 )

tests/integration/tests.py

@@ -155,6 +155,9 @@ class BasicTestCase(unittest.TestCase):
         rom_segment = self.rom[0x112116:0x112116+8]
         self.assertEqual(rom_segment, "HTTP/1.0")
 
+    def test_rom_text_at(self):
+        self.assertEquals(rom_text_at(0x112116, 8), b"HTTP/1.0")
+
     def test_rom_interval(self):
         address = 0x100
         interval = 10
@@ -186,9 +189,6 @@ class BasicTestCase(unittest.TestCase):
         addr2 = calculate_pointer_from_bytes_at(0x100, bank=True)
         self.assertEqual(addr2, 0x2ec3)
 
-    def test_rom_text_at(self):
-        self.assertEquals(rom_text_at(0x112116, 8), "HTTP/1.0")
-
 class TestRomStr(unittest.TestCase):
     sample_text = "hello world!"
     sample = None

tests/test_vba.py

@@ -5,13 +5,13 @@ from __future__ import print_function
 
 import unittest
 
-from setup_vba import (
+from tests.setup_vba import (
     vba,
     autoplayer,
     keyboard,
 )
 
-from bootstrapping import (
+from tests.bootstrapping import (
     bootstrap,
     bootstrap_trainer_battle,
 )

tests/test_vba_battle.py

@@ -4,7 +4,7 @@ Tests for the battle controller
 
 import unittest
 
-from setup_vba import (
+from tests.setup_vba import (
     vba,
     autoplayer,
 )