From d21bd109087dd93d0a5611887297c7069fefe995 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Wed, 30 Oct 2019 14:24:07 +0100 Subject: [PATCH] Revert " Implement feature new format: Cli. Generate adapter for tabulate. This close issue #340" This reverts commit c26159d48f60e737ba6e308b3ed88858cd115cc7. The patch was NOT ready to be merged. --- setup.py | 1 - src/tablib/core.py | 8 -------- src/tablib/formats/__init__.py | 3 +-- src/tablib/formats/_cli.py | 20 -------------------- tests/test_tablib.py | 6 ------ 5 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 src/tablib/formats/_cli.py diff --git a/setup.py b/setup.py index 698ace7..2ba3e76 100755 --- a/setup.py +++ b/setup.py @@ -9,7 +9,6 @@ install = [ 'xlrd', 'xlwt', 'pyyaml', - 'tabulate', ] diff --git a/src/tablib/core.py b/src/tablib/core.py index e0c4327..17d9621 100644 --- a/src/tablib/core.py +++ b/src/tablib/core.py @@ -621,14 +621,6 @@ class Dataset: """ pass - @property - def cli(): - """A CLI table representation of the :class:`Dataset` object. - - .. note:: This method can be used for export only. - """ - pass - @property def jira(): """A Jira table representation of the :class:`Dataset` object. diff --git a/src/tablib/formats/__init__.py b/src/tablib/formats/__init__.py index b0afeec..12f2610 100644 --- a/src/tablib/formats/__init__.py +++ b/src/tablib/formats/__init__.py @@ -14,7 +14,6 @@ from . import _tsv as tsv from . import _xls as xls from . import _xlsx as xlsx from . import _yaml as yaml -from . import _cli as cli # xlsx before as xls (xlrd) can also read xlsx -available = (json, xlsx, xls, yaml, csv, dbf, tsv, html, jira, latex, ods, df, rst, cli) +available = (json, xlsx, xls, yaml, csv, dbf, tsv, html, jira, latex, ods, df, rst) diff --git a/src/tablib/formats/_cli.py b/src/tablib/formats/_cli.py deleted file mode 100644 index 5441e2f..0000000 --- a/src/tablib/formats/_cli.py +++ /dev/null @@ -1,20 +0,0 @@ -""" Tablib - CLI Support -""" -from tabulate import tabulate - -title = 'cli' -extensions = ('txt',) - -DEFAULT_FORMAT = 'plain' - -def export_set(dataset, **kwargs): - """Returns CLI representation of Dataset.""" - if( dataset.headers is not None ): - kwargs.setdefault('headers', dataset.headers) - kwargs.setdefault('tablefmt', DEFAULT_FORMAT) - return tabulate( dataset, **kwargs) - -def export_book(dataset, **kwargs): - """Returns CLI representation of Dataset.""" - kwargs.setdefault('tablefmt', DEFAULT_FORMAT) - return tabulate( dataset, **kwargs) diff --git a/tests/test_tablib.py b/tests/test_tablib.py index bd336f9..695d13d 100755 --- a/tests/test_tablib.py +++ b/tests/test_tablib.py @@ -1214,12 +1214,6 @@ class JiraTests(BaseTestCase): def test_jira_export_empty_dataset(self): self.assertTrue(tablib.Dataset().jira is not None) -class CliTests(BaseTestCase): - def test_cli_export(self): - self.assertEqual('a b c', tablib.Dataset(['a', 'b', 'c']).cli) - - def test_cli_export_github(self): - self.assertEqual('|---|---|---|\n| a | b | c |', tablib.Dataset(['a','b','c']).export('cli',tablefmt='github')) class DocTests(unittest.TestCase):