Merge e9f37ab201 into cc483e1877

.travis.yml

@@ -1,7 +1,6 @@
 os: linux
 language: python
 python:
-    - "2.7"
     - "3.4"
     - "3.5"
     - "3.6"

pokedex/db/markdown.py

@@ -17,8 +17,9 @@ import re
 import markdown
 import six
 from sqlalchemy.orm.session import object_session
-from markdown.util import etree, AtomicString
 
+from markdown.util import AtomicString
+import xml.etree.ElementTree as etree 
 
 @six.python_2_unicode_compatible
 class MarkdownString(object):

setup.py

@@ -11,7 +11,7 @@ setup(
     install_requires=[
         'SQLAlchemy>=1.0,<1.4',
         'whoosh>=2.5,<2.7',
-        'markdown>=2.4.1,<=2.6.11',
+        'markdown>=3.4,<3.5',
         'construct==2.5.3',
         'six>=1.9.0',
     ],
@@ -22,6 +22,7 @@ setup(
     },
     classifiers=[
         "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",