Fix some pychecker errors.

diff --git a/collate/_abcollator.py b/collate/_abcollator.py
index 9dce32bee99f5a7d9b746310fa7b3e4a90281af7..12575eaed844603f039009a62262fe66b8d29ace 100644 (file)
--- 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 bebbc957608beb017b4e2cca28b6ccc8fe5b0057..70c085aab0b70c7d4981ac0c877332a077ab5f96 100644 (file)
--- 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: