Podwyższenie wymaganej wersji biblioteki librarian do 1.2.5 (wydanej dzisiaj).

[redakcja.git] / apps / api / utils.py

diff --git a/apps/api/utils.py b/apps/api/utils.py
index c072d35..37a89a2 100644 (file)
--- a/apps/api/utils.py
+++ b/apps/api/utils.py
@@ -62,9 +62,16 @@ import locale
 
 NAT_EXPR = re.compile(r'(\d+)', re.LOCALE | re.UNICODE)
 def natural_order(get_key=lambda x: x):
 
 NAT_EXPR = re.compile(r'(\d+)', re.LOCALE | re.UNICODE)
 def natural_order(get_key=lambda x: x):

-    def getter(key):
-        key = [int(x) if n%2 else locale.strxfrm(x.encode('utf-8')) for (n,x) in enumerate(NAT_EXPR.split(get_key(key))) ]
-        return key

 
 

+    def getter(key):
+        nkey = get_key(key)
+        if not isinstance(nkey, unicode):
+            ukey = nkey.decode('utf-8')
+        else:
+            ukey = nkey
+
+        parts = enumerate( NAT_EXPR.split(ukey))            
+        return [int(x) if n%2 else locale.strxfrm(x.encode('utf-8')) for (n,x) in parts ]
+        

     return getter
 
     return getter