remove mismatched html tags

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

diff --git a/apps/wiki/helpers.py b/apps/wiki/helpers.py
index fe4b3b8..8983e40 100644 (file)
--- a/apps/wiki/helpers.py
+++ b/apps/wiki/helpers.py
@@ -1,9 +1,11 @@
-from django import http
-from django.utils import simplejson as json
-from django.utils.functional import Promise
+# -*- coding: utf-8 -*-

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

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

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


@@ -20,7 +22,9 @@ class ExtendedEncoder(json.JSONEncoder):
 # shortcut for JSON reponses
 class JSONResponse(http.HttpResponse):
 
 # shortcut for JSON reponses
 class JSONResponse(http.HttpResponse):
 

-    def __init__(self, data={}, **kwargs):
+    def __init__(self, data=None, **kwargs):
+        if data is None:
+            data = {}

         # get rid of mimetype
         kwargs.pop('mimetype', None)
 
         # get rid of mimetype
         kwargs.pop('mimetype', None)
 


@@ -58,113 +62,3 @@ def ajax_require_permission(permission):
             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))
-
-
-def active_tab(tab):
-    """
-        View decorator, which puts tab info on a request.
-    """
-    def wrapper(f):
-        @wraps(f)
-        def wrapped(request, *args, **kwargs):
-            request.wiki_active_tab = tab
-            return f(request, *args, **kwargs)
-        return wrapped
-    return wrapper
-
-
-class BookChunks(object):
-    """
-        Yields the chunks of a book.
-    """
-
-    def __init__(self, book):
-        self.book = book
-
-    @property
-    def chunks(self):
-        return self.book.chunk_set.all()
-
-
-class ChoiceChunks(BookChunks):
-    """
-        Associates the given chunks iterable for a book.
-    """
-
-    chunks = None
-
-    def __init__(self, book, chunks):
-        self.book = book
-        self.chunks = chunks
-