diff --git a/mwclient/RELEASE-NOTES.txt b/mwclient/RELEASE-NOTES.txt index ed257fc43ef0013cb53050ad3895ebc4a1d86fbb..8bb54da6d9579e89053cd2a5b1e88d52902968d7 100644 --- a/mwclient/RELEASE-NOTES.txt +++ b/mwclient/RELEASE-NOTES.txt @@ -4,7 +4,7 @@ This is mwclient 0.6.3. The following are the release notes for this version. == Changes in version 0.6.3 == Mwclient 0.6.3 is unreleased. -* No changes yet. +* Added domain parameter to login. == Changes in version 0.6.2 == Mwclient was released on 2 May 2009. diff --git a/mwclient/client.py b/mwclient/client.py index ed8ee4d7facc4ba7839df70e2097ff0d74e2ac53..0c7c74e7fe70d56b2aadf874a5c0d17b2d9e8d47 100644 --- a/mwclient/client.py +++ b/mwclient/client.py @@ -274,11 +274,11 @@ class Site(object): raise errors.EmailError, data - def login(self, username = None, password = None, cookies = None): + def login(self, username = None, password = None, cookies = None, domain = None): if self.initialized: self.require(1, 10) if username and password: - self.credentials = (username, password) + self.credentials = (username, password, domain) if cookies: if self.host not in self.conn.cookies: self.conn.cookies[self.host] = http.CookieJar() @@ -287,7 +287,10 @@ class Site(object): if self.credentials: wait_token = self.wait_token() while True: - login = self.api('login', lgname = self.credentials[0], lgpassword = self.credentials[1]) + if self.credentials[2]: + login = self.api('login', lgname = self.credentials[0], lgpassword = self.credentials[1], lgdomain = self.credentials[2]) + else: + login = self.api('login', lgname = self.credentials[0], lgpassword = self.credentials[1]) if login['login']['result'] == 'Success': break elif login['login']['result'] == 'Throttled':