Supply token on login if necessary

mwclient/RELEASE-NOTES.txt

@@ -12,6 +12,7 @@ Mwclient 0.6.4 is unreleased.
 * Bug 2690034: Fix revision iteration
 * Fix module conflict with simplejson-1.x by inserting mwclient path at the 
   beginning of sys.path instead of the end
+* Supply token on login if necessary
 
 == Changes in version 0.6.3 ==
 * Added domain parameter to login.

mwclient/client.py

@@ -323,13 +323,18 @@ class Site(object):
 			
 		if self.credentials:
 			wait_token = self.wait_token()
+			kwargs = {
+				'lgname': self.credentials[0],
+				'lgpassword': self.credentials[1]
+				}
+			if self.credentials[2]:
+				kwargs['lgdomain'] = self.credentials[2]
 			while True:
-				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])
+				login = self.api('login', **kwargs)
 				if login['login']['result'] == 'Success':
 					break
+				elif login['login']['result'] == 'NeedToken':
+					kwargs['lgtoken'] = login['login']['token']
 				elif login['login']['result'] == 'Throttled':
 					self.wait(wait_token, login['login'].get('wait', 5))
 				else: