diff --git a/wicd/guiutil.py b/wicd/guiutil.py
index 454f37d..169dcc8 100644
--- a/wicd/guiutil.py
+++ b/wicd/guiutil.py
@@ -146,5 +146,5 @@ class GreyLabel(gtk.Label):
gtk.Label.__init__(self)
def set_label(self, text):
- self.set_markup("" + text + "")
+ self.set_markup(text)
self.set_alignment(0, 0)
diff --git a/wicd/netentry.py b/wicd/netentry.py
index 161a45b..9765d57 100644
--- a/wicd/netentry.py
+++ b/wicd/netentry.py
@@ -555,7 +555,7 @@ class WiredNetworkEntry(NetworkEntry):
self.image.show()
self.connect_button.show()
- self.name_label.set_label(language['wired_network'])
+ self.name_label.set_label("" + language['wired_network'] + "")
self.is_full_gui = True
@@ -756,7 +756,7 @@ class WirelessNetworkEntry(NetworkEntry):
'encryption_method'))
self.set_channel(wireless.GetWirelessProperty(networkID, 'channel'))
self.name_label.set_use_markup(True)
- self.name_label.set_label("%s %s %s %s" % (self._escape(self.essid),
+ self.name_label.set_label("%s %s %s %s" % (self._escape(self.essid),
self.lbl_strength.get_label(),
self.lbl_encryption.get_label(),
self.lbl_channel.get_label(),
diff --git a/wicd/wicd-client.py b/wicd/wicd-client.py
index 7c9d100..4934215 100755
--- a/wicd/wicd-client.py
+++ b/wicd/wicd-client.py
@@ -753,7 +753,7 @@ def on_exit():
if DBUS_AVAIL:
try:
daemon.SetGUIOpen(False)
- except dbusmanager.DBusException:
+ except DBusException:
pass
def handle_no_dbus():
diff --git a/wicd/wnettools.py b/wicd/wnettools.py
index d09e8f2..f5d720d 100644
--- a/wicd/wnettools.py
+++ b/wicd/wnettools.py
@@ -48,7 +48,7 @@ channel_pattern = re.compile('.*Channel:? ?(\d\d?)', _re_mode)
strength_pattern = re.compile('.*Quality:?=? ?(\d+)\s*/?\s*(\d*)', _re_mode)
altstrength_pattern = re.compile('.*Signal level:?=? ?(\d+)\s*/?\s*(\d*)', _re_mode)
signaldbm_pattern = re.compile('.*Signal level:?=? ?(-\d\d*)', _re_mode)
-bitrates_pattern = re.compile('.*Bit Rates:(.*?)E', _re_mode)
+bitrates_pattern = re.compile('(\d+\s+\S+/s)', _re_mode)
mode_pattern = re.compile('.*Mode:(.*?)\n', _re_mode)
freq_pattern = re.compile('.*Frequency:(.*?)\n', _re_mode)
wep_pattern = re.compile('.*Encryption key:(.*?)\n', _re_mode)
@@ -1114,9 +1114,9 @@ class BaseWirelessInterface(BaseInterface):
ap['channel'] = self._FreqToChannel(freq)
# Bit Rate
- ap['bitrates'] = misc.RunRegex(bitrates_pattern, cell).split('\n')
- ap['bitrates'] = '; '.join(m.strip() for m in ap['bitrates']).rstrip('; ')
-
+ ap['bitrates'] = misc.RunRegex(bitrates_pattern,
+ cell.split("Bit Rates")[-1])
+
# BSSID
ap['bssid'] = misc.RunRegex(ap_mac_pattern, cell)