From 46832b96a5ed60a1299f4450a01688d74e56d17e Mon Sep 17 00:00:00 2001 From: Jon Bergli Heier Date: Fri, 24 Mar 2017 21:53:13 +0100 Subject: Replaced cheetah templates with jinja2 templates. --- pastepy.py | 30 +++++++++++++++++------------- templates/__init__.py | 3 --- templates/base.html | 20 ++++++++++++++++++++ templates/base.tmpl | 20 -------------------- templates/message.html | 5 +++++ templates/message.tmpl | 5 ----- templates/paste.html | 34 ++++++++++++++++++++++++++++++++++ templates/paste.tmpl | 34 ---------------------------------- templates/view.html | 26 ++++++++++++++++++++++++++ templates/view.tmpl | 29 ----------------------------- 10 files changed, 102 insertions(+), 104 deletions(-) delete mode 100644 templates/__init__.py create mode 100644 templates/base.html delete mode 100644 templates/base.tmpl create mode 100644 templates/message.html delete mode 100644 templates/message.tmpl create mode 100644 templates/paste.html delete mode 100644 templates/paste.tmpl create mode 100644 templates/view.html delete mode 100644 templates/view.tmpl diff --git a/pastepy.py b/pastepy.py index 9697fac..fafc81e 100644 --- a/pastepy.py +++ b/pastepy.py @@ -7,8 +7,8 @@ import os import random import settings -import templates +import jinja2 try: import markdown has_markdown = True @@ -57,13 +57,20 @@ class Paste(object): random.seed() + self.template_env = jinja2.Environment(loader = jinja2.FileSystemLoader('templates')) + + def render_template(self, name, args): + template = self.template_env.get_template(name) + data = template.render(**args).encode('utf-8') + self.start_response('200 OK', [('Content-Type', 'text/html; charset=UTF-8'), ('Content-Length', str(len(data)))]) + return [data] + def message(self, msg, title = 'Message'): - self.start_response('200 OK', [('Content-Type', 'text/html; charset=utf-8')]) - return [str(templates.message(searchList = { + return self.render_template('message.html', { 'title': '%s – %s' % (settings.pastebin_name, title), 'header': title, 'text': msg, - }))] + }) def paste(self): c = Cookie.SimpleCookie(self.environ['HTTP_COOKIE'] if 'HTTP_COOKIE' in self.environ else None) @@ -75,8 +82,7 @@ class Paste(object): return self.add_paste(mp) else: return self.message('Invalid type "%s".' % mp['type'].value, 'Error') - self.start_response('200 OK', [('Content-Type', 'text/html; charset=utf-8')]) - return [str(templates.paste(searchList = { + return self.render_template('paste.html', { 'title': settings.pastebin_name, 'header': settings.pastebin_name, 'lexers': self.lexers, @@ -84,7 +90,7 @@ class Paste(object): 'syntax': c['syntax'].value if 'syntax' in c else settings.default, 'remember_me': 'nick' in c, 'remember_syntax': 'syntax' in c, - }))] + }) def preview(self, mp): try: @@ -92,8 +98,7 @@ class Paste(object): except UnknownSyntaxError: return self.message('Could not find lexer "%s".' % mp['syntax'].value, 'Error') - self.start_response('200 OK', [('Content-Type', 'text/html; charset=utf-8')]) - return [str(templates.view(searchList = { + return self.render_template('view.html', { 'title': settings.pastebin_name, 'header': '%s – Preview' % settings.pastebin_name, 'hash': None, @@ -103,7 +108,7 @@ class Paste(object): 'pastetitle': mp['title'].value.decode('utf8') or 'Untitled', 'text': text, 'rendered': (lexername or '').startswith('Rendered '), - }))] + }) def add_paste(self, mp): nick = mp['nick'].value.decode('utf8') or None @@ -172,8 +177,7 @@ class Paste(object): finally: session.close() - self.start_response('200 OK', [('Content-Type', 'text/html; charset=utf-8')]) - return [str(templates.view(searchList = { + return self.render_template('view.html', { 'title': '%s – View paste – %s' % (settings.pastebin_name, paste.title or 'Untitled'), 'header': '%s – View paste' % settings.pastebin_name, 'hash': hash, @@ -183,7 +187,7 @@ class Paste(object): 'pastetitle': paste.title or 'Untitled', 'text': cache.text, 'rendered': (cache.syntax_name or '').startswith('Rendered '), - }))] + }) def raw(self): hash = self.path[1] diff --git a/templates/__init__.py b/templates/__init__.py deleted file mode 100644 index defb657..0000000 --- a/templates/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -from paste import paste -from view import view -from message import message diff --git a/templates/base.html b/templates/base.html new file mode 100644 index 0000000..196a03e --- /dev/null +++ b/templates/base.html @@ -0,0 +1,20 @@ + + + + {{ title }} + +{% block head %} +{% endblock %} + + +
+
+

{{ header }}

+
+
+{% block content %} +{% endblock %} +
+
+ + diff --git a/templates/base.tmpl b/templates/base.tmpl deleted file mode 100644 index 6374752..0000000 --- a/templates/base.tmpl +++ /dev/null @@ -1,20 +0,0 @@ - - - - $title - -#block head -#end block - - -
-
-

$header

-
-
-#block content -#end block -
-
- - diff --git a/templates/message.html b/templates/message.html new file mode 100644 index 0000000..540b64a --- /dev/null +++ b/templates/message.html @@ -0,0 +1,5 @@ +{% extends "base.html" %} +{% block content %} +

New paste

+ {{ text }} +{% endblock %} diff --git a/templates/message.tmpl b/templates/message.tmpl deleted file mode 100644 index 9f69ebc..0000000 --- a/templates/message.tmpl +++ /dev/null @@ -1,5 +0,0 @@ -#extends templates.base -#def content -

New paste

- $text -#end def diff --git a/templates/paste.html b/templates/paste.html new file mode 100644 index 0000000..e22f76d --- /dev/null +++ b/templates/paste.html @@ -0,0 +1,34 @@ +{% extends "base.html" %} +{% block head %} + +{% endblock %} +{% block content %} +
+ +
+{% endblock %} diff --git a/templates/paste.tmpl b/templates/paste.tmpl deleted file mode 100644 index f9c9504..0000000 --- a/templates/paste.tmpl +++ /dev/null @@ -1,34 +0,0 @@ -#extends templates.base -#def head - -#end def -#def content -
- -
-#end def diff --git a/templates/view.html b/templates/view.html new file mode 100644 index 0000000..0a20a62 --- /dev/null +++ b/templates/view.html @@ -0,0 +1,26 @@ +{% extends "base.html" %} +{% block head %} + + +{% endblock %} +{% block content %} +

New paste

+
+

{{ pastetitle }}

+
Pasted by {{ nick }} on {{date }} + {% if syntax %} as {{ syntax }}{% endif %} +
+ + {% if rendered %} +
+ {% endif %} + {{ text }} + {% if rendered %} +
+ {% endif %} +
+{% endblock %} diff --git a/templates/view.tmpl b/templates/view.tmpl deleted file mode 100644 index a23c36e..0000000 --- a/templates/view.tmpl +++ /dev/null @@ -1,29 +0,0 @@ -#extends templates.base -#def head - - -#end def -#def content -

New paste

-
-

$pastetitle

-
Pasted by $nick on $date#slurp -#if $syntax - as $syntax#slurp -#end if -. -
- -#if $rendered -
-#end if - $text -#if $rendered -
-#end if -
-#end def -- cgit v1.2.3