Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions Components.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ def getClassMember(python_file = ''):
if inspect.ismodule(module):
## classes composing the imported module
return dict(inspect.getmembers(module, inspect.isclass))

### exception in module
else:
return module
return module

def GetClass(elem):
""" Get python class from filename.
Expand Down Expand Up @@ -124,9 +124,9 @@ def GetArgs(cls = None):
if inspect.isclass(cls):
constructor = inspect.getargspec(cls.__init__)
return dict(list(zip(constructor[0][1:], constructor[3]))) if constructor[3] != None else {}
else:
#sys.stderr.write(_("Error in GetArgs: First parameter is not a class\n"))
return None

#sys.stderr.write(_("Error in GetArgs: First parameter is not a class\n"))
return None

###########################################################
###
Expand Down Expand Up @@ -726,8 +726,7 @@ def updateDEVSPriorityList(self):
### if devs instance is not none and priority_list has been invoked (else componentSet order is considered)
if self.priority_list != []:

shape_list = self.GetShapeList()
block_list = [c for c in shape_list if isinstance(c, Block)]
block_list = [c for c in self.GetShapeList() if isinstance(c, Block)]

label_list = [m.label for m in block_list]

Expand Down
Loading