[master 1/1] White Space fixes

usta installerbot-noreply at redhat.com
Thu Mar 12 01:59:22 UTC 2015


From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20USTA?= <omerusta at gmail.com>

The whole whitespace fixes for cosmatics and also fixes pylint's mouth
shut up
---
 pyanaconda/anaconda.py                       |  2 +-
 pyanaconda/anaconda_log.py                   | 14 +++++-----
 pyanaconda/bootloader.py                     | 16 +++++------
 pyanaconda/constants.py                      |  8 +++---
 pyanaconda/constants_text.py                 |  2 +-
 pyanaconda/exception.py                      | 12 ++++----
 pyanaconda/image.py                          |  2 +-
 pyanaconda/installclass.py                   |  8 +++---
 pyanaconda/installinterfacebase.py           |  4 +--
 pyanaconda/isys/__init__.py                  |  4 +--
 pyanaconda/iutil.py                          |  8 +++---
 pyanaconda/kickstart.py                      | 42 ++++++++++++++--------------
 pyanaconda/localization.py                   |  8 +++---
 pyanaconda/network.py                        | 18 ++++++------
 pyanaconda/nm.py                             |  8 +++---
 pyanaconda/packaging/dnfpayload.py           |  2 +-
 pyanaconda/rescue.py                         | 40 +++++++++++++-------------
 pyanaconda/screensaver.py                    |  8 +++---
 pyanaconda/storage_utils.py                  |  2 +-
 pyanaconda/text.py                           |  6 ++--
 pyanaconda/timezone.py                       |  2 +-
 pyanaconda/ui/__init__.py                    |  2 +-
 pyanaconda/ui/gui/__init__.py                |  4 +--
 pyanaconda/ui/gui/hubs/progress.py           |  7 ++---
 pyanaconda/ui/gui/spokes/advstorage/iscsi.py |  2 +-
 pyanaconda/ui/gui/spokes/custom.py           |  2 +-
 pyanaconda/ui/gui/spokes/network.py          |  8 +++---
 pyanaconda/ui/gui/spokes/source.py           | 14 +++++-----
 pyanaconda/ui/gui/spokes/user.py             | 10 +++----
 pyanaconda/ui/tui/__init__.py                |  8 +++---
 pyanaconda/ui/tui/hubs/__init__.py           |  6 ++--
 pyanaconda/ui/tui/simpleline/base.py         | 32 ++++++++++-----------
 pyanaconda/ui/tui/simpleline/widgets.py      | 16 +++++------
 pyanaconda/ui/tui/spokes/__init__.py         | 14 +++++-----
 pyanaconda/ui/tui/spokes/askvnc.py           |  6 ++--
 pyanaconda/ui/tui/spokes/password.py         |  4 +--
 pyanaconda/ui/tui/spokes/progress.py         |  6 ++--
 pyanaconda/ui/tui/spokes/storage.py          |  6 ++--
 pyanaconda/ui/tui/spokes/time_spoke.py       | 12 ++++----
 pyanaconda/ui/tui/spokes/user.py             | 14 +++++-----
 pyanaconda/ui/tui/spokes/warnings.py         |  4 +--
 pyanaconda/ui/tui/tuiobject.py               | 10 +++----
 pyanaconda/users.py                          | 14 +++++-----
 pyanaconda/vnc.py                            | 10 +++----
 44 files changed, 213 insertions(+), 214 deletions(-)

diff --git a/pyanaconda/anaconda.py b/pyanaconda/anaconda.py
index cb4138d..e5bf56a 100644
--- a/pyanaconda/anaconda.py
+++ b/pyanaconda/anaconda.py
@@ -234,7 +234,7 @@ def initInterface(self, addon_paths=None):
         if addon_paths:
             self._intf.update_paths(addon_paths)
 
-    def writeXdriver(self, root = None):
+    def writeXdriver(self, root=None):
         # this should go away at some point, but until it does, we
         # need to keep it around.
         if self.xdriver is None:
diff --git a/pyanaconda/anaconda_log.py b/pyanaconda/anaconda_log.py
index 8cb48ec..3e8d70b 100644
--- a/pyanaconda/anaconda_log.py
+++ b/pyanaconda/anaconda_log.py
@@ -61,13 +61,13 @@ def autoSetLevel(handler, value):
 # all handlers of given logger with autoSetLevel == True are set to level
 def setHandlersLevel(logr, level):
     map(lambda hdlr: hdlr.setLevel(level),
-        filter (lambda hdlr: hasattr(hdlr, "autoSetLevel") and hdlr.autoSetLevel, logr.handlers))
+        filter(lambda hdlr: hasattr(hdlr, "autoSetLevel") and hdlr.autoSetLevel, logr.handlers))
 
 class AnacondaSyslogHandler(SysLogHandler):
     # syslog doesn't understand these level names
-    levelMap = { "ERR": "error",
-                 "CRIT": "critical",
-                 "LOCK": "debug"}
+    levelMap = {"ERR": "error",
+                "CRIT": "critical",
+                "LOCK": "debug"}
 
     def __init__(self,
                  address=('localhost', SYSLOG_UDP_PORT),
@@ -91,10 +91,10 @@ def makePickle(self, record):
         return self.formatter.format(record) + "\n"
 
 class AnacondaLog:
-    SYSLOG_CFGFILE  = "/etc/rsyslog.conf"
+    SYSLOG_CFGFILE = "/etc/rsyslog.conf"
     VIRTIO_PORT = "/dev/virtio-ports/org.fedoraproject.anaconda.log.0"
 
-    def __init__ (self):
+    def __init__(self):
         self.loglevel = DEFAULT_LEVEL
         self.remote_syslog = None
         # Rename the loglevels so they are the same as in syslog.
@@ -166,7 +166,7 @@ def __init__ (self):
                             fmtStr=STDOUT_FORMAT, minLevel=logging.INFO)
 
     # Add a simple handler - file or stream, depending on what we're given.
-    def addFileHandler (self, dest, addToLogger, minLevel=DEFAULT_LEVEL,
+    def addFileHandler(self, dest, addToLogger, minLevel=DEFAULT_LEVEL,
                         fmtStr=ENTRY_FORMAT,
                         autoLevel=False):
         try:
diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index 074bbca..d267a87 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -109,8 +109,8 @@ def parse_serial_opt(arg):
     idx = len(opts.speed)
     try:
         opts.parity = arg[idx+0]
-        opts.word   = arg[idx+1]
-        opts.flow   = arg[idx+2]
+        opts.word = arg[idx+1]
+        opts.flow = arg[idx+2]
     except IndexError:
         pass
     return opts
@@ -1591,7 +1591,7 @@ def install(self, args=None):
                 grub_args.insert(0, '--force')
             else:
                 if flags.nombr:
-                    grub_args.insert(0,'--grub-setup=/bin/true')
+                    grub_args.insert(0, '--grub-setup=/bin/true')
                     log.info("bootloader.py: mbr update by grub2 disabled")
                 else:
                     log.info("bootloader.py: mbr will be updated for grub2")
@@ -1849,7 +1849,7 @@ def write_config_images(self, config):
                       "%(initrd_line)s"
                       "%(root_line)s"
                       "\tappend=\"%(args)s\"\n\n"
-                      % {"kernel": image.kernel,  "initrd_line": initrd_line,
+                      % {"kernel": image.kernel, "initrd_line": initrd_line,
                          "label": self.image_label(image),
                          "root_line": root_line, "args": args,
                          "boot_prefix": self.boot_prefix})
@@ -1972,7 +1972,7 @@ def updatePowerPCBootList(self):
                                     ["--print-config=boot-device"])
 
         if len(buf) == 0:
-            log.error ("FAIL: nvram --print-config=boot-device")
+            log.error("FAIL: nvram --print-config=boot-device")
             return
 
         boot_list = buf.strip().split()
@@ -2034,7 +2034,7 @@ def updateNVRAMBootList(self):
                                     ["--print-config=boot-device"])
 
         if len(buf) == 0:
-            log.error ("Failed to determine nvram boot device")
+            log.error("Failed to determine nvram boot device")
             return
 
         boot_list = buf.strip().replace("\"", "").split()
@@ -2253,10 +2253,10 @@ def write_config_header(self, config):
                   "menu hidden\n\n"
                   "timeout %(timeout)d\n"
                   "#totaltimeout 9000\n\n"
-                  % { "productName": productName, "timeout": self.timeout *10 })
+                  % {"productName": productName, "timeout": self.timeout *10})
         config.write(header)
         if self.default is not None:
-            config.write("default %(default)s\n\n" % { "default" : self.image_label(self.default) })
+            config.write("default %(default)s\n\n" % {"default" : self.image_label(self.default)})
         self.write_config_password(config)
 
     def write_config_password(self, config):
diff --git a/pyanaconda/constants.py b/pyanaconda/constants.py
index 26ed16b..47a3898 100644
--- a/pyanaconda/constants.py
+++ b/pyanaconda/constants.py
@@ -49,7 +49,7 @@
 DD_FIRMWARE = "/tmp/DD/lib/firmware"
 DD_RPMS = "/tmp/DD-*"
 
-TRANSLATIONS_UPDATE_DIR="/tmp/updates/po"
+TRANSLATIONS_UPDATE_DIR = "/tmp/updates/po"
 
 ANACONDA_CLEANUP = "anaconda-cleanup"
 MOUNT_DIR = "/run/install"
@@ -165,10 +165,10 @@
 LOGLVL_LOCK = logging.DEBUG-1
 
 # Constants for reporting status to IPMI.  These are from the IPMI spec v2 rev1.1, page 512.
-IPMI_STARTED  = 0x7         # installation started
+IPMI_STARTED = 0x7          # installation started
 IPMI_FINISHED = 0x8         # installation finished successfully
-IPMI_ABORTED  = 0x9         # installation finished unsuccessfully, due to some non-exn error
-IPMI_FAILED   = 0xA         # installation hit an exception
+IPMI_ABORTED = 0x9          # installation finished unsuccessfully, due to some non-exn error
+IPMI_FAILED = 0xA           # installation hit an exception
 
 
 # for how long (in seconds) we try to wait for enough entropy for LUKS
