From a8949f9d9210f5fabb9bfbb645a551dcbbfe1cc4 Mon Sep 17 00:00:00 2001 From: Ping Date: Sun, 6 Sep 2015 14:56:34 +0800 Subject: [PATCH] Remove type-checker for log_rotate_mode option --- tornado/log.py | 11 +++-------- tornado/test/log_test.py | 11 ----------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/tornado/log.py b/tornado/log.py index f8ab706b0..040889a98 100644 --- a/tornado/log.py +++ b/tornado/log.py @@ -203,14 +203,9 @@ def enable_pretty_logging(options=None, logger=None): interval=options.log_rotate_interval, backupCount=options.log_file_num_backups) else: - if not isinstance(rotate_mode, str): - error_message = 'The type of log_rotate_mode option should be ' +\ - 'str, not {}.'.format(str(type(rotate_mode))) - raise TypeError(error_message) - else: - error_message = 'The value of log_rotate_mode option should be ' +\ - '"size" or "time", not "{}".'.format(rotate_mode) - raise ValueError(error_message) + error_message = 'The value of log_rotate_mode option should be ' +\ + '"size" or "time", not "%s".' % rotate_mode + raise ValueError(error_message) channel.setFormatter(LogFormatter(color=False)) logger.addHandler(channel) diff --git a/tornado/test/log_test.py b/tornado/test/log_test.py index b538c4b54..8bc65e558 100644 --- a/tornado/test/log_test.py +++ b/tornado/test/log_test.py @@ -194,17 +194,6 @@ class EnablePrettyLoggingTest(unittest.TestCase): handler.flush() handler.close() - def test_wrong_rotate_mode_type(self): - try: - self.options.log_file_prefix = 'some_path' - self.options.log_rotate_mode = None - self.assertRaises(TypeError, enable_pretty_logging, - options=self.options, logger=self.logger) - finally: - for handler in self.logger.handlers: - handler.flush() - handler.close() - class LoggingOptionTest(unittest.TestCase): """Test the ability to enable and disable Tornado's logging hooks.""" -- 2.47.2