diff --git a/testing/mozbase/mozlog/mozlog/structured/commandline.py b/testing/mozbase/mozlog/mozlog/structured/commandline.py index 886f65fdecc1..61847e51597f 100644 --- a/testing/mozbase/mozlog/mozlog/structured/commandline.py +++ b/testing/mozbase/mozlog/mozlog/structured/commandline.py @@ -62,7 +62,7 @@ def add_logging_group(parser): help=help_str) -def setup_logging(suite, args, defaults=None): +def setup_logging(suite, args, defaults): """ Configure a structuredlogger based on command line arguments. @@ -73,10 +73,7 @@ def setup_logging(suite, args, defaults=None): :param args: A dictionary of {argument_name:value} produced from parsing the command line arguments for the application :param defaults: A dictionary of {formatter name: output stream} to apply - when there is no logging supplied on the command line. If - this isn't supplied, reasonable defaults are chosen - (coloured mach formatting if stdout is a terminal, or raw - logs otherwise). + when there is no logging supplied on the command line. :rtype: StructuredLogger """ @@ -86,13 +83,6 @@ def setup_logging(suite, args, defaults=None): found_stdout_logger = False if not hasattr(args, 'iteritems'): args = vars(args) - - if defaults is None: - if sys.__stdout__.isatty(): - defaults = {"mach_terminal": sys.stdout} - else: - defaults = {"raw": sys.stdout} - for name, values in args.iteritems(): if name.startswith(prefix) and values is not None: for value in values: diff --git a/testing/mozbase/mozlog/mozlog/structured/formatters/machformatter.py b/testing/mozbase/mozlog/mozlog/structured/formatters/machformatter.py index 0ad2179a9954..4acddb7abce8 100644 --- a/testing/mozbase/mozlog/mozlog/structured/formatters/machformatter.py +++ b/testing/mozbase/mozlog/mozlog/structured/formatters/machformatter.py @@ -4,8 +4,6 @@ import time -import blessings - import base @@ -136,8 +134,6 @@ class MachTerminalFormatter(BaseMachFormatter): """ def __init__(self, start_time=None, write_interval=False, write_times=True, terminal=None): - if terminal is None: - terminal = blessings.Terminal() self.terminal = terminal BaseMachFormatter.__init__(self, start_time=start_time, diff --git a/testing/mozbase/mozlog/setup.py b/testing/mozbase/mozlog/setup.py index 03184d9cc113..d6e708137fc7 100644 --- a/testing/mozbase/mozlog/setup.py +++ b/testing/mozbase/mozlog/setup.py @@ -17,7 +17,6 @@ setup(name=PACKAGE_NAME, license='MPL 1.1/GPL 2.0/LGPL 2.1', packages=find_packages(), zip_safe=False, - install_requires=["blessings>=1.3"], tests_require=['mozfile'], platforms =['Any'], classifiers=['Development Status :: 4 - Beta',