[Autotest][Py3] Update logging_manager.py to support Python 3.
To support Python 3, do not overwrite the logging.Logger.findCaller.
If this is not done, in Python 3 logs will show "(Unknown file):0000|"
instead of "autoserv:0518|"
BUG=chromium:990593
TEST=dummy_Pass in python 2 and 3 and verified logs.
Change-Id: I9e322937072db09b03e16c85175baa6b6eafc805
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2536013
Commit-Queue: Derek Beckett <dbeckett@chromium.org>
Tested-by: Derek Beckett <dbeckett@chromium.org>
Reviewed-by: Gregory Nisbet <gregorynisbet@google.com>
Reviewed-by: Prathmesh Prabhu <pprabhu@google.com>
diff --git a/client/common_lib/logging_manager.py b/client/common_lib/logging_manager.py
index 89ad3d6..643bbba 100644
--- a/client/common_lib/logging_manager.py
+++ b/client/common_lib/logging_manager.py
@@ -41,7 +41,14 @@
"""
-import fcntl, logging, os, signal, sys, time, warnings
+import fcntl
+import logging
+import os
+import signal
+import six
+import sys
+import time
+import warnings
# primary public APIs
@@ -129,7 +136,11 @@
# Monkey patch our way around logging's design...
_original_logger__find_caller = logging.Logger.findCaller
-logging.Logger.findCaller = _logging_manager_aware_logger__find_caller
+# Do not overwrite in Python 3 and on. It breaks the "<module>:<line num>|"
+# formatting in Python 3.
+if six.PY2:
+ logging.Logger.findCaller = _logging_manager_aware_logger__find_caller
+
class LoggingFile(object):
