Skip to content

Isort io and compat dirs #23534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 7, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions pandas/compat/numpy/function.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,13 @@
"""

from numpy import ndarray
from pandas.util._validators import (validate_args, validate_kwargs,
validate_args_and_kwargs)
from pandas.errors import UnsupportedFunctionCall
from pandas.core.dtypes.common import is_integer, is_bool

from pandas.compat import OrderedDict
from pandas.errors import UnsupportedFunctionCall
from pandas.util._validators import (
validate_args, validate_args_and_kwargs, validate_kwargs)

from pandas.core.dtypes.common import is_bool, is_integer


class CompatValidator(object):
Expand Down
10 changes: 6 additions & 4 deletions pandas/compat/pickle_compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
Support pre-0.12 series pickle compatibility.
"""

import sys
import pandas # noqa
import copy
import pickle as pkl
from pandas import compat, Index
from pandas.compat import u, string_types # noqa
import sys

from pandas.compat import string_types, u # noqa

import pandas # noqa
from pandas import Index, compat


def load_reduce(self):
Expand Down
4 changes: 3 additions & 1 deletion pandas/io/clipboard/clipboards.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import subprocess
from .exceptions import PyperclipException

from pandas.compat import PY2, text_type

from .exceptions import PyperclipException

EXCEPT_MSG = """
Pyperclip could not find a copy/paste mechanism for your system.
For more information, please visit https://pyperclip.readthedocs.org """
Expand Down
5 changes: 3 additions & 2 deletions pandas/io/clipboard/windows.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
"""
This module implements clipboard handling on Windows using ctypes.
"""
import time
import contextlib
import ctypes
from ctypes import c_size_t, sizeof, c_wchar_p, get_errno, c_wchar
from ctypes import c_size_t, c_wchar, c_wchar_p, get_errno, sizeof
import time

from .exceptions import PyperclipWindowsException


Expand Down
3 changes: 2 additions & 1 deletion pandas/io/formats/console.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
Internal module for console introspection
"""

import sys
import locale
import sys

from pandas.io.formats.terminal import get_terminal_size

# -----------------------------------------------------------------------------
Expand Down
19 changes: 7 additions & 12 deletions pandas/io/formats/csvs.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,24 @@

from __future__ import print_function

import warnings

import csv as csvlib
import os
import warnings
from zipfile import ZipFile

import numpy as np
import os

from pandas._libs import writers as libwriters

from pandas import compat
from pandas.compat import StringIO, range, zip

from pandas.core.dtypes.missing import notna
from pandas.core.dtypes.generic import (
ABCMultiIndex, ABCPeriodIndex, ABCDatetimeIndex, ABCIndexClass)
ABCDatetimeIndex, ABCIndexClass, ABCMultiIndex, ABCPeriodIndex)
from pandas.core.dtypes.missing import notna

from pandas import compat

from pandas.io.common import (
_get_handle,
_infer_compression,
get_filepath_or_buffer,
UnicodeWriter,
)
UnicodeWriter, _get_handle, _infer_compression, get_filepath_or_buffer)


class CSVFormatter(object):
Expand Down
9 changes: 5 additions & 4 deletions pandas/io/formats/excel.py
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
"""Utilities for conversion to writer-agnostic Excel representation
"""

import itertools
import re
import warnings
import itertools

import numpy as np

from pandas.compat import reduce
import pandas.core.common as com

from pandas.core.dtypes.common import is_float, is_scalar
from pandas.core.dtypes import missing
from pandas.core.dtypes.common import is_float, is_scalar
from pandas.core.dtypes.generic import ABCMultiIndex, ABCPeriodIndex

from pandas import Index
import pandas.core.common as com

from pandas.io.formats.css import CSSResolver, CSSWarning
from pandas.io.formats.printing import pprint_thing
from pandas.io.formats.format import get_level_lengths
from pandas.io.formats.printing import pprint_thing


class ExcelCell(object):
Expand Down
36 changes: 14 additions & 22 deletions pandas/io/formats/format.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,45 +5,37 @@
"""

