Skip to content

Commit c82c967

Browse files
PEP 8hroncok
PEP 8
authored and
hroncok
committed
PEP 8 (lines too long)
1 parent abe22ab commit c82c967

File tree

2 files changed

+38
-29
lines changed

2 files changed

+38
-29
lines changed

‎tests/parse_ifconfig.py‎

Lines changed: 34 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,8 @@ def get_netmask_bits(self):
199199
return result
200200

201201
def __repr__(self):
202-
return ('Device(name=%(name)r, flagsint=%(flagsint)r, flagsstr=%(flagsstr)r, mtu=%(mtu)r)'
202+
return ('Device(name=%(name)r, flagsint=%(flagsint)r, '
203+
'flagsstr=%(flagsstr)r, mtu=%(mtu)r)'
203204
% (self.__dict__))
204205

205206
def _debug(self, groups):
@@ -370,7 +371,8 @@ def _parse_line(self, line):
370371
self.baseaddr = int(m.group(1), 16)
371372
line = m.group(2)
372373

373-
m = re.match('memory ' + group_o_hex + '-' + group_hex + ws + '(.*)',
374+
m = re.match('memory ' + group_o_hex + '-' +
375+
group_hex + ws + '(.*)',
374376
line)
375377
if m:
376378
self.memstart = int(m.group(1), 16)
@@ -665,34 +667,34 @@ def test_full(self):
665667
virbr0 = ifconfig.devices[2]
666668
self.assertEqual(virbr0.name, 'virbr0')
667669
# virbr0: flags=4163<UP,BROADCAST,RUNNING,MULTICAST> mtu 1500
668-
# inet 1.12.123.124 netmask 255.255.252.0 broadcast 1.12.123.255
669-
# ether ff:00:11:22:33:42 txqueuelen 0 (Ethernet)
670-
# RX packets 88730 bytes 5140566 (4.9 MiB)
671-
# RX errors 0 dropped 0 overruns 0 frame 0
672-
# TX packets 177583 bytes 244647206 (233.3 MiB)
673-
# TX errors 0 dropped 0 overruns 0 carrier 0 collisions 0
670+
# inet 1.12.123.124 netmask 255.255.252.0 broadcast 1.12.123.255
671+
# ether ff:00:11:22:33:42 txqueuelen 0 (Ethernet)
672+
# RX packets 88730 bytes 5140566 (4.9 MiB)
673+
# RX errors 0 dropped 0 overruns 0 frame 0
674+
# TX packets 177583 bytes 244647206 (233.3 MiB)
675+
# TX errors 0 dropped 0 overruns 0 carrier 0 collisions 0
674676

675677
# Verify vnet0:
676678
vnet0 = ifconfig.devices[3]
677679
self.assertEqual(vnet0.name, 'vnet0')
678680
# vnet0: flags=4163<UP,BROADCAST,RUNNING,MULTICAST> mtu 1500
679-
# inet6 ffff::ffff:ffff:ffff:ffff prefixlen 64 scopeid 0x20<link>
680-
# ether ff:00:11:22:33:42 txqueuelen 0 (Ethernet)
681-
# RX packets 538 bytes 172743 (168.6 KiB)
682-
# RX errors 0 dropped 0 overruns 0 frame 0
683-
# TX packets 26593 bytes 1379054 (1.3 MiB)
684-
# TX errors 0 dropped 0 overruns 0 carrier 0 collisions 0
681+
# inet6 ffff::ffff:ffff:ffff:ffff prefixlen 64 scopeid 0x20<link>
682+
# ether ff:00:11:22:33:42 txqueuelen 0 (Ethernet)
683+
# RX packets 538 bytes 172743 (168.6 KiB)
684+
# RX errors 0 dropped 0 overruns 0 frame 0
685+
# TX packets 26593 bytes 1379054 (1.3 MiB)
686+
# TX errors 0 dropped 0 overruns 0 carrier 0 collisions 0
685687

686688
# Verify vnet1:
687689
vnet1 = ifconfig.devices[4]
688690
self.assertEqual(vnet1.name, 'vnet1')
689691
# vnet1: flags=4163<UP,BROADCAST,RUNNING,MULTICAST> mtu 1500
690-
# inet6 ffff::ffff:ffff:ffff:ffff prefixlen 64 scopeid 0x20<link>
691-
# ether ff:00:11:22:33:42 txqueuelen 0 (Ethernet)
692-
# RX packets 71567 bytes 5033151 (4.7 MiB)
693-
# RX errors 0 dropped 0 overruns 0 frame 0
694-
# TX packets 216553 bytes 200424748 (191.1 MiB)
695-
# TX errors 0 dropped 0 overruns 0 carrier 0 collisions 0
692+
# inet6 ffff::ffff:ffff:ffff:ffff prefixlen 64 scopeid 0x20<link>
693+
# ether ff:00:11:22:33:42 txqueuelen 0 (Ethernet)
694+
# RX packets 71567 bytes 5033151 (4.7 MiB)
695+
# RX errors 0 dropped 0 overruns 0 frame 0
696+
# TX packets 216553 bytes 200424748 (191.1 MiB)
697+
# TX errors 0 dropped 0 overruns 0 carrier 0 collisions 0
696698

697699
fullOld = '''
698700
eth0 Link encap:Ethernet HWaddr 00:11:22:33:44:55
@@ -729,11 +731,11 @@ def test_full(self):
729731
self.assertEqual(eth0.inet, '1.12.123.124')
730732
self.assertEqual(eth0.netmask, '255.255.252.0')
731733
self.assertEqual(eth0.broadcast, '1.12.123.255')
732-
# inet6 addr: dddd::dddd:dddd:dddd:dddd:dddd:dddd/64 Scope:Site
734+
# inet6 addr: dddd::dddd:dddd:dddd:dddd:dddd:dddd/64 Scope:Site
733735
# self.assertEqual(eth0.inet6, 'dddd::dddd:dddd:dddd:dddd:dddd:dddd')
734736
# self.assertEqual(eth0.prefixlen, 64)
735737
# self.assertEqual(eth0.scopeid, 'Site')
736-
# inet6 addr: eeee::eeee:eeee:eeee:eeee:eeee:eeee/64 Scope:Global
738+
# inet6 addr: eeee::eeee:eeee:eeee:eeee:eeee:eeee/64 Scope:Global
737739
# self.assertEqual(eth0.inet6, 'eeee::eeee:eeee:eeee:eeee:eeee:eeee')
738740
# self.assertEqual(eth0.prefixlen, 64)
739741
# self.assertEqual(eth0.scopeid, 'Global')
@@ -809,15 +811,17 @@ def test_parsing_flags_line(self):
809811
self.assertEqual(dev.mtu, 1500)
810812

811813
dev = self.parse_single_device(
812-
'foo: flags=4163<UP,BROADCAST,RUNNING,MULTICAST> mtu 1500 outfill 32 keepalive 96\n')
814+
'foo: flags=4163<UP,BROADCAST,RUNNING,MULTICAST> mtu 1500 '
815+
'outfill 32 keepalive 96\n')
813816
self.assertEqual(dev.mtu, 1500)
814817
self.assertEqual(dev.outfill, 32)
815818
self.assertEqual(dev.keepalive, 96)
816819

817820
# old format
818821
dev = self.parse_single_device(
819822
'foo Link encap:Ethernet HWaddr F0:F0:F0:F0:F0:F0\n'
820-
' UP BROADCAST RUNNING MULTICAST MTU:500 Metric:2 Outfill:55 Keepalive:66\n')
823+
' UP BROADCAST RUNNING MULTICAST MTU:500 Metric:2 '
824+
'Outfill:55 Keepalive:66\n')
821825
self.assertEqual(dev.flagsstr, 'UP BROADCAST RUNNING MULTICAST')
822826
self.assertEqual(dev.mtu, 500)
823827
self.assertEqual(dev.metric, 2)
@@ -827,7 +831,8 @@ def test_parsing_flags_line(self):
827831
def test_parsing_ip(self):
828832
dev = self.parse_single_device(
829833
'foo: flags=4163<UP,BROADCAST,RUNNING,MULTICAST> mtu 1500\n'
830-
' inet 1.12.123.124 netmask 255.255.252.0 broadcast 1.12.123.255\n')
834+
' inet 1.12.123.124 netmask 255.255.252.0 broadcast '
835+
'1.12.123.255\n')
831836
self.assertEqual(dev.inet, '1.12.123.124')
832837
self.assertEqual(dev.netmask, '255.255.252.0')
833838
self.assertEqual(dev.get_netmask_bits(), 22)
@@ -846,7 +851,8 @@ def test_parsing_ip(self):
846851

847852
dev = self.parse_single_device(
848853
'foo: flags=4163<UP,BROADCAST,RUNNING,MULTICAST> mtu 1500\n'
849-
' inet 1.1.1.1 netmask 255.255.255.254 destination 1.12.123.255\n')
854+
' inet 1.1.1.1 netmask 255.255.255.254 destination '
855+
'1.12.123.255\n')
850856
self.assertEqual(dev.inet, '1.1.1.1')
851857
self.assertEqual(dev.netmask, '255.255.255.254')
852858
self.assertEqual(dev.broadcast, None)
@@ -855,7 +861,8 @@ def test_parsing_ip(self):
855861
# old format
856862
dev = self.parse_single_device(
857863
'foo Link encap:Ethernet HWaddr F0:F0:F0:F0:F0:F0\n'
858-
' inet addr:1.2.3.4 P-t-P:10.20.30.40 Mask:255.255.254.0\n')
864+
' inet addr:1.2.3.4 P-t-P:10.20.30.40 '
865+
'Mask:255.255.254.0\n')
859866
self.assertEqual(dev.inet, '1.2.3.4')
860867
self.assertEqual(dev.destination, '10.20.30.40')
861868
self.assertEqual(dev.broadcast, None)

‎tests/test_ethtool.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,8 @@ def _functions_accepting_devnames(self, devname):
114114
self.assertEqualIpv4Str(broadcast, scraped.broadcast)
115115

116116
self.assertIsStringExceptForLoopback(ethtool.get_businfo, devname,
117-
'[Errno 95] Operation not supported')
117+
'[Errno 95] Operation not '
118+
'supported')
118119

119120
self.assertIsInt(ethtool.get_flags(devname))
120121
# flagsint cannot be obtained from old ifconfig format
@@ -130,7 +131,8 @@ def _functions_accepting_devnames(self, devname):
130131
self.assertEqual(ethtool.get_ipaddr(devname), scraped.inet)
131132

132133
self.assertIsStringExceptForLoopback(ethtool.get_module, devname,
133-
'[Errno 95] Operation not supported')
134+
'[Errno 95] Operation not '
135+
'supported')
134136

135137
if assignable:
136138
self.assertIsString(ethtool.get_netmask(devname))

0 commit comments

Comments
 (0)