jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/463720 )

Change subject: [cleanup] cleanup exceptions.py & login.py in pywikibot/ ......................................................................

[cleanup] cleanup exceptions.py & login.py in pywikibot/

- remove preleading harmless "u" from comments - remove some very old commented out code

Change-Id: I3d6dff28e7105eefe5f326165a18cab09998b4d6 --- M pywikibot/exceptions.py M pywikibot/login.py 2 files changed, 1 insertion(+), 13 deletions(-)

Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified

diff --git a/pywikibot/exceptions.py b/pywikibot/exceptions.py index 98e4fd5..92a0a2e 100644 --- a/pywikibot/exceptions.py +++ b/pywikibot/exceptions.py @@ -143,7 +143,7 @@

# Preformatted UNICODE message where the page title will be inserted # Override this in subclasses. - # u"Oh noes! Page %s is too funky, we should not delete it ;(" + # 'Oh noes! Page %s is too funky, we should not delete it ;(' message = None

def __init__(self, page, message=None): diff --git a/pywikibot/login.py b/pywikibot/login.py index a17c230..0f54a60 100644 --- a/pywikibot/login.py +++ b/pywikibot/login.py @@ -335,18 +335,6 @@ return False self.storecookiedata(cookiedata) pywikibot.log('Should be logged in now') -# # Show a warning according to the local bot policy -# FIXME: disabled due to recursion; need to move this to the Site object -# after login -# if not self.botAllowed(): -# logger.error( -# u"Username '%(name)s' is not listed on [[%(page)s]]." -# % {'name': self.username, -# 'page': botList[self.site.family.name][self.site.code]}) -# logger.error( -# "Please make sure you are allowed to use the robot before actually using it!" -# ) -# return False return True

def showCaptchaWindow(self, url):