[PATCH 3/6] Remove unnecessary variables, imports, semicolons

David Shea dshea at redhat.com
Sun Sep 8 16:33:20 UTC 2013


---
 pyanaconda/installclasses/fedora.py     | 2 +-
 pyanaconda/keyboard.py                  | 2 +-
 pyanaconda/network.py                   | 2 +-
 pyanaconda/nm.py                        | 2 --
 pyanaconda/ui/gui/hubs/progress.py      | 2 +-
 pyanaconda/ui/gui/spokes/langsupport.py | 4 +---
 pyanaconda/ui/gui/spokes/network.py     | 2 +-
 pyanaconda/ui/gui/spokes/welcome.py     | 9 ++++-----
 8 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/pyanaconda/installclasses/fedora.py b/pyanaconda/installclasses/fedora.py
index 00eae33..2977211 100644
--- a/pyanaconda/installclasses/fedora.py
+++ b/pyanaconda/installclasses/fedora.py
@@ -66,7 +66,7 @@ class InstallClass(BaseInstallClass):
                 dev = network.NetworkDevice(ROOT_PATH + network.netscriptsDir, devName)
                 try:
                     dev.loadIfcfgFile()
-                except IOError as e:
+                except IOError:
                     continue
                 dev.set(('ONBOOT', 'yes'))
                 dev.writeIfcfgFile()
diff --git a/pyanaconda/keyboard.py b/pyanaconda/keyboard.py
index 934b701..5b1643c 100644
--- a/pyanaconda/keyboard.py
+++ b/pyanaconda/keyboard.py
@@ -517,7 +517,7 @@ class XklWrapper(object):
         # BUG?: if the last layout in the list is activated and removed,
         #       state.group may be equal to n_groups
         if cur_group >= num_groups:
-            cur_group = num_groups - 1;
+            cur_group = num_groups - 1
 
         layout = self._rec.layouts[cur_group]
         variant = self._rec.variants[cur_group]
diff --git a/pyanaconda/network.py b/pyanaconda/network.py
index f70c0a2..3c7f638 100644
--- a/pyanaconda/network.py
+++ b/pyanaconda/network.py
@@ -339,7 +339,7 @@ def dumpMissingDefaultIfcfgs():
             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)
-        except nm.DeviceSettingsNotFoundError as e:
+        except nm.DeviceSettingsNotFoundError:
             log.debug("network: no ifcfg file for %s", devname)
         rv = True
 