diff --git a/pyanaconda/constants_text.py b/pyanaconda/constants_text.py
index 750a984..10bd47e 100644
--- a/pyanaconda/constants_text.py
+++ b/pyanaconda/constants_text.py
@@ -38,7 +38,7 @@ def __len__(self):
         return 2
 
 TEXT_OK_STR = N_("OK")
-TEXT_OK_CHECK  = "ok"
+TEXT_OK_CHECK = "ok"
 TEXT_OK_BUTTON = Translator(TEXT_OK_STR, TEXT_OK_CHECK)
 
 TEXT_CANCEL_STR = N_("Cancel")
diff --git a/pyanaconda/exception.py b/pyanaconda/exception.py
index c1b27a7..05735bc 100644
--- a/pyanaconda/exception.py
+++ b/pyanaconda/exception.py
@@ -218,11 +218,11 @@ def runDebug(self, exc_info):
             iutil.vtActivate(self._intf_tty_num)
 
 def initExceptionHandling(anaconda):
-    fileList = [ "/tmp/anaconda.log", "/tmp/packaging.log",
-                 "/tmp/program.log", "/tmp/storage.log", "/tmp/ifcfg.log",
-                 "/tmp/dnf.log", "/tmp/dnf.rpm.log",
-                 "/tmp/yum.log", iutil.getSysroot() + "/root/install.log",
-                 "/proc/cmdline" ]
+    fileList = ["/tmp/anaconda.log", "/tmp/packaging.log",
+                "/tmp/program.log", "/tmp/storage.log", "/tmp/ifcfg.log",
+                "/tmp/dnf.log", "/tmp/dnf.rpm.log",
+                "/tmp/yum.log", iutil.getSysroot() + "/root/install.log",
+                "/proc/cmdline"]
 
     if os.path.exists("/tmp/syslog"):
         fileList.extend(["/tmp/syslog"])
@@ -251,7 +251,7 @@ def initExceptionHandling(anaconda):
                                 "_bootloader.password",
                                 "payload._groups",
                                 "payload._yum"],
-                  localSkipList=[ "passphrase", "password", "_oldweak", "_password" ],
+                  localSkipList=["passphrase", "password", "_oldweak", "_password"],
                   fileList=fileList)
 
     conf.register_callback("lsblk_output", lsblk_callback, attchmnt_only=True)
diff --git a/pyanaconda/image.py b/pyanaconda/image.py
index 9662832..3458ba7 100644
--- a/pyanaconda/image.py
+++ b/pyanaconda/image.py
@@ -173,7 +173,7 @@ def mountImage(isodir, tree):
             image = os.path.normpath("%s/%s" % (isodir, image))
 
         try:
-            blivet.util.mount(image, tree, fstype = 'iso9660', options="ro")
+            blivet.util.mount(image, tree, fstype='iso9660', options="ro")
         except OSError:
             exn = MissingImageError()
             if errorHandler.cb(exn) == ERROR_RAISE:
diff --git a/pyanaconda/installclass.py b/pyanaconda/installclass.py
index d7ec1db..e58c56c 100644
--- a/pyanaconda/installclass.py
+++ b/pyanaconda/installclass.py
@@ -168,7 +168,7 @@ def _ordering(first, second):
     for d in env_path + ["installclasses",
               "/tmp/updates/pyanaconda/installclasses",
               "/tmp/product/pyanaconda/installclasses",
-              "%s/pyanaconda/installclasses" % get_python_lib(plat_specific=1) ]:
+              "%s/pyanaconda/installclasses" % get_python_lib(plat_specific=1)]:
         if os.access(d, os.R_OK):
             path.append(d)
 
@@ -185,7 +185,7 @@ def _ordering(first, second):
     for fileName in files:
         if fileName[0] == '.':
             continue
-        if len (fileName) < 4:
+        if len(fileName) < 4:
             continue
         if fileName[-3:] != ".py" and fileName[-4:-1] != ".py":
             continue
@@ -197,7 +197,7 @@ def _ordering(first, second):
         try:
             found = imputil.imp.find_module(mainName)
         except ImportError:
-            log.warning ("module import of %s failed: %s", mainName, sys.exc_info()[0])
+            log.warning("module import of %s failed: %s", mainName, sys.exc_info()[0])
             continue
 
         try:
@@ -210,7 +210,7 @@ def _ordering(first, second):
                     if not obj.hidden or showHidden:
                         lst.append(((obj.name, obj), sortOrder))
         except (ImportError, AttributeError):
-            log.warning ("module import of %s failed: %s", mainName, sys.exc_info()[0])
+            log.warning("module import of %s failed: %s", mainName, sys.exc_info()[0])
 
     lst.sort(_ordering)
     for (item, _) in lst:
diff --git a/pyanaconda/installinterfacebase.py b/pyanaconda/installinterfacebase.py
index c657236..2167c96 100644
--- a/pyanaconda/installinterfacebase.py
+++ b/pyanaconda/installinterfacebase.py
@@ -22,8 +22,8 @@
 log = logging.getLogger("anaconda")
 
 class InstallInterfaceBase(object):
-    def messageWindow(self, title, text, ty="ok", default = None,
-             custom_buttons=None,  custom_icon=None):
+    def messageWindow(self, title, text, ty="ok", default=None,
+             custom_buttons=None, custom_icon=None):
         raise NotImplementedError
 
     def detailedMessageWindow(self, title, text, longText=None, ty="ok",
diff --git a/pyanaconda/isys/__init__.py b/pyanaconda/isys/__init__.py
index 02e7d85..67667bd 100644
--- a/pyanaconda/isys/__init__.py
+++ b/pyanaconda/isys/__init__.py
@@ -49,9 +49,9 @@
 NO_SWAP_EXTRA_RAM = 200
 
 ## Flush filesystem buffers.
-def sync ():
+def sync():
     # TODO: This can be replaced with os.sync in Python 3.3
-    return _isys.sync ()
+    return _isys.sync()
 
 ISO_BLOCK_SIZE = 2048
 
diff --git a/pyanaconda/iutil.py b/pyanaconda/iutil.py
index b163091..f096619 100644
--- a/pyanaconda/iutil.py
+++ b/pyanaconda/iutil.py
@@ -685,11 +685,11 @@ def add_po_path(directory):
     """ Looks to see what translations are under a given path and tells
     the gettext module to use that path as the base dir """
     for d in os.listdir(directory):
-        if not os.path.isdir("%s/%s" %(directory,d)):
+        if not os.path.isdir("%s/%s" %(directory, d)):
             continue
-        if not os.path.exists("%s/%s/LC_MESSAGES" %(directory,d)):
+        if not os.path.exists("%s/%s/LC_MESSAGES" %(directory, d)):
             continue
-        for basename in os.listdir("%s/%s/LC_MESSAGES" %(directory,d)):
+        for basename in os.listdir("%s/%s/LC_MESSAGES" %(directory, d)):
             if not basename.endswith(".mo"):
                 continue
             log.info("setting %s as translation source for %s", directory, basename[:-3])
@@ -1096,7 +1096,7 @@ def upcase_first_letter(text):
 def get_mount_paths(devnode):
     '''given a device node, return a list of all active mountpoints.'''
     devno = os.stat(devnode).st_rdev
-    majmin = "%d:%d" % (os.major(devno),os.minor(devno))
+    majmin = "%d:%d" % (os.major(devno), os.minor(devno))
     mountinfo = (line.split() for line in open("/proc/self/mountinfo"))
     return [info[4] for info in mountinfo if info[2] == majmin]
 
diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index b64bd09..8f75445 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -124,8 +124,8 @@ def run(self, chroot):
         with open(messages, "w") as fp:
             rc = iutil.execWithRedirect(self.interp, ["/tmp/%s" % os.path.basename(path)],
                                         stdout=fp,
-                                        root = scriptRoot,
-                                        env_prune = env_prune)
+                                        root=scriptRoot,
+                                        env_prune=env_prune)
 
         if rc != 0:
             log.error("Error code %s running the kickstart script at line %s", rc, self.lineno)
@@ -673,16 +673,16 @@ def execute(self, storage, ksdata, instClass):
             args += ["--service=ssh"]
 
         for dev in self.trusts:
-            args += [ "--trust=%s" % (dev,) ]
+            args += ["--trust=%s" % (dev,)]
 
         for port in self.ports:
-            args += [ "--port=%s" % (port,) ]
+            args += ["--port=%s" % (port,)]
 
         for remove_service in self.remove_services:
-            args += [ "--remove-service=%s" % (remove_service,) ]
+            args += ["--remove-service=%s" % (remove_service,)]
 
         for service in self.services:
-            args += [ "--service=%s" % (service,) ]
+            args += ["--service=%s" % (service,)]
 
         cmd = "/usr/bin/firewall-offline-cmd"
         if not os.path.exists(iutil.getSysroot()+cmd):
@@ -1573,9 +1573,9 @@ def execute(self, storage, ksdata, instClass, users):
 
 class SELinux(commands.selinux.FC3_SELinux):
     def execute(self, *args):
-        selinux_states = { SELINUX_DISABLED: "disabled",
-                           SELINUX_ENFORCING: "enforcing",
-                           SELINUX_PERMISSIVE: "permissive" }
+        selinux_states = {SELINUX_DISABLED: "disabled",
+                          SELINUX_ENFORCING: "enforcing",
+                          SELINUX_PERMISSIVE: "permissive"}
 
         if self.selinux is None:
             # Use the defaults set by the installed (or not) selinux package
@@ -1590,7 +1590,7 @@ def execute(self, *args):
             selinux_cfg.set(("SELINUX", selinux_states[self.selinux]))
             selinux_cfg.write()
         except IOError as msg:
-            log.error ("Error setting selinux mode: %s", msg)
+            log.error("Error setting selinux mode: %s", msg)
 
 class Services(commands.services.FC6_Services):
     def execute(self, storage, ksdata, instClass):
