Merge remote branch 'cros/upstream' into master

client/common_lib/logging_manager.py

 import logging, os, signal, sys, warnings
 
 # primary public APIs
 
 def configure_logging(logging_config, **kwargs):
     """
     Configure the logging module using the specific configuration object, which
     should be an instance of logging_config.LoggingConfig (usually of a
     subclass).  Any keyword args will be passed to the object's
     configure_logging() method.
@@ skipping 61 matching lines @@
         ### START additional code.
         if co in _caller_code_to_skip_in_logging_stack:
             f = f.f_back
             continue
         ### END additional code.
         rv = (filename, f.f_lineno, co.co_name)
         break
     return rv
 
 
-if sys.version_info[:2] > (2, 6):
+if sys.version_info[:2] > (2, 7):
     warnings.warn('This module has not been reviewed for Python %s' %
                   sys.version)
 
 
 # Monkey patch our way around logging's design...
 _original_logger__find_caller = logging.Logger.findCaller
 logging.Logger.findCaller = _logging_manager_aware_logger__find_caller
 
 
 class LoggingFile(object):
@@ skipping 514 matching lines @@
         # spawn the initial logging subprocess
         self._push_context(self._get_context())
 
 
     def undo_redirect(self):
         # len == 1 would mean only start_logging() had been called (but no
         # redirects had occurred)
         if len(self._context_stack) < 2:
             raise RuntimeError('No redirects to undo')
         super(FdRedirectionLoggingManager, self).undo_redirect()