From a76933edd5b554456f81b2dbeaacd4ab06528d1b Mon Sep 17 00:00:00 2001 From: Hugo Date: Tue, 22 Oct 2019 11:58:42 +0200 Subject: [PATCH] Refs #401 - Sort imports with isort --- setup.py | 1 - src/tablib/__init__.py | 12 +++++++++--- src/tablib/core.py | 1 - src/tablib/formats/__init__.py | 18 +++++++++--------- src/tablib/formats/_csv.py | 1 - src/tablib/formats/_dbf.py | 4 +--- src/tablib/formats/_json.py | 1 - src/tablib/formats/_latex.py | 1 - src/tablib/formats/_ods.py | 1 + src/tablib/formats/_rst.py | 1 - src/tablib/formats/_tsv.py | 8 +++----- src/tablib/formats/_xls.py | 3 ++- src/tablib/formats/_xlsx.py | 1 + src/tablib/formats/_yaml.py | 3 ++- src/tablib/packages/dbfpy/dbf.py | 3 +-- src/tablib/packages/dbfpy/header.py | 2 +- src/tablib/packages/dbfpy/record.py | 1 + tests/test_tablib.py | 1 + tox.ini | 3 ++- 19 files changed, 34 insertions(+), 32 deletions(-) diff --git a/setup.py b/setup.py index 56d06f3..2ba3e76 100755 --- a/setup.py +++ b/setup.py @@ -2,7 +2,6 @@ from setuptools import find_packages, setup - install = [ 'odfpy', 'openpyxl>=2.4.0', diff --git a/src/tablib/__init__.py b/src/tablib/__init__.py index fafb569..e94e939 100644 --- a/src/tablib/__init__.py +++ b/src/tablib/__init__.py @@ -1,9 +1,15 @@ """ Tablib. """ -from pkg_resources import get_distribution, DistributionNotFound +from pkg_resources import DistributionNotFound, get_distribution from tablib.core import ( - Databook, Dataset, detect_format, import_set, import_book, - InvalidDatasetType, InvalidDimensions, UnsupportedFormat + Databook, + Dataset, + InvalidDatasetType, + InvalidDimensions, + UnsupportedFormat, + detect_format, + import_book, + import_set, ) try: diff --git a/src/tablib/core.py b/src/tablib/core.py index 61c7a50..17d9621 100644 --- a/src/tablib/core.py +++ b/src/tablib/core.py @@ -14,7 +14,6 @@ from operator import itemgetter from tablib import formats - __title__ = 'tablib' __author__ = 'Kenneth Reitz' __license__ = 'MIT' diff --git a/src/tablib/formats/__init__.py b/src/tablib/formats/__init__.py index 9542d9a..12f2610 100644 --- a/src/tablib/formats/__init__.py +++ b/src/tablib/formats/__init__.py @@ -2,18 +2,18 @@ """ from . import _csv as csv -from . import _json as json -from . import _xls as xls -from . import _yaml as yaml -from . import _tsv as tsv -from . import _html as html -from . import _xlsx as xlsx -from . import _ods as ods from . import _dbf as dbf -from . import _latex as latex from . import _df as df -from . import _rst as rst +from . import _html as html from . import _jira as jira +from . import _json as json +from . import _latex as latex +from . import _ods as ods +from . import _rst as rst +from . import _tsv as tsv +from . import _xls as xls +from . import _xlsx as xlsx +from . import _yaml as yaml # xlsx before as xls (xlrd) can also read xlsx available = (json, xlsx, xls, yaml, csv, dbf, tsv, html, jira, latex, ods, df, rst) diff --git a/src/tablib/formats/_csv.py b/src/tablib/formats/_csv.py index 975d171..8bd3728 100644 --- a/src/tablib/formats/_csv.py +++ b/src/tablib/formats/_csv.py @@ -4,7 +4,6 @@ import csv from io import StringIO - title = 'csv' extensions = ('csv',) diff --git a/src/tablib/formats/_dbf.py b/src/tablib/formats/_dbf.py index 2a6df32..7ac814e 100644 --- a/src/tablib/formats/_dbf.py +++ b/src/tablib/formats/_dbf.py @@ -4,11 +4,9 @@ import io import os import tempfile -from tablib.packages.dbfpy import dbf -from tablib.packages.dbfpy import dbfnew +from tablib.packages.dbfpy import dbf, dbfnew from tablib.packages.dbfpy import record as dbfrecord - title = 'dbf' extensions = ('csv',) diff --git a/src/tablib/formats/_json.py b/src/tablib/formats/_json.py index f427ff2..98879ac 100644 --- a/src/tablib/formats/_json.py +++ b/src/tablib/formats/_json.py @@ -6,7 +6,6 @@ from uuid import UUID import tablib - title = 'json' extensions = ('json', 'jsn') diff --git a/src/tablib/formats/_latex.py b/src/tablib/formats/_latex.py index fae2ceb..0b1e3bc 100644 --- a/src/tablib/formats/_latex.py +++ b/src/tablib/formats/_latex.py @@ -4,7 +4,6 @@ """ import re - title = 'latex' extensions = ('tex',) diff --git a/src/tablib/formats/_ods.py b/src/tablib/formats/_ods.py index 43a2cfb..c874514 100644 --- a/src/tablib/formats/_ods.py +++ b/src/tablib/formats/_ods.py @@ -2,6 +2,7 @@ """ from io import BytesIO + from odf import opendocument, style, table, text title = 'ods' diff --git a/src/tablib/formats/_rst.py b/src/tablib/formats/_rst.py index 8067f73..3f8c369 100644 --- a/src/tablib/formats/_rst.py +++ b/src/tablib/formats/_rst.py @@ -5,7 +5,6 @@ from itertools import zip_longest from statistics import median from textwrap import TextWrapper - title = 'rst' extensions = ('rst',) diff --git a/src/tablib/formats/_tsv.py b/src/tablib/formats/_tsv.py index 380b4e6..cdc85bd 100644 --- a/src/tablib/formats/_tsv.py +++ b/src/tablib/formats/_tsv.py @@ -1,11 +1,9 @@ """ Tablib - TSV (Tab Separated Values) Support. """ -from tablib.formats._csv import ( - export_set as export_set_wrapper, - import_set as import_set_wrapper, - detect as detect_wrapper, -) +from tablib.formats._csv import detect as detect_wrapper +from tablib.formats._csv import export_set as export_set_wrapper +from tablib.formats._csv import import_set as import_set_wrapper title = 'tsv' extensions = ('tsv',) diff --git a/src/tablib/formats/_xls.py b/src/tablib/formats/_xls.py index 3fc94af..d405c77 100644 --- a/src/tablib/formats/_xls.py +++ b/src/tablib/formats/_xls.py @@ -3,10 +3,11 @@ from io import BytesIO -import tablib import xlrd import xlwt +import tablib + title = 'xls' extensions = ('xls',) diff --git a/src/tablib/formats/_xlsx.py b/src/tablib/formats/_xlsx.py index 6ac46b9..6774ef1 100644 --- a/src/tablib/formats/_xlsx.py +++ b/src/tablib/formats/_xlsx.py @@ -4,6 +4,7 @@ from io import BytesIO import openpyxl + import tablib Workbook = openpyxl.workbook.Workbook diff --git a/src/tablib/formats/_yaml.py b/src/tablib/formats/_yaml.py index 3707876..54b635e 100644 --- a/src/tablib/formats/_yaml.py +++ b/src/tablib/formats/_yaml.py @@ -1,9 +1,10 @@ """ Tablib - YAML Support. """ -import tablib import yaml +import tablib + title = 'yaml' extensions = ('yaml', 'yml') diff --git a/src/tablib/packages/dbfpy/dbf.py b/src/tablib/packages/dbfpy/dbf.py index cd9999d..dd38c9c 100644 --- a/src/tablib/packages/dbfpy/dbf.py +++ b/src/tablib/packages/dbfpy/dbf.py @@ -62,8 +62,7 @@ __author__ = "Jeff Kunce " __all__ = ["Dbf"] -from . import header -from . import record +from . import header, record from .utils import INVALID_VALUE diff --git a/src/tablib/packages/dbfpy/header.py b/src/tablib/packages/dbfpy/header.py index 05db880..e407427 100644 --- a/src/tablib/packages/dbfpy/header.py +++ b/src/tablib/packages/dbfpy/header.py @@ -19,8 +19,8 @@ __date__ = "$Date: 2010/09/16 05:06:39 $"[7:-2] __all__ = ["DbfHeader"] -import io import datetime +import io import struct import sys diff --git a/src/tablib/packages/dbfpy/record.py b/src/tablib/packages/dbfpy/record.py index db79e86..86830b9 100644 --- a/src/tablib/packages/dbfpy/record.py +++ b/src/tablib/packages/dbfpy/record.py @@ -20,6 +20,7 @@ import sys from . import utils + class DbfRecord: """DBF record. diff --git a/tests/test_tablib.py b/tests/test_tablib.py index 5464a8d..2f37fdb 100755 --- a/tests/test_tablib.py +++ b/tests/test_tablib.py @@ -9,6 +9,7 @@ import unittest from uuid import uuid4 from MarkupPy import markup + import tablib from tablib.core import Row, detect_format from tablib.formats import _csv as csv_module diff --git a/tox.ini b/tox.ini index c3eaa2a..ab712da 100644 --- a/tox.ini +++ b/tox.ini @@ -24,11 +24,12 @@ basepython = python3.7 deps = flake8 # flake8-black - # flake8-isort + isort twine check-manifest commands = # flake8 src/tablib tests/ + isort --check-only check-manifest -v python setup.py sdist twine check dist/*