Skip to content

Commit 4608384

Browse files
committed
STY: placate linter
1 parent a21270c commit 4608384

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

src/bluesky/callbacks/zmq.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@
1515
import asyncio
1616
import copy
1717
import logging
18-
from typing import NamedTuple
19-
from pathlib import Path
2018
import pickle
2119
import warnings
22-
from typing import Union
20+
from pathlib import Path
21+
from typing import NamedTuple, Union
2322

2423
from ..run_engine import Dispatcher, DocumentNames
2524

src/bluesky/commandline/zmq_proxy.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from pathlib import Path
55
from typing import Union
66

7-
from bluesky.callbacks.zmq import Proxy, RemoteDispatcher, ServerCurve, ClientCurve
7+
from bluesky.callbacks.zmq import ClientCurve, Proxy, RemoteDispatcher, ServerCurve
88

99
logger = logging.getLogger("bluesky")
1010

@@ -103,27 +103,31 @@ def main():
103103
# Server mode - check for client mode flags
104104
if args.in_client_secret or args.in_server_public:
105105
raise ValueError(
106-
"Cannot use client CURVE options (--in-client-secret, --in-server-public) when input is in bind mode"
106+
"Cannot use client CURVE options (--in-client-secret, --in-server-public) when "
107+
+ "input is in bind mode"
107108
)
108109
else:
109110
# Client mode - check for server mode flags
110111
if args.in_curve_secret or args.in_curve_client_keys or args.in_curve_allow:
111112
raise ValueError(
112-
"Cannot use server CURVE options (--in-curve-secret, --in-curve-client-keys, --in-curve-allow) when input is in connect mode"
113+
"Cannot use server CURVE options (--in-curve-secret, --in-curve-client-keys, --in-curve-allow) "
114+
+ "when input is in connect mode"
113115
)
114116

115117
# Validate CURVE configuration consistency for output
116118
if out_bind:
117119
# Server mode - check for client mode flags
118120
if args.out_client_secret or args.out_server_public:
119121
raise ValueError(
120-
"Cannot use client CURVE options (--out-client-secret, --out-server-public) when output is in bind mode"
122+
"Cannot use client CURVE options (--out-client-secret, --out-server-public) "
123+
+ "when output is in bind mode"
121124
)
122125
else:
123126
# Client mode - check for server mode flags
124127
if args.out_curve_secret or args.out_curve_client_keys or args.out_curve_allow:
125128
raise ValueError(
126-
"Cannot use server CURVE options (--out-curve-secret, --out-curve-client-keys, --out-curve-allow) when output is in connect mode"
129+
"Cannot use server CURVE options (--out-curve-secret, --out-curve-client-keys, --out-curve-allow) "
130+
+ "when output is in connect mode"
127131
)
128132

129133
# Helper to build ServerCurve or None
@@ -160,8 +164,8 @@ def build_client_curve(secret: Union[str, None], server_public: Union[str, None]
160164

161165
# Configure logging BEFORE creating the proxy so we capture socket configuration debug messages
162166
if args.verbose:
163-
from bluesky.log import config_bluesky_logging
164167
import bluesky.log
168+
from bluesky.log import config_bluesky_logging
165169

166170
# "INFO" if called with '-v' or '-vv', "DEBUG" if called with '-vvv'
167171
level = "INFO" if args.verbose <= 2 else "DEBUG"

0 commit comments

Comments
 (0)