Revert r79006: "Add code to 'fix' python encoding and it's unit test."

presubmit_support.py

 #!/usr/bin/python
 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Enables directory-specific presubmit checks to run at upload and/or commit.
 """
 
 __version__ = '1.4'
 
@@ skipping 32 matching lines @@
     # sure loads exists.
     # Statement seems to have no effect
     # pylint: disable=W0104
     json.loads
   except (ImportError, AttributeError):
     # Import the one included in depot_tools.
     sys.path.append(os.path.join(os.path.dirname(__file__), 'third_party'))
     import simplejson as json  # pylint: disable=F0401
 
 # Local imports.
-import fix_encoding
 import gclient_utils
 import owners
 import presubmit_canned_checks
 import scm
 
 
 # Ask for feedback only once in program lifetime.
 _ASKED_FOR_FEEDBACK = False
 
 
@@ skipping 72 matching lines @@
       """
       self._message = message
       self._items = []
       if items:
         self._items = items
       self._long_text = long_text.rstrip()
 
     def handle(self, output):
       output.write(self._message)
       output.write('\n')
-      for index, item in enumerate(self._items):
-        output.write('  ')
-        # Write separately in case it's unicode.
-        output.write(item)
-        if index < len(self._items) - 1:
-          output.write(' \\')
-        output.write('\n')
+      if len(self._items) > 0:
+        output.write('  ' + ' \\\n  '.join(map(str, self._items)) + '\n')
       if self._long_text:
-        output.write('\n***************\n')
-        # Write separately in case it's unicode.
-        output.write(self._long_text)
-        output.write('\n***************\n')
+        # Sometimes self._long_text is a ascii string, a codepage string
+        # (on windows), or a unicode object.
+        try:
+          long_text = self._long_text.decode()
+        except UnicodeDecodeError:
+          long_text = self._long_text.decode('ascii', 'replace')
+
+        output.write('\n***************\n%s\n***************\n' %
+            long_text)
       if self.fatal:
         output.fail()
 
   class PresubmitAddReviewers(PresubmitResult):
     """Add some suggested reviewers to the change."""
     def __init__(self, reviewers):
       super(OutputApi.PresubmitAddReviewers, self).__init__('')
       self.reviewers = reviewers
 
     def handle(self, output):
@@ skipping 1018 matching lines @@
                               options.commit,
                               options.verbose,
                               sys.stdout,
                               sys.stdin,
                               options.default_presubmit,
                               options.may_prompt)
   return not results.should_continue()
 
 
 if __name__ == '__main__':
-  fix_encoding.fix_encoding()
   sys.exit(Main(None))