Fix imports. Is this directory needed?

kernel/mvk_server/python_sccd_compiler/generic_generator.py

@@ -7,12 +7,12 @@
 import traceback
 
 import time
-from utils import Enum, Logger
+from kernel.mvk_server.python_sccd_compiler.utils import Enum, Logger
 
-from visitor import Visitor
-from sccd_constructs import FormalParameter
-from stateful_writer import StatefulWriter
-import generic_language_constructs as GLC
+from kernel.mvk_server.python_sccd_compiler.visitor import Visitor
+from kernel.mvk_server.python_sccd_compiler.sccd_constructs import FormalParameter
+from kernel.mvk_server.python_sccd_compiler.stateful_writer import StatefulWriter
+import kernel.mvk_server.python_sccd_compiler.generic_language_constructs as GLC
 
 Platforms = Enum("Threads","GameLoop","EventLoop") 
 

kernel/mvk_server/python_sccd_compiler/generic_language_constructs.py

@@ -720,9 +720,15 @@ class NoneExpression(SimpleExpression):
 # helpers
 
 def MakeExpression(expr):
+
+	try:
+		bs = basestring
+	except NameError:
+		bs = str
+
 	if isinstance(expr, Expression):
 		return expr
-	elif isinstance(expr, basestring):
+	elif isinstance(expr, bs):
 		return Literal(expr)
 	elif expr is None:
 		return None
@@ -739,7 +745,7 @@ def MakeExpressionList(l):
 def MakeExpressionMap(m):
 	if not isinstance(m, dict):
 		raise Exception("Expected argument of type 'dict'.")
-	for key in m.keys():
+	for key in list(m.keys()):
 		m[key] = MakeExpression(m[key])
 	return m
 

kernel/mvk_server/python_sccd_compiler/javascript_writer.py

@@ -1,5 +1,5 @@
-from visitor import Visitor
-from generic_language_constructs import *
+from kernel.mvk_server.python_sccd_compiler.visitor import Visitor
+from kernel.mvk_server.python_sccd_compiler.generic_language_constructs import *
 
 class JavascriptWriter(CLikeWriterBase):
 	def __init__(self, outputter):
@@ -155,7 +155,7 @@ class JavascriptWriter(CLikeWriterBase):
 			self.out.extendWrite("new Object()")
 		else:
 			self.out.extendWrite("{")
-			keys = elements.keys()
+			keys = list(elements.keys())
 			for i in range(len(keys)):
 				if i != 0:
 					self.out.extendWrite(", ")			

kernel/mvk_server/python_sccd_compiler/lexer.py

