Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch from recliner to readme #202

Merged
merged 1 commit into from Feb 27, 2014
Merged

Switch from recliner to readme #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Expand Up @@ -75,8 +75,8 @@ def recursive_glob(path, pattern, cutdirs=0):
"Jinja2",
"psycopg2cffi",
"PyYAML",
"recliner>=0.3.1",
"raven",
"readme>=0.1.1",
"redis",
"SQLAlchemy",
"sqlalchemy-citext>=1.2.0",
Expand Down
8 changes: 2 additions & 6 deletions warehouse/packaging/views.py
View file
Open in desktop
Expand Up @@ -15,8 +15,8 @@
from __future__ import unicode_literals

import jinja2
import readme.rst

from recliner import htmlize
from werkzeug.exceptions import NotFound

from warehouse.helpers import url_for
Expand Down Expand Up @@ -76,11 +76,7 @@ def project_detail(app, request, project_name, version=None):

if release.get("description"):
# Render the project description
description_html = htmlize(release["description"])

# If our description wasn't able to be rendered, wrap it in <pre></pre>
if not description_html.rendered:
description_html = "<pre>" + description_html + "</pre>"
description_html = readme.rst.render(release["description"])
else:
description_html = ""

Expand Down