summaryrefslogtreecommitdiff
path: root/pint
diff options
context:
space:
mode:
authorGuido Imperiale <crusaderky@gmail.com>2019-12-13 11:53:11 +0000
committerGuido Imperiale <crusaderky@gmail.com>2019-12-13 11:53:11 +0000
commit5548f5ef543546a66863afc7adc4a6bef815722d (patch)
tree097043f912beb732c6086fb540491526bc052c63 /pint
parent32f43110f107264d86ba630b8ec7b104abe8647c (diff)
downloadpint-5548f5ef543546a66863afc7adc4a6bef815722d.tar.gz
isort
Diffstat (limited to 'pint')
-rw-r--r--pint/__init__.py9
-rw-r--r--pint/compat.py2
-rw-r--r--pint/context.py2
-rw-r--r--pint/definitions.py4
-rw-r--r--pint/formatting.py2
-rw-r--r--pint/numpy_func.py4
-rw-r--r--pint/pint_eval.py1
-rw-r--r--pint/quantity.py50
-rw-r--r--pint/registry.py62
-rw-r--r--pint/registry_helpers.py2
-rw-r--r--pint/systems.py9
-rw-r--r--pint/testsuite/__init__.py8
-rw-r--r--pint/testsuite/helpers.py6
-rw-r--r--pint/testsuite/parameterized.py3
-rw-r--r--pint/testsuite/test_application_registry.py1
-rw-r--r--pint/testsuite/test_babel.py5
-rw-r--r--pint/testsuite/test_contexts.py4
-rw-r--r--pint/testsuite/test_converters.py4
-rw-r--r--pint/testsuite/test_definitions.py9
-rw-r--r--pint/testsuite/test_errors.py2
-rw-r--r--pint/testsuite/test_issues.py7
-rw-r--r--pint/testsuite/test_numpy_func.py10
-rw-r--r--pint/testsuite/test_quantity.py4
-rw-r--r--pint/testsuite/test_unit.py6
-rw-r--r--pint/testsuite/test_util.py15
-rw-r--r--pint/unit.py5
-rw-r--r--pint/util.py8
27 files changed, 118 insertions, 126 deletions
diff --git a/pint/__init__.py b/pint/__init__.py
index 4f525c7..b3d4393 100644
--- a/pint/__init__.py
+++ b/pint/__init__.py
@@ -12,6 +12,8 @@
:license: BSD, see LICENSE for more details.
"""
+import sys
+
import pkg_resources
from .context import Context
@@ -26,12 +28,9 @@ from .errors import (
from .formatting import formatter
from .measurement import Measurement
from .quantity import Quantity
-from .registry import UnitRegistry, LazyRegistry
+from .registry import LazyRegistry, UnitRegistry
from .unit import Unit
-from .util import pi_theorem, logger
-
-
-import sys
+from .util import logger, pi_theorem
try:
from pintpandas import PintArray, PintType
diff --git a/pint/compat.py b/pint/compat.py
index 4c20d3e..93d1a65 100644
--- a/pint/compat.py
+++ b/pint/compat.py
@@ -9,9 +9,9 @@
:license: BSD, see LICENSE for more details.
"""
import tokenize
+from decimal import Decimal
from io import BytesIO
from numbers import Number
-from decimal import Decimal
def tokenizer(input_string):
diff --git a/pint/context.py b/pint/context.py
index 777affb..e4fff6a 100644
--- a/pint/context.py
+++ b/pint/context.py
@@ -13,8 +13,8 @@ import re
import weakref
from collections import ChainMap, defaultdict
-from .util import ParserHelper, to_units_container, SourceIterator
from .errors import DefinitionSyntaxError
+from .util import ParserHelper, SourceIterator, to_units_container
#: Regex to match the header parts of a context.
_header_re = re.compile(
diff --git a/pint/definitions.py b/pint/definitions.py
index e6ad101..7cd4799 100644
--- a/pint/definitions.py
+++ b/pint/definitions.py
@@ -9,8 +9,8 @@
:license: BSD, see LICENSE for more details.
"""
-from .converters import ScaleConverter, OffsetConverter
-from .util import UnitsContainer, _is_dim, ParserHelper
+from .converters import OffsetConverter, ScaleConverter
+from .util import ParserHelper, UnitsContainer, _is_dim
class Definition:
diff --git a/pint/formatting.py b/pint/formatting.py
index 75f374e..224e0a2 100644
--- a/pint/formatting.py
+++ b/pint/formatting.py
@@ -11,7 +11,7 @@
import re
-from .babel_names import _babel_units, _babel_lengths
+from .babel_names import _babel_lengths, _babel_units
from .compat import Loc
__JOIN_REG_EXP = re.compile(r"\{\d*\}")
diff --git a/pint/numpy_func.py b/pint/numpy_func.py
index 9ebb4df..6025e27 100644
--- a/pint/numpy_func.py
+++ b/pint/numpy_func.py
@@ -7,11 +7,11 @@
:license: BSD, see LICENSE for more details.
"""
+import warnings
from inspect import signature
from itertools import chain
-import warnings
-from .compat import is_upcast_type, np, eq
+from .compat import eq, is_upcast_type, np
from .errors import DimensionalityError
from .util import iterable, sized
diff --git a/pint/pint_eval.py b/pint/pint_eval.py
index 2c2e02e..f768d6c 100644
--- a/pint/pint_eval.py
+++ b/pint/pint_eval.py
@@ -10,7 +10,6 @@
"""
import operator
-
import token as tokenlib
from .errors import DefinitionSyntaxError
diff --git a/pint/quantity.py b/pint/quantity.py
index 4d345b4..3561e07 100644
--- a/pint/quantity.py
+++ b/pint/quantity.py
@@ -21,38 +21,30 @@ import warnings
from pkg_resources.extern.packaging import version
-from .formatting import (
- remove_custom_flags,
- siunitx_format_unit,
- ndarray_to_latex,
- ndarray_to_latex_parts,
+from .compat import SKIP_ARRAY_FUNCTION_CHANGE_WARNING # noqa: F401
+from .compat import (
+ NUMPY_VER,
+ BehaviorChangeWarning,
+ Loc,
+ _to_magnitude,
+ array_function_change_msg,
+ eq,
+ is_upcast_type,
+ ndarray,
+ np,
)
+from .definitions import UnitDefinition
from .errors import (
DimensionalityError,
OffsetUnitCalculusError,
PintTypeError,
UnitStrippedWarning,
)
-from .definitions import UnitDefinition
-from .compat import (
- Loc,
- NUMPY_VER,
- BehaviorChangeWarning,
- ndarray,
- np,
- _to_magnitude,
- is_upcast_type,
- eq,
- array_function_change_msg,
-)
-from .compat import SKIP_ARRAY_FUNCTION_CHANGE_WARNING # noqa: F401
-from .util import (
- PrettyIPython,
- logger,
- UnitsContainer,
- SharedRegistryObject,
- to_units_container,
- infer_base_unit,
+from .formatting import (
+ ndarray_to_latex,
+ ndarray_to_latex_parts,
+ remove_custom_flags,
+ siunitx_format_unit,
)
from .numpy_func import (
HANDLED_UFUNCS,
@@ -64,6 +56,14 @@ from .numpy_func import (
op_units_output_ufuncs,
set_units_ufuncs,
)
+from .util import (
+ PrettyIPython,
+ SharedRegistryObject,
+ UnitsContainer,
+ infer_base_unit,
+ logger,
+ to_units_container,
+)
class _Exception(Exception): # pragma: no cover
diff --git a/pint/registry.py b/pint/registry.py
index d420102..68a17f8 100644
--- a/pint/registry.py
+++ b/pint/registry.py
@@ -33,54 +33,52 @@
"""
import copy
-import os
-import re
-import math
import functools
import itertools
-import pkg_resources
+import math
+import os
+import re
+from collections import defaultdict
+from contextlib import closing, contextmanager
from decimal import Decimal
from fractions import Fraction
-from contextlib import contextmanager, closing
-from io import open, StringIO
-from collections import defaultdict
-from tokenize import NUMBER, NAME
+from io import StringIO, open
+from tokenize import NAME, NUMBER
-from . import registry_helpers
-from .context import Context, ContextChain
-from .util import (
- getattr_maybe_raise,
- logger,
- pi_theorem,
- solve_dependencies,
- ParserHelper,
- string_preprocessor,
- find_connected_nodes,
- find_shortest_path,
- UnitsContainer,
- _is_dim,
- to_units_container,
- SourceIterator,
-)
+import pkg_resources
+from . import registry_helpers, systems
from .compat import tokenizer
+from .context import Context, ContextChain
+from .converters import ScaleConverter
from .definitions import (
+ AliasDefinition,
Definition,
- UnitDefinition,
- PrefixDefinition,
DimensionDefinition,
- AliasDefinition,
+ PrefixDefinition,
+ UnitDefinition,
)
-from .converters import ScaleConverter
from .errors import (
- DimensionalityError,
- UndefinedUnitError,
DefinitionSyntaxError,
+ DimensionalityError,
RedefinitionError,
+ UndefinedUnitError,
)
-
from .pint_eval import build_eval_tree
-from . import systems
+from .util import (
+ ParserHelper,
+ SourceIterator,
+ UnitsContainer,
+ _is_dim,
+ find_connected_nodes,
+ find_shortest_path,
+ getattr_maybe_raise,
+ logger,
+ pi_theorem,
+ solve_dependencies,
+ string_preprocessor,
+ to_units_container,
+)
_BLOCK_RE = re.compile(r" |\(")
diff --git a/pint/registry_helpers.py b/pint/registry_helpers.py
index 9fd3f75..db2ba91 100644
--- a/pint/registry_helpers.py
+++ b/pint/registry_helpers.py
@@ -14,7 +14,7 @@ from inspect import signature
from itertools import zip_longest
from .errors import DimensionalityError
-from .util import to_units_container, UnitsContainer
+from .util import UnitsContainer, to_units_container
def _replace_units(original_units, values_by_name):
diff --git a/pint/systems.py b/pint/systems.py
index 4ae8360..134f570 100644
--- a/pint/systems.py
+++ b/pint/systems.py
@@ -11,17 +11,18 @@
import re
+from pint.compat import Loc
+
+from .babel_names import _babel_systems
from .definitions import Definition, UnitDefinition
from .errors import DefinitionSyntaxError, RedefinitionError
from .util import (
- to_units_container,
- getattr_maybe_raise,
SharedRegistryObject,
SourceIterator,
+ getattr_maybe_raise,
logger,
+ to_units_container,
)
-from .babel_names import _babel_systems
-from pint.compat import Loc
class Group(SharedRegistryObject):
diff --git a/pint/testsuite/__init__.py b/pint/testsuite/__init__.py
index ffcfbf1..1d09c7f 100644
--- a/pint/testsuite/__init__.py
+++ b/pint/testsuite/__init__.py
@@ -2,16 +2,15 @@
import doctest
import logging
+import math
import os
import unittest
-
from contextlib import contextmanager
+from logging.handlers import BufferingHandler
+from pint import Quantity, UnitRegistry, logger
from pint.compat import ndarray, np
-
-from pint import logger, UnitRegistry, Quantity
from pint.testsuite.helpers import PintOutputChecker
-from logging.handlers import BufferingHandler
class TestHandler(BufferingHandler):
@@ -155,7 +154,6 @@ def run():
return test_runner.run(testsuite())
-import math
_GLOBS = {
"wrapping.rst": {
diff --git a/pint/testsuite/helpers.py b/pint/testsuite/helpers.py
index a6cb78c..952f059 100644
--- a/pint/testsuite/helpers.py
+++ b/pint/testsuite/helpers.py
@@ -1,15 +1,15 @@
# -*- coding: utf-8 -*-
import doctest
-from distutils.version import StrictVersion
import re
import unittest
+from distutils.version import StrictVersion
from ..compat import (
- HAS_NUMPY,
HAS_BABEL,
- HAS_UNCERTAINTIES,
+ HAS_NUMPY,
HAS_NUMPY_ARRAY_FUNCTION,
+ HAS_UNCERTAINTIES,
NUMPY_VER,
)
diff --git a/pint/testsuite/parameterized.py b/pint/testsuite/parameterized.py
index 2396105..366b4be 100644
--- a/pint/testsuite/parameterized.py
+++ b/pint/testsuite/parameterized.py
@@ -23,11 +23,10 @@
# def test_eval(self, input, expected_output):
# self.assertEqual(eval(input), expected_output)
+import unittest
from collections.abc import Callable
from functools import wraps
-import unittest
-
def augment_method_docstring(
method, new_class_dict, classname, param_names, param_values, new_method
diff --git a/pint/testsuite/test_application_registry.py b/pint/testsuite/test_application_registry.py
index b0f77eb..923304c 100644
--- a/pint/testsuite/test_application_registry.py
+++ b/pint/testsuite/test_application_registry.py
@@ -11,7 +11,6 @@ from pint import (
get_application_registry,
set_application_registry,
)
-
from pint.testsuite import BaseTestCase
from pint.testsuite.helpers import requires_uncertainties
diff --git a/pint/testsuite/test_babel.py b/pint/testsuite/test_babel.py
index 2210fe7..e85ec40 100644
--- a/pint/testsuite/test_babel.py
+++ b/pint/testsuite/test_babel.py
@@ -1,9 +1,10 @@
# -*- coding: utf-8 -*-
-from pint.testsuite import helpers, BaseTestCase
-from pint import UnitRegistry
import os
+from pint import UnitRegistry
+from pint.testsuite import BaseTestCase, helpers
+
class TestBabel(BaseTestCase):
@helpers.requires_babel()
diff --git a/pint/testsuite/test_contexts.py b/pint/testsuite/test_contexts.py
index 1bdf3ed..80103d0 100644
--- a/pint/testsuite/test_contexts.py
+++ b/pint/testsuite/test_contexts.py
@@ -3,10 +3,10 @@
import itertools
from collections import defaultdict
-from pint import UnitRegistry, DefinitionSyntaxError, DimensionalityError
+from pint import DefinitionSyntaxError, DimensionalityError, UnitRegistry
from pint.context import Context
-from pint.util import UnitsContainer
from pint.testsuite import QuantityTestCase
+from pint.util import UnitsContainer
def add_ctxs(ureg):
diff --git a/pint/testsuite/test_converters.py b/pint/testsuite/test_converters.py
index 7fadc00..53d37b5 100644
--- a/pint/testsuite/test_converters.py
+++ b/pint/testsuite/test_converters.py
@@ -3,8 +3,8 @@
import itertools
from pint.compat import np
-from pint.converters import ScaleConverter, OffsetConverter, Converter
-from pint.testsuite import helpers, BaseTestCase
+from pint.converters import Converter, OffsetConverter, ScaleConverter
+from pint.testsuite import BaseTestCase, helpers
class TestConverter(BaseTestCase):
diff --git a/pint/testsuite/test_definitions.py b/pint/testsuite/test_definitions.py
index 8f30a45..25197a8 100644
--- a/pint/testsuite/test_definitions.py
+++ b/pint/testsuite/test_definitions.py
@@ -1,16 +1,15 @@
# -*- coding: utf-8 -*-
-from pint.util import UnitsContainer
-from pint.converters import ScaleConverter, OffsetConverter
+from pint.converters import OffsetConverter, ScaleConverter
from pint.definitions import (
+ AliasDefinition,
Definition,
+ DimensionDefinition,
PrefixDefinition,
UnitDefinition,
- DimensionDefinition,
- AliasDefinition,
)
-
from pint.testsuite import BaseTestCase
+from pint.util import UnitsContainer
class TestDefinition(BaseTestCase):
diff --git a/pint/testsuite/test_errors.py b/pint/testsuite/test_errors.py
index 56ae752..920ed2e 100644
--- a/pint/testsuite/test_errors.py
+++ b/pint/testsuite/test_errors.py
@@ -5,8 +5,8 @@ import pickle
from pint import (
DefinitionSyntaxError,
DimensionalityError,
- Quantity,
OffsetUnitCalculusError,
+ Quantity,
RedefinitionError,
UndefinedUnitError,
UnitRegistry,
diff --git a/pint/testsuite/test_issues.py b/pint/testsuite/test_issues.py
index b61abf5..4913b01 100644
--- a/pint/testsuite/test_issues.py
+++ b/pint/testsuite/test_issues.py
@@ -2,15 +2,14 @@
import copy
import math
-import unittest
import pprint
+import unittest
from pint import DimensionalityError, UnitRegistry
-from pint.unit import UnitsContainer
-from pint.util import ParserHelper
-
from pint.compat import np
from pint.testsuite import QuantityTestCase, helpers
+from pint.unit import UnitsContainer
+from pint.util import ParserHelper
class TestIssues(QuantityTestCase):
diff --git a/pint/testsuite/test_numpy_func.py b/pint/testsuite/test_numpy_func.py
index 573f6a4..262a2dd 100644
--- a/pint/testsuite/test_numpy_func.py
+++ b/pint/testsuite/test_numpy_func.py
@@ -1,21 +1,21 @@
# -*- coding: utf-8 -*-
-import pint.numpy_func
+from unittest.mock import patch
+import pint.numpy_func
from pint import DimensionalityError, OffsetUnitCalculusError
from pint.compat import np
-from pint.testsuite.test_numpy import TestNumpyMethods
from pint.numpy_func import (
+ _get_first_input_units,
_is_quantity,
_is_quantity_sequence,
- _get_first_input_units,
convert_to_consistent_units,
- unwrap_and_wrap_consistent_units,
get_op_output_unit,
implements,
numpy_wrap,
+ unwrap_and_wrap_consistent_units,
)
-from unittest.mock import patch
+from pint.testsuite.test_numpy import TestNumpyMethods
class TestNumPyFuncUtils(TestNumpyMethods):
diff --git a/pint/testsuite/test_quantity.py b/pint/testsuite/test_quantity.py
index 3433cad..070d7f0 100644
--- a/pint/testsuite/test_quantity.py
+++ b/pint/testsuite/test_quantity.py
@@ -5,13 +5,13 @@ import datetime
import math
import operator as op
import warnings
+from unittest.mock import patch
from pint import DimensionalityError, OffsetUnitCalculusError, UnitRegistry
-from pint.unit import UnitsContainer
from pint.compat import BehaviorChangeWarning, np
from pint.testsuite import QuantityTestCase, helpers
from pint.testsuite.parameterized import ParameterizedTestCase
-from unittest.mock import patch
+from pint.unit import UnitsContainer
class TestQuantity(QuantityTestCase):
diff --git a/pint/testsuite/test_unit.py b/pint/testsuite/test_unit.py
index e1bcf57..6327143 100644
--- a/pint/testsuite/test_unit.py
+++ b/pint/testsuite/test_unit.py
@@ -5,17 +5,17 @@ import functools
import math
import re
-from pint.compat import np
-from pint.registry import UnitRegistry, LazyRegistry
from pint import (
DefinitionSyntaxError,
DimensionalityError,
RedefinitionError,
UndefinedUnitError,
)
+from pint.compat import np
+from pint.registry import LazyRegistry, UnitRegistry
from pint.testsuite import QuantityTestCase, helpers
from pint.testsuite.parameterized import ParameterizedTestCase
-from pint.util import UnitsContainer, ParserHelper
+from pint.util import ParserHelper, UnitsContainer
class TestUnit(QuantityTestCase):
diff --git a/pint/testsuite/test_util.py b/pint/testsuite/test_util.py
index 2d2ccd1..29848d3 100644
--- a/pint/testsuite/test_util.py
+++ b/pint/testsuite/test_util.py
@@ -4,19 +4,20 @@ import collections
import copy
import operator as op
from decimal import Decimal
+
from pint.testsuite import BaseTestCase, QuantityTestCase
from pint.util import (
- string_preprocessor,
- find_shortest_path,
- matrix_to_string,
- transpose,
- tokenizer,
- find_connected_nodes,
ParserHelper,
UnitsContainer,
- to_units_container,
+ find_connected_nodes,
+ find_shortest_path,
iterable,
+ matrix_to_string,
sized,
+ string_preprocessor,
+ to_units_container,
+ tokenizer,
+ transpose,
)
diff --git a/pint/unit.py b/pint/unit.py
index f96e549..733208d 100644
--- a/pint/unit.py
+++ b/pint/unit.py
@@ -14,11 +14,10 @@ import locale
import operator
from numbers import Number
-from .util import PrettyIPython, UnitsContainer, SharedRegistryObject
-
from .compat import NUMERIC_TYPES
-from .formatting import siunitx_format_unit
from .definitions import UnitDefinition
+from .formatting import siunitx_format_unit
+from .util import PrettyIPython, SharedRegistryObject, UnitsContainer
class Unit(PrettyIPython, SharedRegistryObject):
diff --git a/pint/util.py b/pint/util.py
index 7175a03..ca0f011 100644
--- a/pint/util.py
+++ b/pint/util.py
@@ -10,20 +10,20 @@
"""
import logging
-from logging import NullHandler
import operator
import re
from collections.abc import Mapping
from decimal import Decimal
-from numbers import Number
from fractions import Fraction
from functools import lru_cache
+from logging import NullHandler
+from numbers import Number
from token import NAME, NUMBER
-from .compat import tokenizer, NUMERIC_TYPES
+from .compat import NUMERIC_TYPES, tokenizer
+from .errors import DefinitionSyntaxError
from .formatting import format_unit
from .pint_eval import build_eval_tree
-from .errors import DefinitionSyntaxError
logger = logging.getLogger(__name__)
logger.addHandler(NullHandler())