@@ -1879,7 +1879,7 @@ def parse(self, *args):
 class AnacondaKSHandler(superclass):
     AddonClassType = AddonData
 
-    def __init__ (self, addon_paths=None, commandUpdates=None, dataUpdates=None):
+    def __init__(self, addon_paths=None, commandUpdates=None, dataUpdates=None):
         if addon_paths is None:
             addon_paths = []
 
@@ -1907,7 +1907,7 @@ def __init__ (self, addon_paths=None, commandUpdates=None, dataUpdates=None):
 
             classes = collect(module_name, path, lambda cls: issubclass(cls, self.AddonClassType))
             if classes:
-                addons[addon_id] = classes[0](name = addon_id)
+                addons[addon_id] = classes[0](name=addon_id)
 
         # Prepare the final structures for 3rd party addons
         self.addons = AddonRegistry(addons)
@@ -1918,11 +1918,11 @@ def __str__(self):
 class AnacondaPreParser(KickstartParser):
     # A subclass of KickstartParser that only looks for %pre scripts and
     # sets them up to be run.  All other scripts and commands are ignored.
-    def __init__ (self, handler, followIncludes=True, errorsAreFatal=True,
-                  missingIncludeIsFatal=True):
+    def __init__(self, handler, followIncludes=True, errorsAreFatal=True,
+                 missingIncludeIsFatal=True):
         KickstartParser.__init__(self, handler, missingIncludeIsFatal=False)
 
-    def handleCommand (self, lineno, args):
+    def handleCommand(self, lineno, args):
         pass
 
     def setupSections(self):
@@ -1934,12 +1934,12 @@ def setupSections(self):
 
 
 class AnacondaKSParser(KickstartParser):
-    def __init__ (self, handler, followIncludes=True, errorsAreFatal=True,
-                  missingIncludeIsFatal=True, scriptClass=AnacondaKSScript):
+    def __init__(self, handler, followIncludes=True, errorsAreFatal=True,
+                 missingIncludeIsFatal=True, scriptClass=AnacondaKSScript):
         self.scriptClass = scriptClass
         KickstartParser.__init__(self, handler)
 
-    def handleCommand (self, lineno, args):
+    def handleCommand(self, lineno, args):
         if not self.handler:
             return
 
@@ -2020,7 +2020,7 @@ def runPostScripts(scripts):
         return
 
     log.info("Running kickstart %%post script(s)")
-    map (lambda s: s.run(iutil.getSysroot()), postScripts)
+    map(lambda s: s.run(iutil.getSysroot()), postScripts)
     log.info("All kickstart %%post script(s) have been run")
 
 def runPreScripts(scripts):
@@ -2032,13 +2032,13 @@ def runPreScripts(scripts):
     log.info("Running kickstart %%pre script(s)")
     stdoutLog.info(_("Running pre-installation scripts"))
 
-    map (lambda s: s.run("/"), preScripts)
+    map(lambda s: s.run("/"), preScripts)
 
     log.info("All kickstart %%pre script(s) have been run")
 
 def runTracebackScripts(scripts):
     log.info("Running kickstart %%traceback script(s)")
-    for script in filter (lambda s: s.type == KS_SCRIPT_TRACEBACK, scripts):
+    for script in filter(lambda s: s.type == KS_SCRIPT_TRACEBACK, scripts):
         script.run("/")
     log.info("All kickstart %%traceback script(s) have been run")
 
diff --git a/pyanaconda/localization.py b/pyanaconda/localization.py
index 6cac742..9a28837 100644
--- a/pyanaconda/localization.py
+++ b/pyanaconda/localization.py
@@ -139,10 +139,10 @@ def find_best_locale_match(locale, langcodes):
 
     """
 
-    score_map = { "language" : 1000,
-                  "territory":  100,
-                  "script"   :   10,
-                  "encoding" :    1 }
+    score_map = {"language" : 1000,
+                 "territory":  100,
+                 "script"   :   10,
+                 "encoding" :    1}
 
     def get_match_score(locale, langcode):
         score = 0
diff --git a/pyanaconda/network.py b/pyanaconda/network.py
index f1b3ab8..b1d23bf 100644
--- a/pyanaconda/network.py
+++ b/pyanaconda/network.py
@@ -196,7 +196,7 @@ def _ifcfg_files(directory):
         if name.startswith("ifcfg-"):
             if name == "ifcfg-lo":
                 continue
-            rv.append(os.path.join(directory,name))
+            rv.append(os.path.join(directory, name))
     return rv
 
 def logIfcfgFiles(message=""):
@@ -278,7 +278,7 @@ def dumpMissingDefaultIfcfgs():
             nm.nm_update_settings_of_device(devname, [['connection', 'id', devname, None]])
             log.debug("network: dumping ifcfg file for default autoconnection on %s", devname)
             nm.nm_update_settings_of_device(devname, [['connection', 'autoconnect', False, None]])
-            log.debug("network: setting autoconnect of %s to False" , devname)
+            log.debug("network: setting autoconnect of %s to False", devname)
         except nm.SettingsNotFoundError:
             log.debug("network: no ifcfg file for %s", devname)
         rv.append(devname)
@@ -347,7 +347,7 @@ def dracutBootArguments(devname, ifcfg, storage_ipaddr, hostname=None):
                 else:
                     gateway = ""
                 netmask = ifcfg.get('NETMASK%s' % cfgidx)
-                prefix  = ifcfg.get('PREFIX%s' % cfgidx)
+                prefix = ifcfg.get('PREFIX%s' % cfgidx)
                 if not netmask and prefix:
                     netmask = prefix2netmask(int(prefix))
                 ipaddr = ifcfg.get('IPADDR%s' % cfgidx)
@@ -538,7 +538,7 @@ def _add_slave_connection(slave_type, slave, master, activate, values=None):
     slave_name = slave
 
     values = []
-    suuid =  str(uuid4())
+    suuid = str(uuid4())
     # assume ethernet, TODO: infiniband, wifi, vlan
     values.append(['connection', 'uuid', suuid, 's'])
     values.append(['connection', 'id', slave_name, 's'])
@@ -629,7 +629,7 @@ def ifcfg_to_ksdata(ifcfg, devname):
         return None
 
     # ipv4 and ipv6
-    if ifcfg.get("ONBOOT") and ifcfg.get("ONBOOT" ) == "no":
+    if ifcfg.get("ONBOOT") and ifcfg.get("ONBOOT") == "no":
         kwargs["onboot"] = False
     if ifcfg.get('MTU') and ifcfg.get('MTU') != "0":
         kwargs["mtu"] = ifcfg.get('MTU')
@@ -645,7 +645,7 @@ def ifcfg_to_ksdata(ifcfg, devname):
             kwargs["bootProto"] = "static"
             kwargs["ip"] = ifcfg.get('IPADDR')
             netmask = ifcfg.get('NETMASK')
-            prefix  = ifcfg.get('PREFIX')
+            prefix = ifcfg.get('PREFIX')
             if not netmask and prefix:
                 netmask = prefix2netmask(int(prefix))
             if netmask:
@@ -656,7 +656,7 @@ def ifcfg_to_ksdata(ifcfg, devname):
         elif ifcfg.get('IPADDR0'):
             kwargs["bootProto"] = "static"
             kwargs["ip"] = ifcfg.get('IPADDR0')
-            prefix  = ifcfg.get('PREFIX0')
+            prefix = ifcfg.get('PREFIX0')
             if prefix:
                 netmask = prefix2netmask(int(prefix))
                 kwargs["netmask"] = netmask
@@ -879,7 +879,7 @@ def get_team_slaves(master_specs):
     return slaves
 
 def ifaceForHostIP(host):
-    route = iutil.execWithCapture("ip", [ "route", "get", "to", host ])
+    route = iutil.execWithCapture("ip", ["route", "get", "to", host])
     if not route:
         log.error("Could not get interface for route to %s", host)
         return ""
@@ -926,7 +926,7 @@ def copyFileToPath(fileName, destPath='', overwrite=False):
 def copyIfcfgFiles(destPath):
     files = os.listdir(netscriptsDir)
     for cfgFile in files:
-        if cfgFile.startswith(("ifcfg-","keys-")):
+        if cfgFile.startswith(("ifcfg-", "keys-")):
             srcfile = os.path.join(netscriptsDir, cfgFile)
             copyFileToPath(srcfile, destPath)
 
diff --git a/pyanaconda/nm.py b/pyanaconda/nm.py
index 183cd96..5cbf5d3 100644
--- a/pyanaconda/nm.py
+++ b/pyanaconda/nm.py
@@ -483,10 +483,10 @@ def nm_device_ip_config(name, version=4):
 
     if version == 4:
         dbus_iface = ".IP4Config"
-        prop= "Ip4Config"
+        prop = "Ip4Config"
     elif version == 6:
         dbus_iface = ".IP6Config"
-        prop= "Ip6Config"
+        prop = "Ip6Config"
     else:
         return []
 
@@ -642,7 +642,7 @@ def _settings_for_hwaddr(hwaddr):
     return _find_settings(hwaddr, '802-3-ethernet', 'mac-address',
             format_value=lambda ba: ":".join("%02X" % b for b in ba))
 
-def _find_settings(value, key1, key2, format_value=lambda x:x):
+def _find_settings(value, key1, key2, format_value=lambda x: x):
     """Return list of object paths of settings having given value of key1, key2 setting
 
        :param value: required value of setting
@@ -674,7 +674,7 @@ def _find_settings(value, key1, key2, format_value=lambda x:x):
 
     return retval
 
