jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/516994 )
Change subject: feat(TokenWallet): login automatically
......................................................................
feat(TokenWallet): login automatically
The following script used to fail with
"AssertionError: User must login in this site".
from pywikibot import Site
print(Site().tokens['edit'])
This patch makes TokenWallet.load_tokens and TokenWallet.__getitem__
login automatically if not already.
Change-Id: I3f5c8fa873aa447b1d7679cbfc9f004af2ffdc93
---
M pywikibot/site.py
1 file changed, 8 insertions(+), 3 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/site.py b/pywikibot/site.py
index 18a745d..d212853 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -1740,7 +1740,10 @@
"""Container for tokens."""
def __init__(self, site):
- """Initializer."""
+ """Initializer.
+
+ @type site: pywikibot.site.APISite
+ """
self.site = site
self._tokens = {}
self.failed_cache = set() # cache unavailable tokens.
@@ -1755,7 +1758,8 @@
in one request.
@type all: bool
"""
- assert self.site.user(), 'User must login in this site'
+ if self.site.user() is None:
+ self.site.login()
self._tokens.setdefault(self.site.user(), {}).update(
self.site.get_tokens(types, all=all))
@@ -1771,7 +1775,8 @@
def __getitem__(self, key):
"""Get token value for the given key."""
- assert self.site.user(), 'User must login in this site'
+ if self.site.user() is None:
+ self.site.login()
user_tokens = self._tokens.setdefault(self.site.user(), {})
# always preload all for users without tokens
--
To view, visit https://gerrit.wikimedia.org/r/516994
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I3f5c8fa873aa447b1d7679cbfc9f004af2ffdc93
Gerrit-Change-Number: 516994
Gerrit-PatchSet: 2
Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot (75)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/516755 )
Change subject: [bugfix] Fix the outputlang parameter in listpages.py
......................................................................
[bugfix] Fix the outputlang parameter in listpages.py
The listpages parameter -format:7 needs -outputlang to be set. But it can not
be set because of this typo.
Change-Id: I4b8147585d5598382b740acc485900af63c2838c
---
M scripts/listpages.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/listpages.py b/scripts/listpages.py
index 6ea6033..3328ff5 100755
--- a/scripts/listpages.py
+++ b/scripts/listpages.py
@@ -200,7 +200,7 @@
fmt = value.replace('\\03{{', '\03{{')
if not fmt.strip():
notitle = True
- elif option == '-outputlang:':
+ elif option == '-outputlang':
outputlang = value
elif option == '-get':
page_get = True
--
To view, visit https://gerrit.wikimedia.org/r/516755
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I4b8147585d5598382b740acc485900af63c2838c
Gerrit-Change-Number: 516755
Gerrit-PatchSet: 2
Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot (75)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/516645 )
Change subject: [cleanup] Remove interwiki_replacement_overrides
......................................................................
[cleanup] Remove interwiki_replacement_overrides
Override is done by code_alias already
and there is no difference to other redirected sites
Bug: T225417
Bug: T89451
Change-Id: I93cee7ae6fd3f46c4dc10b8ee598c2bf4df550aa
---
M pywikibot/family.py
1 file changed, 0 insertions(+), 9 deletions(-)
Approvals:
Dvorapa: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/family.py b/pywikibot/family.py
index 1ef3d45..fb9671a 100644
--- a/pywikibot/family.py
+++ b/pywikibot/family.py
@@ -1690,14 +1690,6 @@
# Completely removed
removed_wikis = []
- # Mappings which should be in effect, even for
- # closed/removed wikis
- interwiki_replacement_overrides = {
- # Moldovan projects are closed, however
- # Romanian was to be the replacement.
- 'mo': 'ro',
- }
-
# WikimediaFamily uses wikibase for the category name containing
# disambiguation pages for the various languages. We need the
# wikibase code and item number:
@@ -1728,7 +1720,6 @@
def interwiki_replacements(cls):
"""Return an interwiki code replacement mapping."""
rv = cls.code_aliases.copy()
- rv.update(cls.interwiki_replacement_overrides)
return FrozenDict(rv)
def shared_image_repository(self, code):
--
To view, visit https://gerrit.wikimedia.org/r/516645
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I93cee7ae6fd3f46c4dc10b8ee598c2bf4df550aa
Gerrit-Change-Number: 516645
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: jenkins-bot (75)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/516595 )
Change subject: [PEP8] Be consistent in return statement
......................................................................
[PEP8] Be consistent in return statement
returning False from generate_user_files.main() is never used as I can see
and it is not consistent with returning None implicitly at the end of this
function.
- just return
- change the message to plural support and comma separated delimiters
Change-Id: I6724d3f0c955b52044306de8c533d88809d7937e
---
M generate_user_files.py
1 file changed, 5 insertions(+), 3 deletions(-)
Approvals:
Dvorapa: Looks good to me, approved
jenkins-bot: Verified
diff --git a/generate_user_files.py b/generate_user_files.py
index 36decb8..84d1e31 100755
--- a/generate_user_files.py
+++ b/generate_user_files.py
@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
"""Script to create user-config.py."""
#
-# (C) Pywikibot team, 2010-2018
+# (C) Pywikibot team, 2010-2019
#
# Distributed under the terms of the MIT license.
#
@@ -440,8 +440,10 @@
local_args = pywikibot.handle_args(args)
if local_args:
- pywikibot.output('Unknown arguments: %s' % ' '.join(local_args))
- return False
+ pywikibot.output('Unknown argument{}: {}'
+ .format('s' if len(local_args) > 1 else '',
+ ', '.join(local_args)))
+ return
pywikibot.output('You can abort at any time by pressing ctrl-c')
if config.mylang is not None:
--
To view, visit https://gerrit.wikimedia.org/r/516595
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I6724d3f0c955b52044306de8c533d88809d7937e
Gerrit-Change-Number: 516595
Gerrit-PatchSet: 2
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: jenkins-bot (75)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/510699 )
Change subject: [cleanup] reduce code complexity of generate_user_files.create_user_config
......................................................................
[cleanup] reduce code complexity of generate_user_files.create_user_config
Saving botpassword becomes its own function
Change-Id: I048be05ecdc3424a8693686cc3bb8821a74e3677
---
M generate_user_files.py
1 file changed, 6 insertions(+), 1 deletion(-)
Approvals:
Dvorapa: Looks good to me, approved
jenkins-bot: Verified
diff --git a/generate_user_files.py b/generate_user_files.py
index 36decb8..3358336 100755
--- a/generate_user_files.py
+++ b/generate_user_files.py
@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
"""Script to create user-config.py."""
#
-# (C) Pywikibot team, 2010-2018
+# (C) Pywikibot team, 2010-2019
#
# Distributed under the terms of the MIT license.
#
@@ -371,6 +371,11 @@
os.remove(_fnc)
raise
+ save_botpasswords(botpasswords, _fncpass)
+
+
+def save_botpasswords(botpasswords, _fncpass):
+ """Write botpasswords to file."""
if botpasswords:
# Save user-password.py if necessary
# user-config.py is already created at this point
--
To view, visit https://gerrit.wikimedia.org/r/510699
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I048be05ecdc3424a8693686cc3bb8821a74e3677
Gerrit-Change-Number: 510699
Gerrit-PatchSet: 2
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: jenkins-bot (75)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/516479 )
Change subject: [bugfix] getSitelink method must return the title with namespace
......................................................................
[bugfix] getSitelink method must return the title with namespace
Bug: T225504
Change-Id: Id790e61d781f0017d2ac804d1373f9412bb76775
---
M pywikibot/page.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Dvorapa: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/page.py b/pywikibot/page.py
index 47b5731..ee802e5 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -4636,7 +4636,7 @@
if dbname not in self.sitelinks:
raise pywikibot.NoPage(self)
else:
- return self.sitelinks[dbname].title
+ return self.sitelinks[dbname].canonical_title()
def setSitelink(self, sitelink, **kwargs):
"""
--
To view, visit https://gerrit.wikimedia.org/r/516479
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Id790e61d781f0017d2ac804d1373f9412bb76775
Gerrit-Change-Number: 516479
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Lokal Profil <andre.costa(a)wikimedia.se>
Gerrit-Reviewer: jenkins-bot (75)