@@ -1,4 +1,4 @@
-from utils import Enum
+from kernel.mvk_server.python_sccd_compiler.utils import Enum
 
 TokenType = Enum("SLASH",
 				 "LBRACKET",

kernel/mvk_server/python_sccd_compiler/path_calculator.py

@@ -1,5 +1,5 @@
-from compiler_exceptions import *
-from visitor import Visitor
+from kernel.mvk_server.python_sccd_compiler.compiler_exceptions import *
+from kernel.mvk_server.python_sccd_compiler.visitor import Visitor
 
 class PathCalculator(Visitor):
 	""" Computes the states that must be exited and entered for a specific transition if the system is to make

kernel/mvk_server/python_sccd_compiler/python_writer.py

@@ -1,4 +1,4 @@
-from generic_language_constructs import *
+from kernel.mvk_server.python_sccd_compiler.generic_language_constructs import *
 
 class PythonWriter(GenericWriterBase):
 	def __init__(self, outputter):
@@ -201,7 +201,7 @@ class PythonWriter(GenericWriterBase):
 	def visit_MapExpression(self, m):
 		elements = m.getElements()
 		self.out.extendWrite("{")
-		keys = elements.keys()
+		keys = list(elements.keys())
 		for i in range(len(keys)):
 			if i != 0:
 				self.out.extendWrite(", ")			

kernel/mvk_server/python_sccd_compiler/sccd_constructs.py

@@ -2,10 +2,10 @@ import abc
 import re
 import xml.etree.ElementTree as ET
 import os.path
-from utils import Logger
-from visitor import Visitable
-from compiler_exceptions import CompilerException, TransitionException, UnprocessedException
-from lexer import Lexer, Token, TokenType
+from kernel.mvk_server.python_sccd_compiler.utils import Logger
+from kernel.mvk_server.python_sccd_compiler.visitor import Visitable
+from kernel.mvk_server.python_sccd_compiler.compiler_exceptions import CompilerException, TransitionException, UnprocessedException
+from kernel.mvk_server.python_sccd_compiler.lexer import Lexer, Token, TokenType
 
 # http://docs.python.org/2/library/xml.etree.elementtree.html
 
@@ -847,7 +847,11 @@ class Class(Visitable):
 		for i in inheritances :
 			self.super_classes.append((i.get("class",""),i.get("priority",1)))
 
-		self.super_classes.sort(lambda a, b: cmp(b[1], a[1])) # sort from high priority to low priority
+		try:
+			self.super_classes.sort(lambda a, b: cmp(b[1], a[1]))  # sort from high priority to low priority
+		except TypeError:
+			self.super_classes = sorted(self.super_classes, key = lambda x: x[1], reverse = True)
+
 		priorityChecker = {}
 		for super_class, priority in self.super_classes:
 			if priority in priorityChecker:
@@ -857,7 +861,7 @@ class Class(Visitable):
 			if super_class not in checkIt:
 				checkIt.append(super_class)
 			priorityChecker[priority] = checkIt
-		for priority, checkIt in priorityChecker.iteritems():
+		for priority, checkIt in priorityChecker.items():
 			if len(checkIt) > 1:
 				Logger.showWarning("Class <" + self.name + "> inherits from classes <" + ", ".join(checkIt) + "> with same priority <" + str(priority) + ">. Document inheritance order is used.")
 

kernel/mvk_server/python_sccd_compiler/sccdc.py

@@ -1,17 +1,17 @@
 import argparse
 import os
 import sys
-from generic_generator import GenericGenerator, Platforms
-from utils import Enum, Logger, FileWriter
-from super_class_linker import SuperClassLinker
-from state_linker import StateLinker
-from path_calculator import PathCalculator
-from sccd_constructs import ClassDiagram
-from generic_language_constructs import GenericConstruct
-from compiler_exceptions import CompilerException
+from kernel.mvk_server.python_sccd_compiler.generic_generator import GenericGenerator, Platforms
+from kernel.mvk_server.python_sccd_compiler.utils import Enum, Logger, FileWriter
+from kernel.mvk_server.python_sccd_compiler.super_class_linker import SuperClassLinker
+from kernel.mvk_server.python_sccd_compiler.state_linker import StateLinker
+from kernel.mvk_server.python_sccd_compiler.path_calculator import PathCalculator
+from kernel.mvk_server.python_sccd_compiler.sccd_constructs import ClassDiagram
+from kernel.mvk_server.python_sccd_compiler.generic_language_constructs import GenericConstruct
+from kernel.mvk_server.python_sccd_compiler.compiler_exceptions import CompilerException
 
-from javascript_writer import JavascriptWriter
-from python_writer import PythonWriter
+from kernel.mvk_server.python_sccd_compiler.javascript_writer import JavascriptWriter
+from kernel.mvk_server.python_sccd_compiler.python_writer import PythonWriter
 
 def generate(input_file, output_file, target_language, platform):
 	sccd = xmlToSccd(input_file)

kernel/mvk_server/python_sccd_compiler/state_linker.py

@@ -1,7 +1,7 @@
-from visitor import Visitor
-from sccd_constructs import INSTATE_SEQ
-from compiler_exceptions import CompilerException
-from lexer import Lexer, Token, TokenType
+from kernel.mvk_server.python_sccd_compiler.visitor import Visitor
+from kernel.mvk_server.python_sccd_compiler.sccd_constructs import INSTATE_SEQ
+from kernel.mvk_server.python_sccd_compiler.compiler_exceptions import CompilerException
+from kernel.mvk_server.python_sccd_compiler.lexer import Lexer, Token, TokenType
 
 class StateReferenceException(CompilerException):
 	pass

kernel/mvk_server/python_sccd_compiler/stateful_writer.py

@@ -1,7 +1,7 @@
 # Used by generic_generator to create an AST of generic language constructs
 # while visiting an AST of SCCD constructs
 
-from generic_language_constructs import *
+from kernel.mvk_server.python_sccd_compiler.generic_language_constructs import *
 
 class ExpressionWrapper(SimpleExpression, AbstractList):
 	def __init__(self, expr = None):

kernel/mvk_server/python_sccd_compiler/super_class_linker.py

@@ -1,6 +1,6 @@
-from compiler_exceptions import *
-from utils import Logger
-from visitor import Visitor
+from kernel.mvk_server.python_sccd_compiler.compiler_exceptions import *
+from kernel.mvk_server.python_sccd_compiler.utils import Logger
+from kernel.mvk_server.python_sccd_compiler.visitor import Visitor
 
 class SuperClassLinker(Visitor):
 	""" Computes the states that must be exited and entered for a specific transition if the system is to make
@@ -27,7 +27,7 @@ class SuperClassLinker(Visitor):
 		c.abstract_method_names = getClassAbstractMethodNames(c)
 
 		# check if <super> tags exist for all inherited classes
-		for name,obj in c.super_class_objs.iteritems():
+		for name,obj in c.super_class_objs.items():
 			if obj:
 				if name not in c.constructors[0].super_class_parameters:
 					num_params = len(obj.constructors[0].parameters)

kernel/mvk_server/python_sccd_compiler/utils.py

@@ -1,4 +1,4 @@
-from compiler_exceptions import CodeBlockException
+from kernel.mvk_server.python_sccd_compiler.compiler_exceptions import CodeBlockException
 from sys import stdout
 
 class Logger(object):
@@ -10,17 +10,17 @@ class Logger(object):
 	@staticmethod   
 	def showError(error):
 		if(Logger.verbose > -1) :
-			print "ERROR : " + error
+			print("ERROR : " + error)
 				
 	@staticmethod
 	def showWarning(warning):
 		if(Logger.verbose > 0) :
-			print "WARNING : " + warning
+			print("WARNING : " + warning)
 			
 	@staticmethod	
 	def showInfo(info):
 		if(Logger.verbose > 1) :
-			print "INFO : " + info
+			print("INFO : " + info)
 
 #######################