-def nm_get_settings(value, key1, key2, format_value=lambda x:x):
+def nm_get_settings(value, key1, key2, format_value=lambda x: x):
     """Return settings having given value of key1, key2 setting
 
        Returns list of settings(dicts) , None if settings were not found.
diff --git a/pyanaconda/packaging/dnfpayload.py b/pyanaconda/packaging/dnfpayload.py
index f688680..a2532e0 100644
--- a/pyanaconda/packaging/dnfpayload.py
+++ b/pyanaconda/packaging/dnfpayload.py
@@ -103,7 +103,7 @@ def reasonable_mpoint(mpoint):
 
     # reserve extra
     requested = requested + Size("150 MB")
-    sufficients = {key : val for (key,val) in df.items() if val > requested
+    sufficients = {key : val for (key, val) in df.items() if val > requested
                    and reasonable_mpoint(key)}
     log.info('Sufficient mountpoints found: %s', sufficients)
 
diff --git a/pyanaconda/rescue.py b/pyanaconda/rescue.py
index b3c96b3..42ca0d8 100644
--- a/pyanaconda/rescue.py
+++ b/pyanaconda/rescue.py
@@ -26,7 +26,7 @@
 import time
 import re
 
-from snack import ButtonChoiceWindow, ListboxChoiceWindow,SnackScreen
+from snack import ButtonChoiceWindow, ListboxChoiceWindow, SnackScreen
 
 from pyanaconda.constants import ANACONDA_CLEANUP
 from pyanaconda.constants_text import TEXT_OK_BUTTON, TEXT_NO_BUTTON, TEXT_YES_BUTTON
@@ -52,7 +52,7 @@ class RescueInterface(InstallInterfaceBase):
     def waitWindow(self, title, text):
         return WaitWindow(self.screen, title, text)
 
-    def progressWindow(self, title, text, total, updpct = 0.05, pulse = False):
+    def progressWindow(self, title, text, total, updpct=0.05, pulse=False):
         return ProgressWindow(self.screen, title, text, total, updpct, pulse)
 
     def detailedMessageWindow(self, title, text, longText=None, ty="ok",
@@ -61,7 +61,7 @@ def detailedMessageWindow(self, title, text, longText=None, ty="ok",
         return self.messageWindow(title, text, ty, default, custom_icon,
                                   custom_buttons)
 
-    def messageWindow(self, title, text, ty = "ok", default = None,
+    def messageWindow(self, title, text, ty="ok", default=None,
                       custom_icon=None, custom_buttons=None):
         if custom_buttons is None:
             custom_buttons = []
@@ -81,7 +81,7 @@ def messageWindow(self, title, text, ty = "ok", default = None,
         elif ty == "custom":
             tmpbut = []
             for but in custom_buttons:
-                tmpbut.append(but.replace("_",""))
+                tmpbut.append(but.replace("_", ""))
 
             rc = ButtonChoiceWindow(self.screen, title, text, width=60, buttons=tmpbut)
 
@@ -108,7 +108,7 @@ def meh_interface(self):
     def tty_num(self):
         return 1
 
-    def shutdown (self):
+    def shutdown(self):
         self.screen.finish()
 
     def suspend(self):
@@ -122,7 +122,7 @@ def __init__(self):
         self.screen = SnackScreen()
         self._meh_interface = meh.ui.text.TextIntf()
 
-def makeFStab(instPath = ""):
+def makeFStab(instPath=""):
     if os.access("/proc/mounts", os.R_OK):
         f = open("/proc/mounts", "r")
         buf = f.read()
@@ -171,7 +171,7 @@ def makeResolvConf(instPath):
     f.write(buf)
     f.close()
 
-def runShell(screen = None, msg=""):
+def runShell(screen=None, msg=""):
     if screen:
         screen.suspend()
 
@@ -192,7 +192,7 @@ def runShell(screen = None, msg=""):
     if os.path.exists("/usr/bin/firstaidkit-qs"):
         iutil.execWithRedirect("/usr/bin/firstaidkit-qs", [])
 
-    if proc is None or proc.returncode!=0:
+    if proc is None or proc.returncode != 0:
         if os.path.exists("/bin/bash"):
             iutil.execConsole()
         else:
@@ -260,8 +260,8 @@ def doRescue(intf, rescue_mount, ksdata):
                                                                     intf.screen,
                                                                     ty, val, tb)
 
-    for f in [ "services", "protocols", "group", "joe", "man.config",
-               "nsswitch.conf", "selinux", "mke2fs.conf" ]:
+    for f in ["services", "protocols", "group", "joe", "man.config",
+              "nsswitch.conf", "selinux", "mke2fs.conf"]:
         try:
             os.symlink('/mnt/runtime/etc/' + f, '/etc/' + f)
         except OSError:
@@ -295,7 +295,7 @@ def doRescue(intf, rescue_mount, ksdata):
                   "If for some reason this process fails you can choose 'Skip' "
                   "and this step will be skipped and you will go directly to a "
                   "command shell.\n\n") % (iutil.getSysroot(),),
-                  [_("Continue"), _("Read-Only"), _("Skip")] )
+                  [_("Continue"), _("Read-Only"), _("Skip")])
 
             if rc == _("Skip").lower():
                 runShell(intf.screen)
@@ -315,7 +315,7 @@ def doRescue(intf, rescue_mount, ksdata):
     elif len(roots) == 1:
         root = roots[0]
     else:
-        height = min (len (roots), 12)
+        height = min(len(roots), 12)
         if height == 12:
             scroll = 1
         else:
@@ -329,9 +329,9 @@ def doRescue(intf, rescue_mount, ksdata):
             ListboxChoiceWindow(intf.screen, _("System to Rescue"),
                                 _("Which device holds the root partition "
                                   "of your installation?"), lst,
-                                [ _("OK"), _("Exit") ], width = 30,
-                                scroll = scroll, height = height,
-                                help = "multipleroot")
+                                [_("OK"), _("Exit")], width=30,
+                                scroll=scroll, height=height,
+                                help="multipleroot")
 
         if button == _("Exit").lower():
             root = None
@@ -361,7 +361,7 @@ def doRescue(intf, rescue_mount, ksdata):
                      "\tchroot %(rootPath)s\n\n%(msg)s") %
                                    {'rootPath': iutil.getSysroot(),
                                     'msg': msg},
-                                   [_("OK")] )
+                                   [_("OK")])
             rootmounted = True
 
             # now turn on swap
@@ -408,7 +408,7 @@ def doRescue(intf, rescue_mount, ksdata):
             # do we have bash?
             try:
                 if os.access("/usr/bin/bash", os.R_OK):
-                    os.symlink ("/usr/bin/bash", "/bin/bash")
+                    os.symlink("/usr/bin/bash", "/bin/bash")
             except OSError:
                 pass
         except (ValueError, LookupError, SyntaxError, NameError):
@@ -429,7 +429,7 @@ def doRescue(intf, rescue_mount, ksdata):
                     _("An error occurred trying to mount some or all of your "
                       "system. Some of it may be mounted under %s.\n\n"
                       "Press <return> to get a shell.") % iutil.getSysroot() + msg,
-                      [_("OK")] )
+                      [_("OK")])
     else:
         if flags.automatedInstall and ksdata.reboot.action in [KS_REBOOT, KS_SHUTDOWN]:
             log.info("No Linux partitions found")
@@ -445,7 +445,7 @@ def doRescue(intf, rescue_mount, ksdata):
             ButtonChoiceWindow(intf.screen, _("Rescue Mode"),
                                _("You don't have any Linux partitions. Press "
                                  "return to get a shell.%s") % msg,
-                               [ _("OK") ], width = 50)
+                               [_("OK")], width=50)
 
     msgStr = ""
 
@@ -456,7 +456,7 @@ def doRescue(intf, rescue_mount, ksdata):
         except (OSError, IOError) as e:
             log.error("error making a resolv.conf: %s", e)
         msgStr = _("Your system is mounted under the %s directory.") % (iutil.getSysroot(),)
-        ButtonChoiceWindow(intf.screen, _("Rescue"), msgStr, [_("OK")] )
+        ButtonChoiceWindow(intf.screen, _("Rescue"), msgStr, [_("OK")])
 
     # we do not need ncurses anymore, shut them down
     intf.shutdown()
diff --git a/pyanaconda/screensaver.py b/pyanaconda/screensaver.py
index f95a98f..3809cb0 100644
--- a/pyanaconda/screensaver.py
+++ b/pyanaconda/screensaver.py
@@ -26,14 +26,14 @@
 log = logging.getLogger("anaconda")
 
 SCREENSAVER_SERVICE = "org.freedesktop.ScreenSaver"
-SCREENSAVER_PATH    = "/org/freedesktop/ScreenSaver"
-SCREENSAVER_IFACE   = "org.freedesktop.ScreenSaver"
+SCREENSAVER_PATH = "/org/freedesktop/ScreenSaver"
+SCREENSAVER_IFACE = "org.freedesktop.ScreenSaver"
 
-SCREENSAVER_INHIBIT_METHOD   = "Inhibit"
+SCREENSAVER_INHIBIT_METHOD = "Inhibit"
 SCREENSAVER_UNINHIBIT_METHOD = "UnInhibit"
 
 SCREENSAVER_APPLICATION = "anaconda"
-SCREENSAVER_REASON      = "Installing"
+SCREENSAVER_REASON = "Installing"
 
 def inhibit_screensaver(connection):
     """
diff --git a/pyanaconda/storage_utils.py b/pyanaconda/storage_utils.py
index d0906d3..d047986 100644
--- a/pyanaconda/storage_utils.py
+++ b/pyanaconda/storage_utils.py
@@ -172,7 +172,7 @@ def sanity_check(storage, min_ram=isys.MIN_RAM):
     checkSizes = [('/usr', Size("250 MiB")), ('/tmp', Size("50 MiB")), ('/var', Size("384 MiB")),
                   ('/home', Size("100 MiB")), ('/boot', Size("200 MiB"))]
     mustbeonlinuxfs = ['/', '/var', '/tmp', '/usr', '/home', '/usr/share', '/usr/lib']
-    mustbeonroot = ['/bin','/dev','/sbin','/etc','/lib','/root', '/mnt', 'lost+found', '/proc']
+    mustbeonroot = ['/bin', '/dev', '/sbin', '/etc', '/lib', '/root', '/mnt', 'lost+found', '/proc']
 
     filesystems = storage.mountpoints
     root = storage.fsset.rootDevice
