From d8f6e431f195f4eb3497496e5b6883762773613d Mon Sep 17 00:00:00 2001 From: Tarek Ziade Date: Tue, 21 Feb 2012 13:19:35 +0100 Subject: [PATCH] removed some prints --- flake8/messages.py | 10 ++++++++++ flake8/pyflakes.py | 12 +++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/flake8/messages.py b/flake8/messages.py index 2ded7e1..0e5bff4 100644 --- a/flake8/messages.py +++ b/flake8/messages.py @@ -13,6 +13,16 @@ class Message(object): return '%s:%s: %s' % (self.filename, self.lineno, self.message % self.message_args) + def __lt__(self, other): + if self.filename != other.filename: + return self.filename < other.filename + return self.lineno < other.lineno + + def __cmp__(self, other): + if self.filename != other.filename: + return cmp(self.filename, other.filename) + return cmp(self.lineno, other.lineno) + class UnusedImport(Message): message = '%r imported but unused' diff --git a/flake8/pyflakes.py b/flake8/pyflakes.py index 25245d3..142dd5b 100644 --- a/flake8/pyflakes.py +++ b/flake8/pyflakes.py @@ -9,6 +9,7 @@ except ImportError: import os.path import _ast +import sys from flake8 import messages from flake8.util import skip_warning @@ -645,7 +646,7 @@ def checkPath(filename): return check(open(filename, 'U').read() + '\n', filename) except IOError: msg = sys.exc_info()[1] - print >> sys.stderr, "%s: %s" % (filename, msg.args[1]) + sys.stderr.write("%s: %s\n" % (filename, msg.args[1])) return 1 @@ -677,18 +678,19 @@ def check(codeString, filename='(code)'): # Avoid using msg, since for the only known case, it contains a # bogus message that claims the encoding the file declared was # unknown. - print >> sys.stderr, "%s: problem decoding source" % (filename, ) + sys.stderr.write("%s: problem decoding source\n" % (filename)) else: line = text.splitlines()[-1] if offset is not None: offset = offset - (len(text) - len(line)) - print >> sys.stderr, '%s:%d: %s' % (filename, lineno, msg) - print >> sys.stderr, line + + sys.stderr.write('%s:%d: %s\n' % (filename, lineno, msg)) + sys.stderr.write(line + '\n') if offset is not None: - print >> sys.stderr, " " * offset, "^" + sys.stderr.write(" " * offset + "^\n") return 1 else: