Skip to content

Commit 47a7dab

Browse files
thomas-manginthomas-mangin
committed
more code ruff'ing
1 parent 48b15e5 commit 47a7dab

8 files changed

Lines changed: 155 additions & 60 deletions

File tree

‎etc/exabgp/example-api-program.run‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def _reader():
8686

8787
if not data:
8888
# we lost the pipe
89-
sys.stderr.write('the read pipe was closed by the other side : %s' % str(exc))
89+
sys.stderr.write('the read pipe was closed by the other side')
9090
sys.exit(1)
9191

9292
received += data

‎etc/exabgp/run/api-blocklist.run‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import sys
88
import errno
99
import threading
1010
import time
11-
import json
1211
import ipaddress
1312
import traceback
1413
import requests
@@ -44,7 +43,10 @@ blocklists = [
4443
{'url': 'https://www.spamhaus.org/drop/drop.txt', 'refresh': 7200},
4544
{'url': 'https://www.spamhaus.org/drop/edrop.txt', 'refresh': 7200},
4645
{'url': 'https://www.spamhaus.org/drop/dropv6.txt', 'refresh': 7200},
47-
{'url': 'https://rules.emergingthreats.net/fwrules/emerging-Block-IPs.txt', 'refresh': 7200},
46+
{
47+
'url': 'https://rules.emergingthreats.net/fwrules/emerging-Block-IPs.txt',
48+
'refresh': 7200,
49+
},
4850
{'url': 'https://blocklist.greensnow.co/greensnow.txt', 'refresh': 7200},
4951
{'url': 'https://www.darklist.de/raw.php', 'refresh': 7200},
5052
{'url': 'https://sigs.interserver.net/ipslim.txt', 'refresh': 7200},
@@ -63,12 +65,12 @@ def requestsGet(url):
6365
def lineFilter(line):
6466
if not line:
6567
return None
66-
l = line.strip()
67-
if l.startswith(';'):
68+
line = line.strip()
69+
if line.startswith(';'):
6870
return None
69-
if l.startswith('#'):
71+
if line.startswith('#'):
7072
return None
71-
return l.split(' ')[0].split(';')[0].split('#')[0].strip()
73+
return line.split(' ')[0].split(';')[0].split('#')[0].strip()
7274

7375

7476
class blocklistThread(object):
@@ -200,15 +202,15 @@ if __name__ == '__main__':
200202
newBlocklist[prefix] = None
201203

202204
for prefix in currentBlocklist:
203-
if not prefix in newBlocklist:
205+
if prefix not in newBlocklist:
204206
specs = specs4
205207
if ipaddress.ip_network(prefix).version == 6:
206208
specs = specs6
207209
sys.stdout.write('withdraw route ' + str(prefix) + specs + '\n')
208210
sys.stdout.flush()
209211

210212
for prefix in newBlocklist:
211-
if not prefix in currentBlocklist:
213+
if prefix not in currentBlocklist:
212214
specs = specs4
213215
if ipaddress.ip_network(prefix).version == 6:
214216
specs = specs6

‎etc/exabgp/run/api-no-respawn-1.run‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/usr/bin/env python3
22

33
import sys
4-
import time
54

65
messages = [
76
'announce route 1.1.1.1/32 next-hop 11.11.11.11',

‎qa/bin/functional‎

Lines changed: 54 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -328,11 +328,11 @@ class EncodingTests(Tests):
328328
self.collect()
329329
if self.code == 0:
330330
if self._check in self.stdout:
331-
if os.getenv('DEBUG', None) != None:
331+
if os.getenv('DEBUG', None) is not None:
332332
self.report('completed successfully')
333333
return True
334334
if self._check in self.stderr:
335-
if os.getenv('DEBUG', None) != None:
335+
if os.getenv('DEBUG', None) is not None:
336336
self.report('completed successfully')
337337
return True
338338

@@ -435,10 +435,30 @@ class EncodingTests(Tests):
435435
result = []
436436
for test in self.selected():
437437
result.append(
438-
' '.join(['>', sys.argv[0], 'encoding', '--server', test.nick, '--port', f'{test.conf["port"]}'])
438+
' '.join(
439+
[
440+
'>',
441+
sys.argv[0],
442+
'encoding',
443+
'--server',
444+
test.nick,
445+
'--port',
446+
f'{test.conf["port"]}',
447+
]
448+
)
439449
)
440450
result.append(
441-
' '.join(['>', sys.argv[0], 'encoding', '--client', test.nick, '--port', f'{test.conf["port"]}'])
451+
' '.join(
452+
[
453+
'>',
454+
sys.argv[0],
455+
'encoding',
456+
'--client',
457+
test.nick,
458+
'--port',
459+
f'{test.conf["port"]}',
460+
]
461+
)
442462
)
443463
return '\n'.join(result)
444464

@@ -449,7 +469,16 @@ class EncodingTests(Tests):
449469
for test in self.selected():
450470
test.setup()
451471
self.display()
452-
test.run([sys.argv[0], 'encoding', '--server', test.nick, '--port', f'{test.conf["port"]}'])
472+
test.run(
473+
[
474+
sys.argv[0],
475+
'encoding',
476+
'--server',
477+
test.nick,
478+
'--port',
479+
f'{test.conf["port"]}',
480+
]
481+
)
453482
time.sleep(0.005)
454483

455484
time.sleep(0.02)
@@ -458,7 +487,14 @@ class EncodingTests(Tests):
458487
test.setup()
459488
self.display()
460489
client[test.nick] = Exec().run(
461-
[sys.argv[0], 'encoding', '--client', test.nick, '--port', f'{test.conf["port"]}']
490+
[
491+
sys.argv[0],
492+
'encoding',
493+
'--client',
494+
test.nick,
495+
'--port',
496+
f'{test.conf["port"]}',
497+
]
462498
)
463499
time.sleep(0.005)
464500

@@ -578,7 +614,12 @@ class DecodingTests(Tests):
578614
self.display()
579615
message = test.conf['type']
580616
if message == 'open':
581-
cmd = [Path.EXABGP, 'decode', '--%s' % test.conf['type'], test.conf['packet']]
617+
cmd = [
618+
Path.EXABGP,
619+
'decode',
620+
'--%s' % test.conf['type'],
621+
test.conf['packet'],
622+
]
582623
elif message in ['update', 'nlri']:
583624
cmd = [
584625
Path.EXABGP,
@@ -774,7 +815,12 @@ if __name__ == '__main__':
774815
subparser = parser.add_subparsers()
775816

776817
add_test(subparser, 'decoding', decoding, ['list', 'edit', 'dry', 'timeout', 'port'])
777-
add_test(subparser, 'encoding', encoding, ['list', 'edit', 'dry', 'timeout', 'port', 'server', 'client'])
818+
add_test(
819+
subparser,
820+
'encoding',
821+
encoding,
822+
['list', 'edit', 'dry', 'timeout', 'port', 'server', 'client'],
823+
)
778824
add_test(subparser, 'parsing', parsing, ['list', 'dry', 'edit'])
779825

780826
parsed = parser.parse_args()

‎qa/sbin/bgp‎

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,6 @@ class Checker(object):
460460
ordered = []
461461
for kg in sorted(list(group.keys())):
462462
source = group[kg]
463-
appending = []
464463
for ks in sorted(list(source.keys())):
465464
ordered.append(source[ks])
466465
return ordered
@@ -692,13 +691,31 @@ def parse_cmdline():
692691

693692
parser = argparse.ArgumentParser(add_help=False)
694693
parser.add_argument('--help', help='this help :-)', action='store_true')
695-
parser.add_argument('--echo', help='accept any BGP messages send it back to the emiter', action='store_true')
696-
parser.add_argument('--sink', help='accept any BGP messages and reply with a keepalive', action='store_true')
697-
parser.add_argument('--asn', help='ASN to use (otherwise extracted from the OPEN)', type=int, default=None)
694+
parser.add_argument(
695+
'--echo',
696+
help='accept any BGP messages send it back to the emiter',
697+
action='store_true',
698+
)
699+
parser.add_argument(
700+
'--sink',
701+
help='accept any BGP messages and reply with a keepalive',
702+
action='store_true',
703+
)
704+
parser.add_argument(
705+
'--asn',
706+
help='ASN to use (otherwise extracted from the OPEN)',
707+
type=int,
708+
default=None,
709+
)
698710
parser.add_argument('--port', help='port to bind to', type=int, default=port)
699711
parser.add_argument('--view', help='look at the expected packets', action='store_true')
700712
parser.add_argument('--ipv6', help='bind using ipv6', action='store_true')
701-
parser.add_argument('checks', help='a list of expected route announcement/withdrawl', nargs='?', type=open)
713+
parser.add_argument(
714+
'checks',
715+
help='a list of expected route announcement/withdrawl',
716+
nargs='?',
717+
type=open,
718+
)
702719

703720
cmdarg = parser.parse_args()
704721

@@ -801,7 +818,8 @@ async def main(options, checker, queue):
801818
service = BGPService(loop, queue, options, checker)
802819

803820
server = await asyncio.start_server(
804-
lambda reader, writer: BGPProtocol(service, reader, writer).handle_bgp(), sock=sock
821+
lambda reader, writer: BGPProtocol(service, reader, writer).handle_bgp(),
822+
sock=sock,
805823
)
806824
# perhaps set backlog to 1 ..
807825

@@ -826,7 +844,7 @@ if __name__ == '__main__':
826844
flushed('\n')
827845

828846
if queue.empty():
829-
flushed(f'failed with no code')
847+
flushed('failed with no code')
830848
sys.exit(1)
831849

832850
code = queue.get()

‎qa/sbin/bgp-3.6‎

Lines changed: 51 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,12 @@ class BGPHandler(asyncore.dispatcher_with_send):
167167
yield 'notification:%d,%d' % (body[0], body[1]), bytestream(body)
168168

169169
def announce(self, *args):
170-
flushed(' ', self.ip, self.port, ' '.join(str(_) for _ in args) if len(args) > 1 else args[0])
170+
flushed(
171+
' ',
172+
self.ip,
173+
self.port,
174+
' '.join(str(_) for _ in args) if len(args) > 1 else args[0],
175+
)
171176

172177
def check_signal(self):
173178
if self.messages and self.messages[0].startswith('signal:'):
@@ -307,7 +312,12 @@ class BGPHandler(asyncore.dispatcher_with_send):
307312
% (
308313
self.counter,
309314
'%s:%s:%s:%s'
310-
% (bytestream(header[:16]), bytestream(header[16:18]), bytestream(header[18:]), bytestream(body)),
315+
% (
316+
bytestream(header[:16]),
317+
bytestream(header[16:18]),
318+
bytestream(header[18:]),
319+
bytestream(body),
320+
),
311321
)
312322
)
313323
self.send(self.keepalive)
@@ -319,7 +329,12 @@ class BGPHandler(asyncore.dispatcher_with_send):
319329
% (
320330
self.counter,
321331
'%s:%s:%s:%s'
322-
% (bytestream(header[:16]), bytestream(header[16:18]), bytestream(header[18:]), bytestream(body)),
332+
% (
333+
bytestream(header[:16]),
334+
bytestream(header[16:18]),
335+
bytestream(header[18:]),
336+
bytestream(body),
337+
),
323338
)
324339
)
325340
self.send(header + body)
@@ -328,7 +343,12 @@ class BGPHandler(asyncore.dispatcher_with_send):
328343
% (
329344
self.counter,
330345
'%s:%s:%s:%s'
331-
% (bytestream(header[:16]), bytestream(header[16:18]), bytestream(header[18:]), bytestream(body)),
346+
% (
347+
bytestream(header[:16]),
348+
bytestream(header[16:18]),
349+
bytestream(header[18:]),
350+
bytestream(body),
351+
),
332352
)
333353
)
334354
return
@@ -352,11 +372,17 @@ class BGPHandler(asyncore.dispatcher_with_send):
352372
self.announce(
353373
'received %d (%1s%s):' % (self.counter, self.options['letter'], self.step),
354374
'%s:%s:%s:%s'
355-
% (announcement[:32], announcement[32:36], announcement[36:38], announcement[38:]),
375+
% (
376+
announcement[:32],
377+
announcement[32:36],
378+
announcement[36:38],
379+
announcement[38:],
380+
),
356381
)
357382
else:
358383
self.announce(
359-
'received %d (%1s%s):' % (self.counter, self.options['letter'], self.step), announcement
384+
'received %d (%1s%s):' % (self.counter, self.options['letter'], self.step),
385+
announcement,
360386
)
361387
self.check_signal()
362388
else:
@@ -380,7 +406,12 @@ class BGPHandler(asyncore.dispatcher_with_send):
380406
if message.startswith('F' * 32):
381407
self.announce(
382408
' %s:%s:%s:%s'
383-
% (message[:32], message[32:36], message[36:38], message[38:])
409+
% (
410+
message[:32],
411+
message[32:36],
412+
message[36:38],
413+
message[38:],
414+
)
384415
)
385416
else:
386417
self.announce(' %s' % message)
@@ -389,7 +420,12 @@ class BGPHandler(asyncore.dispatcher_with_send):
389420
if message.startswith('F' * 32):
390421
self.announce(
391422
'expected : %s:%s:%s:%s'
392-
% (message[:32], message[32:36], message[36:38], message[38:])
423+
% (
424+
message[:32],
425+
message[32:36],
426+
message[36:38],
427+
message[38:],
428+
)
393429
)
394430
else:
395431
self.announce('expected : %s' % message)
@@ -520,7 +556,7 @@ class BGPServer(asyncore.dispatcher):
520556
pair = self.accept()
521557
if pair is not None:
522558
sock, addr = pair
523-
handler = BGPHandler(sock).setup(*addr[:2], messages=messages, options=self.options)
559+
BGPHandler(sock).setup(*addr[:2], messages=messages, options=self.options)
524560

