Skip to content
This repository has been archived by the owner on Oct 2, 2023. It is now read-only.

Update python-markdown #113

Merged
merged 2 commits into from
Jul 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
os: linux
language: python
python:
- "2.7"
- "3.4"
- "3.5"
- "3.6"
Expand Down
8 changes: 2 additions & 6 deletions pokedex/db/markdown.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,8 @@
import markdown
import six
from sqlalchemy.orm.session import object_session
try:
# Markdown 2.1+
from markdown.util import etree, AtomicString
except ImportError:
# Old Markdown
from markdown import etree, AtomicString
from markdown.util import AtomicString
import xml.etree.ElementTree as etree

@six.python_2_unicode_compatible
class MarkdownString(object):
Expand Down
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
install_requires=[
'SQLAlchemy>=1.0,<2.0',
'whoosh>=2.5,<2.7',
'markdown==2.4.1',
'markdown>=3.4,<3.5',
'construct==2.5.3',
'six>=1.9.0',
],
Expand All @@ -21,7 +21,6 @@
],
},
classifiers=[
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.7",
Expand Down