Merge branch 'master' of github.com:bartTC/dpaste

This commit is contained in:
Martin Mahner 2013-03-19 19:30:05 +00:00
commit 8142f3476b
3 changed files with 7 additions and 11 deletions

View file

@ -29,8 +29,6 @@ class NakedHtmlFormatter(HtmlFormatter):
def pygmentize(code_string, lexer_name=LEXER_DEFAULT): def pygmentize(code_string, lexer_name=LEXER_DEFAULT):
lexer_name = LEXER_LIST_NAME.get(lexer_name, None) lexer_name = LEXER_LIST_NAME.get(lexer_name, None)
print lexer_name
try: try:
if lexer_name: if lexer_name:
lexer = get_lexer_by_name(lexer_name) lexer = get_lexer_by_name(lexer_name)

View file

@ -1,9 +1,8 @@
{% extends "dpaste/base.html" %} {% extends "dpaste/base.html" %}
{% block headline %} {% block title %}404 Not found{% endblock %}
<h1>404 Not found</h1> {% block headline %}404 Not found{% endblock %}
{% endblock %}
{% block content %} {% block page %}
<p>Snippet you have searched is not available (anymore).</p> <p>Snippet you have searched is not available (anymore).</p>
{% endblock %} {% endblock %}

View file

@ -1,9 +1,8 @@
{% extends "dpaste/base.html" %} {% extends "dpaste/base.html" %}
{% block headline %} {% block title %}500 Internal Server Error{% endblock %}
<h1>500 Internal Server Error</h1> {% block headline %}500 Internal Server Error{% endblock %}
{% endblock %}
{% block content %} {% block page %}
<p>Sorry, there was an error with your request. My fault!</p> <p>Sorry, there was an error with your request. The server notified the admin via email.</p>
{% endblock %} {% endblock %}