From 92fc0878bc7b75741a3434d17310e390a9304e70 Mon Sep 17 00:00:00 2001 From: Joe Wreschnig Date: Sun, 21 Feb 2010 23:31:56 -0800 Subject: [PATCH] Fix some pychecker errors. --- collate/_abcollator.py | 7 ++++++- collate/_locale.py | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/collate/_abcollator.py b/collate/_abcollator.py index 9dce32b..12575ea 100644 --- a/collate/_abcollator.py +++ b/collate/_abcollator.py @@ -1,17 +1,22 @@ import collate.strings class Collator(object): + encoding = "ascii" + def cmp(self, string1, string2): """Return negative if a < b, zero if a == b, positive if a > b.""" return cmp(self.key(string1), self.key(string2)) + def key(self, string): + return string + def words(self, string): """Split the string along word boundries.""" if isinstance(string, str): string = string.decode(self.encoding, 'replace') return string.split() - def sortemekey(self, string, invalid=float('inf')): + def sortemekey(self, string): """Return a key based on sortemes of a string. If the string is a str instance, it is decoded to a unicode diff --git a/collate/_locale.py b/collate/_locale.py index bebbc95..70c085a 100644 --- a/collate/_locale.py +++ b/collate/_locale.py @@ -93,7 +93,7 @@ def encoding(preferred=None): if fromlocale is not None: return fromlocale try: - locale.setlocale(locale.LC_COLLATE, '')[1] + locale.setlocale(locale.LC_COLLATE, '') except locale.Error: pass else: -- 2.20.1