[PATCH 03/15] remove Network(): remove another unused method
Radek Vykydal
rvykydal at redhat.com
Thu Jul 19 10:02:36 UTC 2012
---
pyanaconda/iw/network_gui.py | 4 +---
pyanaconda/network.py | 9 ---------
pyanaconda/textw/netconfig_text.py | 4 +---
tests/pyanaconda_test/network_test.py | 22 ----------------------
4 files changed, 2 insertions(+), 37 deletions(-)
diff --git a/pyanaconda/iw/network_gui.py b/pyanaconda/iw/network_gui.py
index f1c19c0..f1eee76f 100644
--- a/pyanaconda/iw/network_gui.py
+++ b/pyanaconda/iw/network_gui.py
@@ -155,9 +155,7 @@ def selectInstallNetDeviceDialog(network, devices = None):
store = gtk.TreeStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
combo.set_model(store)
- ksdevice = network.getKSDevice()
- if ksdevice:
- ksdevice = ksdevice.iface
+ ksdevice = network.ksdevice
preselected = None
for dev in devices:
diff --git a/pyanaconda/network.py b/pyanaconda/network.py
index c35793c..2f2f329 100644
--- a/pyanaconda/network.py
+++ b/pyanaconda/network.py
@@ -494,15 +494,6 @@ class Network:
self.ksdevice = dev
break
- def getKSDevice(self):
- if self.ksdevice is None:
- return None
-
- try:
- return self.netdevices[self.ksdevice]
- except:
- return None
-
@property
def gateway(self):
"""GATEWAY - last device in list wins"""
diff --git a/pyanaconda/textw/netconfig_text.py b/pyanaconda/textw/netconfig_text.py
index ed1fff2..40a31cb 100644
--- a/pyanaconda/textw/netconfig_text.py
+++ b/pyanaconda/textw/netconfig_text.py
@@ -72,9 +72,7 @@ class NetworkConfiguratorText:
devnames.sort()
# Preselect device set in kickstart
- ksdevice = self.anaconda.network.getKSDevice()
- if ksdevice:
- ksdevice = ksdevice.iface
+ ksdevice = self.anaconda.ksdevice
for devname in devnames:
hwaddr = self.netdevs[devname].get("HWADDR")
diff --git a/tests/pyanaconda_test/network_test.py b/tests/pyanaconda_test/network_test.py
index 7ad58cf..26c1b46 100644
--- a/tests/pyanaconda_test/network_test.py
+++ b/tests/pyanaconda_test/network_test.py
@@ -316,28 +316,6 @@ class NetworkTest(mock.TestCase):
self.assertEqual(pyanaconda.network.shutil.move.call_args[0],
(TMP_FILE, '%s/keys-%s' % (TMP_DIR, self.DEVICE)))
- def network_get_ks_device_1_test(self):
- import pyanaconda.network
- nw = pyanaconda.network.Network()
- nw.ksdevice = None
- ret = nw.getKSDevice()
- self.assertEqual(ret, None)
-
- def network_get_ks_device_2_test(self):
- import pyanaconda.network
- nw = pyanaconda.network.Network()
- nw.ksdevice = 'ksdev'
- ret = nw.getKSDevice()
- self.assertEqual(ret, None)
-
- def network_get_ks_device_3_test(self):
- import pyanaconda.network
- nw = pyanaconda.network.Network()
- nw.netdevices['ksdev'] = 'device'
- nw.ksdevice = 'ksdev'
- ret = nw.getKSDevice()
- self.assertEqual(ret, 'device')
-
def network_write_ifcfg_files_test(self):
import pyanaconda.network
nw = pyanaconda.network.Network()
--
1.7.4
More information about the anaconda-patches
mailing list