summaryrefslogtreecommitdiff
path: root/gitlab
diff options
context:
space:
mode:
authorGauvain Pocentek <gauvain@pocentek.net>2016-11-05 13:59:57 +0100
committerGauvain Pocentek <gauvain@pocentek.net>2016-11-05 13:59:57 +0100
commit11c14257e4c7e5d2b31f7e68df8dec1f14878fea (patch)
treee5f0309c11a88a605649a483c209eecac72a817e /gitlab
parentbe83ff9c73d7d8a5807ddce305595ada2b56ba8a (diff)
downloadgitlab-11c14257e4c7e5d2b31f7e68df8dec1f14878fea.tar.gz
Fix docstring for http_{username,password}
Diffstat (limited to 'gitlab')
-rw-r--r--gitlab/__init__.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/gitlab/__init__.py b/gitlab/__init__.py
index 14b642d..d4de709 100644
--- a/gitlab/__init__.py
+++ b/gitlab/__init__.py
@@ -61,10 +61,10 @@ class Gitlab(object):
email (str): The user email or login.
password (str): The user password (associated with email).
ssl_verify (bool): Whether SSL certificates should be validated.
- timeout (float or tuple(float,float)): Timeout to use for requests to
- the GitLab server.
- http_username: (str): Username for HTTP authentication
- http_password: (str): Password for HTTP authentication
+ timeout (float): Timeout to use for requests to the GitLab server.
+ http_username (str): Username for HTTP authentication
+ http_password (str): Password for HTTP authentication
+
Attributes:
user_emails (UserEmailManager): Manager for GitLab users' emails.
user_keys (UserKeyManager): Manager for GitLab users' SSH keys.