Skip to content

Django 2.0 #80

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Django 2.0 #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a1a2e6
Use django.urls instead of django.core.urlresolvers
Ge0 Dec 3, 2017
b3a0760
Import either urlresolvers or urls from django
Ge0 Dec 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion django_markdown/templatetags/django_markdown.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
import posixpath

from django import template
from django.core.urlresolvers import reverse

try: # django <= 1.6
from django.core.urlresolvers import reverse
except ImportError: # from django 1.7 to django 2.0 (and more)
from django.urls import reverse

from ..utils import markdown as _markdown, settings, simplejson, mark_safe

Expand Down
6 changes: 5 additions & 1 deletion django_markdown/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
""" Markdown utils. """
from django.core.urlresolvers import reverse
try: # django <= 1.6
from django.core.urlresolvers import reverse
except ImportError: # from django 1.7 to django 2.0 (and more)
from django.urls import reverse

import markdown as markdown_module
from django.utils.encoding import force_text
from django.utils.safestring import mark_safe
Expand Down