summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Doc/library/logging.rst8
-rw-r--r--Lib/logging/__init__.py6
2 files changed, 13 insertions, 1 deletions
diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst
index c1ae108..4e880b2 100644
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -319,6 +319,14 @@ order::
"%(asctime)s - %(levelname)s - %(message)s"
+Formatters use a user-configurable function to convert the creation time of a
+record to a tuple. By default, :func:`time.localtime` is used; to change this
+for a particular formatter instance, set the ``converter`` attribute of the
+instance to a function with the same signature as :func:`time.localtime` or
+:func:`time.gmtime`. To change it for all formatters, for example if you want
+all logging times to be shown in GMT, set the ``converter`` attribute in the
+Formatter class (to ``time.gmtime`` for GMT display).
+
Configuring Logging
^^^^^^^^^^^^^^^^^^^
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index b4eaab6..afb4004 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -433,7 +433,11 @@ class Formatter(object):
traceback.print_exception()
"""
sio = io.StringIO()
- traceback.print_exception(ei[0], ei[1], ei[2], None, sio)
+ tb = ei[2]
+ # See issues #9427, #1553375. Commented out for now.
+ #if getattr(self, 'fullstack', False):
+ # traceback.print_stack(tb.tb_frame.f_back, file=sio)
+ traceback.print_exception(ei[0], ei[1], tb, None, sio)
s = sio.getvalue()
sio.close()
if s[-1:] == "\n":