Quellcode durchsuchen

Do other recommended changes from 2to3.

Bentley James Oakes vor 7 Jahren
Ursprung
Commit
77ff848904

+ 1 - 1
src/python_sccd/python_sccd_compiler/generic_language_constructs.py

@@ -752,7 +752,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
 

+ 1 - 1
src/python_sccd/python_sccd_compiler/javascript_writer.py

@@ -158,7 +158,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(", ")            

+ 1 - 1
src/python_sccd/python_sccd_compiler/python_writer.py

@@ -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(", ")			

+ 1 - 1
src/python_sccd/python_sccd_compiler/sccd_constructs.py

@@ -879,7 +879,7 @@ class Class(Visitable):
                 checkIt.append(super_class)
             priorityChecker[priority] = checkIt
 
-        for priority, checkIt in priorityChecker.items():
+        for priority, checkIt in list(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.")
 

+ 1 - 1
src/python_sccd/python_sccd_compiler/super_class_linker.py

@@ -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.items():
+		for name,obj in list(c.super_class_objs.items()):
 			if obj:
 				if name not in c.constructors[0].super_class_parameters:
 					num_params = len(obj.constructors[0].parameters)

+ 1 - 1
src/python_sccd/python_sccd_runtime/libs/ordered_set.py

@@ -163,7 +163,7 @@ class OrderedSet(collections.MutableSet):
             i = self.items.index(key)
             del self.items[i]
             del self.map[key]
-            for k, v in self.map.items():
+            for k, v in list(self.map.items()):
                 if v >= i:
                     self.map[k] = v - 1
 

+ 8 - 3
src/python_sccd/python_sccd_runtime/libs/ui.py

@@ -7,9 +7,14 @@
  Date: 2014/08/21
 """
 
-import Tkinter as tk
-from drawing import drawing
-from utils import utils
+
+try:
+    import Tkinter as tk
+except ImportError:
+    import tkinter as tk
+
+from src.python_sccd.python_sccd_runtime.libs.drawing import drawing
+from src.python_sccd.python_sccd_runtime.libs.utils import utils
 
 from sccd.runtime.statecharts_core import Event
 

+ 2 - 2
src/python_sccd/python_sccd_runtime/statecharts_core.py

@@ -932,7 +932,7 @@ class Transition:
         try:
             self.obj.configuration = self.obj.config_mem[self.obj.configuration_bitmap]
         except:
-            self.obj.configuration = self.obj.config_mem[self.obj.configuration_bitmap] = sorted([s for s in self.obj.states.values() if 2**s.state_id & self.obj.configuration_bitmap], key=lambda s: s.state_id)
+            self.obj.configuration = self.obj.config_mem[self.obj.configuration_bitmap] = sorted([s for s in list(self.obj.states.values()) if 2**s.state_id & self.obj.configuration_bitmap], key=lambda s: s.state_id)
         self.enabled_event = None
     
     def __getEffectiveTargetStates(self):
@@ -1097,7 +1097,7 @@ class RuntimeClassBase(object):
                 due = [self.events.pop()]
             is_stable = not self.bigStep(due)
             self.processBigStepOutput()
-        for index, entry in self.timers_to_add.items():
+        for index, entry in list(self.timers_to_add.items()):
             self.timers[index] = self.events.add(*entry)
         self.timers_to_add = {}
         self.__set_stable(True)

+ 1 - 0
src/setup.sh

@@ -0,0 +1 @@
+python2 setup.py install --user && python3 setup.py install --user