X-Git-Url: https://git.korewanetadesu.com/?p=python-collate.git;a=blobdiff_plain;f=collate%2F_abcollator.py;h=fdd7783fc1eceee8382bd46856e8af7ac787e468;hp=bc43dc384d75e926ba1636356f931a44f3b81096;hb=7dc546d67cd996c0a54b07261ab1b7bcdf4019ce;hpb=53e1676b8d68cccd2b0692654d3871e44e0ba6b6

diff --git a/collate/_abcollator.py b/collate/_abcollator.py
index bc43dc3..fdd7783 100644
--- a/collate/_abcollator.py
+++ b/collate/_abcollator.py
@@ -5,20 +5,14 @@ class Collator(object):
         """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 into separate words.
-
-        This split is done using Unicode's definition of whitespace.
-        """
-        return string.split()
-
-    def sortemes(self, string):
-        words = []
-        for word in self.words(string):
-            words.extend(collate._strings.alnumsplit(word))
-        return filter(collate._strings.wordlike, words)
-
-    def sortemekey(self, string):
-        words = map(collate._strings.numeric, self.sortemes(string))
-        words = [(i, self.key(word)) for (i, word) in words]
-        return words
+    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)
+        # Shove the sortkeyed original string on the end to resolve
+        # ties intelligently.
+        return (keys, self.key(string))