From d4bc782e236145d7e59cbb2532b88a15be8b66f0 Mon Sep 17 00:00:00 2001 From: Sebastian Bank Date: Fri, 25 Dec 2020 12:56:29 +0100 Subject: [PATCH] reorder/reformat imports --- csv23/__init__.py | 5 +++-- csv23/_common.py | 2 +- csv23/_workarounds.py | 2 +- csv23/openers.py | 8 ++++---- csv23/readers.py | 12 +++++------- csv23/shortcuts.py | 3 +-- csv23/writers.py | 12 +++++------- tests/conftest.py | 4 ++-- tests/test_init.py | 4 +++- tests/test_rowtype.py | 6 ++---- tests/test_stdlib_csv.py | 16 +++++++--------- tests/test_stdlib_truncate.py | 2 +- tests/test_writers.py | 4 ++-- 13 files changed, 37 insertions(+), 43 deletions(-) diff --git a/csv23/__init__.py b/csv23/__init__.py index 3b1747b..d90ea9e 100644 --- a/csv23/__init__.py +++ b/csv23/__init__.py @@ -12,11 +12,12 @@ unregister_dialect) from ._common import ENCODING, DIALECT, ROWTYPE +from .dialects import unix_dialect +from .extras import NamedTupleReader, NamedTupleWriter from .openers import open_reader, open_writer from .readers import reader, DictReader from .writers import writer, DictWriter -from .dialects import unix_dialect -from .extras import NamedTupleReader, NamedTupleWriter + from .shortcuts import read_csv, write_csv __all__ = ['open_csv', diff --git a/csv23/_common.py b/csv23/_common.py index 04add51..95b113c 100644 --- a/csv23/_common.py +++ b/csv23/_common.py @@ -2,9 +2,9 @@ from __future__ import unicode_literals -import sys import codecs import locale +import sys PY2 = (sys.version_info.major == 2) diff --git a/csv23/_workarounds.py b/csv23/_workarounds.py index 832c64c..78c54ff 100644 --- a/csv23/_workarounds.py +++ b/csv23/_workarounds.py @@ -1,7 +1,7 @@ # _workarounds.py -import io import csv +import io import warnings from ._common import PY2 diff --git a/csv23/openers.py b/csv23/openers.py index d3f83cf..f807ce4 100644 --- a/csv23/openers.py +++ b/csv23/openers.py @@ -4,12 +4,12 @@ from __future__ import unicode_literals -import io -import functools import contextlib +import functools +import io -from ._common import PY2, ENCODING, DIALECT, ROWTYPE -from ._common import none_encoding, is_8bit_clean +from ._common import (PY2, ENCODING, DIALECT, ROWTYPE, + none_encoding, is_8bit_clean) from ._dispatch import get_reader, get_writer __all__ = ['open_reader', 'open_writer'] diff --git a/csv23/readers.py b/csv23/readers.py index 2f78330..9191b38 100644 --- a/csv23/readers.py +++ b/csv23/readers.py @@ -4,16 +4,14 @@ import csv -__all__ = [ - 'reader', 'DictReader', - 'UnicodeTextReader', 'UnicodeBytesReader', -] - -from ._common import PY2, ENCODING, DIALECT -from ._common import none_encoding, is_8bit_clean, csv_args +from ._common import (PY2, ENCODING, DIALECT, + none_encoding, is_8bit_clean, csv_args) from ._dispatch import register_reader from ._workarounds import warn_if_issue31590 +__all__ = ['reader', 'DictReader', + 'UnicodeTextReader', 'UnicodeBytesReader'] + def reader(stream, dialect=DIALECT, encoding=False, **fmtparams): r"""CSV reader yielding lists of :func:`py:unicode` strings (PY3: :class:`py3:str`). diff --git a/csv23/shortcuts.py b/csv23/shortcuts.py index 0f5377a..f2b055b 100644 --- a/csv23/shortcuts.py +++ b/csv23/shortcuts.py @@ -8,8 +8,7 @@ from ._common import PY2 -from . import (DIALECT, - ENCODING, +from . import (DIALECT, ENCODING, reader as csv23_reader, writer as csv23_writer) diff --git a/csv23/writers.py b/csv23/writers.py index 2340f72..677d9ae 100644 --- a/csv23/writers.py +++ b/csv23/writers.py @@ -2,11 +2,11 @@ from __future__ import unicode_literals -import io import csv +import io -from ._common import PY2, ENCODING, DIALECT -from ._common import none_encoding, is_8bit_clean, csv_args +from ._common import (PY2, ENCODING, DIALECT, + none_encoding, is_8bit_clean, csv_args) from ._dispatch import register_writer from ._workarounds import has_issue12178 @@ -15,10 +15,8 @@ else: from unittest import mock -__all__ = [ - 'writer', 'DictWriter', - 'UnicodeTextWriter', 'UnicodeBytesWriter' -] +__all__ = ['writer', 'DictWriter', + 'UnicodeTextWriter', 'UnicodeBytesWriter'] def writer(stream, dialect=DIALECT, encoding=False, **fmtparams): diff --git a/tests/conftest.py b/tests/conftest.py index 57f1f54..ba728ae 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -2,9 +2,9 @@ from __future__ import unicode_literals -import sys -import locale import argparse +import locale +import sys import pytest diff --git a/tests/test_init.py b/tests/test_init.py index dd219a8..a480429 100644 --- a/tests/test_init.py +++ b/tests/test_init.py @@ -6,7 +6,9 @@ from csv23 import open_csv, iterrows -LINE, ROW = 'Wonderful Spam,Lovely Spam\r\n', ['Wonderful Spam', 'Lovely Spam'] +LINE = 'Wonderful Spam,Lovely Spam\r\n' + +ROW = ['Wonderful Spam', 'Lovely Spam'] def test_open_csv(filepath, row=ROW): diff --git a/tests/test_rowtype.py b/tests/test_rowtype.py index 6bc20e2..77aa5fc 100644 --- a/tests/test_rowtype.py +++ b/tests/test_rowtype.py @@ -8,10 +8,8 @@ from csv23.openers import open_reader, open_writer -PYTHONS = [ - 'Graham Chapman', 'John Cleese', 'Terry Gilliam', - 'Eric Idle', 'Terry Jones', 'Michael Palin' -] +PYTHONS = ['Graham Chapman', 'John Cleese', 'Terry Gilliam', + 'Eric Idle', 'Terry Jones', 'Michael Palin'] FIELDNAMES = ['first_name', 'last_name'] diff --git a/tests/test_stdlib_csv.py b/tests/test_stdlib_csv.py index 8765a70..524d5e0 100644 --- a/tests/test_stdlib_csv.py +++ b/tests/test_stdlib_csv.py @@ -1,7 +1,7 @@ # test_stdlib_csv.py - verify stdlib csv behaviour for workarounds -import io import csv +import io import pytest @@ -25,14 +25,12 @@ (csv.QUOTE_NONE, None, '\\', False), # escapes: ,\r\n\\ issue31590 ] -VALUES = [ - 'spam, eggs', - 'spam\r eggs', - 'spam\n eggs', - 'spam "spam" eggs', - '"spam spam eggs"', - 'spam\\eggs', -] +VALUES = ['spam, eggs', + 'spam\r eggs', + 'spam\n eggs', + 'spam "spam" eggs', + '"spam spam eggs"', + 'spam\\eggs'] @pytest.mark.parametrize(', '.join(FORMATS[0]), FORMATS[1:]) diff --git a/tests/test_stdlib_truncate.py b/tests/test_stdlib_truncate.py index f9e60af..bc4a331 100644 --- a/tests/test_stdlib_truncate.py +++ b/tests/test_stdlib_truncate.py @@ -10,8 +10,8 @@ from __future__ import unicode_literals -import importlib import contextlib +import importlib import pytest diff --git a/tests/test_writers.py b/tests/test_writers.py index c0d45aa..56d22a3 100644 --- a/tests/test_writers.py +++ b/tests/test_writers.py @@ -2,14 +2,14 @@ from __future__ import unicode_literals -import io import csv +import io import pytest +from csv23._common import is_8bit_clean from csv23.openers import open_writer from csv23.writers import writer, UnicodeTextWriter, UnicodeBytesWriter -from csv23._common import is_8bit_clean if not pytest.csv23.PY2: from csv23.writers import _UnicodeTextWriter