Skip to content

Commit

Permalink
Refs jazzband#273 - Replaced vendored markup lib by dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
claudep committed Mar 9, 2019
1 parent 733d77a commit 8e90967
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 972 deletions.
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
'odfpy',
'openpyxl>=2.4.0',
'backports.csv',
'markuppy'
'xlrd',
'xlwt',
'pyyaml',
Expand Down
2 changes: 0 additions & 2 deletions tablib/compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
5 changes: 2 additions & 3 deletions tablib/formats/_html.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
Loading

0 comments on commit 8e90967

Please sign in to comment.