For now just stick to using newline joining.

This commit is contained in:
Joshua Harlow 2012-06-16 08:54:52 -07:00
parent 9b3dd45833
commit a9c9de6376

View File

@ -126,7 +126,7 @@ def netdev_pformat():
max_len = len(max(netdev_s.splitlines(), key=len)) max_len = len(max(netdev_s.splitlines(), key=len))
header = util.center("Net device info", "+", max_len) header = util.center("Net device info", "+", max_len)
lines.extend([header, netdev_s]) lines.extend([header, netdev_s])
return os.linesep.join(lines) return "\n".join(lines)
def route_pformat(): def route_pformat():
@ -149,11 +149,11 @@ def route_pformat():
max_len = len(max(route_s.splitlines(), key=len)) max_len = len(max(route_s.splitlines(), key=len))
header = util.center("Route info", "+", max_len) header = util.center("Route info", "+", max_len)
lines.extend([header, route_s]) lines.extend([header, route_s])
return os.linesep.join(lines) return "\n".join(lines)
def debug_info(): def debug_info():
lines = [] lines = []
lines.append(netdev_pformat()) lines.append(netdev_pformat())
lines.append(route_pformat()) lines.append(route_pformat())
return os.linesep.join(lines) return "\n".join(lines)