from __future__ import print_function
# pylint: disable=W0141

from functools import partial

import numpy as np

from pandas._libs import lib
from pandas._libs.tslibs import NaT, iNaT, Timestamp, Timedelta
from pandas._libs.tslib import format_array_from_datetime
from pandas._libs.tslibs import NaT, Timedelta, Timestamp, iNaT
from pandas.compat import StringIO, lzip, map, u, zip

from pandas import compat
from pandas.compat import StringIO, lzip, map, zip, u

from pandas.core.dtypes.missing import isna, notna
from pandas.core.dtypes.common import (
is_categorical_dtype,
is_float_dtype,
is_period_arraylike,
is_integer_dtype,
is_interval_dtype,
is_datetimetz,
is_integer,
is_float,
is_scalar,
is_numeric_dtype,
is_datetime64_dtype,
is_timedelta64_dtype,
is_list_like)
from pandas.core.dtypes.generic import ABCSparseArray, ABCMultiIndex
is_categorical_dtype, is_datetime64_dtype, is_datetimetz, is_float,
is_float_dtype, is_integer, is_integer_dtype, is_interval_dtype,
is_list_like, is_numeric_dtype, is_period_arraylike, is_scalar,
is_timedelta64_dtype)
from pandas.core.dtypes.generic import ABCMultiIndex, ABCSparseArray
from pandas.core.dtypes.missing import isna, notna

from pandas import compat
from pandas.core.base import PandasObject
import pandas.core.common as com
from pandas.core.index import Index, ensure_index
from pandas.core.config import get_option, set_option
from pandas.core.index import Index, ensure_index
from pandas.core.indexes.datetimes import DatetimeIndex
from pandas.core.indexes.period import PeriodIndex

from pandas.io.formats.terminal import get_terminal_size
from pandas.io.common import _expand_user, _stringify_path
from pandas.io.formats.printing import adjoin, justify, pprint_thing
from pandas.io.formats.terminal import get_terminal_size

# pylint: disable=W0141


common_docstring = """
Expand Down
15 changes: 7 additions & 8 deletions pandas/io/formats/html.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,21 @@
"""

from __future__ import print_function
from distutils.version import LooseVersion

from distutils.version import LooseVersion
from textwrap import dedent

from pandas import compat
from pandas.compat import (lzip, range, map, zip, u,
OrderedDict, unichr)
from pandas.compat import OrderedDict, lzip, map, range, u, unichr, zip

import pandas.core.common as com
from pandas.core.dtypes.generic import ABCMultiIndex

from pandas import compat
import pandas.core.common as com
from pandas.core.config import get_option

from pandas.io.formats.format import (
TableFormatter, buffer_put_lines, get_level_lengths)
from pandas.io.formats.printing import pprint_thing
from pandas.io.formats.format import (get_level_lengths,
buffer_put_lines)
from pandas.io.formats.format import TableFormatter


class HTMLFormatter(TableFormatter):
Expand Down
5 changes: 3 additions & 2 deletions pandas/io/formats/latex.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@

import numpy as np

from pandas import compat
from pandas.compat import range, map, zip, u
from pandas.compat import map, range, u, zip

from pandas.core.dtypes.generic import ABCMultiIndex

from pandas import compat

from pandas.io.formats.format import TableFormatter


Expand Down
5 changes: 4 additions & 1 deletion pandas/io/formats/printing.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@
"""

import sys

from pandas.compat import u

from pandas.core.dtypes.inference import is_sequence

from pandas import compat
from pandas.compat import u
from pandas.core.config import get_option


Expand Down
33 changes: 18 additions & 15 deletions pandas/io/formats/style.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,27 @@
Module for applying conditional formatting to
DataFrames and Series.
"""
from collections import MutableMapping, defaultdict
from contextlib import contextmanager
import copy
from functools import partial
from itertools import product
from contextlib import contextmanager
from uuid import uuid1
import copy
from collections import defaultdict, MutableMapping

