8000 conflicts from future cleaning · tomralex/robotics-toolbox-python@b1cadc8 · GitHub
[go: up one dir, main page]

Skip to content

Commit b1cadc8

Browse files
committed
conflicts from future cleaning
1 parent 7392bca commit b1cadc8

File tree

1 file changed

+4
-29
lines changed

1 file changed

+4
-29
lines changed

roboticstoolbox/robot/PoERobot.py

Lines changed: 4 additions & 29 deletions
< 63E5 /tr>
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,6 @@ def __str__(self):
3939
s += "]"
4040
return s
4141

42-
def _repr_pretty_(self, p, cycle):
43-
"""
44-
Pretty string for IPython (superclass method)
45-
46-
:param p: pretty printer handle (ignored)
47-
:param cycle: pretty printer flag (ignored)
48-
49-
"""
50-
# see https://ipython.org/ipython-doc/stable/api/generated/IPython.lib.pretty.html
51-
52-
p.text(f"{i}:\n{str(x)}")
53-
5442
def _ets_world(self, twist: Twist3) -> ETS:
5543
"""
5644
Convert twist to its corresponding ETS
@@ -201,27 +189,14 @@ def __str__(self):
201189
return s
202190

203191
def __repr__(self):
204-
s = "PoERobot([\n "
205-
for j, link in enumerate(self):
206-
s += repr(link) + ","
207-
s += "],\n"
192+
s = "PoERobot([\n"
193+
s += "\n".join([" " + repr(link) + "," for link in self])
194+
s += "\n ],\n"
208195
s += f" T0=SE3({np.array_repr(self.T0.A)}),\n"
209-
s += f" name={self.name},\n"
196+
s += f" name=\"{self.name}\",\n"
210197
s += ")"
211198
return s
212199

213-
def _repr_pretty_(self, p, cycle):
214-
"""
215-
Pretty string for IPython (superclass method)
216-
217-
:param p: pretty printer handle (ignored)
218-
:param cycle: pretty printer flag (ignored)
219-
220-
"""
221-
# see https://ipython.org/ipython-doc/stable/api/generated/IPython.lib.pretty.html
222-
223-
p.text(f"{i}:\n{str(x)}")
224-
225200
def nbranches(self):
226201
return 0
227202

0 commit comments

Comments
 (0)
0