Fix

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

diff --git a/apps/api/utils.py b/apps/api/utils.py
index d8177ab..f6d9b1b 100644 (file)
--- a/apps/api/utils.py
+++ b/apps/api/utils.py
@@ -11,7 +11,7 @@ from piston.utils import rc
 
 import api.response
 
 
 import api.response
 

-from wlrepo import MercurialLibrary
+import wlrepo

 import settings
 
 class TextEmitter(Emitter):
 import settings
 
 class TextEmitter(Emitter):


@@ -39,7 +39,7 @@ def validate_form(formclass, source='GET'):
             form = formclass(getattr(request, source), request.FILES)
 
             if not form.is_valid():
             form = formclass(getattr(request, source), request.FILES)
 
             if not form.is_valid():

-                errorlist = [{'field': k, 'errors': e} for k, e in form.errors.items()]
+                errorlist = [{'field': k, 'errors': str(e)} for k, e in form.errors.items()]

                 return api.response.BadRequest().django_response(errorlist)
 
             kwargs['form'] = form
                 return api.response.BadRequest().django_response(errorlist)
 
             kwargs['form'] = form


@@ -50,11 +50,28 @@ def validate_form(formclass, source='GET'):
 def hglibrary(func):
     @wraps(func)
     def decorated(self, *args, **kwargs):
 def hglibrary(func):
     @wraps(func)
     def decorated(self, *args, **kwargs):

-        l = MercurialLibrary(settings.REPOSITORY_PATH)
+        l = wlrepo.open_library(settings.REPOSITORY_PATH, 'hg')

         kwargs['lib'] = l
         return func(self, *args, **kwargs)
     return decorated
         kwargs['lib'] = l
         return func(self, *args, **kwargs)
     return decorated

-    
-            
+
+
+
+import re
+import locale
+
+NAT_EXPR = re.compile(r'(\d+)', re.LOCALE | re.UNICODE)
+def natural_order(get_key=lambda x: x):
+
+    def getter(key):
+        nkey = get_key(key)
+        if not isinstance(key, unicode):
+            ukey = key.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