From e3975f38b34972122f5a1c16d7cde95fa6dae755 Mon Sep 17 00:00:00 2001 From: Romain Bignon Date: Sun, 24 May 2015 13:10:32 +0200 Subject: [PATCH] fix compatibility with python2.6 --- weboob/tools/application/formatters/iformatter.py | 4 ++-- weboob/tools/application/formatters/table.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/weboob/tools/application/formatters/iformatter.py b/weboob/tools/application/formatters/iformatter.py index 5bb865b3..d22d7d04 100644 --- a/weboob/tools/application/formatters/iformatter.py +++ b/weboob/tools/application/formatters/iformatter.py @@ -121,7 +121,7 @@ class IFormatter(object): def output(self, formatted): if self.outfile != sys.stdout: with open(self.outfile, "a+") as outfile: - outfile.write(formatted.encode(guess_encoding(outfile), errors='replace') + os.linesep) + outfile.write(formatted.encode(guess_encoding(outfile), 'replace') + os.linesep) else: for line in formatted.split('\n'): @@ -133,7 +133,7 @@ class IFormatter(object): self.print_lines = 0 if isinstance(line, unicode): - line = line.encode(guess_encoding(self.outfile), errors='replace') + line = line.encode(guess_encoding(self.outfile), 'replace') print(line) self.print_lines += 1 diff --git a/weboob/tools/application/formatters/table.py b/weboob/tools/application/formatters/table.py index 98687c78..44d9f101 100644 --- a/weboob/tools/application/formatters/table.py +++ b/weboob/tools/application/formatters/table.py @@ -40,7 +40,7 @@ class TableFormatter(IFormatter): def flush(self): s = self.get_formatted_table() if s is not None: - self.output(s.encode(guess_encoding(self.outfile), errors='replace')) + self.output(s.encode(guess_encoding(self.outfile), 'replace')) def get_formatted_table(self): if len(self.queue) == 0: