summaryrefslogtreecommitdiff
path: root/src/leap/bitmask
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2013-10-29 12:24:45 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2013-10-29 12:35:30 -0300
commitc90be9157d5423d055984b354c5712f6873336b8 (patch)
tree5a3d4429866b89129bcbeeb5c13220bda71161e6 /src/leap/bitmask
parentd6a40020d89a1dfab6c49aa710b6e84bc91140b6 (diff)
Update docstrings to unicode types.
Diffstat (limited to 'src/leap/bitmask')
-rw-r--r--src/leap/bitmask/config/providerconfig.py5
-rw-r--r--src/leap/bitmask/gui/login.py4
-rw-r--r--src/leap/bitmask/services/soledad/soledadbootstrapper.py4
3 files changed, 7 insertions, 6 deletions
diff --git a/src/leap/bitmask/config/providerconfig.py b/src/leap/bitmask/config/providerconfig.py
index 44698d83..e80b2337 100644
--- a/src/leap/bitmask/config/providerconfig.py
+++ b/src/leap/bitmask/config/providerconfig.py
@@ -169,11 +169,12 @@ class ProviderConfig(BaseConfig):
checking if the cert exists because we
are about to write it.
:type about_to_download: bool
+
+ :rtype: unicode
"""
cert_path = os.path.join(get_path_prefix(), "leap", "providers",
- self.get_domain(),
- "keys", "ca", "cacert.pem")
+ self.get_domain(), "keys", "ca", "cacert.pem")
if not about_to_download:
cert_exists = os.path.exists(cert_path)
diff --git a/src/leap/bitmask/gui/login.py b/src/leap/bitmask/gui/login.py
index ac34fe23..255a06d3 100644
--- a/src/leap/bitmask/gui/login.py
+++ b/src/leap/bitmask/gui/login.py
@@ -168,7 +168,7 @@ class LoginWidget(QtGui.QWidget):
"""
Returns the user that appears in the widget.
- :rtype: str
+ :rtype: unicode
"""
return self.ui.lnUser.text()
@@ -185,7 +185,7 @@ class LoginWidget(QtGui.QWidget):
"""
Returns the password that appears in the widget
- :rtype: str
+ :rtype: unicode
"""
return self.ui.lnPassword.text()
diff --git a/src/leap/bitmask/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
index 3bb5fd84..c673ea61 100644
--- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py
+++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
@@ -414,9 +414,9 @@ class SoledadBootstrapper(AbstractBootstrapper):
:param provider_config: Provider configuration
:type provider_config: ProviderConfig
:param user: User's login
- :type user: str
+ :type user: unicode
:param password: User's password
- :type password: str
+ :type password: unicode
:param download_if_needed: If True, it will only download
files if the have changed since the
time it was previously downloaded.