summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/gui
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-10-30 13:02:47 -0300
committerTomás Touceda <chiiph@leap.se>2013-10-30 13:02:47 -0300
commita365958532bf4b2676a9337bf40f3b67bdf473d1 (patch)
tree8ebc9ac1a842d005832c4073994ccd2e1c31eda7 /src/leap/bitmask/gui
parentd28cb4d97c15952070f1bd2b737264686b025836 (diff)
parent1198f8484f0a6c89a610cd9aabcf30d2f43c832e (diff)
Merge remote-tracking branch 'ivan/bug/4003_fix-non-ascii-password-change' into develop
Diffstat (limited to 'src/leap/bitmask/gui')
-rw-r--r--src/leap/bitmask/gui/mainwindow.py4
-rw-r--r--src/leap/bitmask/gui/preferenceswindow.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index dddd53da..fa1a82f8 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -880,8 +880,8 @@ class MainWindow(QtGui.QMainWindow):
leap_assert(self._provider_config, "We need a provider config!")
if data[self._provider_bootstrapper.PASSED_KEY]:
- username = self._login_widget.get_user().encode("utf8")
- password = self._login_widget.get_password().encode("utf8")
+ username = self._login_widget.get_user()
+ password = self._login_widget.get_password()
if self._srp_auth is None:
self._srp_auth = SRPAuth(self._provider_config)
diff --git a/src/leap/bitmask/gui/preferenceswindow.py b/src/leap/bitmask/gui/preferenceswindow.py
index 58cb05ba..b043afe6 100644
--- a/src/leap/bitmask/gui/preferenceswindow.py
+++ b/src/leap/bitmask/gui/preferenceswindow.py
@@ -156,7 +156,7 @@ class PreferencesWindow(QtGui.QDialog):
"""
logger.debug("SRP password changed successfully.")
try:
- self._soledad.change_passphrase(str(new_password))
+ self._soledad.change_passphrase(new_password)
logger.debug("Soledad password changed successfully.")
except NoStorageSecret:
logger.debug(