Revision: 4006
Author: jussi.ao.malinen
Date: Tue Aug 31 04:55:40 2010
Log: moved pad_console_length and get_console_lenght to utils/__init__.py
http://code.google.com/p/robotframework/source/detail?r=4006
Modified:
/trunk/src/robot/output/monitor.py
/trunk/src/robot/utils/__init__.py
=======================================
--- /trunk/src/robot/output/monitor.py Tue Aug 31 04:39:16 2010
+++ /trunk/src/robot/output/monitor.py Tue Aug 31 04:55:40 2010
@@ -16,7 +16,6 @@
import sys
from robot import utils
-from robot.utils.text import pad_console_length, get_console_length #
TODO: to __init__
from loggerhelper import IsLogged
@@ -83,12 +82,12 @@
self._write(info, newline=start_suite)
def _get_info(self, name, doc, maxwidth):
- if get_console_length(name) > maxwidth:
- return pad_console_length(name, maxwidth, cut_left=True)
+ if utils.get_console_length(name) > maxwidth:
+ return utils.pad_console_length(name, maxwidth, cut_left=True)
if doc == '':
- return pad_console_length(name, maxwidth)
+ return utils.pad_console_length(name, maxwidth)
info = '%s :: %s' % (name, doc.splitlines()[0])
- return pad_console_length(info, maxwidth)
+ return utils.pad_console_length(info, maxwidth)
def _write_status(self, status):
self._write(' | %s |' % self._highlight(status))
=======================================
--- /trunk/src/robot/utils/__init__.py Mon May 31 05:21:54 2010
+++ /trunk/src/robot/utils/__init__.py Tue Aug 31 04:55:40 2010
@@ -30,7 +30,8 @@
get_time, get_elapsed_time, elapsed_time_to_string,
timestr_to_secs, secs_to_timestr, secs_to_timestamp,
timestamp_to_secs, parse_time)
-from text import cut_long_message, format_assign_message
+from text import (cut_long_message, format_assign_message,
+ pad_console_length, get_console_length)
from unic import unic, safe_repr
from xmlwriter import XmlWriter