diff --git a/pyanaconda/text.py b/pyanaconda/text.py
index a049c30..e5f6277 100644
--- a/pyanaconda/text.py
+++ b/pyanaconda/text.py
@@ -72,7 +72,7 @@ def set(self, amount):
     def refresh(self):
         pass
 
-    def __init__(self, screen, title, text, total, updpct = 0.05, pulse = False):
+    def __init__(self, screen, title, text, total, updpct=0.05, pulse=False):
         self.multiplier = 1
         if total == 1.0:
             self.multiplier = 100
@@ -108,8 +108,8 @@ def run(self):
         txt = TextboxReflowed(65, self.txt)
         toplevel.add(txt, 0, 0)
 
-        passphraseentry = Entry(60, password = 1)
-        toplevel.add(passphraseentry, 0, 1, (0,0,0,1))
+        passphraseentry = Entry(60, password=1)
+        toplevel.add(passphraseentry, 0, 1, (0, 0, 0, 1))
 
         buttons = ButtonBar(self.screen, [TEXT_OK_BUTTON, TEXT_CANCEL_BUTTON])
         toplevel.add(buttons, 0, 2, growx=1)
diff --git a/pyanaconda/timezone.py b/pyanaconda/timezone.py
index 956c33e..9afbfdb 100644
--- a/pyanaconda/timezone.py
+++ b/pyanaconda/timezone.py
@@ -127,7 +127,7 @@ def write_timezone_config(timezone, root):
         lines = fobj.readlines()
         fobj.close()
     except IOError:
-        lines = [ "0.0 0 0.0\n", "0\n" ]
+        lines = ["0.0 0 0.0\n", "0\n"]
 
     try:
         with open(os.path.normpath(root + "/etc/adjtime"), "w") as fobj:
diff --git a/pyanaconda/ui/__init__.py b/pyanaconda/ui/__init__.py
index 9bf7959..8d71c5f 100644
--- a/pyanaconda/ui/__init__.py
+++ b/pyanaconda/ui/__init__.py
@@ -82,7 +82,7 @@ def tty_num(self):
     def update_paths(cls, pathdict):
         """Receives pathdict and appends it's contents to the current
            class defined search path dictionary."""
-        for k,v in pathdict.items():
+        for k, v in pathdict.items():
             cls.paths.setdefault(k, [])
             cls.paths[k].extend(v)
 
diff --git a/pyanaconda/ui/gui/__init__.py b/pyanaconda/ui/gui/__init__.py
index bcf32f6..314c422 100644
--- a/pyanaconda/ui/gui/__init__.py
+++ b/pyanaconda/ui/gui/__init__.py
@@ -480,8 +480,8 @@ class GraphicalUserInterface(UserInterface):
        It is suitable for use both directly and via VNC.
     """
     def __init__(self, storage, payload, instclass,
-                 distributionText = product.distributionText, isFinal = product.isFinal,
-                 quitDialog = QuitDialog, gui_lock = None, fullscreen=False):
+                 distributionText=product.distributionText, isFinal=product.isFinal,
+                 quitDialog=QuitDialog, gui_lock=None, fullscreen=False):
 
         UserInterface.__init__(self, storage, payload, instclass)
 
diff --git a/pyanaconda/ui/gui/hubs/progress.py b/pyanaconda/ui/gui/hubs/progress.py
index 3f91513..7644cca 100644
--- a/pyanaconda/ui/gui/hubs/progress.py
+++ b/pyanaconda/ui/gui/hubs/progress.py
@@ -56,7 +56,7 @@ def __init__(self, data, storage, payload, instclass):
 
         self._rnotes_id = None
 
-    def _do_configuration(self, widget = None, reenable_ransom = True):
+    def _do_configuration(self, widget=None, reenable_ransom=True):
         from pyanaconda.install import doConfiguration
         from pyanaconda.threads import threadMgr, AnacondaThread
 
@@ -82,7 +82,7 @@ def _start_ransom_notes(self):
         self._cycle_rnotes()
         self._rnotes_id = GLib.timeout_add_seconds(60, self._cycle_rnotes)
 
-    def _update_progress(self, callback = None):
+    def _update_progress(self, callback=None):
         from pyanaconda.progress import progressQ
         import Queue
 
@@ -143,8 +143,7 @@ def _install_done(self):
         # package installation done, check personalization spokes
         # and start the configuration step if all is ready
         if not self._inSpoke and self.continuePossible:
-            self._do_configuration(reenable_ransom = False)
-
+            self._do_configuration(reenable_ransom=False)
         else:
             # some mandatory spokes are not ready
             # switch to configure and finish page
diff --git a/pyanaconda/ui/gui/spokes/advstorage/iscsi.py b/pyanaconda/ui/gui/spokes/advstorage/iscsi.py
index 29d738d..22e11c3 100644
--- a/pyanaconda/ui/gui/spokes/advstorage/iscsi.py
+++ b/pyanaconda/ui/gui/spokes/advstorage/iscsi.py
@@ -317,7 +317,7 @@ def on_discover_field_changed(self, *args):
 
     def _add_nodes(self, nodes):
         for node in nodes:
-            iface =  self.iscsi.ifaces.get(node.iface, node.iface)
+            iface = self.iscsi.ifaces.get(node.iface, node.iface)
             portal = "%s:%s" % (node.address, node.port)
             self._store.append([False, True, node.name, iface, portal])
 
diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
index 74f48e0..8647818 100644
--- a/pyanaconda/ui/gui/spokes/custom.py
+++ b/pyanaconda/ui/gui/spokes/custom.py
@@ -1441,7 +1441,7 @@ def _set_devices_label(self):
             if num_disks > 1:
                 devices_desc += CP_("GUI|Custom Partitioning|Devices",
                                     " and %d other", " and %d others",
-                                    num_disks - 1) % (num_disks -1 )
+                                    num_disks - 1) % (num_disks -1)
         self._deviceDescLabel.set_text(devices_desc)
 
     def _populate_right_side(self, selector):
diff --git a/pyanaconda/ui/gui/spokes/network.py b/pyanaconda/ui/gui/spokes/network.py
index 052871b..53fa476 100644
--- a/pyanaconda/ui/gui/spokes/network.py
+++ b/pyanaconda/ui/gui/spokes/network.py
@@ -79,7 +79,7 @@ def getNMObjProperty(obj, nm_iface_suffix, prop):
                            prop)
 
 
-DEVICES_COLUMN_TITLE  = 2
+DEVICES_COLUMN_TITLE = 2
 DEVICES_COLUMN_OBJECT = 3
 
 
@@ -250,7 +250,7 @@ def get_iface(self):
         else:
             iface = self.setting_value("connection", "interface-name")
             if not iface:
-                hwaddr = self.setting_value("802-3-ethernet","mac-address")
+                hwaddr = self.setting_value("802-3-ethernet", "mac-address")
                 if hwaddr:
                     hwaddr = ":".join("%02X" % b for b in hwaddr)
                     iface = nm.nm_hwaddr_to_device_name(hwaddr)
@@ -663,7 +663,7 @@ def selected_dev_cfg(self):
         return model[itr][DEVICES_COLUMN_OBJECT]
 
     def add_dev_cfg(self, dev_cfg):
-        log.debug ("network: GUI, device configuration added: connection %s device %s",
+        log.debug("network: GUI, device configuration added: connection %s device %s",
                      dev_cfg.con_uuid, dev_cfg.get_iface())
         self.dev_cfg_store.append([
             self._dev_icon_name(dev_cfg),
@@ -755,7 +755,7 @@ def dev_cfg(self, uuid=None, device=None):
     def remove_device(self, device):
         # This should not concern wifi and ethernet devices,
         # just virtual devices e.g. vpn probably
-        log.debug("network: GUI, device removed: %s" , device.get_iface())
+        log.debug("network: GUI, device removed: %s", device.get_iface())
         dev_cfg = self.dev_cfg(device=device)
         if dev_cfg:
             dev_cfg.device = None
diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py
index 447a4a3..c91be69 100644
--- a/pyanaconda/ui/gui/spokes/source.py
+++ b/pyanaconda/ui/gui/spokes/source.py
@@ -747,11 +747,11 @@ def refresh(self):
 
         for dev in potentialHdisoSources(self.storage.devicetree):
             # path model size format type uuid of format
-            dev_info = { "model" : self._sanitize_model(dev.disk.model),
-                         "path"  : dev.path,
-                         "size"  : dev.size,
-                         "format": dev.format.name or "",
-                         "label" : dev.format.label or dev.format.uuid or ""
+            dev_info = {"model" : self._sanitize_model(dev.disk.model),
+                        "path"  : dev.path,
+                        "size"  : dev.size,
+                        "format": dev.format.name or "",
+                        "label" : dev.format.label or dev.format.uuid or ""
                        }
 
             # With the label in here, the combo box can appear really long thus pushing the "pick an image"
@@ -1118,7 +1118,7 @@ def _update_payload_repos(self):
             :returns: True if any repo was changed, added or removed
             :rtype: bool
         """
-        REPO_ATTRS=("name", "baseurl", "mirrorlist", "proxy", "enabled")
+        REPO_ATTRS = ("name", "baseurl", "mirrorlist", "proxy", "enabled")
         changed = False
 
         ui_orig_names = [r[REPO_OBJ].orig_name for r in self._repoStore]
@@ -1130,7 +1130,7 @@ def _update_payload_repos(self):
             self.payload.data.repo.dataList().remove(repo)
             changed = True
 
-        for repo, orig_repo in [(r[REPO_OBJ],self.payload.getAddOnRepo(r[REPO_OBJ].orig_name)) for r in self._repoStore]:
+        for repo, orig_repo in [(r[REPO_OBJ], self.payload.getAddOnRepo(r[REPO_OBJ].orig_name)) for r in self._repoStore]:
             if not orig_repo:
                 # TODO: Need an API to do this w/o touching yum (not addRepo)
                 self.payload.data.repo.dataList().append(repo)
