From 9f8a8f6a646a65ced7069fc054d718f73448b4de Mon Sep 17 00:00:00 2001 From: Gormogon Date: Sun, 14 Jun 2015 08:22:35 -0400 Subject: [PATCH] PEP and Unused Import --- src/modules/bootloader/main.py | 2 +- src/modules/initramfs/main.py | 6 +++--- src/modules/unpackfs/main.py | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py index cbb7aa9f1..3b4c9e554 100644 --- a/src/modules/bootloader/main.py +++ b/src/modules/bootloader/main.py @@ -215,7 +215,7 @@ def prepare_bootloader(fw_type): boot_p = boot_device[-1:] device = boot_device[:-1] - if (not boot_p or not device): + if not boot_p or not device: return ("EFI directory \"{!s}\" not found!", "Boot partition: \"{!s}\"", "Boot device: \"{!s}\"".format(efi_directory, boot_p, device)) diff --git a/src/modules/initramfs/main.py b/src/modules/initramfs/main.py index 6b9fd1348..37279c4d3 100644 --- a/src/modules/initramfs/main.py +++ b/src/modules/initramfs/main.py @@ -26,7 +26,7 @@ def run(): :return: """ - returnCode = chroot_call(["update-initramfs", "-k", "all", "-u"]) + return_code = chroot_call(["update-initramfs", "-k", "all", "-u"]) - if returnCode != 0: - return "Failed to run update-initramfs on the target", "The exit code was {}".format(returnCode) + if return_code != 0: + return "Failed to run update-initramfs on the target", "The exit code was {}".format(return_code) diff --git a/src/modules/unpackfs/main.py b/src/modules/unpackfs/main.py index beffc731c..2fbcfbee8 100644 --- a/src/modules/unpackfs/main.py +++ b/src/modules/unpackfs/main.py @@ -26,7 +26,6 @@ import shutil import subprocess import sys import tempfile -from collections import namedtuple from libcalamares import *