jenkins-bot has submitted this change and it was merged.
Change subject: pep8-ified pywikibot/login.py
......................................................................
pep8-ified pywikibot/login.py
Change-Id: Ia974873801cd37906c097e2c4f3130fcdf1c496d
---
M pywikibot/login.py
1 file changed, 20 insertions(+), 20 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/login.py b/pywikibot/login.py
index a548197..e5b9f97 100644
--- a/pywikibot/login.py
+++ b/pywikibot/login.py
@@ -46,28 +46,26 @@
self.username = user
elif sysop:
try:
- self.username = config.sysopnames\
- [self.site.family.name][self.site.code]
+ self.username =
config.sysopnames[self.site.family.name][self.site.code]
except KeyError:
raise NoUsername(
u"""ERROR: Sysop username for %(fam_name)s:%(wiki_code)s is undefined.
If you have a sysop account for that site, please add a line to user-config.py:
sysopnames['%(fam_name)s']['%(wiki_code)s'] = 'myUsername'"""
- % {'fam_name': self.site.family.name,
- 'wiki_code': self.site.code})
+ % {'fam_name': self.site.family.name,
+ 'wiki_code': self.site.code})
else:
try:
- self.username = config.usernames\
- [self.site.family.name][self.site.code]
+ self.username =
config.usernames[self.site.family.name][self.site.code]
except:
raise NoUsername(
u"""ERROR: Username for %(fam_name)s:%(wiki_code)s is undefined.
If you have an account for that site, please add a line to user-config.py:
usernames['%(fam_name)s']['%(wiki_code)s'] = 'myUsername'"""
- % {'fam_name': self.site.family.name,
- 'wiki_code': self.site.code})
+ % {'fam_name': self.site.family.name,
+ 'wiki_code': self.site.code})
self.password = password
if getattr(config, 'password_file', ''):
self.readPassword()
@@ -95,7 +93,7 @@
# No bot policies on other sites
return True
- def getCookie(self, remember=True, captcha = None):
+ def getCookie(self, remember=True, captcha=None):
"""
Login to the site.
@@ -141,25 +139,27 @@
"""
password_f = open(config.password_file)
for line in password_f:
- if not line.strip(): continue
+ if not line.strip():
+ continue
entry = eval(line)
- if len(entry) == 2: #for default userinfo
- if entry[0] == self.username: self.password = entry[1]
- elif len(entry) == 4: #for userinfo included code and family
+ if len(entry) == 2: # for default userinfo
+ if entry[0] == self.username:
+ self.password = entry[1]
+ elif len(entry) == 4: # for userinfo included code and family
if entry[0] == self.site.code and \
- entry[1] == self.site.family.name and \
- entry[2] == self.username:
+ entry[1] == self.site.family.name and \
+ entry[2] == self.username:
self.password = entry[3]
password_f.close()
- def login(self, retry = False):
+ def login(self, retry=False):
if not self.password:
# As we don't want the password to appear on the screen, we set
# password = True
self.password = pywikibot.input(
- u'Password for user %(name)s on %(site)s:'
- % {'name': self.username, 'site': self.site},
- password = True)
+ u'Password for user %(name)s on %(site)s:'
+ % {'name': self.username, 'site': self.site},
+ password=True)
# self.password = self.password.encode(self.site.encoding())
@@ -171,7 +171,7 @@
pywikibot.error(u"Login failed (%s)." % e.code)
if retry:
self.password = None
- return self.login(retry = True)
+ return self.login(retry=True)
else:
return False
self.storecookiedata(cookiedata)
--
To view, visit https://gerrit.wikimedia.org/r/79594
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia974873801cd37906c097e2c4f3130fcdf1c496d
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
Pywikibot-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/pywikibot-commits
