diff options
author | Radomir Dopieralski <sheep-devel@sheep.art.pl> | 2013-06-23 19:20:28 (GMT) |
---|---|---|
committer | Radomir Dopieralski <sheep-devel@sheep.art.pl> | 2013-06-23 19:20:28 (GMT) |
commit | b189dbf1915ad2a21d0c97395cf8f711fa1dd3d2 (patch) | |
tree | 1f1b9bd857e812680f54ebf7afc662750629c4fa /hatta | |
parent | e1633a80adc78f7122a374f281a4bc23b9bf3630 (diff) |
Fix missing views and get rid of a dict comprehension
Diffstat (limited to 'hatta')
-rw-r--r-- | hatta/page.py | 2 | ||||
-rw-r--r-- | hatta/views.py | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/hatta/page.py b/hatta/page.py index 461f2df..5c74736 100644 --- a/hatta/page.py +++ b/hatta/page.py @@ -578,7 +578,7 @@ class WikiPageImage(WikiPageFile): if self.title not in self.storage: raise hatta.error.NotFoundErr() content = ['<img src="%s" alt="%s">' - % (self.request.get_url(self.title, self.wiki.render), + % (self.request.get_url(self.title, 'render'), werkzeug.escape(self.title))] return content diff --git a/hatta/views.py b/hatta/views.py index 57a479c..fac2d25 100644 --- a/hatta/views.py +++ b/hatta/views.py @@ -57,14 +57,14 @@ class URL(object): def get_views(cls): """Returns a dict of views.""" - return {name: func for name, func, url, methods in cls.urls} + return dict((name, func) for name, func, url, methods in cls.urls) def _serve_default(request, title, content=None, mime=None): """Some pages have their default content.""" if title in request.wiki.storage: - return request.wiki.download(request, title) + return download(request, title) if content is None: content = pkgutil.get_data('hatta', os.path.join('static', title)) mime = mime or 'application/octet-stream' @@ -145,7 +145,7 @@ def save(request, title): else: lines = [werkzeug.html.p(werkzeug.html( _(u'No preview for binaries.')))] - return request.wiki.edit(request, title, preview=lines) + return edit(request, title, preview=lines) elif request.form.get('save'): if captcha and request.wiki.recaptcha_private_key: response = captcha.submit( @@ -154,7 +154,7 @@ def save(request, title): request.wiki.recaptcha_private_key, request.remote_addr) if not response.is_valid: text = request.form.get("text", '') - return request.wiki.edit(request, title, preview=text.split('\n'), + return edit(request, title, preview=text.split('\n'), captcha_error=response.error_code) comment = request.form.get("comment", "") author = request.get_author() @@ -302,7 +302,7 @@ def render(request, title): cache_filename, cache_mime = page.render_mime() render = page.render_cache except (AttributeError, NotImplementedError): - return request.wiki.download(request, title) + return download(request, title) cache_dir = os.path.join(request.wiki.cache, 'render', werkzeug.url_quote(title, safe='')) |