Revert "Merge remote branch 'cros/upstream' into autotest-rebase"

client/common_lib/base_job.py

 import os, copy, logging, errno, fcntl, time, re, weakref, traceback
 import cPickle as pickle
 
 from autotest_lib.client.common_lib import autotemp, error, log
 
 
 class job_directory(object):
     """Represents a job.*dir directory."""
 
 
@@ skipping 404 matching lines @@
         return property(getter, setter)
 
 
 class status_log_entry(object):
     """Represents a single status log entry."""
 
     RENDERED_NONE_VALUE = '----'
     TIMESTAMP_FIELD = 'timestamp'
     LOCALTIME_FIELD = 'localtime'
 
-    # non-space whitespace is forbidden in any fields
-    BAD_CHAR_REGEX = re.compile(r'[\t\n\r\v\f]')
-
     def __init__(self, status_code, subdir, operation, message, fields,
                  timestamp=None):
         """Construct a status.log entry.
 
         @param status_code: A message status code. Must match the codes
             accepted by autotest_lib.common_lib.log.is_valid_status.
         @param subdir: A valid job subdirectory, or None.
         @param operation: Description of the operation, or None.
         @param message: A printable string describing event to be recorded.
         @param fields: A dictionary of arbitrary alphanumeric key=value pairs
             to be included in the log, or None.
         @param timestamp: An optional integer timestamp, in the same format
             as a time.time() timestamp. If unspecified, the current time is
             used.
 
         @raise ValueError: if any of the parameters are invalid
         """
+        # non-space whitespace is forbidden in any fields
+        bad_char_regex = r'[\t\n\r\v\f]'
 
         if not log.is_valid_status(status_code):
             raise ValueError('status code %r is not valid' % status_code)
         self.status_code = status_code
 
-        if subdir and self.BAD_CHAR_REGEX.search(subdir):
+        if subdir and re.search(bad_char_regex, subdir):
             raise ValueError('Invalid character in subdir string')
         self.subdir = subdir
 
-        if operation and self.BAD_CHAR_REGEX.search(operation):
+        if operation and re.search(bad_char_regex, operation):
             raise ValueError('Invalid character in operation string')
         self.operation = operation
 
         # break the message line into a single-line message that goes into the
         # database, and a block of additional lines that goes into the status
         # log but will never be parsed
         message_lines = message.split('\n')
         self.message = message_lines[0].replace('\t', ' ' * 8)
         self.extra_message_lines = message_lines[1:]
-        if self.BAD_CHAR_REGEX.search(self.message):
+        if re.search(bad_char_regex, self.message):
             raise ValueError('Invalid character in message %r' % self.message)
 
         if not fields:
             self.fields = {}
         else:
             self.fields = fields.copy()
         for key, value in self.fields.iteritems():
-            if self.BAD_CHAR_REGEX.search(key + value):
+            if re.search(bad_char_regex, key + value):
                 raise ValueError('Invalid character in %r=%r field'
                                  % (key, value))
 
         # build up the timestamp
         if timestamp is None:
             timestamp = int(time.time())
         self.fields[self.TIMESTAMP_FIELD] = str(timestamp)
         self.fields[self.LOCALTIME_FIELD] = time.strftime(
             '%b %d %H:%M:%S', time.localtime(timestamp))
 
@@ skipping 508 matching lines @@
         """Record a job-level status event, using a status_log_entry.
 
         This is the same as self.record but using an existing status log
         entry object rather than constructing one for you.
 
         @param entry: A status_log_entry object
         @param log_in_subdir: A boolean that indicates (when true) that subdir
                 logs should be written into the subdirectory status log file.
         """
         self._get_status_logger().record_entry(entry, log_in_subdir)