fix video

[redakcja.git] / apps / wiki / helpers.py

diff --git a/apps/wiki/helpers.py b/apps/wiki/helpers.py
index f072ef9..b60265f 100644 (file)
--- a/apps/wiki/helpers.py
+++ b/apps/wiki/helpers.py
@@ -1,8 +1,14 @@
-from django import http
-from django.utils import simplejson as json
-from django.utils.functional import Promise
+# -*- coding: utf-8 -*-
+#
+# This file is part of MIL/PEER, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from datetime import datetime
 from functools import wraps
 from datetime import datetime
 from functools import wraps

+import json
+
+from django import http
+from django.utils.functional import Promise

 
 
 class ExtendedEncoder(json.JSONEncoder):
 
 
 class ExtendedEncoder(json.JSONEncoder):


@@ -22,10 +28,10 @@ class JSONResponse(http.HttpResponse):
 
     def __init__(self, data={}, **kwargs):
         # get rid of mimetype
 
     def __init__(self, data={}, **kwargs):
         # get rid of mimetype

-        kwargs.pop('mimetype', None)
+        kwargs.pop('content_type', None)

 
         data = json.dumps(data, cls=ExtendedEncoder)
 
         data = json.dumps(data, cls=ExtendedEncoder)

-        super(JSONResponse, self).__init__(data, mimetype="application/json", **kwargs)
+        super(JSONResponse, self).__init__(data, content_type="application/json", **kwargs)

 
 
 # return errors
 
 
 # return errors


@@ -44,7 +50,7 @@ def ajax_login_required(view):
     @wraps(view)
     def authenticated_view(request, *args, **kwargs):
         if not request.user.is_authenticated():
     @wraps(view)
     def authenticated_view(request, *args, **kwargs):
         if not request.user.is_authenticated():

-            return http.HttpResponse("Login required.", status=401, mimetype="text/plain")
+            return http.HttpResponse("Login required.", status=401, content_type="text/plain")

         return view(request, *args, **kwargs)
     return authenticated_view
 
         return view(request, *args, **kwargs)
     return authenticated_view
 


@@ -54,78 +60,7 @@ def ajax_require_permission(permission):
         @wraps(view)
         def authorized_view(request, *args, **kwargs):
             if not request.user.has_perm(permission):
         @wraps(view)
         def authorized_view(request, *args, **kwargs):
             if not request.user.has_perm(permission):

-                return http.HttpResponse("Access Forbidden.", status=403, mimetype="text/plain")
+                return http.HttpResponse("Access Forbidden.", status=403, content_type="text/plain")

             return view(request, *args, **kwargs)
         return authorized_view
     return decorator
             return view(request, *args, **kwargs)
         return authorized_view
     return decorator

-
-import collections
-
-def recursive_groupby(iterable):
-    """
-#    >>> recursive_groupby([1,2,3,4,5])
-#    [1, 2, 3, 4, 5]
-
-    >>> recursive_groupby([[1]])
-    [1]
-
-    >>> recursive_groupby([('a', 1),('a', 2), 3, ('b', 4), 5])
-    ['a', [1, 2], 3, 'b', [4], 5]
-
-    >>> recursive_groupby([('a', 'x', 1),('a', 'x', 2), ('a', 'x', 3)])
-    ['a', ['x', [1, 2, 3]]]
-
-    """
-
-    def _generator(iterator):
-        group = None
-        grouper = None
-
-        for item in iterator:
-            if not isinstance(item, collections.Sequence):
-                if grouper is not None:
-                    yield grouper
-                    if len(group):
-                        yield recursive_groupby(group)
-                    group = None
-                    grouper = None
-                yield item
-                continue
-            elif len(item) == 1:
-                if grouper is not None:
-                    yield grouper
-                    if len(group):
-                        yield recursive_groupby(group)
-                    group = None
-                    grouper = None
-                yield item[0]
-                continue
-            elif not len(item):
-                continue
-
-            if grouper is None:
-                group = [item[1:]]
-                grouper = item[0]
-                continue
-
-            if grouper != item[0]:
-                if grouper is not None:
-                    yield grouper
-                    if len(group):
-                        yield recursive_groupby(group)
-                    group = None
-                    grouper = None
-                group = [item[1:]]
-                grouper = item[0]
-                continue
-
-            group.append(item[1:])
-
-        if grouper is not None:
-            yield grouper
-            if len(group):
-                yield recursive_groupby(group)
-            group = None
-            grouper = None
-
-    return list(_generator(iterable))