--- a/PLCGenerator.py Thu Oct 11 10:25:19 2018 +0300
+++ b/PLCGenerator.py Thu Oct 11 12:00:40 2018 +0300
@@ -24,7 +24,6 @@
from __future__ import absolute_import
-from types import *
import re
from six.moves import xrange
@@ -710,7 +709,7 @@
def ComputeConnectionTypes(self, pou):
body = pou.getbody()
- if isinstance(body, ListType):
+ if isinstance(body, list):
body = body[0]
body_content = body.getcontent()
body_type = body_content.getLocalTag()
@@ -943,7 +942,7 @@
def ComputeProgram(self, pou):
body = pou.getbody()
- if isinstance(body, ListType):
+ if isinstance(body, list):
body = body[0]
body_content = body.getcontent()
body_type = body_content.getLocalTag()
@@ -1051,7 +1050,7 @@
uncomputed_index = range(len(paths))
factorized_paths = []
for num, path in enumerate(paths):
- if isinstance(path, ListType):
+ if isinstance(path, list):
if len(path) > 1:
str_path = str(path[-1:])
same_paths.setdefault(str_path, [])
@@ -1341,7 +1340,7 @@
paths.append([variable, tuple(factorized_paths)])
else:
paths.append([variable] + factorized_paths)
- elif isinstance(result[0], ListType):
+ elif isinstance(result[0], list):
paths.append([variable] + result[0])
elif result[0] is not None:
paths.append([variable, result[0]])
@@ -1352,7 +1351,7 @@
return paths
def ComputePaths(self, paths, first=False):
- if isinstance(paths, TupleType):
+ if isinstance(paths, tuple):
if None in paths:
return [("TRUE", ())]
else:
@@ -1361,7 +1360,7 @@
return JoinList([(" OR ", ())], vars)
else:
return [("(", ())] + JoinList([(" OR ", ())], vars) + [(")", ())]
- elif isinstance(paths, ListType):
+ elif isinstance(paths, list):
vars = [self.ComputePaths(path) for path in paths]
return JoinList([(" AND ", ())], vars)
elif paths is None:
@@ -1423,7 +1422,7 @@
if connections is not None and len(connections) == 1:
instanceLocalId = connections[0].getrefLocalId()
body = pou.getbody()
- if isinstance(body, ListType):
+ if isinstance(body, list):
body = body[0]
return body.getcontentInstance(instanceLocalId)
return None
@@ -1435,7 +1434,7 @@
if connections is not None and len(connections) == 1:
instanceLocalId = connections[0].getrefLocalId()
body = pou.getbody()
- if isinstance(body, ListType):
+ if isinstance(body, list):
body = body[0]
instances.append(body.getcontentInstance(instanceLocalId))
return instances
@@ -1456,7 +1455,7 @@
if connections is not None and len(connections) == 1:
instanceLocalId = connections[0].getrefLocalId()
body = pou.getbody()
- if isinstance(body, ListType):
+ if isinstance(body, list):
body = body[0]
instance = body.getcontentInstance(instanceLocalId)
if isinstance(instance, TransitionClass):
@@ -1490,7 +1489,7 @@
if connections is not None and len(connections) == 1:
instanceLocalId = connections[0].getrefLocalId()
body = pou.getbody()
- if isinstance(body, ListType):
+ if isinstance(body, list):
body = body[0]
instance = body.getcontentInstance(instanceLocalId)
if isinstance(instance, TransitionClass):
@@ -1515,7 +1514,7 @@
if connections is not None and len(connections) == 1:
stepLocalId = connections[0].getrefLocalId()
body = pou.getbody()
- if isinstance(body, ListType):
+ if isinstance(body, list):
body = body[0]
step = body.getcontentInstance(stepLocalId)
self.GenerateSFCStep(step, pou)
@@ -1562,7 +1561,7 @@
if connections is not None and len(connections) == 1:
instanceLocalId = connections[0].getrefLocalId()
body = pou.getbody()
- if isinstance(body, ListType):
+ if isinstance(body, list):
body = body[0]
instance = body.getcontentInstance(instanceLocalId)
if isinstance(instance, StepClass):
@@ -1617,7 +1616,7 @@
self.TagName = previous_tagname
elif transitionValues["type"] == "connection":
body = pou.getbody()
- if isinstance(body, ListType):
+ if isinstance(body, list):
body = body[0]
connections = transitionValues["value"].getconnections()
if connections is not None: