diff options
| author | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2014-03-14 13:42:19 (GMT) |
|---|---|---|
| committer | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2014-03-14 13:42:19 (GMT) |
| commit | 698abe75d4e44dfecb8e6b8aa421b8505d24be05 (patch) | |
| tree | a7b2557f3cdafd359a8bfb773de8dcb18e2ff41b /Lib/logging/__init__.py | |
| parent | a0b9eeb66d958037c96f80b730e8d1e5dfbf4265 (diff) | |
| download | cpython-698abe75d4e44dfecb8e6b8aa421b8505d24be05.zip cpython-698abe75d4e44dfecb8e6b8aa421b8505d24be05.tar.gz cpython-698abe75d4e44dfecb8e6b8aa421b8505d24be05.tar.bz2 | |
Closes #20918: Added handling for exceptions during fallback output of logging exceptions.
Diffstat (limited to 'Lib/logging/__init__.py')
| -rw-r--r-- | Lib/logging/__init__.py | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py index bd9b994..478c5af 100644 --- a/Lib/logging/__init__.py +++ b/Lib/logging/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2001-2013 by Vinay Sajip. All Rights Reserved. +# Copyright 2001-2014 by Vinay Sajip. All Rights Reserved. # # Permission to use, copy, modify, and distribute this software and its # documentation for any purpose and without fee is hereby granted, @@ -18,7 +18,7 @@ Logging package for Python. Based on PEP 282 and comments thereto in comp.lang.python. -Copyright (C) 2001-2013 Vinay Sajip. All Rights Reserved. +Copyright (C) 2001-2014 Vinay Sajip. All Rights Reserved. To use, simply 'import logging' and log away! """ @@ -42,6 +42,7 @@ except ImportError: #pragma: no cover __author__ = "Vinay Sajip <vinay_sajip@red-dove.com>" __status__ = "production" +# The following module attributes are no longer updated. __version__ = "0.5.1.2" __date__ = "07 February 2010" @@ -902,8 +903,15 @@ class Handler(Filterer): sys.stderr.write('Logged from file %s, line %s\n' % ( record.filename, record.lineno)) # Issue 18671: output logging message and arguments - sys.stderr.write('Message: %r\n' - 'Arguments: %s\n' % (record.msg, record.args)) + try: + sys.stderr.write('Message: %r\n' + 'Arguments: %s\n' % (record.msg, + record.args)) + except Exception: + sys.stderr.write('Unable to print the message and arguments' + ' - possible formatting error.\nUse the' + ' traceback above to help find the error.\n' + ) except OSError: #pragma: no cover pass # see issue 5971 finally: |