diff --git a/pyanaconda/ui/gui/spokes/user.py b/pyanaconda/ui/gui/spokes/user.py
index 08f1e60..3762edf 100644
--- a/pyanaconda/ui/gui/spokes/user.py
+++ b/pyanaconda/ui/gui/spokes/user.py
@@ -103,7 +103,7 @@ def initialize(self):
         # Validate the group input box
         self.add_check(self._tGroups, self._validateGroups)
 
-    def _apply_checkboxes(self, _editable = None, data = None):
+    def _apply_checkboxes(self, _editable=None, data=None):
         """Update the state of this screen according to the
         checkbox states on the screen. It is called from
         the toggled Gtk event.
@@ -242,7 +242,7 @@ def initialize(self):
             self._user = self.data.user.userList[0]
         else:
             self._user = self.data.UserData()
-        self._wheel = self.data.GroupData(name = "wheel")
+        self._wheel = self.data.GroupData(name="wheel")
         self._groupDict = {"wheel": self._wheel}
 
         # placeholders for the text boxes
@@ -444,7 +444,7 @@ def _updatePwQuality(self):
         self.pw_bar.set_value(val)
         self.pw_label.set_text(text)
 
-    def usepassword_toggled(self, togglebutton = None, data = None):
+    def usepassword_toggled(self, togglebutton=None, data=None):
         """Called by Gtk callback when the "Use password" check
         button is toggled. It will make password entries in/sensitive."""
 
@@ -459,7 +459,7 @@ def password_changed(self, editable=None, data=None):
         """Update the password strength level bar"""
         self._updatePwQuality()
 
-    def username_changed(self, editable = None, data = None):
+    def username_changed(self, editable=None, data=None):
         """Called by Gtk callback when the username or hostname
         entry changes. It disables the guess algorithm if the
         user added his own text there and reenable it when the
@@ -476,7 +476,7 @@ def username_changed(self, editable = None, data = None):
             self.pw.emit("changed")
             self.confirm.emit("changed")
 
-    def full_name_changed(self, editable = None, data = None):
+    def full_name_changed(self, editable=None, data=None):
         """Called by Gtk callback when the full name field changes.
         It guesses the username and hostname, strips diacritics
         and make those lowercase.
diff --git a/pyanaconda/ui/tui/__init__.py b/pyanaconda/ui/tui/__init__.py
index 0fb1ca7..4e8c5e1 100644
--- a/pyanaconda/ui/tui/__init__.py
+++ b/pyanaconda/ui/tui/__init__.py
@@ -59,8 +59,8 @@ class TextUserInterface(ui.UserInterface):
     ENVIRONMENT = "anaconda"
 
     def __init__(self, storage, payload, instclass,
-                 productTitle = u"Anaconda", isFinal = True,
-                 quitMessage = None):
+                 productTitle=u"Anaconda", isFinal=True,
+                 quitMessage=None):
         """
         For detailed description of the arguments see
         the parent class.
@@ -138,8 +138,8 @@ def setup(self, data):
         """Construct all the objects required to implement this interface.
            This method must be provided by all subclasses.
         """
-        self._app = tui.App(self.productTitle, yes_or_no_question = YesNoDialog,
-                            quit_message = self.quitMessage, queue = hubQ.q)
+        self._app = tui.App(self.productTitle, yes_or_no_question=YesNoDialog,
+                            quit_message=self.quitMessage, queue=hubQ.q)
 
         # tell python-meh it should use our raw_input
         self._meh_interface.set_io_handler(meh.ui.text.IOHandler(in_func=self._app.raw_input))
diff --git a/pyanaconda/ui/tui/hubs/__init__.py b/pyanaconda/ui/tui/hubs/__init__.py
index 7605dca..87d1b38 100644
--- a/pyanaconda/ui/tui/hubs/__init__.py
+++ b/pyanaconda/ui/tui/hubs/__init__.py
@@ -77,7 +77,7 @@ def setup(self, environment="anaconda"):
         # only schedule the hub if it has some spokes
         return self._spoke_count != 0
 
-    def refresh(self, args = None):
+    def refresh(self, args=None):
         """This methods fills the self._window list by all the objects
         we want shown on this screen. Title and Spokes mostly."""
         TUIObject.refresh(self, args)
@@ -87,8 +87,8 @@ def _prep(i, w):
             return tui.ColumnWidget([(3, [number]), (None, [w])], 1)
 
         # split spokes to two columns
-        left = [_prep(i, w) for i,w in self._keys.items() if i % 2 == 1]
-        right = [_prep(i, w) for i,w in self._keys.items() if i % 2 == 0]
+        left = [_prep(i, w) for i, w in self._keys.items() if i % 2 == 1]
+        right = [_prep(i, w) for i, w in self._keys.items() if i % 2 == 0]
 
         c = tui.ColumnWidget([(39, left), (39, right)], 2)
         self._window.append(c)
diff --git a/pyanaconda/ui/tui/simpleline/base.py b/pyanaconda/ui/tui/simpleline/base.py
index 6371b93..952c5a8 100644
--- a/pyanaconda/ui/tui/simpleline/base.py
+++ b/pyanaconda/ui/tui/simpleline/base.py
@@ -66,8 +66,8 @@ class App(object):
     STOP_MAINLOOP = False
     NOP = None
 
-    def __init__(self, title, yes_or_no_question = None, width = 80, queue = None,
-                 quit_message = None):
+    def __init__(self, title, yes_or_no_question=None, width=80, queue=None,
+                 quit_message=None):
         """
         :param title: application title for whenever we need to display app name
         :type title: unicode
@@ -106,7 +106,7 @@ def __init__(self, title, yes_or_no_question = None, width = 80, queue = None,
         #   - False = already running loop, exit when window closes
         self._screens = []
 
-    def register_event_handler(self, event, callback, data = None):
+    def register_event_handler(self, event, callback, data=None):
         """This method registers a callback which will be called
            when message "event" is encountered during process_events.
 
@@ -165,7 +165,7 @@ def _thread_input(self, queue, prompt, hidden):
 
         queue.put((hubQ.HUB_CODE_INPUT, [data]))
 
-    def switch_screen(self, ui, args = None):
+    def switch_screen(self, ui, args=None):
         """Schedules a screen to replace the current one.
 
         :param ui: screen to show
@@ -184,7 +184,7 @@ def switch_screen(self, ui, args = None):
         self._screens.append((ui, args, oldloop))
         self.redraw()
 
-    def switch_screen_with_return(self, ui, args = None):
+    def switch_screen_with_return(self, ui, args=None):
         """Schedules a screen to show, but keeps the current one in stack
            to return to, when the new one is closed.
 
@@ -199,7 +199,7 @@ def switch_screen_with_return(self, ui, args = None):
 
         self.redraw()
 
-    def switch_screen_modal(self, ui, args = None):
+    def switch_screen_modal(self, ui, args=None):
         """Starts a new screen right away, so the caller can collect data back.
         When the new screen is closed, the caller is redisplayed.
 
@@ -216,7 +216,7 @@ def switch_screen_modal(self, ui, args = None):
         self._screens.append((ui, args, self.START_MAINLOOP))
         self._do_redraw()
 
-    def schedule_screen(self, ui, args = None):
+    def schedule_screen(self, ui, args=None):
         """Add screen to the bottom of the stack. This is mostly usefull
         at the beginning to prepare the first screen hierarchy to display.
 
@@ -228,7 +228,7 @@ def schedule_screen(self, ui, args = None):
         """
         self._screens.insert(0, (ui, args, self.NOP))
 
-    def close_screen(self, scr = None):
+    def close_screen(self, scr=None):
         """Close the currently displayed screen and exit it's main loop
         if necessary. Next screen from the stack is then displayed.
 
@@ -382,7 +382,7 @@ def _mainloop(self):
             except ExitMainLoop:
                 break
 
-    def process_events(self, return_at = None):
+    def process_events(self, return_at=None):
         """This method processes incoming async messages and returns
            when a specific message is encountered or when the queue
            is empty.
@@ -491,7 +491,7 @@ class UIScreen(object):
     # title line of the screen
     title = u"Screen.."
 
-    def __init__(self, app, screen_height = 25):
+    def __init__(self, app, screen_height=25):
         """
         :param app: reference to application main class
         :type app: instance of class App
@@ -523,7 +523,7 @@ def setup(self, environment):
 
         return True
 
-    def refresh(self, args = None):
+    def refresh(self, args=None):
         """Method which prepares the content desired on the screen to self._window.
 
         :param args: optional argument passed from switch_screen calls
@@ -608,7 +608,7 @@ def input(self, args, key):
 
         return key
 
-    def prompt(self, args = None):
+    def prompt(self, args=None):
         """Return the text to be shown as prompt or handle the prompt and return None.
 
         :param args: optional argument passed from switch_screen calls
@@ -630,7 +630,7 @@ def close(self):
         self.app.close_screen(self)
 
 class Widget(object):
-    def __init__(self, max_width = None, default = None):
+    def __init__(self, max_width=None, default=None):
         """Initializes base Widgets buffer.
 
            :param max_width: server as a hint about screen size to write method with default arguments
@@ -706,7 +706,7 @@ def setend(self):
         """Sets the cursor to first column in new line at the end."""
         self._cursor = (self.height, 0)
 
-    def draw(self, w, row = None, col = None, block = False):
+    def draw(self, w, row=None, col=None, block=False):
         """This method copies w widget's content to this widget's buffer at row, col position.
 
            :param w: widget to take content from
@@ -749,7 +749,7 @@ def draw(self, w, row = None, col = None, block = False):
         else:
             self._cursor = (row + w.height, 0)
 
