Unused imports and variables.
Signed-off-by: Vratislav Podzimek vpodzime@redhat.com --- pyanaconda/isys/__init__.py | 9 --------- pyanaconda/ui/categories/__init__.py | 1 - pyanaconda/ui/gui/__init__.py | 1 + pyanaconda/ui/gui/hubs/__init__.py | 4 ---- pyanaconda/ui/gui/spokes/__init__.py | 1 - pyanaconda/ui/tui/__init__.py | 1 - tests/gui/inside/__init__.py | 2 -- tests/gui/outside/__init__.py | 1 - 8 files changed, 1 insertion(+), 19 deletions(-)
diff --git a/pyanaconda/isys/__init__.py b/pyanaconda/isys/__init__.py index 44f6144..f29f08b 100644 --- a/pyanaconda/isys/__init__.py +++ b/pyanaconda/isys/__init__.py @@ -29,16 +29,7 @@ except ImportError: # up PYTHONPATH and just do this basic import. import _isys
-import os -import os.path -import socket -import stat -import sys -from pyanaconda import iutil import blivet.arch -import re -import struct -import dbus import time import datetime
diff --git a/pyanaconda/ui/categories/__init__.py b/pyanaconda/ui/categories/__init__.py index 6a0e270..5fa3ccd 100644 --- a/pyanaconda/ui/categories/__init__.py +++ b/pyanaconda/ui/categories/__init__.py @@ -19,7 +19,6 @@ # Red Hat Author(s): Chris Lumens clumens@redhat.com #
-import os.path from pyanaconda.i18n import N_
__all__ = ["SpokeCategory"] diff --git a/pyanaconda/ui/gui/__init__.py b/pyanaconda/ui/gui/__init__.py index 6364f54..bbbdb9c 100644 --- a/pyanaconda/ui/gui/__init__.py +++ b/pyanaconda/ui/gui/__init__.py @@ -615,6 +615,7 @@ class GraphicalUserInterface(UserInterface): dlg.refresh(details) rc = dlg.run() dlg.window.destroy() + return rc
@gtk_action_wait def showYesNoQuestion(self, message): diff --git a/pyanaconda/ui/gui/hubs/__init__.py b/pyanaconda/ui/gui/hubs/__init__.py index e2cb44a..a89248b 100644 --- a/pyanaconda/ui/gui/hubs/__init__.py +++ b/pyanaconda/ui/gui/hubs/__init__.py @@ -19,8 +19,6 @@ # Red Hat Author(s): Chris Lumens clumens@redhat.com #
-import os - from gi.repository import GLib
from pyanaconda.flags import flags @@ -29,9 +27,7 @@ from pyanaconda.product import distributionText
from pyanaconda.ui import common from pyanaconda.ui.gui import GUIObject -from pyanaconda.ui.gui.spokes import StandaloneSpoke from pyanaconda.ui.gui.utils import gtk_call_once, escape_markup -from pyanaconda.constants import ANACONDA_ENVIRON
import logging log = logging.getLogger("anaconda") diff --git a/pyanaconda/ui/gui/spokes/__init__.py b/pyanaconda/ui/gui/spokes/__init__.py index 53989c3..183dc6f 100644 --- a/pyanaconda/ui/gui/spokes/__init__.py +++ b/pyanaconda/ui/gui/spokes/__init__.py @@ -21,7 +21,6 @@
from pyanaconda.ui import common from pyanaconda.ui.gui import GUIObject -import os.path
__all__ = ["StandaloneSpoke", "NormalSpoke"]
diff --git a/pyanaconda/ui/tui/__init__.py b/pyanaconda/ui/tui/__init__.py index 655913a..cb510b5 100644 --- a/pyanaconda/ui/tui/__init__.py +++ b/pyanaconda/ui/tui/__init__.py @@ -149,7 +149,6 @@ class TextUserInterface(ui.UserInterface): _hubs = self._list_hubs()
# First, grab a list of all the standalone spokes. - path = os.path.join(os.path.dirname(__file__), "spokes") spokes = self._collectActionClasses(self.paths["spokes"], StandaloneSpoke) actionClasses = self._orderActionClasses(spokes, _hubs)
diff --git a/tests/gui/inside/__init__.py b/tests/gui/inside/__init__.py index cf4cf90..5b42cbe 100644 --- a/tests/gui/inside/__init__.py +++ b/tests/gui/inside/__init__.py @@ -17,12 +17,10 @@ # # Author: Chris Lumens clumens@redhat.com from dogtail.config import config -from dogtail.predicate import GenericPredicate from dogtail.tree import SearchError, root from dogtail.utils import doDelay, screenshot
import glob -import os import unittest
class UITestCase(unittest.TestCase): diff --git a/tests/gui/outside/__init__.py b/tests/gui/outside/__init__.py index a8e02bb..a5f5144 100644 --- a/tests/gui/outside/__init__.py +++ b/tests/gui/outside/__init__.py @@ -26,7 +26,6 @@ import os import shutil import subprocess import tempfile -import unittest
class Creator(object): """A Creator subclass defines all the parameters for making a VM to run a
On 07/30/2014 04:33 AM, Vratislav Podzimek wrote:
diff --git a/pyanaconda/ui/gui/__init__.py b/pyanaconda/ui/gui/__init__.py index 6364f54..bbbdb9c 100644 --- a/pyanaconda/ui/gui/__init__.py +++ b/pyanaconda/ui/gui/__init__.py @@ -615,6 +615,7 @@ class GraphicalUserInterface(UserInterface): dlg.refresh(details) rc = dlg.run() dlg.window.destroy()
return rc @gtk_action_wait def showYesNoQuestion(self, message):
For this one, we still don't really care about the return value, so I'd rather that dlg.run() just not be assigned to anything to make it consistent with showError a couple lines up.
Other than that, looks good.
On Wed, 2014-07-30 at 09:36 -0400, David Shea wrote:
On 07/30/2014 04:33 AM, Vratislav Podzimek wrote:
diff --git a/pyanaconda/ui/gui/__init__.py b/pyanaconda/ui/gui/__init__.py index 6364f54..bbbdb9c 100644 --- a/pyanaconda/ui/gui/__init__.py +++ b/pyanaconda/ui/gui/__init__.py @@ -615,6 +615,7 @@ class GraphicalUserInterface(UserInterface): dlg.refresh(details) rc = dlg.run() dlg.window.destroy()
return rc @gtk_action_wait def showYesNoQuestion(self, message):For this one, we still don't really care about the return value, so I'd rather that dlg.run() just not be assigned to anything to make it consistent with showError a couple lines up.
Alright, I'm okay with both solutions. Fixing locally.
anaconda-patches@lists.fedorahosted.org
-
David Shea -
Vratislav Podzimek