Skip to content

Commit 5154805

Browse files
committed
Update the isort multi line output setting
These changes follow up the "Fix and improve tests for Python != 3.7" PR.
1 parent 96e5bc1 commit 5154805

File tree

5 files changed

+13
-12
lines changed

5 files changed

+13
-12
lines changed

.isort.cfg

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
11
[settings]
2-
force_single_line=True
32
from_first=True
3+
4+
; 3 stands for Vertical Hanging Indent, e.g.
5+
; from third_party import (
6+
; lib1,
7+
; lib2,
8+
; lib3,
9+
; )
10+
; docs: https://github.com/timothycrosley/isort#multi-line-output-modes
11+
multi_line_output=3

opentelemetry-api/src/opentelemetry/loader.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,7 @@ def my_factory_for_t(api_type: typing.Type[T]) -> typing.Optional[T]:
6161
means that the Python interpreter was invoked with the ``-E`` or ``-I`` flag).
6262
"""
6363

64-
from typing import Callable
65-
from typing import Optional
66-
from typing import Type
67-
from typing import TypeVar
64+
from typing import Callable, Optional, Type, TypeVar
6865
import importlib
6966
import os
7067
import sys

opentelemetry-api/src/opentelemetry/trace/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@
6464
from contextlib import contextmanager
6565
import typing
6666

67-
from opentelemetry import loader
68-
from opentelemetry import types
67+
from opentelemetry import loader, types
6968

7069
# TODO: quarantine
7170
ParentSpan = typing.Optional[typing.Union['Span', 'SpanContext']]

opentelemetry-sdk/src/opentelemetry/sdk/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
from . import trace
16-
from . import util
15+
from . import trace, util
1716

1817
__all__ = [
1918
"trace",

opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@
1313
# limitations under the License.
1414

1515

16-
from collections import OrderedDict
17-
from collections import deque
18-
from collections import namedtuple
16+
from collections import OrderedDict, deque, namedtuple
1917
from contextlib import contextmanager
2018
import random
2119
import threading

0 commit comments

Comments
 (0)