Skip to content

Commit

Permalink
Update isort settings
Browse files Browse the repository at this point in the history
  • Loading branch information
Jamim committed Aug 21, 2019
1 parent b05f347 commit c9821ec
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 19 deletions.
10 changes: 9 additions & 1 deletion .isort.cfg
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
[settings]
force_single_line=True
from_first=True

; 3 stands for Vertical Hanging Indent, e.g.
; from third_party import (
; lib1,
; lib2,
; lib3,
; )
; docs: https://github.com/timothycrosley/isort#multi-line-output-modes
multi_line_output=3
5 changes: 1 addition & 4 deletions opentelemetry-api/src/opentelemetry/loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,7 @@ def my_factory_for_t(api_type: typing.Type[T]) -> typing.Optional[T]:
means that the Python interpreter was invoked with the ``-E`` or ``-I`` flag).
"""

from typing import Callable
from typing import Optional
from typing import Type
from typing import TypeVar
from typing import Callable, Optional, Type, TypeVar
import importlib
import os
import sys
Expand Down
12 changes: 3 additions & 9 deletions opentelemetry-api/src/opentelemetry/trace/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,9 @@
"""

from contextlib import contextmanager
from typing import Callable
from typing import Dict
from typing import Iterator
from typing import Optional
from typing import Type
from typing import Union

from opentelemetry import loader
from opentelemetry import types
from typing import Callable, Dict, Iterator, Optional, Type, Union

from opentelemetry import loader, types

# TODO: quarantine
ParentSpan = Optional[Union['Span', 'SpanContext']]
Expand Down
3 changes: 1 addition & 2 deletions opentelemetry-sdk/src/opentelemetry/sdk/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

from . import trace
from . import util
from . import trace, util

__all__ = [
"trace",
Expand Down
4 changes: 1 addition & 3 deletions opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@
# limitations under the License.


from collections import OrderedDict
from collections import deque
from collections import namedtuple
from collections import OrderedDict, deque, namedtuple
from contextlib import contextmanager
import random
import threading
Expand Down

0 comments on commit c9821ec

Please sign in to comment.