diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2008-08-10 21:22:36 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2008-08-10 21:22:36 (GMT) |
| commit | 83ec84bc301636fc17a70901e40095f867d913ff (patch) | |
| tree | 43403a255cc488cf7ae98919c846720c97586881 /src/hardware | |
| parent | c7169b1cc630e46f422605c26ec83509e4d892a1 (diff) | |
A few fixes to my previous commits.
Rework pulsingicon to share more code, without upsetting
pylint. Based on Martin Dengler idea.
Diffstat (limited to 'src/hardware')
| -rw-r--r-- | src/hardware/nminfo.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/hardware/nminfo.py b/src/hardware/nminfo.py index 521438a..a703ff6 100644 --- a/src/hardware/nminfo.py +++ b/src/hardware/nminfo.py @@ -1,5 +1,3 @@ -# vi: ts=4 ai noet -# # Copyright (C) 2006-2007 Red Hat, Inc. # # This program is free software; you can redistribute it and/or modify @@ -28,7 +26,6 @@ import dbus.service from sugar import env -from hardware import nmclient from hardware import keydialog IW_AUTH_KEY_MGMT_802_1X = 0x1 @@ -486,6 +483,8 @@ class NMInfo(object): def get_key_for_network(self, dev_op, net_op, ssid, attempt, new_key, async_cb, async_err_cb): + from hardware import nmclient + if not isinstance(ssid, unicode): raise ValueError("Invalid arguments; ssid must be unicode.") if self._allowed_networks.has_key(ssid) and not new_key: |