Simplify algorithm. No changes to sort behavior or runtime.

[python-collate.git] / collate / _abcollator.py

diff --git a/collate/_abcollator.py b/collate/_abcollator.py
index fdd7783..9dce32b 100644 (file)
--- a/collate/_abcollator.py
+++ b/collate/_abcollator.py
@@ -1,18 +1,28 @@
-import collate._strings
+import collate.strings
 
 class Collator(object):
     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 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')):
-        keys = []
-        for sorteme in collate._strings.sortemes(string):
-            num, alpha = collate._strings.numeric(sorteme, invalid)
-            if num == invalid:
-                keys.append(self.key(alpha))
-            else:
-                keys.append(num)
+        """Return a key based on sortemes of a string.
+
+        If the string is a str instance, it is decoded to a unicode
+        instance according to the 'encoding' attribute of the
+        Collator.
+        """
+        if isinstance(string, str):
+            string = string.decode(self.encoding, 'replace')
+
         # Shove the sortkeyed original string on the end to resolve
         # ties intelligently.
-        return (keys, self.key(string))
+        return (collate.strings.sortemes(string, self.key),
+                self.key(string))
+