Merge commit 'refs/top-bases/t/bug-1755' into t/bug-1755t/bug-1755

* commit 'refs/top-bases/t/bug-1755': (261 commits)
  Fix up style issues introduced by commit 3f8a1e1
  Don't set default timezone
  Restore setting a language with the command line OLPC #10681
  battery frame device: replace HAL with UPower
  use ConsoleKit instead of HAL for shutdown/reboot
  fix recognition of JEBs outside of data store
  Adjust the year in the licence visible in the control panel
  Handle activities that cycle through windows dlo#10695
  Speaker frame device: pop up palette on left-click instead of toggling mute
  recognise translations using pgettext
  Remove last few pieces of buddy-icon.jpg handling
  fix whitespace error introduced by 4b6a534 (revert of 4a3416b)
  Commit from Sugar Labs: Translation System by user RafaelOrtiz.: 374 of 374 messages translated (0 fuzzy).
  Intro: Fall back to user name if GECOS real name field is empty
  Sugar Ad-hoc icons show in search results when connect/disconnect to AP OLPC #10412
  Show busy cursor during session shutdown
  Show free space for the Journal in the Journal volumes toolbar (SL#2318)
  Fix incorrect logging level for warning about missing GSM configuration
  simplify extension loading exception error
  Revert "Add cpu and memory resource indicator to frame" as agreed on with erikos. Scheduling for inclusion in 0.94 after potential artwork changes based on feedback from the Design Team.
  ...

Conflicts:
	src/jarabe/util/emulator.py

1 files changed, 36 insertions, 25 deletions

diff --git a/src/jarabe/desktop/keydialog.py b/src/jarabe/desktop/keydialog.py
index 1e6d17a..6241b9b 100644
--- a/src/jarabe/desktop/keydialog.py
+++ b/src/jarabe/desktop/keydialog.py
@@ -24,8 +24,14 @@ import dbus
 from jarabe.model import network
 from jarabe.model.network import Secrets
 
+
 IW_AUTH_ALG_OPEN_SYSTEM = 'open'
-IW_AUTH_ALG_SHARED_KEY  = 'shared'
+IW_AUTH_ALG_SHARED_KEY = 'shared'
+
+WEP_PASSPHRASE = 1
+WEP_HEX = 2
+WEP_ASCII = 3
+
 
 def string_is_hex(key):
     is_hex = True
@@ -34,6 +40,7 @@ def string_is_hex(key):
             is_hex = False
     return is_hex
 
+
 def string_is_ascii(string):
     try:
         string.encode('ascii')
@@ -41,12 +48,14 @@ def string_is_ascii(string):
     except UnicodeEncodeError:
         return False
 
+
 def string_to_hex(passphrase):
     key = ''
     for c in passphrase:
         key += '%02x' % ord(c)
     return key
 
+
 def hash_passphrase(passphrase):
     # passphrase must have a length of 64
     if len(passphrase) > 64:
@@ -57,16 +66,18 @@ def hash_passphrase(passphrase):
     passphrase = hashlib.md5(passphrase).digest()
     return string_to_hex(passphrase)[:26]
 
+
 class CanceledKeyRequestError(dbus.DBusException):
     def __init__(self):
         dbus.DBusException.__init__(self)
         self._dbus_error_name = network.NM_SETTINGS_IFACE + '.CanceledError'
 
+
 class KeyDialog(gtk.Dialog):
     def __init__(self, ssid, flags, wpa_flags, rsn_flags, dev_caps, settings,
                  response):
         gtk.Dialog.__init__(self, flags=gtk.DIALOG_MODAL)
-        self.set_title("Wireless Key Required")
+        self.set_title('Wireless Key Required')
 
         self._settings = settings
         self._response = response
@@ -108,9 +119,6 @@ class KeyDialog(gtk.Dialog):
     def get_response_object(self):
         return self._response
 
-WEP_PASSPHRASE = 1
-WEP_HEX = 2
-WEP_ASCII = 3
 
 class WEPKeyDialog(KeyDialog):
     def __init__(self, ssid, flags, wpa_flags, rsn_flags, dev_caps, settings,
@@ -120,9 +128,9 @@ class WEPKeyDialog(KeyDialog):
 
         # WEP key type
         self.key_store = gtk.ListStore(str, int)
-        self.key_store.append(["Passphrase (128-bit)", WEP_PASSPHRASE])
-        self.key_store.append(["Hex (40/128-bit)", WEP_HEX])
-        self.key_store.append(["ASCII (40/128-bit)", WEP_ASCII])
+        self.key_store.append(['Passphrase (128-bit)', WEP_PASSPHRASE])
+        self.key_store.append(['Hex (40/128-bit)', WEP_HEX])
+        self.key_store.append(['ASCII (40/128-bit)', WEP_ASCII])
 
         self.key_combo = gtk.ComboBox(self.key_store)
         cell = gtk.CellRendererText()
@@ -132,7 +140,7 @@ class WEPKeyDialog(KeyDialog):
         self.key_combo.connect('changed', self._key_combo_changed_cb)
 
         hbox = gtk.HBox()
-        hbox.pack_start(gtk.Label(_("Key Type:")))
+        hbox.pack_start(gtk.Label(_('Key Type:')))
         hbox.pack_start(self.key_combo)
         hbox.show_all()
         self.vbox.pack_start(hbox)
@@ -142,8 +150,8 @@ class WEPKeyDialog(KeyDialog):
 
         # WEP authentication mode
         self.auth_store = gtk.ListStore(str, str)
-        self.auth_store.append(["Open System", IW_AUTH_ALG_OPEN_SYSTEM])
-        self.auth_store.append(["Shared Key", IW_AUTH_ALG_SHARED_KEY])
+        self.auth_store.append(['Open System', IW_AUTH_ALG_OPEN_SYSTEM])
+        self.auth_store.append(['Shared Key', IW_AUTH_ALG_SHARED_KEY])
 
         self.auth_combo = gtk.ComboBox(self.auth_store)
         cell = gtk.CellRendererText()
@@ -152,7 +160,7 @@ class WEPKeyDialog(KeyDialog):
         self.auth_combo.set_active(0)
 
         hbox = gtk.HBox()
-        hbox.pack_start(gtk.Label(_("Authentication Type:")))
+        hbox.pack_start(gtk.Label(_('Authentication Type:')))
         hbox.pack_start(self.auth_combo)
         hbox.show_all()
 
@@ -179,8 +187,8 @@ class WEPKeyDialog(KeyDialog):
 
     def print_security(self):
         (key, auth_alg) = self._get_security()
-        print "Key: %s" % key
-        print "Auth: %d" % auth_alg
+        print 'Key: %s' % key
+        print 'Auth: %d' % auth_alg
 
     def create_security(self):
         (key, auth_alg) = self._get_security()
@@ -209,6 +217,7 @@ class WEPKeyDialog(KeyDialog):
 
         self.set_response_sensitive(gtk.RESPONSE_OK, valid)
 
+
 class WPAKeyDialog(KeyDialog):
     def __init__(self, ssid, flags, wpa_flags, rsn_flags, dev_caps, settings,
                  response):
@@ -217,7 +226,7 @@ class WPAKeyDialog(KeyDialog):
         self.add_key_entry()
 
         self.store = gtk.ListStore(str)
-        self.store.append([_("WPA & WPA2 Personal")])
+        self.store.append([_('WPA & WPA2 Personal')])
 
         self.combo = gtk.ComboBox(self.store)
         cell = gtk.CellRendererText()
@@ -226,7 +235,7 @@ class WPAKeyDialog(KeyDialog):
         self.combo.set_active(0)
 
         self.hbox = gtk.HBox()
-        self.hbox.pack_start(gtk.Label(_("Wireless Security:")))
+        self.hbox.pack_start(gtk.Label(_('Wireless Security:')))
         self.hbox.pack_start(self.combo)
         self.hbox.show_all()
 
@@ -246,21 +255,21 @@ class WPAKeyDialog(KeyDialog):
             from subprocess import Popen, PIPE
             p = Popen(['wpa_passphrase', ssid, key], stdout=PIPE)
             for line in p.stdout:
-                if line.strip().startswith("psk="):
+                if line.strip().startswith('psk='):
                     real_key = line.strip()[4:]
             if p.wait() != 0:
-                raise RuntimeError("Error hashing passphrase")
+                raise RuntimeError('Error hashing passphrase')
             if real_key and len(real_key) != 64:
                 real_key = None
 
         if not real_key:
-            raise RuntimeError("Invalid key")
+            raise RuntimeError('Invalid key')
 
         return real_key
 
     def print_security(self):
         key = self._get_security()
-        print "Key: %s" % key
+        print 'Key: %s' % key
 
     def create_security(self):
         secrets = Secrets(self._settings)
@@ -281,6 +290,7 @@ class WPAKeyDialog(KeyDialog):
         self.set_response_sensitive(gtk.RESPONSE_OK, valid)
         return False
 
+
 def create(ssid, flags, wpa_flags, rsn_flags, dev_caps, settings, response):
     if wpa_flags == network.NM_802_11_AP_SEC_NONE and \
             rsn_flags == network.NM_802_11_AP_SEC_NONE:
@@ -290,13 +300,15 @@ def create(ssid, flags, wpa_flags, rsn_flags, dev_caps, settings, response):
         key_dialog = WPAKeyDialog(ssid, flags, wpa_flags, rsn_flags,
                                   dev_caps, settings, response)
 
-    key_dialog.connect("response", _key_dialog_response_cb)
-    key_dialog.connect("destroy", _key_dialog_destroy_cb)
+    key_dialog.connect('response', _key_dialog_response_cb)
+    key_dialog.connect('destroy', _key_dialog_destroy_cb)
     key_dialog.show_all()
 
+
 def _key_dialog_destroy_cb(key_dialog, data=None):
     _key_dialog_response_cb(key_dialog, gtk.RESPONSE_CANCEL)
 
+
 def _key_dialog_response_cb(key_dialog, response_id):
     response = key_dialog.get_response_object()
     secrets = None
@@ -308,10 +320,9 @@ def _key_dialog_response_cb(key_dialog, response_id):
         response.set_error(CanceledKeyRequestError())
     elif response_id == gtk.RESPONSE_OK:
         if not secrets:
-            raise RuntimeError("Invalid security arguments.")
+            raise RuntimeError('Invalid security arguments.')
         response.set_secrets(secrets)
     else:
-        raise RuntimeError("Unhandled key dialog response %d" % response_id)
+        raise RuntimeError('Unhandled key dialog response %d' % response_id)
 
     key_dialog.destroy()
-