Index: Tools/Scripts/webkitpy/layout_tests/views/metered_stream.py |
diff --git a/Tools/Scripts/webkitpy/layout_tests/views/metered_stream.py b/Tools/Scripts/webkitpy/layout_tests/views/metered_stream.py |
index fd04ad868a85a4ba798497a066950e2878198780..ef643931005429256cb05c1b72f418719cdcda96 100644 |
--- a/Tools/Scripts/webkitpy/layout_tests/views/metered_stream.py |
+++ b/Tools/Scripts/webkitpy/layout_tests/views/metered_stream.py |
@@ -35,6 +35,7 @@ LOG_HANDLER_NAME = 'MeteredStreamLogHandler' |
class MeteredStream(object): |
+ |
""" |
This class implements a stream wrapper that has 'meters' as well as |
regular output. A 'meter' is a single line of text that can be erased |
@@ -61,7 +62,7 @@ class MeteredStream(object): |
self._last_partial_line = '' |
self._last_write_time = 0.0 |
self._throttle_delay_in_secs = 0.066 if self._erasing else 10.0 |
- self._number_of_columns = sys.maxint |
+ self._number_of_columns = sys.maxsize |
if self._isatty and number_of_columns: |
self._number_of_columns = number_of_columns |
@@ -99,7 +100,12 @@ class MeteredStream(object): |
self._erase_last_partial_line() |
if self._verbose: |
now_tuple = time.localtime(now) |
- msg = '%02d:%02d:%02d.%03d %d %s' % (now_tuple.tm_hour, now_tuple.tm_min, now_tuple.tm_sec, int((now * 1000) % 1000), pid, self._ensure_newline(txt)) |
+ msg = '%02d:%02d:%02d.%03d %d %s' % (now_tuple.tm_hour, |
+ now_tuple.tm_min, |
+ now_tuple.tm_sec, |
+ int((now * 1000) % 1000), |
+ pid, |
+ self._ensure_newline(txt)) |
elif self._isatty: |
msg = txt |
else: |
@@ -126,6 +132,7 @@ class MeteredStream(object): |
class _LogHandler(logging.Handler): |
+ |
def __init__(self, meter): |
logging.Handler.__init__(self) |
self._meter = meter |