Christ, I'd forgotten how horrific the with syntax was <3.9

Can't use bracketed expressions to split multiple context managers
across lines prior to Python 3.9. Have to use the horrid line-ending
markers instead...

nobodd/prep.py

@@ -96,10 +96,10 @@ def prepare_image(conf):
             conf.logger.info(
                 'Skipping resize; %s is already %d bytes or larger',
                 conf.image, conf.size)
-    with (
-        DiskImage(conf.image, access=mmap.ACCESS_WRITE) as img,
-        FatFileSystem(img.partitions[conf.boot_partition].data) as fs
-    ):
+    with \
+        DiskImage(conf.image, access=mmap.ACCESS_WRITE) as img, \
+        FatFileSystem(img.partitions[conf.boot_partition].data) as fs:
+
         cmdline = fs.root / conf.cmdline
         conf.logger.info(
             'Re-writing %s in partition %d', conf.cmdline, conf.boot_partition)
@@ -128,10 +128,10 @@ def detect_partitions(conf):
     partition.
     """
     conf.logger.info('Detecting partitions')
-    with (
-        conf.image.open('rb') as img_file,
-        DiskImage(img_file) as img
-    ):
+    with \
+        conf.image.open('rb') as img_file, \
+        DiskImage(img_file) as img:
+
         fat_types = (
             {UUID('ebd0a0a2-b9e5-4433-87c0-68b6b72699c7'),
              UUID('c12a7328-f81f-11d2-ba4b-00a0c93ec93b')}

nobodd/server.py

@@ -195,10 +195,10 @@ def main(args=None):
             board.serial: board
             for board in conf.boards
         }
-        with (
-            BootServer((conf.listen, conf.port), boards) as server,
-            DefaultSelector() as selector
-        ):
+        with \
+            BootServer((conf.listen, conf.port), boards) as server, \
+            DefaultSelector() as selector:
+
             server.logger.addHandler(logging.StreamHandler(sys.stderr))
             server.logger.setLevel(logging.DEBUG if debug else logging.INFO)
             server.logger.info('Ready')

tests/test_prep.py

@@ -25,10 +25,10 @@ def test_help(capsys):
 
 
 def test_error_exit_no_debug(capsys, monkeypatch):
-    with (
-        mock.patch('nobodd.prep.get_parser') as get_parser,
-        monkeypatch.context() as m,
-    ):
+    with \
+        mock.patch('nobodd.prep.get_parser') as get_parser, \
+        monkeypatch.context() as m:
+
         m.delenv('DEBUG', raising=False)
         get_parser.side_effect = RuntimeError('trouble is bad')
 
@@ -38,10 +38,10 @@ def test_error_exit_no_debug(capsys, monkeypatch):
 
 
 def test_error_exit_with_debug(monkeypatch):
-    with (
-        mock.patch('nobodd.prep.get_parser') as get_parser,
-        monkeypatch.context() as m,
-    ):
+    with \
+        mock.patch('nobodd.prep.get_parser') as get_parser, \
+        monkeypatch.context() as m:
+
         m.setenv('DEBUG', '1')
         get_parser.side_effect = RuntimeError('trouble is bad')
 
@@ -50,11 +50,11 @@ def test_error_exit_with_debug(monkeypatch):
 
 
 def test_error_exit_with_pdb(monkeypatch):
-    with (
-        mock.patch('nobodd.prep.get_parser') as get_parser,
-        mock.patch('pdb.post_mortem') as post_mortem,
-        monkeypatch.context() as m
-    ):
+    with \
+        mock.patch('nobodd.prep.get_parser') as get_parser, \
+        mock.patch('pdb.post_mortem') as post_mortem, \
+        monkeypatch.context() as m:
+
         m.setenv('DEBUG', '2')
         get_parser.side_effect = RuntimeError('trouble is bad')
 
@@ -72,21 +72,21 @@ def test_regular_operation(fat_disks_w):
             str(fat_disk)
         ]) == 0
         assert fat_disk.stat().st_size == 50 * 1048576
-        with (
-            DiskImage(fat_disk) as img,
-            FatFileSystem(img.partitions[1].data) as fs,
-        ):
+        with \
+            DiskImage(fat_disk) as img, \
+            FatFileSystem(img.partitions[1].data) as fs:
+
             assert (fs.root / 'cmdline.txt').read_text() == (
                 'ip=dhcp nbdroot=myserver/myshare root=/dev/nbd0p5 '
                 'console=serial0,115200 dwc_otg.lpm_enable=0 console=tty1 '
                 'rootfstype=ext4 rootwait fixrtc quiet splash')
 
 
 def test_cmdline_no_newline(fat16_disk_w):
-    with (
-        DiskImage(fat16_disk_w, access=mmap.ACCESS_WRITE) as img,
-        FatFileSystem(img.partitions[1].data) as fs
-    ):
+    with \
+        DiskImage(fat16_disk_w, access=mmap.ACCESS_WRITE) as img, \
+        FatFileSystem(img.partitions[1].data) as fs:
+
         # Ensure the transformation works even when cmdline.txt has no newlines
         path = fs.root / 'cmdline.txt'
         path.write_text(path.read_text().rstrip('\n'))
@@ -100,10 +100,10 @@ def test_cmdline_no_newline(fat16_disk_w):
         str(fat16_disk_w)
     ]) == 0
 
-    with (
-        DiskImage(fat16_disk_w) as img,
-        FatFileSystem(img.partitions[1].data) as fs,
-    ):
+    with \
+        DiskImage(fat16_disk_w) as img, \
+        FatFileSystem(img.partitions[1].data) as fs:
+
         assert (fs.root / 'cmdline.txt').read_text() == (
             'ip=dhcp nbdroot=myserver/myshare root=/dev/nbd0p5 '
             'console=serial0,115200 dwc_otg.lpm_enable=0 console=tty1 '
@@ -184,10 +184,10 @@ def test_default_host_share(fat16_disk_w):
             str(fat16_disk_w)
         ]) == 0
 
-    with (
-        DiskImage(fat16_disk_w) as img,
-        FatFileSystem(img.partitions[1].data) as fs,
-    ):
+    with \
+        DiskImage(fat16_disk_w) as img, \
+        FatFileSystem(img.partitions[1].data) as fs:
+
         assert (fs.root / 'cmdline.txt').read_text() == (
             'ip=dhcp nbdroot=louis.prima.org/fat16-mutable root=/dev/nbd0p5 '
             'console=serial0,115200 dwc_otg.lpm_enable=0 console=tty1 '

tests/test_server.py

@@ -85,10 +85,10 @@ def test_sigterm(main_thread, capsys):
 
 
 def test_error_exit_no_debug(main_thread, capsys, monkeypatch):
-    with (
-        mock.patch('nobodd.server.get_parser') as get_parser,
-        monkeypatch.context() as m,
-    ):
+    with \
+        mock.patch('nobodd.server.get_parser') as get_parser, \
+        monkeypatch.context() as m:
+
         m.delenv('DEBUG', raising=False)
         get_parser.side_effect = RuntimeError('trouble is bad')
 
@@ -102,10 +102,10 @@ def test_error_exit_no_debug(main_thread, capsys, monkeypatch):
 
 
 def test_error_exit_with_debug(main_thread, monkeypatch):
-    with (
-        mock.patch('nobodd.server.get_parser') as get_parser,
-        monkeypatch.context() as m,
-    ):
+    with \
+        mock.patch('nobodd.server.get_parser') as get_parser, \
+        monkeypatch.context() as m:
+
         m.setenv('DEBUG', '1')
         get_parser.side_effect = RuntimeError('trouble is bad')
 
@@ -116,11 +116,11 @@ def test_error_exit_with_debug(main_thread, monkeypatch):
 
 
 def test_error_exit_with_pdb(main_thread, capsys, monkeypatch):
-    with (
-        mock.patch('nobodd.server.get_parser') as get_parser,
-        mock.patch('pdb.post_mortem') as post_mortem,
-        monkeypatch.context() as m,
-    ):
+    with \
+        mock.patch('nobodd.server.get_parser') as get_parser, \
+        mock.patch('pdb.post_mortem') as post_mortem, \
+        monkeypatch.context() as m:
+
         m.setenv('DEBUG', '2')
         get_parser.side_effect = RuntimeError('trouble is bad')
 
@@ -131,10 +131,10 @@ def test_error_exit_with_pdb(main_thread, capsys, monkeypatch):
 
 
 def test_regular_operation(fat16_disk, main_thread, capsys):
-    with (
-        disk.DiskImage(fat16_disk) as img,
-        fs.FatFileSystem(img.partitions[1].data) as boot,
-    ):
+    with \
+        disk.DiskImage(fat16_disk) as img, \
+        fs.FatFileSystem(img.partitions[1].data) as boot:
+
         expected = (boot.root / 'random').read_bytes()
 
     main_thread.argv = [