Skip to content

Commit d414a0c

Browse files
authored
Merge pull request InigoMoreno#1 from DeepX-inc/fix/python2->3
fix errors in python2/3 incompatibilities
2 parents 85c9521 + ddaaa4a commit d414a0c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

smach_viewer/smach_viewer/smach_viewer_gui.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -274,10 +274,10 @@ def get_dotcode(self, selected_paths, closed_paths, depth, max_depth, containers
274274
dotstr += '"%s" %s;\n' % (child_path, attr_string(child_attrs))
275275

276276
# Iterate over edges
277-
internal_edges = zip(
277+
internal_edges = list(zip(
278278
self._internal_outcomes,
279279
self._outcomes_from,
280-
self._outcomes_to)
280+
self._outcomes_to))
281281

282282
# Add edge from container label to initial state
283283
internal_edges += [('','__proxy__',initial_child) for initial_child in self._initial_states]

smach_viewer/smach_viewer/xdot/xdot.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ def __init__(self, parser, buf):
569569
self.pen = Pen()
570570
self.shapes = []
571571

572-
def __nonzero__(self):
572+
def __bool__(self):
573573
return self.pos < len(self.buf)
574574

575575
def unescape(self, buf):

0 commit comments

Comments
 (0)