Py2to3

.bumpversion.cfg

@@ -0,0 +1,4 @@
+[bumpversion]
+current_version = 1.5.0
+files = version.py
+

.gitignore

@@ -3,4 +3,5 @@ parsetab.py
 parser.out
 zxbasmtab.py
 zxbpptab.py
-.idea
+.idea
+/zxbtab.py

api/check.py

@@ -9,11 +9,11 @@
 #                    the GNU General License
 # ----------------------------------------------------------------------
 
-import config
-import global_
-from constants import CLASS
-from constants import SCOPE
-from errmsg import syntax_error
+from . import config
+from . import global_
+from .constants import CLASS
+from .constants import SCOPE
+from .errmsg import syntax_error
 
 
 __all__ = ['check_type',

api/config.py

@@ -16,8 +16,8 @@
 import sys
 
 # The options container
-import options
-import global_
+from . import options
+from . import global_
 
 OPTIONS = options.Options()
 

api/constants.py

@@ -9,14 +9,14 @@
 #                    the GNU General License
 # ----------------------------------------------------------------------
 
+from .decorator import classproperty
+
 __all__ = [
     'ID_CLASSES', 'DEPRECATED_SUFFIXES', 'ID_TYPES',
     'TYPE_NAMES', 'NAME_TYPES', 'TYPE_SIZES', 'SUFFIX_TYPE',
     'PTR_TYPE'
 ]
 
-from decorator import classproperty
-
 # -------------------------------------------------
 # Global constants
 # -------------------------------------------------

api/debug.py

@@ -5,16 +5,15 @@
 # Simple debugging module
 
 import os
+import inspect
 
-from config import OPTIONS
+from .config import OPTIONS
 
 __all__ = ['__DEBUG__', '__LINE__', '__FILE__']
 
 # --------------------- END OF GLOBAL FLAGS ---------------------
 
-import inspect
-
-def __DEBUG__(msg, level = 1):
+def __DEBUG__(msg, level=1):
     if level > OPTIONS.Debug.value:
         return
 

api/errmsg.py

@@ -10,8 +10,8 @@
 # ----------------------------------------------------------------------
 
 import sys
-import global_
-from config import OPTIONS
+from . import global_
+from .config import OPTIONS
 
 # Expors only these functions. Others
 __all__ = ['syntax_error', 'warning']

api/global_.py

@@ -17,8 +17,8 @@
 # Don't touch unless you know what are you doing
 # ----------------------------------------------------------------------
 
-from opcodestemps import OpcodesTemps
-from constants import TYPE
+from .opcodestemps import OpcodesTemps
+from .constants import TYPE
 
 # ----------------------------------------------------------------------
 # Initializes a singleton container

api/optimize.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 from ast_ import NodeVisitor
-from config import OPTIONS
+from .config import OPTIONS
 from api.errmsg import warning
 import api.check as chk
 from api.constants import TYPE

api/options.py

@@ -9,10 +9,11 @@
 #                    the GNU General License
 # ----------------------------------------------------------------------
 
+from .errors import Error
+
 TRUE = true = True
 FALSE = false = False
 
-from errors import Error
 
 __all__ = ['Option', 'Options']
 

api/symboltable.py

@@ -11,28 +11,27 @@
 
 from collections import OrderedDict
 
-from debug import __DEBUG__
+from .debug import __DEBUG__
 
 import symbols
-
 from symbols.symbol_ import Symbol
 
-import global_
-from config import OPTIONS
+from . import global_
+from .config import OPTIONS
 
-from errmsg import syntax_error
-from errmsg import warning_implicit_type
-from errmsg import syntax_error_func_type_mismatch
-from errmsg import syntax_error_not_array_nor_func
+from .errmsg import syntax_error
+from .errmsg import warning_implicit_type
+from .errmsg import syntax_error_func_type_mismatch
+from .errmsg import syntax_error_not_array_nor_func
 
-from constants import DEPRECATED_SUFFIXES
-from constants import SUFFIX_TYPE
-from constants import SCOPE
-from constants import CLASS
-from constants import TYPE
+from .constants import DEPRECATED_SUFFIXES
+from .constants import SUFFIX_TYPE
+from .constants import SCOPE
+from .constants import CLASS
+from .constants import TYPE
 
-from check import is_number
-from check import check_is_declared_strict
+from .check import is_number
+from .check import check_is_declared_strict
 
 
 # ----------------------------------------------------------------------

arch/__init__.py

@@ -2,4 +2,4 @@
 # -*- coding: utf-8 -*-
 # vim:ts=4:et:sw=4:
 
-import zx48k
+from . import zx48k

arch/zx48k/__init__.py

@@ -2,8 +2,8 @@
 # -*- coding: utf-8 -*-
 # vim:ts=4:et:sw=4:
 
-import beep
-from translator import *
+from . import beep
+from .translator import *
 
 import api.global_
 from api.constants import TYPE

arch/zx48k/beep.py

@@ -2,65 +2,67 @@
 # -*- coding: utf-8 -*-
 # vim:ts=4:et:sw=4:
 
-''' This library converts duration,pitch for a beep
+__doc___ = """This library converts duration,pitch for a beep
 from floating point to HL,DE Integers.
-'''
+"""
+
+
 class BeepError(BaseException):
-    ''' Returned when invalid pitch specified (e.g. Out of Range)
-    '''
-    def __init__(self, msg = 'Invalid beep parameters'):
+    """Returned when invalid pitch specified (e.g. Out of Range)
+    """
+
+    def __init__(self, msg='Invalid beep parameters'):
         self.message = msg
 
     def __str__(self):
         return self.message
-
+
+
 # Pitch (frequencies) tables
-TABLE = [261.625565290, # C
-    277.182631135,
-    293.664768100,
-    311.126983881,
-    329.627557039,
-    349.228231549,
-    369.994422674,
-    391.995436072,
-    415.304697513,
-    440.000000000,
-    466.163761616,
-    493.883301378]
+TABLE = [261.625565290,  # C
+         277.182631135,
+         293.664768100,
+         311.126983881,
+         329.627557039,
+         349.228231549,
+         369.994422674,
+         391.995436072,
+         415.304697513,
+         440.000000000,
+         466.163761616,
+         493.883301378]
 
 
 def getDEHL(duration, pitch):
-    ''' Converts duration,pitch to a pair of unsigned 16 bit integers,
+    """Converts duration,pitch to a pair of unsigned 16 bit integers,
     to be loaded in DE,HL, following the ROM listing.
     Returns a t-uple with the DE, HL values.
-    '''
+    """
     intPitch = int(pitch)
-    fractPitch = pitch - intPitch # Gets fractional part
+    fractPitch = pitch - intPitch  # Gets fractional part
     tmp = 1 + 0.0577622606 * fractPitch
     if not -60 <= intPitch <= 127:
         raise BeepError('Pitch out of range: must be between [-60, 127]')
 
     if duration < 0 or duration > 10:
         raise BeepError('Invalid duration: must be between [0, 10]')
-    
+
     A = intPitch + 60
-    B = -5 + int(A / 12) # -5 <= B <= 10
-    A %= 0xC # Semitones above C
-    
+    B = -5 + int(A / 12)  # -5 <= B <= 10
+    A %= 0xC  # Semitones above C
+
     frec = TABLE[A]
     tmp2 = tmp * frec
     f = tmp2 * 2.0 ** B
-
-    DE = int (0.5 + f * duration - 1)
-    HL = int (0.5 + 437500.0 / f - 30.125)
 
-    return (DE, HL)
-
+    DE = int(0.5 + f * duration - 1)
+    HL = int(0.5 + 437500.0 / f - 30.125)
+    return DE, HL
+
 
 if __name__ == '__main__':
     # Simple test
-    print getDEHL(1, 0), [hex(x) for x in getDEHL(1, 0)]
-    print getDEHL(5, 0), [hex(x) for x in getDEHL(5, 0)]
-    print getDEHL(1.5, 15.0), [hex(x) for x in getDEHL(1.5, 15.0)]
-    print getDEHL(1.5, 17.0), [hex(x) for x in getDEHL(1.5, 17.0)]
-
+    print(getDEHL(1, 0), [hex(x) for x in getDEHL(1, 0)])
+    print(getDEHL(5, 0), [hex(x) for x in getDEHL(5, 0)])
+    print(getDEHL(1.5, 15.0), [hex(x) for x in getDEHL(1.5, 15.0)])
+    print(getDEHL(1.5, 17.0), [hex(x) for x in getDEHL(1.5, 17.0)])