py3: Make sure modules import under Python 3.

buildlib/rapt/build.py

@@ -12,6 +12,9 @@
 import subprocess
 import hashlib
 
+from . import plat
+from . import iconmaker
+
 import rapt.plat as plat
 import rapt.iconmaker as iconmaker
 
@@ -182,7 +185,7 @@ def add(fn, relfn):
 
         sd = os.path.abspath(sd)
 
-        for dir, dirs, files in os.walk(sd):  # @ReservedAssignment
+        for dir, dirs, files in os.walk(sd): # @ReservedAssignment
 
             for _fn in dirs:
                 fn = os.path.join(dir, _fn)

buildlib/rapt/configure.py

@@ -1,11 +1,10 @@
 import json
 import os
 import re
-import plat
+from . import plat
 
 __ = plat.__
 
-
 # Taken from https://docs.oracle.com/javase/tutorial/java/nutsandbolts/_keywords.html
 JAVA_KEYWORDS = """
 abstract    continue    for    new    switch
@@ -177,7 +176,7 @@ def configure(interface, directory, default_name=None, default_version=None):
             internet = "INTERNET" in config.permissions
             internet = interface.yesno_choice(__("Do you want to allow the app to access the Internet?"), internet)
         else:
-            internet = False  # included in template.
+            internet = False # included in template.
 
         permissions = [ i for i in config.permissions if i not in [ "INTERNET" ] ]
 

buildlib/rapt/iconmaker.py

@@ -1,6 +1,6 @@
 import pygame_sdl2
 import os
-import plat
+from . import plat
 import shutil
 
 

buildlib/rapt/install_sdk.py

@@ -7,7 +7,7 @@
 import shutil
 import subprocess
 
-import rapt.plat as plat
+from . import plat
 
 __ = plat.__
 
@@ -127,8 +127,8 @@ def get_packages(interface):
     packages = [ ]
 
     wanted_packages = [
-        ( "platform-tools", "platform-tools"),
-        ( "platforms;android-28", "platforms/android-28"),
+        ("platform-tools", "platform-tools"),
+        ("platforms;android-28", "platforms/android-28"),
         ]
 
     for i, j in wanted_packages:

buildlib/rapt/interface.py

@@ -5,13 +5,14 @@
 import subprocess
 import urllib
 
-import plat
+from . import plat
 
 import colorama
 from colorama import Fore, Back, Style
 
 colorama.init()
 
+
 class Interface(object):
 
     def write(self, s, style=""):
@@ -54,7 +55,6 @@ def final_success(self, prompt):
         self.write(prompt, Fore.GREEN + Style.BRIGHT)
         print
 
-
     def yesno(self, prompt):
         """
         Prompts the user for a response to a yes or no question.
@@ -94,8 +94,6 @@ def yesno_choice(self, prompt, default=None):
 
         print
 
-
-
     def terms(self, url, prompt):
         """
         Displays `url` to the user, and then prompts the user to accept the
@@ -112,8 +110,7 @@ def terms(self, url, prompt):
         if not self.yesno(prompt):
             self.fail("You must accept the terms and conditions to proceed.")
 
-
-    def input(self, prompt, empty=None): #@ReservedAssignment
+    def input(self, prompt, empty=None): # @ReservedAssignment
         """
         Prompts the user for input. The input is expected to be a string, which
         is stripped of leading and trailing whitespace. If `empty` is true,