Merge pull request #1 from sidhujasminder/fixing-byte-encoding

Handles error, "required string got bytes in sys.stdout"

icdiff.py

@@ -430,13 +430,13 @@ class PassThroughOptionParser(OptionParser):
     def _process_long_opt(self, rargs, values):
         try:
             OptionParser._process_long_opt(self, rargs, values)
-        except BadOptionError, err:
+        except BadOptionError as err:
             self.largs.append(err.opt_str)
 
     def _process_short_opts(self, rargs, values):
         try:
             OptionParser._process_short_opts(self, rargs, values)
-        except BadOptionError, err:
+        except BadOptionError as err:
             self.largs.append(err.opt_str)
 
 def get_options():
@@ -532,7 +532,7 @@ def codec_print(s, options):
     if hasattr(sys.stdout, "buffer"):
         sys.stdout.buffer.write(s.encode(options.output_encoding))
     else:
-        sys.stdout.write(s.encode(options.output_encoding))
+        sys.stdout.write(bytes.decode((s.encode(options.output_encoding))))
 
 
 def diff(a, b, options=None):