Refs jazzband#273 - Replaced vendored markup lib by dependency

claudep · Mar 9, 2019 · 2fc4b7d · 2fc4b7d
1 parent 41cbaa0
commit 2fc4b7d
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 978 deletions.
diff --git a/NOTICE b/NOTICE
diff --git a/requirements.txt b/requirements.txt
@@ -4,6 +4,7 @@ chardet==3.0.4
 et-xmlfile==1.0.1
 idna==2.6
 jdcal==1.3
+MarkupPy==1.14
 numpy==1.13.1
 odfpy==1.3.5
 openpyxl==2.4.8

diff --git a/setup.py b/setup.py
@@ -36,6 +36,7 @@
     'odfpy',
     'openpyxl>=2.4.0',
     'backports.csv;python_version<"3.0"',
+    'markuppy'
     'xlrd',
     'xlwt',
     'pyyaml',

diff --git a/tablib/compat.py b/tablib/compat.py
@@ -16,7 +16,6 @@
 if is_py3:
     from io import BytesIO
     from io import StringIO
-    from tablib.packages import markup3 as markup
     from statistics import median
     from itertools import zip_longest as izip_longest
     import csv
@@ -28,7 +27,6 @@
 else:
     from cStringIO import StringIO as BytesIO
     from StringIO import StringIO
-    from tablib.packages import markup
     from tablib.packages.statistics import median
     from itertools import izip_longest
     from backports import csv

diff --git a/tablib/formats/_html.py b/tablib/formats/_html.py
@@ -7,14 +7,13 @@
 
 if sys.version_info[0] > 2:
     from io import BytesIO as StringIO
-    from tablib.packages import markup3 as markup
 else:
     from cStringIO import StringIO
-    from tablib.packages import markup
 
+import codecs
+from MarkupPy import markup
 import tablib
 from tablib.compat import unicode
-import codecs
 
 BOOK_ENDINGS = 'h3'