Skip to content

Commit

Permalink
linting: organize imports
Browse files Browse the repository at this point in the history
Order imports: standard libraries followed by external libraries
followed by local imports

Signed-off-by: Bastian Stender <[email protected]>
  • Loading branch information
Bastian-Krause committed Jun 4, 2018
1 parent 0e12f84 commit c7cefc2
Show file tree
Hide file tree
Showing 29 changed files with 34 additions and 41 deletions.
2 changes: 1 addition & 1 deletion examples/hawkbit/test_hawkbit.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import pytest
import time
import pytest

from labgrid.external import HawkbitTestClient

Expand Down
3 changes: 2 additions & 1 deletion examples/library/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@
"""Power-cycle a target until the /dev/nand0 device is missing."""

import sys
import logging

from labgrid import Environment, StepReporter
from labgrid.strategy.bareboxstrategy import Status


# enable debug logging
import logging
logging.basicConfig(
level=logging.DEBUG,
format='%(levelname)7s: %(message)s',
Expand Down
4 changes: 2 additions & 2 deletions labgrid/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
This class encapsulates access functions to the environment configuration
"""
import attr
import os
from yaml import YAMLError
import attr

from .exceptions import NoConfigFoundError, InvalidConfigError
from .util.yaml import load, resolve_templates
from yaml import YAMLError

@attr.s(cmp=False)
class Config:
Expand Down
2 changes: 1 addition & 1 deletion labgrid/consoleloggingreporter.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import os
import sys
from datetime import datetime

from .step import steps
from datetime import datetime


class ConsoleLoggingReporter:
Expand Down
2 changes: 1 addition & 1 deletion labgrid/driver/common.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import attr
import subprocess
import attr

from ..binding import BindingError, BindingMixin
from .exception import ExecutionError
Expand Down
2 changes: 1 addition & 1 deletion labgrid/driver/fastbootdriver.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# pylint: disable=no-member
import attr
import subprocess
import os.path
import attr

from ..factory import target_factory
from ..resource.remote import NetworkAndroidFastboot
Expand Down
1 change: 0 additions & 1 deletion labgrid/driver/modbusdriver.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from importlib import import_module

import attr

from ..factory import target_factory
Expand Down
2 changes: 1 addition & 1 deletion labgrid/driver/networkusbstoragedriver.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# pylint: disable=no-member
import attr
import logging
import subprocess
import os
import attr

from ..factory import target_factory
from ..resource.udev import USBMassStorage, USBSDMuxDevice
Expand Down
2 changes: 1 addition & 1 deletion labgrid/driver/openocddriver.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# pylint: disable=no-member
import attr
import subprocess
import os.path
import attr

from ..factory import target_factory
from ..protocol import BootstrapProtocol
Expand Down
4 changes: 2 additions & 2 deletions labgrid/driver/power/gude.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from ..exception import ExecutionError

import requests

from ..exception import ExecutionError


def power_set(host, index, value):
index = int(index)
Expand Down
3 changes: 2 additions & 1 deletion labgrid/driver/power/gude24.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import requests

from ..exception import ExecutionError

import requests

# This driver implements a power port for Gude Power Switches with up to
# 24 ports.
Expand Down
2 changes: 1 addition & 1 deletion labgrid/driver/quartushpsdriver.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# pylint: disable=no-member
import attr
import subprocess
import os.path
import re
import attr

from ..factory import target_factory
from ..resource.remote import NetworkAlteraUSBBlaster
Expand Down
5 changes: 1 addition & 4 deletions labgrid/driver/shelldriver.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,10 @@
import io
import logging
import re
import time
import shlex

import attr
from pexpect import TIMEOUT

import time

import xmodem

from ..factory import target_factory
Expand Down
2 changes: 1 addition & 1 deletion labgrid/driver/usbloader.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# pylint: disable=no-member
import attr
import subprocess
import os.path
import attr

from ..factory import target_factory
from ..protocol import BootstrapProtocol
Expand Down
2 changes: 1 addition & 1 deletion labgrid/driver/usbsdmuxdriver.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# pylint: disable=no-member
import attr
import subprocess
import attr

from .common import Driver
from ..factory import target_factory
Expand Down
2 changes: 1 addition & 1 deletion labgrid/driver/usbstorage.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# pylint: disable=no-member
import logging
import attr
import os
from time import time
import attr

from ..factory import target_factory
from ..resource.udev import USBMassStorage, USBSDMuxDevice
Expand Down
2 changes: 1 addition & 1 deletion labgrid/driver/usbtmcdriver.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# pylint: disable=no-member
import attr
from importlib import import_module
from decimal import Decimal
import attr

from .common import Driver
from ..factory import target_factory
Expand Down
2 changes: 1 addition & 1 deletion labgrid/driver/usbvideodriver.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# pylint: disable=no-member
import attr
import subprocess
import attr

from .common import Driver
from ..factory import target_factory
Expand Down
2 changes: 1 addition & 1 deletion labgrid/environment.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import attr
import os
import attr

from .target import Target
from .config import Config
Expand Down
2 changes: 1 addition & 1 deletion labgrid/external/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
from .hawkbit import *
from .hawkbit import HawkbitTestClient
from .usbstick import USBStick
2 changes: 1 addition & 1 deletion labgrid/pytestplugin/fixtures.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import os
import pytest
import subprocess
import pytest

from .. import Environment
from ..exceptions import NoResourceFoundError
Expand Down
2 changes: 0 additions & 2 deletions labgrid/remote/authenticator.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
from pprint import pprint

from twisted.internet.defer import inlineCallbacks

from autobahn.twisted.wamp import ApplicationSession


Expand Down
8 changes: 4 additions & 4 deletions labgrid/remote/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,19 @@
coordinator, acquire a place and interact with the connected resources"""
import argparse
import asyncio
import txaio
import os
import subprocess
import traceback
import logging
import sys
from pprint import pformat
from textwrap import indent
from socket import gethostname
from getpass import getuser
from collections import defaultdict, OrderedDict
from time import sleep
from datetime import datetime

from pprint import pformat
import txaio
from autobahn.asyncio.wamp import ApplicationSession

from .common import ResourceEntry, ResourceMatch, Place, enable_tcp_nodelay
Expand Down Expand Up @@ -707,7 +706,8 @@ def bootstrap(self):
target = self._get_target(place)
from ..driver.usbloader import IMXUSBDriver, MXSUSBDriver
from ..driver.openocddriver import OpenOCDDriver
from ..resource.remote import NetworkMXSUSBLoader, NetworkIMXUSBLoader, NetworkAlteraUSBBlaster
from ..resource.remote import (NetworkMXSUSBLoader, NetworkIMXUSBLoader,
NetworkAlteraUSBBlaster)
drv = None
for resource in target.resources:
if isinstance(resource, NetworkIMXUSBLoader):
Expand Down
2 changes: 0 additions & 2 deletions labgrid/remote/exporter.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@
import subprocess
from socket import gethostname, socket, AF_INET, SOCK_STREAM
from contextlib import closing

import attr

from autobahn.asyncio.wamp import ApplicationRunner, ApplicationSession

from .config import ResourceConfig
Expand Down
2 changes: 1 addition & 1 deletion labgrid/resource/ethernetport.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import logging
import subprocess
import attr
from time import time
import attr

from ..factory import target_factory
from .common import ManagedResource, ResourceManager
Expand Down
2 changes: 1 addition & 1 deletion labgrid/resource/remote.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import logging
import attr
import os
import attr

from ..factory import target_factory
from .common import NetworkResource, ManagedResource, ResourceManager
Expand Down
5 changes: 2 additions & 3 deletions labgrid/resource/udev.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
from functools import partial

import attr
import logging
import os
import pyudev
import warnings
import attr
import pyudev

from ..factory import target_factory
from .common import ManagedResource, ResourceManager
Expand Down
2 changes: 1 addition & 1 deletion labgrid/strategy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
from .bareboxstrategy import BareboxStrategy
from .shellstrategy import ShellStrategy
from .ubootstrategy import UBootStrategy
from .graphstrategy import *
from .graphstrategy import * # pylint: disable=wildcard-import
2 changes: 1 addition & 1 deletion labgrid/util/qmp.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import json
import attr
import logging
import attr


@attr.s(cmp=False)
Expand Down

0 comments on commit c7cefc2

Please sign in to comment.