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 02cb733..9dce32b 100644 (file)
--- a/collate/_abcollator.py
+++ b/collate/_abcollator.py
@@ -1,4 +1,4 @@
-import collate._strings
+import collate.strings
 
 class Collator(object):
     def cmp(self, string1, string2):
@@ -6,18 +6,23 @@ class Collator(object):
         return cmp(self.key(string1), self.key(string2))
 
     def words(self, string):
-        """Split the string into separate words.
+        """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')):
+        """Return a key based on sortemes of a string.
 
-        This split is done using Unicode's definition of whitespace.
+        If the string is a str instance, it is decoded to a unicode
+        instance according to the 'encoding' attribute of the
+        Collator.
         """
-        return string.split()
+        if isinstance(string, str):
+            string = string.decode(self.encoding, 'replace')
 
-    def sortemes(self, string):
-        return collate._strings.alnumsplit(string)
+        # Shove the sortkeyed original string on the end to resolve
+        # ties intelligently.
+        return (collate.strings.sortemes(string, self.key),
+                self.key(string))
 
-    def sortemekey(self, string, invalid=float('inf')):
-        words = []
-        for sorteme in self.sortemes(string):
-            num, alpha = collate._strings.numeric(sorteme, invalid)
-            words.append((num, self.key(alpha)))
-        return words