import numpy as np

from pandas.compat import range
from pandas.util._decorators import Appender

from pandas.core.dtypes.common import is_float, is_string_like
from pandas.core.dtypes.generic import ABCSeries

import pandas as pd
from pandas.api.types import is_list_like
import pandas.core.common as com
from pandas.core.config import get_option
from pandas.core.generic import _shared_docs
from pandas.core.indexing import _maybe_numeric_slice, _non_reducing_slice

try:
from jinja2 import (
Expand All @@ -18,18 +33,6 @@
"Please install with `conda install Jinja2`\n"
"or `pip install Jinja2`")

from pandas.core.dtypes.common import is_float, is_string_like

import numpy as np
import pandas as pd
from pandas.api.types import is_list_like
from pandas.compat import range
from pandas.core.config import get_option
from pandas.core.generic import _shared_docs
import pandas.core.common as com
from pandas.core.indexing import _maybe_numeric_slice, _non_reducing_slice
from pandas.util._decorators import Appender
from pandas.core.dtypes.generic import ABCSeries

try:
import matplotlib.pyplot as plt
Expand Down
2 changes: 1 addition & 1 deletion pandas/io/formats/terminal.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

import os
import shutil
from pandas.compat import PY3

from pandas.compat import PY3

__all__ = ['get_terminal_size', 'is_terminal']

Expand Down
20 changes: 12 additions & 8 deletions pandas/io/json/json.py
Original file line number Diff line number Diff line change
@@ -1,23 +1,27 @@
# pylint: disable-msg=E1101,W0613,W0603
from itertools import islice
import os

import numpy as np

import pandas._libs.json as json
from pandas._libs.tslibs import iNaT
from pandas.compat import StringIO, long, u, to_str
from pandas import compat, isna
from pandas import Series, DataFrame, to_datetime, MultiIndex
from pandas.io.common import (get_filepath_or_buffer, _get_handle,
_infer_compression, _stringify_path,
BaseIterator)
from pandas.io.parsers import _validate_integer
from pandas.compat import StringIO, long, to_str, u

from pandas.core.dtypes.common import is_period_dtype

from pandas import DataFrame, MultiIndex, Series, compat, isna, to_datetime
import pandas.core.common as com
from pandas.core.reshape.concat import concat

from pandas.io.common import (
BaseIterator, _get_handle, _infer_compression, _stringify_path,
get_filepath_or_buffer)
from pandas.io.formats.printing import pprint_thing
from pandas.io.parsers import _validate_integer

from .normalize import _convert_to_line_delimits
from .table_schema import build_table_schema, parse_table_schema
from pandas.core.dtypes.common import is_period_dtype

loads = json.loads
dumps = json.dumps
Expand Down
6 changes: 4 additions & 2 deletions pandas/io/json/normalize.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
# ---------------------------------------------------------------------
# JSON normalization routines

import copy
from collections import defaultdict
import copy

import numpy as np

from pandas._libs.writers import convert_json_to_lines
from pandas import compat, DataFrame

from pandas import DataFrame, compat


def _convert_to_line_delimits(s):
Expand Down
11 changes: 6 additions & 5 deletions pandas/io/json/table_schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@
import warnings

import pandas._libs.json as json

from pandas.core.dtypes.common import (
is_bool_dtype, is_categorical_dtype, is_datetime64_dtype,
is_datetime64tz_dtype, is_integer_dtype, is_numeric_dtype, is_period_dtype,
is_string_dtype, is_timedelta64_dtype)

from pandas import DataFrame
from pandas.api.types import CategoricalDtype
import pandas.core.common as com
from pandas.core.dtypes.common import (
is_integer_dtype, is_timedelta64_dtype, is_numeric_dtype,
is_bool_dtype, is_datetime64_dtype, is_datetime64tz_dtype,
is_categorical_dtype, is_period_dtype, is_string_dtype
)

loads = json.loads

Expand Down
Loading