525561

526562
def drop():
@@ -556,20 +592,22 @@ def main():
556592
flushed(
557593
'a list of expected route announcement/withdrawl in the format <number>:announce:<ipv4-route> <number>:withdraw:<ipv4-route> <number>:raw:<exabgp hex dump : separated>'
558594
)
559-
flushed('for example:', sys.argv[0], '1:announce:10.0.0.0/8 1:announce:192.0.2.0/24 2:withdraw:10.0.0.0/8 ')
595+
flushed(
596+
'for example:',
597+
sys.argv[0],
598+
'1:announce:10.0.0.0/8 1:announce:192.0.2.0/24 2:withdraw:10.0.0.0/8 ',
599+
)
560600
flushed('routes with the same <number> can arrive in any order')
561601
sys.exit(1)
562602

563603
options = {'sink': False, 'echo': False, 'port': int(port), 'messages': []}
564604

565605
for arg in sys.argv[1:]:
566606
if arg == '--sink':
567-
messages = []
568607
options['sink'] = True
569608
continue
570609

571610
if arg == '--echo':
572-
messages = []
573611
options['echo'] = True
574612
continue
575613

@@ -598,7 +636,7 @@ def main():
598636
BGPServer('127.0.0.1', options)
599637
try:
600638
BGPServer('::1', options)
601-
except:
639+
except Exception:
602640
# does not work on travis-ci
603641
pass
604642
drop()

0 commit comments

Comments
 (0)