fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of stigma:platforma
[redakcja.git]
/
apps
/
api
/
utils.py
diff --git
a/apps/api/utils.py
b/apps/api/utils.py
index
d8177ab
..
9b45a32
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,19
@@
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
+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 x for (n,x) in enumerate(NAT_EXPR.split(get_key(key))) ]
+ return key
+
+ return getter