diff --git a/pyanaconda/nm.py b/pyanaconda/nm.py
index 1109d6e..76d4288 100644
--- a/pyanaconda/nm.py
+++ b/pyanaconda/nm.py
@@ -277,8 +277,6 @@ def nm_device_ip_config(name, version=4):
        UnknownDeviceError if device is not found
        PropertyNotFoundError if ip configuration is not found
     """
-    retval = []
-
     state = nm_device_property(name, "State")
     if state != NetworkManager.DeviceState.ACTIVATED:
         return []
diff --git a/pyanaconda/ui/gui/hubs/progress.py b/pyanaconda/ui/gui/hubs/progress.py
index 45b4734..e89f7cf 100644
--- a/pyanaconda/ui/gui/hubs/progress.py
+++ b/pyanaconda/ui/gui/hubs/progress.py
@@ -29,7 +29,7 @@ import sys
 import glob
 
 from pyanaconda.i18n import _
-from pyanaconda.localization import langcode_matches_locale, find_best_locale_match
+from pyanaconda.localization import find_best_locale_match
 from pyanaconda.product import productName
 from pyanaconda.flags import flags
 from pyanaconda.constants import THREAD_INSTALL, THREAD_CONFIGURATION, DEFAULT_LANG
diff --git a/pyanaconda/ui/gui/spokes/langsupport.py b/pyanaconda/ui/gui/spokes/langsupport.py
index 125e3b5..39e93d2 100644
--- a/pyanaconda/ui/gui/spokes/langsupport.py
+++ b/pyanaconda/ui/gui/spokes/langsupport.py
@@ -20,14 +20,12 @@
 #                    Vratislav Podzimek <vpodzime at redhat.com>
 #
 
-from gi.repository import Gtk, Pango
+from gi.repository import Pango
 from pyanaconda.flags import flags
 from pyanaconda.i18n import N_
-from pyanaconda.iutil import strip_accents
 from pyanaconda.ui.gui.spokes import NormalSpoke
 from pyanaconda.ui.gui.categories.localization import LocalizationCategory
 from pyanaconda.ui.gui.spokes.lib.lang_locale_handler import LangLocaleHandler
-from pyanaconda.ui.gui.utils import set_treeview_selection
 from pyanaconda import localization
 
 import re
diff --git a/pyanaconda/ui/gui/spokes/network.py b/pyanaconda/ui/gui/spokes/network.py
index 97c2174..ee76fe2 100644
--- a/pyanaconda/ui/gui/spokes/network.py
+++ b/pyanaconda/ui/gui/spokes/network.py
@@ -43,7 +43,7 @@ from pyanaconda.ui.gui.utils import gtk_call_once, enlightbox
 from pyanaconda.ui.common import FirstbootSpokeMixIn
 
 from pyanaconda import network
-from pyanaconda.nm import nm_activated_devices, nm_device_setting_value, nm_dbus_ay_to_ipv6
+from pyanaconda.nm import nm_device_setting_value, nm_dbus_ay_to_ipv6
 
 from gi.repository import GLib, GObject, Pango, Gio, NetworkManager, NMClient
 import dbus
diff --git a/pyanaconda/ui/gui/spokes/welcome.py b/pyanaconda/ui/gui/spokes/welcome.py
index 63218ac..219c344 100644
--- a/pyanaconda/ui/gui/spokes/welcome.py
+++ b/pyanaconda/ui/gui/spokes/welcome.py
@@ -24,10 +24,9 @@ import sys
 import re
 import langtable
 
-from gi.repository import Gtk, Pango
 from pyanaconda.ui.gui.hubs.summary import SummaryHub
 from pyanaconda.ui.gui.spokes import StandaloneSpoke
-from pyanaconda.ui.gui.utils import enlightbox, set_treeview_selection
+from pyanaconda.ui.gui.utils import enlightbox
 from pyanaconda.ui.gui.spokes.lib.lang_locale_handler import LangLocaleHandler
 
 from pyanaconda import localization
@@ -36,7 +35,7 @@ from pyanaconda import keyboard
 from pyanaconda import flags
 from pyanaconda import geoloc
 from pyanaconda.i18n import _
-from pyanaconda.iutil import is_unsupported_hw, strip_accents
+from pyanaconda.iutil import is_unsupported_hw
 from pyanaconda.constants import DEFAULT_LANG
 
 import logging
@@ -150,7 +149,7 @@ class WelcomeLanguageSpoke(LangLocaleHandler, StandaloneSpoke):
         self._languageEntry = self.builder.get_object("languageEntry")
         self._langSelection = self.builder.get_object("languageViewSelection")
         self._langSelectedRenderer = self.builder.get_object("langSelectedRenderer")
-        self._langSelectedColumn = self.builder.get_object("langSelectedColumn");
+        self._langSelectedColumn = self.builder.get_object("langSelectedColumn")
         self._langView = self.builder.get_object("languageView")
         self._localeView = self.builder.get_object("localeView")
         self._localeStore = self.builder.get_object("localeStore")
@@ -243,7 +242,7 @@ class WelcomeLanguageSpoke(LangLocaleHandler, StandaloneSpoke):
 
     # Signal handlers.
     def on_lang_selection_changed(self, selection):
-        (store, selected) = selection.get_selected_rows()
+        (_store, selected) = selection.get_selected_rows()
         LangLocaleHandler.on_lang_selection_changed(self, selection)
 
         if not selected and hasattr(self.window, "set_may_continue"):
-- 
1.8.3.1



More information about the anaconda-patches mailing list