Refs #273 - Replaced vendored markup lib by dependency

MANIFEST.in

@@ -1 +1 @@
-include HISTORY.md README.md LICENSE AUTHORS NOTICE test_tablib.py
+include HISTORY.md README.md LICENSE AUTHORS test_tablib.py

requirements.txt

@@ -1,4 +1,5 @@
 backports.csv; python_version < '3.0'
+MarkupPy
 odfpy
 openpyxl>=2.4.0
 pandas

setup.py

@@ -34,6 +34,7 @@
     'odfpy',
     'openpyxl>=2.4.0',
     'backports.csv;python_version<"3.0"',
+    'markuppy'
     'xlrd',
     'xlwt',
     'pyyaml',

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,11 +27,12 @@
 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
     import tablib.packages.dbfpy as dbfpy
 
     unicode = unicode
     xrange = xrange
+
+from MarkupPy import markup  # Kept temporarily to avoid breaking existing imports

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'