-    def write(self, text, row = None, col = None, width = None, block = False):
+    def write(self, text, row=None, col=None, width=None, block=False):
         """This method emulates typing machine writing to this widget's buffer.
 
            :param text: text to type
@@ -826,7 +826,7 @@ def write(self, text, row = None, col = None, width = None, block = False):
 
 if __name__ == "__main__":
     class HelloWorld(UIScreen):
-        def show(self, args = None):
+        def show(self, args=None):
             print("""Hello World\nquit by typing 'quit'""")
             return True
 
diff --git a/pyanaconda/ui/tui/simpleline/widgets.py b/pyanaconda/ui/tui/simpleline/widgets.py
index b3d8508..feb40ae 100644
--- a/pyanaconda/ui/tui/simpleline/widgets.py
+++ b/pyanaconda/ui/tui/simpleline/widgets.py
@@ -49,7 +49,7 @@ def render(self, width):
         """
 
         base.Widget.render(self, width)
-        self.write(self._text, width = width)
+        self.write(self._text, width=width)
 
 class CenterWidget(base.Widget):
     """Class to handle horizontal centering of content."""
@@ -72,10 +72,10 @@ def render(self, width):
 
         base.Widget.render(self, width)
         self._w.render(width)
-        self.draw(self._w, col = (width - self._w.width) / 2)
+        self.draw(self._w, col=(width - self._w.width) / 2)
 
 class ColumnWidget(base.Widget):
-    def __init__(self, columns, spacing = 0):
+    def __init__(self, columns, spacing=0):
         """Create text columns
 
            :param columns: list containing (column width, [list of widgets to put into this column])
@@ -105,7 +105,7 @@ def render(self, width):
         x = 0
 
         # iterate over tuples (column width, column content)
-        for col_width,col in self._columns:
+        for col_width, col in self._columns:
 
             # set cursor to first line and leftmost empty column
             self.setxy(0, x)
@@ -121,7 +121,7 @@ def render(self, width):
             # render and draw contents of column
             for item in col:
                 item.render(col_max_width)
-                self.draw(item, block = True)
+                self.draw(item, block=True)
 
             # recompute the leftmost empty column
             x = max((x + col_width), self.width) + self._spacing
@@ -129,7 +129,7 @@ def render(self, width):
 class CheckboxWidget(base.Widget):
     """Widget to show checkbox with (un)checked box, name and description."""
 
-    def __init__(self, key = "x", title = None, text = None, completed = None):
+    def __init__(self, key="x", title=None, text=None, completed=None):
         """
         :param key: tick character to be used inside [ ]
         :type key: character
@@ -203,12 +203,12 @@ def text(self):
     t4 = TextWidget(u"Krásný dlouhý text podruhé")
     t5 = TextWidget(u"Test 3")
 
-    c = ColumnWidget([(15, [t1, t2, t3]), (10, [t4, t5])], spacing = 1)
+    c = ColumnWidget([(15, [t1, t2, t3]), (10, [t4, t5])], spacing=1)
     c.render(80)
     print(u"\n".join(c.get_lines()))
 
     print(80*"-")
 
-    c = ColumnWidget([(20, [t1, t2, t3]), (25, [t4, t5]), (15, [t1, t2, t3])], spacing = 3)
+    c = ColumnWidget([(20, [t1, t2, t3]), (25, [t4, t5]), (15, [t1, t2, t3])], spacing=3)
     c.render(80)
     print(u"\n".join(c.get_lines()))
diff --git a/pyanaconda/ui/tui/spokes/__init__.py b/pyanaconda/ui/tui/spokes/__init__.py
index 8b1769f..70a33c9 100644
--- a/pyanaconda/ui/tui/spokes/__init__.py
+++ b/pyanaconda/ui/tui/spokes/__init__.py
@@ -63,7 +63,7 @@ def status(self):
     def completed(self):
         return True
 
-    def refresh(self, args = None):
+    def refresh(self, args=None):
         TUIObject.refresh(self, args)
         return True
 
@@ -84,8 +84,8 @@ def render(self, width):
 
         # always set completed = True here; otherwise key value won't be
         # displayed if completed (spoke value from above) is False
-        c = tui.CheckboxWidget(key = key, completed = True,
-                               title = _(self.title), text = self.status)
+        c = tui.CheckboxWidget(key=key, completed=True,
+                               title=_(self.title), text=self.status)
         c.render(width)
         self.draw(c)
 
@@ -109,12 +109,12 @@ def __init__(self, app, data, storage, payload, instclass):
         NormalTUISpoke.__init__(self, app, data, storage, payload, instclass)
         self.value = None
 
-    def refresh(self, args = None):
+    def refresh(self, args=None):
         self._window = []
         self.value = None
         return True
 
-    def prompt(self, entry = None):
+    def prompt(self, entry=None):
         if not entry:
             return None
 
