Skip to content

Commit bb735ac

Browse files
isort
1 parent 6aea793 commit bb735ac

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+193
-175
lines changed

brownie/__init__.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
#!/usr/bin/python3
22

3-
from .project import compile_source, run
4-
from .network import accounts, alert, history, rpc, web3
5-
from brownie.network.contract import Contract # NOQA: F401
6-
from brownie._gui import Gui
73
from brownie._config import CONFIG as config
4+
from brownie._gui import Gui
85
from brownie.convert import Wei
6+
from brownie.network.contract import Contract # NOQA: F401
7+
8+
from .network import accounts, alert, history, rpc, web3
9+
from .project import compile_source, run
910

1011
__all__ = [
1112
"accounts", # accounts is an Accounts singleton

brownie/_cli/__main__.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
#!/usr/bin/python3
22

3-
from docopt import docopt
43
import importlib
5-
from pathlib import Path
64
import sys
5+
from pathlib import Path
6+
7+
from docopt import docopt
78

89
from brownie import network
9-
from brownie.utils import color, notify
10-
from brownie.exceptions import ProjectNotFound
1110
from brownie._config import ARGV
11+
from brownie.exceptions import ProjectNotFound
12+
from brownie.utils import color, notify
1213

1314
__version__ = "1.0.0b12" # did you change this in docs/conf.py as well?
1415

brownie/_cli/compile.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#!/usr/bin/python3
22

3-
from docopt import docopt
43
import shutil
54

5+
from docopt import docopt
6+
67
from brownie import project
78
from brownie.exceptions import ProjectNotFound
89

brownie/_cli/console.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
from docopt import docopt
88

99
import brownie
10-
from brownie.utils import color
1110
from brownie import network, project
1211
from brownie._config import ARGV, CONFIG, _update_argv_from_docopt
12+
from brownie.utils import color
1313

1414
if sys.platform == "win32":
1515
from pyreadline import Readline

brownie/_cli/init.py

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
from brownie import project
66
from brownie.utils import notify
77

8-
98
__doc__ = """Usage: brownie init [<path>] [options]
109
1110
Arguments:

brownie/_cli/run.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
from docopt import docopt
44

55
from brownie import network, project, run
6-
from brownie.test.output import _print_gas_profile
76
from brownie._config import ARGV, CONFIG, _update_argv_from_docopt
8-
7+
from brownie.test.output import _print_gas_profile
98

109
__doc__ = f"""Usage: brownie run <filename> [<function>] [options]
1110

brownie/_config.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
#!/usr/bin/python3
22

3-
from typing import Dict, Any, Optional
4-
from collections import defaultdict
53
import json
6-
from pathlib import Path
74
import re
5+
from collections import defaultdict
6+
from pathlib import Path
7+
from typing import Any, Dict, Optional
88

99
from brownie._singleton import _Singleton
1010

11-
1211
REPLACE = ["active_network", "networks"]
1312
IGNORE = ["active_network", "brownie_folder"]
1413

brownie/_gui/console.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import tkinter as tk
44

5-
from .styles import TEXT_STYLE
65
from .bases import ToggleButton
6+
from .styles import TEXT_STYLE
77

88

99
class ConsoleButton(ToggleButton):

brownie/_gui/opcodes.py

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from tkinter import ttk
66

77
from brownie.project.sources import is_inside_offset
8+
89
from .bases import ToggleButton
910

1011

brownie/_gui/root.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
import tkinter as tk
55
from tkinter import ttk
66

7+
from brownie.project import get_loaded_projects
8+
79
from .console import Console, ConsoleButton
810
from .opcodes import OpcodeList, ScopingButton
911
from .report import HighlightSelect, ReportSelect
1012
from .source import ContractSelect, SourceNoteBook
1113
from .styles import set_style
1214
from .tooltip import ToolTip
1315

14-
from brownie.project import get_loaded_projects
15-
1616

1717
class Root(tk.Tk):
1818

brownie/_gui/source.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
#!/usr/bin/python3
22

3-
from pathlib import Path
43
import re
54
import tkinter as tk
65
import tkinter.font as tkFont
6+
from pathlib import Path
77
from tkinter import ttk
88

9+
from brownie.project.sources import is_inside_offset
10+
911
from .bases import SelectBox
1012
from .styles import TEXT_COLORS, TEXT_STYLE
11-
from brownie.project.sources import is_inside_offset
1213

1314

1415
class SourceNoteBook(ttk.Notebook):

brownie/_singleton.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/python3
2-
from typing import Dict, Any, Tuple
2+
from typing import Any, Dict, Tuple
33

44

55
class _Singleton(type):

brownie/convert.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#!/usr/bin/python3
22

3-
from typing import TypeVar, Any, List, Tuple, Dict, KeysView, ItemsView, Union
43
from copy import deepcopy
4+
from typing import Any, Dict, ItemsView, KeysView, List, Tuple, TypeVar, Union
5+
56
import eth_utils
67
from hexbytes import HexBytes
78

brownie/exceptions.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
#!/usr/bin/python3
22

3-
from typing import Type, Any
4-
import psutil
5-
63
import json
74
import sys
5+
from typing import Any, Type
86

7+
import psutil
98

109
# network
1110

brownie/network/__init__.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
#!/usr/bin/python3
22

3+
from .account import Accounts
34
from .main import ( # NOQA 401
45
connect,
56
disconnect,
6-
show_active,
7-
is_connected,
87
gas_limit,
98
gas_price,
9+
is_connected,
10+
show_active,
1011
)
11-
from .account import Accounts
12-
from .state import TxHistory
1312
from .rpc import Rpc
13+
from .state import TxHistory
1414
from .web3 import Web3
1515

1616
__all__ = ["accounts", "history", "rpc", "web3"]

brownie/network/account.py

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
#!/usr/bin/python3
22

3-
from typing import List, Dict, Any, Union, Iterator, Optional, Tuple
4-
from getpass import getpass
5-
6-
from hexbytes import HexBytes
7-
import os
8-
from pathlib import Path
93
import json
4+
import os
105
import threading
6+
from getpass import getpass
7+
from pathlib import Path
8+
from typing import Any, Dict, Iterator, List, Optional, Tuple, Union
119

12-
from eth_hash.auto import keccak
1310
import eth_keys
11+
from eth_hash.auto import keccak
12+
from hexbytes import HexBytes
1413

15-
from brownie.utils import color
14+
from brownie._config import CONFIG
15+
from brownie._singleton import _Singleton
16+
from brownie.convert import Wei, to_address
1617
from brownie.exceptions import (
17-
VirtualMachineError,
18-
UnknownAccount,
1918
IncompatibleEVMVersion,
19+
UnknownAccount,
20+
VirtualMachineError,
2021
)
22+
from brownie.network.state import _find_contract
2123
from brownie.network.transaction import TransactionReceipt
24+
from brownie.utils import color
25+
2226
from .rpc import Rpc, _revert_register
2327
from .web3 import Web3
24-
from brownie.network.state import _find_contract
25-
from brownie.convert import to_address, Wei
26-
from brownie._singleton import _Singleton
27-
from brownie._config import CONFIG
2828

2929
web3 = Web3()
3030
rpc = Rpc()

brownie/network/alert.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#!/usr/bin/python3
22

3-
from typing import List, Callable, Tuple, Dict, Union
4-
53
import time as time
64
from threading import Thread
5+
from typing import Callable, Dict, List, Tuple, Union
76

87
from brownie.utils import color
98

brownie/network/contract.py

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,27 @@
11
#!/usr/bin/python3
22

3-
from typing import Iterator, List, Union, Dict, Any, Optional, Tuple, Callable
43
import re
4+
from typing import Any, Callable, Dict, Iterator, List, Optional, Tuple, Union
55

66
import eth_abi
77
from eth_hash.auto import keccak
88
from hexbytes import HexBytes
99

10-
from brownie.utils import color
11-
from .event import _get_topics
12-
from .state import _add_contract, _find_contract, _remove_contract
13-
14-
from .rpc import Rpc, _revert_register
15-
from .web3 import Web3
16-
from brownie.convert import _format_input, _format_output, to_address, Wei
10+
from brownie._config import ARGV, CONFIG
11+
from brownie.convert import Wei, _format_input, _format_output, to_address
1712
from brownie.exceptions import (
1813
ContractExists,
1914
ContractNotFound,
2015
UndeployedLibrary,
2116
VirtualMachineError,
2217
)
23-
from brownie._config import ARGV, CONFIG
18+
from brownie.typing import AccountsType, TransactionReceiptType
19+
from brownie.utils import color
2420

25-
from brownie.typing import TransactionReceiptType, AccountsType
21+
from .event import _get_topics
22+
from .rpc import Rpc, _revert_register
23+
from .state import _add_contract, _find_contract, _remove_contract
24+
from .web3 import Web3
2625

2726
rpc = Rpc()
2827
web3 = Web3()

brownie/network/event.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#!/usr/bin/python3
22

3-
from typing import Dict, List, Union, Iterator, ValuesView, Tuple, Any
4-
from collections import OrderedDict
53
import json
4+
from collections import OrderedDict
5+
from typing import Any, Dict, Iterator, List, Tuple, Union, ValuesView
66

77
import eth_event
88

9-
from brownie.convert import _format_event
109
from brownie._config import CONFIG
10+
from brownie.convert import _format_event
1111
from brownie.exceptions import EventLookupError
1212

1313

brownie/network/main.py

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
#!/usr/bin/python3
2-
from typing import Union, Optional, Tuple
2+
from typing import Optional, Tuple, Union
33

4-
from .web3 import Web3
5-
from .rpc import Rpc
6-
from .account import Accounts
7-
from brownie.convert import Wei
84
from brownie._config import CONFIG, _modify_network_config
5+
from brownie.convert import Wei
6+
7+
from .account import Accounts
8+
from .rpc import Rpc
9+
from .web3 import Web3
910

1011
rpc = Rpc()
1112
web3 = Web3()

brownie/network/rpc.py

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
#!/usr/bin/python3
22

3-
from typing import Dict, Any, List, Union, Tuple, Optional
43
import atexit
54
import gc
6-
import psutil
7-
from subprocess import DEVNULL, PIPE
85
import sys
96
import time
107
import weakref
8+
from subprocess import DEVNULL, PIPE
9+
from typing import Any, Dict, List, Optional, Tuple, Union
1110

12-
from .web3 import Web3
11+
import psutil
1312

1413
from brownie._singleton import _Singleton
15-
from brownie.exceptions import RPCProcessError, RPCConnectionError, RPCRequestError
14+
from brownie.exceptions import RPCConnectionError, RPCProcessError, RPCRequestError
15+
16+
from .web3 import Web3
1617

1718
web3 = Web3()
1819

brownie/network/state.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
#!/usr/bin/python3
22

3-
from typing import List, Dict, Iterator, Any
4-
from .rpc import _revert_register
5-
from brownie.convert import to_address
3+
from typing import Any, Dict, Iterator, List
4+
65
from brownie._singleton import _Singleton
6+
from brownie.convert import to_address
7+
8+
from .rpc import _revert_register
79

810
_contract_map: Dict = {}
911

0 commit comments

Comments
 (0)