From 073fee44304aa4279c7192b33557a5e139f11b16 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Fri, 13 Nov 2020 16:29:11 +0100 Subject: [PATCH] codecheck: reformat with black, version 20.8b1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The formatting of grml2usb that was done with black, version 18.9b0 triggers changes with black 20.8b1-3 as present in current Debian/unstable: | black --check grml2usb | would reformat grml2usb | Oh no! 💥 💔 💥 | 1 file would be reformatted. | make[2]: *** [Makefile:44: codecheck] Error 1 Applying the change via modern black though doesn't lead to any changes with black, version 18.9b0, so let's use this. Gbp-Dch: Ignore --- grml2usb | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/grml2usb b/grml2usb index 9a989e3..e2d9279 100755 --- a/grml2usb +++ b/grml2usb @@ -65,8 +65,7 @@ RE_LOOP_DEVICE = re.compile(r"/dev/loop\d+$") def syslinux_warning(option, opt, opt_parser): - """A helper function for printing a warning about deprecated option - """ + """A helper function for printing a warning about deprecated option""" # pylint: disable-msg=W0613 sys.stderr.write( "Note: the --syslinux option is deprecated as syslinux " @@ -77,8 +76,7 @@ def syslinux_warning(option, opt, opt_parser): # if grub option is set, unset syslinux option def grub_option(option, opt, opt_parser): - """A helper function adjusting other option values - """ + """A helper function adjusting other option values""" # pylint: disable-msg=W0613 setattr(opt_parser.values, option.dest, True) setattr(opt_parser.values, "syslinux", False) @@ -267,8 +265,7 @@ class VerifyException(Exception): def cleanup(): - """Cleanup function to make sure there aren't any mounted devices left behind. - """ + """Cleanup function to make sure there aren't any mounted devices left behind.""" def del_failed(_fn, path, _exc): logging.warning("Deletion of %s failed in temporary folder", path) @@ -403,8 +400,7 @@ def which(program): def get_defaults_file(iso_mount, flavour, name): - """get the default file for syslinux - """ + """get the default file for syslinux""" bootloader_dirs = ["/boot/isolinux/", "/boot/syslinux/"] for directory in bootloader_dirs: for name in name, "%s_%s" % (get_flavour_filename(flavour), name): @@ -1330,8 +1326,7 @@ def get_device_from_partition(partition): def get_flavour(flavour_str): - """Returns the flavour of a grml version string - """ + """Returns the flavour of a grml version string""" return re.match(r"[\w-]*", flavour_str).group() @@ -1807,8 +1802,7 @@ def install_grml(mountpoint, device): def remove_mountpoint(mountpoint): - """remove a registered mountpoint - """ + """remove a registered mountpoint""" try: unmount(mountpoint, "") -- 2.1.4