@@ -173,7 +173,7 @@ class OneShotEditTUIDialog(EditTUIDialog):
        the value is read
     """
 
-    def prompt(self, entry = None):
+    def prompt(self, entry=None):
         ret = None
 
         if entry:
@@ -245,7 +245,7 @@ def visible_fields(self):
 
         return ret
 
-    def refresh(self, args = None):
+    def refresh(self, args=None):
         NormalTUISpoke.refresh(self, args)
 
         if args:
diff --git a/pyanaconda/ui/tui/spokes/askvnc.py b/pyanaconda/ui/tui/spokes/askvnc.py
index 606dbfe..45dda66 100644
--- a/pyanaconda/ui/tui/spokes/askvnc.py
+++ b/pyanaconda/ui/tui/spokes/askvnc.py
@@ -70,7 +70,7 @@ def __init__(self, app, data, storage=None, payload=None,
     def indirect(self):
         return True
 
-    def refresh(self, args = None):
+    def refresh(self, args=None):
         NormalTUISpoke.refresh(self, args)
 
         self._window += [TextWidget(self._message), ""]
@@ -138,13 +138,13 @@ def indirect(self):
     def completed(self):
         return True # We're always complete
 
-    def refresh(self, args = None):
+    def refresh(self, args=None):
         NormalTUISpoke.refresh(self, args)
         self._window += [TextWidget(self._message), ""]
 
         return True
 
-    def prompt(self, args = None):
+    def prompt(self, args=None):
         """Override prompt as password typing is special."""
         p1 = getpass.getpass(_("Password: "))
         p2 = getpass.getpass(_("Password (confirm): "))
diff --git a/pyanaconda/ui/tui/spokes/password.py b/pyanaconda/ui/tui/spokes/password.py
index 4fe971a..c524238 100644
--- a/pyanaconda/ui/tui/spokes/password.py
+++ b/pyanaconda/ui/tui/spokes/password.py
@@ -58,14 +58,14 @@ def status(self):
         else:
             return _("Password is not set.")
 
-    def refresh(self, args = None):
+    def refresh(self, args=None):
         EditTUIDialog.refresh(self, args)
 
         self._window += [TextWidget(_("Please select new root password. You will have to type it twice.")), ""]
 
         return True
 
-    def prompt(self, args = None):
+    def prompt(self, args=None):
         """Overriden prompt as password typing is special."""
         EditTUIDialog.prompt(self, EditTUISpokeEntry(_("Password"), "", EditTUIDialog.PASSWORD, True))
         if self.value == None:
diff --git a/pyanaconda/ui/tui/spokes/progress.py b/pyanaconda/ui/tui/spokes/progress.py
index 92cb2f4..ac42622 100644
--- a/pyanaconda/ui/tui/spokes/progress.py
+++ b/pyanaconda/ui/tui/spokes/progress.py
@@ -65,7 +65,7 @@ def _update_progress(self):
             # throwing an exception)
             while True:
                 try:
-                    (code, args) = q.get(timeout = 1)
+                    (code, args) = q.get(timeout=1)
                     break
                 except Queue.Empty:
                     pass
@@ -104,7 +104,7 @@ def _update_progress(self):
             q.task_done()
         return True
 
-    def refresh(self, args = None):
+    def refresh(self, args=None):
         from pyanaconda.install import doInstall, doConfiguration
         from pyanaconda.threads import threadMgr, AnacondaThread
 
@@ -135,7 +135,7 @@ def refresh(self, args = None):
 
         return True
 
-    def prompt(self, args = None):
+    def prompt(self, args=None):
         return(_("\tInstallation complete.  Press return to quit"))
 
     def input(self, args, key):
diff --git a/pyanaconda/ui/tui/spokes/storage.py b/pyanaconda/ui/tui/spokes/storage.py
index 1c7b600..1bb0d11 100644
--- a/pyanaconda/ui/tui/spokes/storage.py
+++ b/pyanaconda/ui/tui/spokes/storage.py
@@ -185,7 +185,7 @@ def _update_summary(self):
 
         return summary
 
-    def refresh(self, args = None):
+    def refresh(self, args=None):
         NormalTUISpoke.refresh(self, args)
 
         # Join the initialization thread to block on it
@@ -244,7 +244,7 @@ def _format_disk_info(self, disk):
         elif isinstance(disk, DASDDevice):
             if hasattr(disk, "busid"):
                 disk_attrs.append(disk.busid)
-        elif isinstance (disk, ZFCPDiskDevice):
+        elif isinstance(disk, ZFCPDiskDevice):
             if hasattr(disk, "fcp_lun"):
                 disk_attrs.append(disk.fcp_lun)
             if hasattr(disk, "wwpn"):
@@ -441,7 +441,7 @@ def __init__(self, app, data, storage, payload, instclass):
     def indirect(self):
         return True
 
-    def refresh(self, args = None):
+    def refresh(self, args=None):
         NormalTUISpoke.refresh(self, args)
         # synchronize our local data store with the global ksdata
         self.clearPartType = self.data.clearpart.type
diff --git a/pyanaconda/ui/tui/spokes/time_spoke.py b/pyanaconda/ui/tui/spokes/time_spoke.py
index a1a4b4b..653df0f 100644
--- a/pyanaconda/ui/tui/spokes/time_spoke.py
+++ b/pyanaconda/ui/tui/spokes/time_spoke.py
@@ -39,7 +39,7 @@ def initialize(self):
         # needs to be unsorted in order to display in the same order as the GUI
         # so whatever
         self._regions = timezone.get_all_regions_and_timezones().keys()
-        self._timezones = dict((k, sorted(v)) for k,v in timezone.get_all_regions_and_timezones().items())
+        self._timezones = dict((k, sorted(v)) for k, v in timezone.get_all_regions_and_timezones().items())
         self._lower_regions = [r.lower() for r in self._timezones]
 
         self._zones = ["%s/%s" % (region, z) for region in self._timezones for z in self._timezones[region]]
@@ -63,7 +63,7 @@ def status(self):
             return _("Timezone is not set.")
 
 
-    def refresh(self, args = None):
+    def refresh(self, args=None):
         """args is None if we want a list of zones or "zone" to show all timezones in that zone."""
         NormalTUISpoke.refresh(self, args)
 
@@ -80,9 +80,9 @@ def _prep(i, w):
 
         # split zones to three columns
         middle = len(displayed) / 3
-        left = [_prep(i, w) for i,w in enumerate(displayed) if i <= middle]
-        center = [_prep(i, w) for i,w in enumerate(displayed) if i > middle and i <= 2*middle]
-        right = [_prep(i, w) for i,w in enumerate(displayed) if i > 2*middle]
+        left = [_prep(i, w) for i, w in enumerate(displayed) if i <= middle]
+        center = [_prep(i, w) for i, w in enumerate(displayed) if i > middle and i <= 2*middle]
+        right = [_prep(i, w) for i, w in enumerate(displayed) if i > 2*middle]
 
         c = ColumnWidget([(24, left), (24, center), (24, right)], 3)
         self._window.append(c)
@@ -129,7 +129,7 @@ def input(self, args, key):
                 self.app.switch_screen(self, self._regions[keyid])
             return INPUT_PROCESSED
 
-    def prompt(self, args = None):
+    def prompt(self, args=None):
         return _("Please select the timezone.\nUse numbers or type names directly [b to region list, q to quit]: ")
 
     def apply(self):
diff --git a/pyanaconda/ui/tui/spokes/user.py b/pyanaconda/ui/tui/spokes/user.py
index 1c24d6d..8ffdcc6 100644
--- a/pyanaconda/ui/tui/spokes/user.py
+++ b/pyanaconda/ui/tui/spokes/user.py
@@ -39,12 +39,12 @@ class UserSpoke(FirstbootSpokeMixIn, EditTUISpoke):
 
     edit_fields = [
         Entry("Create user", "_create", EditTUISpoke.CHECK, True),
-        Entry("Fullname", "gecos", GECOS_VALID, lambda self,args: args._create),
-        Entry("Username", "name", USERNAME_VALID, lambda self,args: args._create),
-        Entry("Use password", "_use_password", EditTUISpoke.CHECK, lambda self,args: args._create),
-        Entry("Password", "_password", EditTUISpoke.PASSWORD, lambda self,args: args._use_password and args._create),
-        Entry("Administrator", "_admin", EditTUISpoke.CHECK, lambda self,args: args._create),
-        Entry("Groups", "_groups", GROUPLIST_SIMPLE_VALID, lambda self,args: args._create)
+        Entry("Fullname", "gecos", GECOS_VALID, lambda self, args: args._create),
+        Entry("Username", "name", USERNAME_VALID, lambda self, args: args._create),
+        Entry("Use password", "_use_password", EditTUISpoke.CHECK, lambda self, args: args._create),
+        Entry("Password", "_password", EditTUISpoke.PASSWORD, lambda self, args: args._use_password and args._create),
+        Entry("Administrator", "_admin", EditTUISpoke.CHECK, lambda self, args: args._create),
+        Entry("Groups", "_groups", GROUPLIST_SIMPLE_VALID, lambda self, args: args._create)
         ]
 
     @classmethod
@@ -81,7 +81,7 @@ def __init__(self, app, data, storage, payload, instclass):
         # so that all of the properties are set at once
         self.args._password = ""
 
-    def refresh(self, args = None):
+    def refresh(self, args=None):
         self.args._admin = "wheel" in self.args.groups
         self.args._groups = ", ".join(self.args.groups)
         return EditTUISpoke.refresh(self, args)
diff --git a/pyanaconda/ui/tui/spokes/warnings.py b/pyanaconda/ui/tui/spokes/warnings.py
index b98882b..c14b195 100644
--- a/pyanaconda/ui/tui/spokes/warnings.py
+++ b/pyanaconda/ui/tui/spokes/warnings.py
@@ -44,7 +44,7 @@ def __init__(self, *args, **kwargs):
         self._message = _("This hardware (or a combination thereof) is not "
                           "supported by Red Hat.  For more information on "
                           "supported hardware, please refer to "
-                          "http://www.redhat.com/hardware." )
+                          "http://www.redhat.com/hardware.")
         # Does anything need to be displayed?
         self._unsupported = productName.startswith("Red Hat ") and \
                             is_unsupported_hw() and \
@@ -54,7 +54,7 @@ def __init__(self, *args, **kwargs):
     def completed(self):
         return not self._unsupported
 
-    def refresh(self, args = None):
+    def refresh(self, args=None):
         StandaloneTUISpoke.refresh(self, args)
 
         self._window += [TextWidget(self._message), ""]
diff --git a/pyanaconda/ui/tui/tuiobject.py b/pyanaconda/ui/tui/tuiobject.py
index 855537f..3d80b66 100644
--- a/pyanaconda/ui/tui/tuiobject.py
+++ b/pyanaconda/ui/tui/tuiobject.py
@@ -41,13 +41,13 @@ def __init__(self, app, message):
         tui.UIScreen.__init__(self, app)
         self._message = message
 
-    def refresh(self, args = None):
+    def refresh(self, args=None):
         tui.UIScreen.refresh(self, args)
         text = tui.TextWidget(self._message)
         self._window.append(tui.CenterWidget(text))
         return True
 
-    def prompt(self, args = None):
+    def prompt(self, args=None):
         return _("Press enter to exit.")
 
     def input(self, args, key):
@@ -73,14 +73,14 @@ def __init__(self, app, message):
         self._message = message
         self._response = None
 
-    def refresh(self, args = None):
+    def refresh(self, args=None):
         tui.UIScreen.refresh(self, args)
         text = tui.TextWidget(self._message)
         self._window.append(tui.CenterWidget(text))
         self._window.append(u"")
         return True
 
-    def prompt(self, args = None):
+    def prompt(self, args=None):
         return _("Please respond 'yes' or 'no': ")
 
     def input(self, args, key):
@@ -116,6 +116,6 @@ def __init__(self, app, data):
     def showable(self):
         return True
 
-    def refresh(self, args = None):
+    def refresh(self, args=None):
         """Put everything to display into self.window list."""
         tui.UIScreen.refresh(self, args)
diff --git a/pyanaconda/users.py b/pyanaconda/users.py
index 465e38a..6425e4c 100644
--- a/pyanaconda/users.py
+++ b/pyanaconda/users.py
@@ -112,10 +112,10 @@ def cryptPassword(password, algo=None):
     saltstr = salts[algo]
 
     for _i in range(saltlen):
-        saltstr = saltstr + random.choice (string.ascii_letters +
-                                           string.digits + './')
+        saltstr = saltstr + random.choice(string.ascii_letters +
+                                          string.digits + './')
 
-    cryptpw = crypt.crypt (password, saltstr)
+    cryptpw = crypt.crypt(password, saltstr)
     if cryptpw is None:
         exn = PasswordCryptError(algo=algo)
         if errorHandler.cb(exn) == ERROR_RAISE:
@@ -193,7 +193,7 @@ def guess_username(fullname):
     return username
 
 class Users:
-    def __init__ (self):
+    def __init__(self):
         self.admin = libuser.admin()
 
     def _prepareChroot(self, root):
@@ -203,7 +203,7 @@ def _prepareChroot(self, root):
 
         childpid = os.fork()
         if not childpid:
-            if not root in ["","/"]:
+            if not root in ["", "/"]:
                 os.chroot(root)
                 os.chdir("/")
                 # This is ok because it's after a fork
@@ -226,7 +226,7 @@ def _finishChroot(self, childpid):
         else:
             return False
 
-    def createGroup (self, group_name, **kwargs):
+    def createGroup(self, group_name, **kwargs):
         """Create a new user on the system with the given name.  Optional kwargs:
 
            gid       -- The GID for the new user.  If none is given, the next
@@ -257,7 +257,7 @@ def createGroup (self, group_name, **kwargs):
         else:
             return self._finishChroot(childpid)
 
-    def createUser (self, user_name, *args, **kwargs):
+    def createUser(self, user_name, *args, **kwargs):
         """Create a new user on the system with the given name.  Optional kwargs:
 
            algo      -- The password algorithm to use in case isCrypted=True.
diff --git a/pyanaconda/vnc.py b/pyanaconda/vnc.py
index 473c16c..8edb11f 100644
--- a/pyanaconda/vnc.py
+++ b/pyanaconda/vnc.py
@@ -227,11 +227,11 @@ def startServer(self):
             self.setVNCPassword()
 
         # Lets start the xvnc.
-        xvnccommand =  [ XVNC_BINARY_NAME, ":%s" % constants.X_DISPLAY_NUMBER,
-                        "-depth", "16", "-br",
-                        "IdleTimeout=0", "-auth", "/dev/null", "-once",
-                        "DisconnectClients=false", "desktop=%s" % (self.desktop,),
-                        "SecurityTypes=%s" % SecurityTypes, "rfbauth=%s" % rfbauth ]
+        xvnccommand = [XVNC_BINARY_NAME, ":%s" % constants.X_DISPLAY_NUMBER,
+                       "-depth", "16", "-br",
+                       "IdleTimeout=0", "-auth", "/dev/null", "-once",
+                       "DisconnectClients=false", "desktop=%s" % (self.desktop,),
+                       "SecurityTypes=%s" % SecurityTypes, "rfbauth=%s" % rfbauth]
 
         try:
             iutil.startX(xvnccommand, output_redirect=self.openlogfile())


-- 
To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/b1083b9046f4135f5b2b55611c61a932531d48a1


More information about the anaconda-patches mailing list