From a93f93a458f6ab3ce48439d2d571e4f88da4c024 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sun, 15 Jan 2017 14:47:14 +0000 Subject: Replaced vendored unicodecsv by a dependency Using https://pypi.python.org/pypi/unicodecsv/0.14.1 --- tablib/compat.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tablib/compat.py') diff --git a/tablib/compat.py b/tablib/compat.py index 2593e36..27ecd08 100644 --- a/tablib/compat.py +++ b/tablib/compat.py @@ -51,7 +51,7 @@ else: from tablib.packages import openpyxl from tablib.packages.odf import opendocument, style, text, table - from tablib.packages import unicodecsv as csv + import unicodecsv as csv import tablib.packages.dbfpy as dbfpy unicode = unicode -- cgit v1.2.1 From e66eb4a18967dd4d35e6e9da265622e9e4015103 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Mon, 20 Feb 2017 16:41:33 +0100 Subject: Replaced vendored openpyxl by a dependency (#221) It is time to make it happen. * Dropped Python 3.2 support Recent dependencies are dropping Python 3.2 too. * Replaced vendored openpyxl by a dependency Thanks Tommy Anthony for the initial patch. --- tablib/compat.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'tablib/compat.py') diff --git a/tablib/compat.py b/tablib/compat.py index 27ecd08..533d480 100644 --- a/tablib/compat.py +++ b/tablib/compat.py @@ -26,7 +26,6 @@ if is_py3: import tablib.packages.xlrd3 as xlrd from tablib.packages.xlrd3.biffh import XLRDError from tablib.packages import markup3 as markup - from tablib.packages import openpyxl3 as openpyxl from tablib.packages.odf3 import opendocument, style, text, table import tablib.packages.dbfpy3 as dbfpy @@ -48,7 +47,6 @@ else: from tablib.packages.xlrd.biffh import XLRDError from tablib.packages import markup from itertools import ifilter - from tablib.packages import openpyxl from tablib.packages.odf import opendocument, style, text, table import unicodecsv as csv -- cgit v1.2.1 From 0ca5520bbc1474dbd872a3f330c681a5201336fd Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Mon, 20 Feb 2017 21:29:22 +0100 Subject: Replaced vendored xlrd/xlwt by dependencies (#277) Refs #273. --- tablib/compat.py | 6 ------ 1 file changed, 6 deletions(-) (limited to 'tablib/compat.py') diff --git a/tablib/compat.py b/tablib/compat.py index 533d480..9a7b872 100644 --- a/tablib/compat.py +++ b/tablib/compat.py @@ -22,9 +22,6 @@ except ImportError: if is_py3: from io import BytesIO - import tablib.packages.xlwt3 as xlwt - import tablib.packages.xlrd3 as xlrd - from tablib.packages.xlrd3.biffh import XLRDError from tablib.packages import markup3 as markup from tablib.packages.odf3 import opendocument, style, text, table import tablib.packages.dbfpy3 as dbfpy @@ -42,9 +39,6 @@ if is_py3: else: from cStringIO import StringIO as BytesIO from cStringIO import StringIO - import tablib.packages.xlwt as xlwt - import tablib.packages.xlrd as xlrd - from tablib.packages.xlrd.biffh import XLRDError from tablib.packages import markup from itertools import ifilter from tablib.packages.odf import opendocument, style, text, table -- cgit v1.2.1 From 62807734bd6f7f4ade5befb9a22b091db4182010 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Sun, 26 Feb 2017 23:05:01 +0100 Subject: Replaced vendored odfpy by a dependency (#280) Refs #273. --- tablib/compat.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'tablib/compat.py') diff --git a/tablib/compat.py b/tablib/compat.py index 9a7b872..43e0bbc 100644 --- a/tablib/compat.py +++ b/tablib/compat.py @@ -23,7 +23,6 @@ except ImportError: if is_py3: from io import BytesIO from tablib.packages import markup3 as markup - from tablib.packages.odf3 import opendocument, style, text, table import tablib.packages.dbfpy3 as dbfpy import csv @@ -41,7 +40,6 @@ else: from cStringIO import StringIO from tablib.packages import markup from itertools import ifilter - from tablib.packages.odf import opendocument, style, text, table import unicodecsv as csv import tablib.packages.dbfpy as dbfpy -- cgit v1.2.1 From 80e72cfa27264efb9f525bd92ce6476c5eadb3e9 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Thu, 12 Jan 2017 09:49:45 +0000 Subject: Fix unicode encode errors on Python 2 -- Fixes #215 Switch csv library to backports.csv as the implementation is closer to the python 3 one. Add a test case covering the problem. Run tests with unicode_literals from future Fix unicode encode errors with unicode characters - Use `backports.csv` instead of `unicodecsv` - Use StringIO instead of cStringIO - Clean-up some Python 2 specific code --- tablib/compat.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tablib/compat.py') diff --git a/tablib/compat.py b/tablib/compat.py index 43e0bbc..d18a781 100644 --- a/tablib/compat.py +++ b/tablib/compat.py @@ -37,11 +37,11 @@ if is_py3: else: from cStringIO import StringIO as BytesIO - from cStringIO import StringIO + from StringIO import StringIO from tablib.packages import markup from itertools import ifilter - import unicodecsv as csv + from backports import csv import tablib.packages.dbfpy as dbfpy unicode = unicode -- cgit v1.2.1 From 38486231cc4dc46d1ff055a38fe7c236cbe5c8aa Mon Sep 17 00:00:00 2001 From: Norman Hooper Date: Wed, 12 Sep 2018 20:27:10 +0200 Subject: reStructuredText (#336) * median for Python 2 * More compat * Support reStructuredText * Tests --- tablib/compat.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'tablib/compat.py') diff --git a/tablib/compat.py b/tablib/compat.py index 43e0bbc..d60ce72 100644 --- a/tablib/compat.py +++ b/tablib/compat.py @@ -22,6 +22,8 @@ except ImportError: if is_py3: from io import BytesIO + from itertools import zip_longest as izip_longest + from statistics import median from tablib.packages import markup3 as markup import tablib.packages.dbfpy3 as dbfpy @@ -39,7 +41,8 @@ else: from cStringIO import StringIO as BytesIO from cStringIO import StringIO from tablib.packages import markup - from itertools import ifilter + from tablib.packages.statistics import median + from itertools import ifilter, izip_longest import unicodecsv as csv import tablib.packages.dbfpy as dbfpy -- cgit v1.2.1 From dd2ba714d3eec5e6a14bdac27b4e6467b6dfb439 Mon Sep 17 00:00:00 2001 From: Jon Dufresne Date: Tue, 1 Jan 2019 09:58:53 -0800 Subject: Remove vendored ordereddict package Now that Python 2.6 support has been dropped, can remove the vendored ordereddict package. Use the stdlib collections.OrderedDict instead. --- tablib/compat.py | 7 ------- 1 file changed, 7 deletions(-) (limited to 'tablib/compat.py') diff --git a/tablib/compat.py b/tablib/compat.py index d60ce72..916d6ab 100644 --- a/tablib/compat.py +++ b/tablib/compat.py @@ -13,13 +13,6 @@ import sys is_py3 = (sys.version_info[0] > 2) - -try: - from collections import OrderedDict -except ImportError: - from tablib.packages.ordereddict import OrderedDict - - if is_py3: from io import BytesIO from itertools import zip_longest as izip_longest -- cgit v1.2.1 From 499ce52304b8994500ba0e81bd23d9ac6a2038cf Mon Sep 17 00:00:00 2001 From: Jon Dufresne Date: Tue, 1 Jan 2019 10:40:29 -0800 Subject: Remove unused compat entries Organize both the Python2 & Python3 sections in the same order so they are easier to compare. Removed: - basestring - ifilter - bytes --- tablib/compat.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'tablib/compat.py') diff --git a/tablib/compat.py b/tablib/compat.py index d60ce72..2f97650 100644 --- a/tablib/compat.py +++ b/tablib/compat.py @@ -22,19 +22,14 @@ except ImportError: if is_py3: from io import BytesIO - from itertools import zip_longest as izip_longest - from statistics import median + from io import StringIO from tablib.packages import markup3 as markup - import tablib.packages.dbfpy3 as dbfpy - + from statistics import median + from itertools import zip_longest as izip_longest import csv - from io import StringIO - # py3 mappings + import tablib.packages.dbfpy3 as dbfpy - ifilter = filter unicode = str - bytes = bytes - basestring = str xrange = range else: @@ -42,8 +37,7 @@ else: from cStringIO import StringIO from tablib.packages import markup from tablib.packages.statistics import median - from itertools import ifilter, izip_longest - + from itertools import izip_longest import unicodecsv as csv import tablib.packages.dbfpy as dbfpy -- cgit v1.2.1