Pywikibot-commits May 2019

pywikibot-commits@lists.wikimedia.org

1 participants
147 discussions

[Gerrit] pywikibot/core[master]: [tests] Additional pwb.py tests

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/511906 ) Change subject: [tests] Additional pwb.py tests ...................................................................... [tests] Additional pwb.py tests Test selection of similar scripts Change-Id: I08462df62401b6dbfe224ef9bda405732d6716d8 --- M tests/pwb_tests.py 1 file changed, 48 insertions(+), 0 deletions(-) Approvals: Framawiki: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/pwb_tests.py b/tests/pwb_tests.py index cabc3c1..5cba20b 100644 --- a/tests/pwb_tests.py +++ b/tests/pwb_tests.py @@ -13,6 +13,7 @@ # from __future__ import absolute_import, division, unicode_literals +import io import sys from tests import join_tests_path, create_path_func @@ -75,6 +76,53 @@ self.assertEqual('Häuser', vpwb['stdout'].strip()) self.assertEqual('Häuser', vpwb['stderr'].strip()) + def test_script_found(self): + """Test pwb.py script call which is found.""" + stdout = io.StringIO(execute_pwb(['pwb'])['stdout']) + self.assertEqual( + stdout.readline().strip(), + "Wrapper script to use Pywikibot in 'directory' mode.") + + def test_script_not_found(self): + """Test pwbot.py script call which is not found.""" + stderr = io.StringIO(execute_pwb(['pywikibot'])['stderr']) + self.assertEqual(stderr.readline().strip(), + 'ERROR: pywikibot.py not found! Misspelling?') + + def test_one_similar_script(self): + """Test shell.py script call which gives one similar result.""" + result = [ + 'ERROR: hello.py not found! Misspelling?', + 'NOTE: Starting the most similar script shell.py', + 'in 5.0 seconds; type CTRL-C to stop.', + ] + stream = execute_pwb(['hello'], data_in=chr(3), timeout=6) + stderr = io.StringIO(stream['stderr']) + with self.subTest(line=0): + self.assertEqual(stderr.readline().strip(), result[0]) + with self.subTest(line=1): + text = stderr.readline().strip() + self.assertTrue( + text.startswith(result[1]), + msg='"{}" does not start with "{}"'.format(text, result[1])) + with self.subTest(line=2): + self.assertEqual(stderr.readline().strip(), result[2]) + + def test_similar_scripts_found(self): + """Test script call which gives multiple similar results.""" + result = [ + 'ERROR: commons.py not found! Misspelling?', + '', + 'The most similar scripts are:', + '1 - nowcommons', + '2 - commonscat', + '3 - commons_link', + ] + stderr = io.StringIO(execute_pwb(['commons'], data_in='q')['stderr']) + for line in range(6): + with self.subTest(line=line): + self.assertEqual(stderr.readline().strip(), result[line]) + if __name__ == '__main__': # pragma: no cover unittest.main(verbosity=10) -- To view, visit https://gerrit.wikimedia.org/r/511906 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: I08462df62401b6dbfe224ef9bda405732d6716d8 Gerrit-Change-Number: 511906 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

4 years, 10 months

[Gerrit] pywikibot/core[master]: [TEST] fix test_create_short_link

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/511463 ) Change subject: [TEST] fix test_create_short_link ...................................................................... [TEST] fix test_create_short_link Bug: T223865 Change-Id: Ib980e88bf0dec0ce16ecc7ce42a5110a508bc3aa --- M pywikibot/page.py M tests/page_tests.py 2 files changed, 13 insertions(+), 6 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index 062ec9d..7cc9f3f 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -66,6 +66,8 @@ from urllib import quote as quote_from_bytes, unquote as unquote_to_bytes +PROTOCOL_REGEX = r'\Ahttps?://' + __all__ = ( 'BasePage', 'Page', @@ -2218,7 +2220,7 @@ """ return self.content_model == 'flow-board' - def create_short_link(self, permalink=False, with_protocol=False): + def create_short_link(self, permalink=False, with_protocol=True): """ Return a shortened link that points to that page. @@ -2228,8 +2230,9 @@ @param permalink: If true, the link will point to the actual revision of the page. @type permalink: bool - @param with_protocol: If true, the link will have https propotol - prepend. + @param with_protocol: If true, and if it's not already included, + the link will have http(s) protocol prepended. On Wikimedia wikis + the protocol is already present. @type with_protocol: bool @return: The reduced link. @rtype: str @@ -2241,7 +2244,10 @@ url = self.permalink() if permalink else self.full_url() link = wiki.create_short_link(url) - if with_protocol: + if re.match(PROTOCOL_REGEX, link): + if not with_protocol: + return re.sub(PROTOCOL_REGEX, '', link) + elif with_protocol: return '{}://{}'.format(wiki.protocol(), link) return link diff --git a/tests/page_tests.py b/tests/page_tests.py index 55ce2fe..7aa8008 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -1186,12 +1186,13 @@ site = self.get_site() p1 = pywikibot.Page(site, 'User:Framawiki/pwb_tests/shortlink') with self.subTest(parameters='defaulted'): - self.assertEqual(p1.create_short_link(), 'w.wiki/3Cy') + self.assertEqual(p1.create_short_link(), 'https://w.wiki/3Cy') with self.subTest(with_protocol=True): self.assertEqual(p1.create_short_link(with_protocol=True), 'https://w.wiki/3Cy') with self.subTest(permalink=True): - self.assertEqual(p1.create_short_link(permalink=True), + self.assertEqual(p1.create_short_link(permalink=True, + with_protocol=False), 'w.wiki/3Cz') -- To view, visit https://gerrit.wikimedia.org/r/511463 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: Ib980e88bf0dec0ce16ecc7ce42a5110a508bc3aa Gerrit-Change-Number: 511463 Gerrit-PatchSet: 5 Gerrit-Owner: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75) Gerrit-CC: Lokal Profil <andre.costa(a)wikimedia.se>

4 years, 10 months

[Gerrit] pywikibot/core[master]: [IMPR] Simplify tuple expression

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/511680 ) Change subject: [IMPR] Simplify tuple expression ...................................................................... [IMPR] Simplify tuple expression also use private function _make_parameter directly Change-Id: I99f03f3c1f329b03838fb3faad2272da7bebe959 --- M pywikibot/date.py 1 file changed, 4 insertions(+), 7 deletions(-) Approvals: Framawiki: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/date.py b/pywikibot/date.py index b2da643..3f3a8c1 100644 --- a/pywikibot/date.py +++ b/pywikibot/date.py @@ -465,23 +465,20 @@ params = encf(value) - # name 'MakeParameter' kept to avoid breaking blame below - MakeParameter = _make_parameter - if type(params) in _listTypes: assert len(params) == len(decoders), ( 'parameter count ({0}) does not match decoder count ({1})' .format(len(params), len(decoders))) # convert integer parameters into their textual representation - params = [MakeParameter(decoders[i], param) - for i, param in enumerate(params)] - return strPattern % tuple(params) + params = tuple(_make_parameter(decoders[i], param) + for i, param in enumerate(params)) + return strPattern % params else: assert len(decoders) == 1, ( 'A single parameter does not match {0} decoders.' .format(len(decoders))) # convert integer parameter into its textual representation - return strPattern % MakeParameter(decoders[0], params) + return strPattern % _make_parameter(decoders[0], params) def _make_parameter(decoder, param): -- To view, visit https://gerrit.wikimedia.org/r/511680 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: I99f03f3c1f329b03838fb3faad2272da7bebe959 Gerrit-Change-Number: 511680 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

4 years, 10 months

[Gerrit] pywikibot/i18n[master]: [i18n] recover checkimages/sr.json

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/512465 ) Change subject: [i18n] recover checkimages/sr.json ...................................................................... [i18n] recover checkimages/sr.json Bug: T224331 Bug: T220178 Change-Id: Iea30ecd8dd50260fc4d1ec9116b45bd6de6fd028 --- M checkimages/sr.json 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/checkimages/sr.json b/checkimages/sr.json index 6611579..158f2c4 100644 --- a/checkimages/sr.json +++ b/checkimages/sr.json @@ -1,7 +1,11 @@ { "@metadata": { "authors": [ + "Acamicamacaraca", "BadDog", + "Milicevic01", + "Rancher", + "xqt", "Zoranzoki21" ] }, @@ -9,9 +13,11 @@ "checkimages-doubles-file-comment": "Бот: Датотека већ постоји на Остави, можда ће бити избрисана", "checkimages-doubles-head": "Дупликат датотеке", "checkimages-doubles-talk-comment": "Бот: Обавештење о томе да датотека већ постоји на Остави", + "checkimages-doubles-file-comment": "Бот: Датотека већ постоји на Остави", "checkimages-log-comment": "Бот: Ажурирање дневника", "checkimages-no-license-head": "Слика без лиценце", "checkimages-source-tag-comment": "Бот: означавам новоотпремљену неозначену датотеку", "checkimages-source-notice-comment": "Бот: тражим извор информација.", "checkimages-unknown-extension-head": "Непознат додатак!" + "checkimages-unknown-extension-msg": "Изгледа да датотека %(file)s садржи погрешну екстензију.", } -- To view, visit https://gerrit.wikimedia.org/r/512465 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iea30ecd8dd50260fc4d1ec9116b45bd6de6fd028 Gerrit-Change-Number: 512465 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

4 years, 10 months

[Gerrit] pywikibot/core[master]: Validate IndexPage contents before saving it

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/512049 ) Change subject: Validate IndexPage contents before saving it ...................................................................... Validate IndexPage contents before saving it Trying to save any other content than a {{:MediaWiki:Proofreadpage_index_template}} template fails silently with a parameterless template being saved instead. Change-Id: I371e0dc2d365224edc8cbf9796408464694cc398 --- M pywikibot/proofreadpage.py M tests/proofreadpage_tests.py 2 files changed, 107 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/proofreadpage.py b/pywikibot/proofreadpage.py index d05f932..39dbd28 100644 --- a/pywikibot/proofreadpage.py +++ b/pywikibot/proofreadpage.py @@ -53,6 +53,7 @@ import pywikibot from pywikibot.comms import http from pywikibot.data.api import Request +from pywikibot.exceptions import OtherPageSaveError from pywikibot.tools import ModuleDeprecationWrapper _logger = 'proofreadpage' @@ -750,6 +751,8 @@ """Index Page page used in Mediawiki ProofreadPage extension.""" + INDEX_TEMPLATE = ':MediaWiki:Proofreadpage_index_template' + def __init__(self, source, title=''): """Instantiate a IndexPage object. @@ -809,6 +812,36 @@ else: return None + def save(self, *args, **kwargs): # See Page.save(). + """ + Save page after validating the content. + + Trying to save any other content fails silently with a parameterless + INDEX_TEMPLATE being saved. + """ + if not self.has_valid_content(): + raise OtherPageSaveError( + self, 'An IndexPage must consist only of a single call to ' + '{{%s}}.' % self.INDEX_TEMPLATE) + kwargs['contentformat'] = 'text/x-wiki' + kwargs['contentmodel'] = 'proofread-index' + super(IndexPage, self).save(*args, **kwargs) + + def has_valid_content(self): + """Test page only contains a single call to the index template.""" + if (not self.text.startswith('{{' + self.INDEX_TEMPLATE) + or not self.text.endswith('}}')): + return False + + # Discard all inner templates as only top-level ones matter + tmplts = pywikibot.textlib.extract_templates_and_params_regex_simple( + self.text) + if len(tmplts) != 1 or tmplts[0][0] != self.INDEX_TEMPLATE: + # Only a single call to the INDEX_TEMPLATE is allowed + return False + + return True + def purge(self): """Overwrite purge method. diff --git a/tests/proofreadpage_tests.py b/tests/proofreadpage_tests.py index ebabb93..efa1518 100644 --- a/tests/proofreadpage_tests.py +++ b/tests/proofreadpage_tests.py @@ -769,6 +769,80 @@ self.assertEqual(list(gen), self.pages) +class TestIndexPageHasValidContent(IndexPageTestCase): + + """Unit tests for has_valid_content().""" + + family = 'wikisource' + code = 'en' + + index_name = 'Index:Phosphor (1888).djvu' + valid_template = '{{%s|foo=bar}}' % IndexPage.INDEX_TEMPLATE + other_template = '{{PoTM|bar=foobar}}' + + @classmethod + def setUpClass(cls): + """Prepare tests by creating an IndexPage instance.""" + super(TestIndexPageHasValidContent, cls).setUpClass() + cls.index = IndexPage(cls.site, cls.index_name) + + def test_has_valid_content_empty(self): + """Test empty page is invalid.""" + self.index.text = '' + self.assertFalse(self.index.has_valid_content()) + + def test_has_valid_content_non_template(self): + """Test non-template is invalid.""" + self.index.text = 'foobar' + self.assertFalse(self.index.has_valid_content()) + + def test_has_valid_content_valid(self): + """Test correct Index template is valid.""" + self.index.text = self.valid_template + self.assertTrue(self.index.has_valid_content()) + + def test_has_valid_content_prefixed(self): + """Test prefixing Index template is invalid.""" + self.index.text = 'pre {}'.format(self.valid_template) + self.assertFalse(self.index.has_valid_content()) + + def test_has_valid_content_postfixed(self): + """Test postfixing Index template is invalid.""" + self.index.text = '{}post'.format(self.valid_template) + self.assertFalse(self.index.has_valid_content()) + + def test_has_valid_content_pre_and_postfixed(self): + """Test pre- and postfixing Index template is invalid.""" + self.index.text = 'pre{}post'.format(self.valid_template) + self.assertFalse(self.index.has_valid_content()) + + def test_has_valid_content_second_template(self): + """Test postfixing a second template is invalid.""" + self.index.text = self.valid_template + self.other_template + self.assertFalse(self.index.has_valid_content()) + + def test_has_valid_content_wrong_template(self): + """Test incorrect template is invalid.""" + self.index.text = self.other_template + self.assertFalse(self.index.has_valid_content()) + + def test_has_valid_content_missnamed_template(self): + """Test nested templates is valid.""" + self.index.text = '{{%s_bar|foo=bar}}' % IndexPage.INDEX_TEMPLATE + self.assertFalse(self.index.has_valid_content()) + + def test_has_valid_content_nested_template(self): + """Test nested templates is valid.""" + self.index.text = ('{{%s|foo=%s}}' + % (IndexPage.INDEX_TEMPLATE, self.other_template)) + self.assertTrue(self.index.has_valid_content()) + + def test_has_valid_content_multiple_valid(self): + """Test multiple Index templates is invalid.""" + self.index.text = self.valid_template * 2 + self.assertFalse(self.index.has_valid_content()) + + if __name__ == '__main__': # pragma: no cover try: unittest.main() -- To view, visit https://gerrit.wikimedia.org/r/512049 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: I371e0dc2d365224edc8cbf9796408464694cc398 Gerrit-Change-Number: 512049 Gerrit-PatchSet: 3 Gerrit-Owner: Lokal Profil <andre.costa(a)wikimedia.se> 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: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

4 years, 11 months

[Gerrit] pywikibot/core[master]: [cleanup] use "any" function instead of sequence of "or" statements

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/512116 ) Change subject: [cleanup] use "any" function instead of sequence of "or" statements ...................................................................... [cleanup] use "any" function instead of sequence of "or" statements Reduce code complexity from E32 to D26 in getCombinedGenerator (reported from codeclimate.com) Change-Id: I386e9ab3c2126d80d457053247368cf5226b6b23 --- M pywikibot/pagegenerators.py 1 file changed, 15 insertions(+), 16 deletions(-) Approvals: Lokal Profil: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index ea2ae8e..2cd467c 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -526,17 +526,18 @@ self.gens[i].set_maximum_items(self.limit) except AttributeError: self.gens[i] = itertools.islice(self.gens[i], self.limit) - if len(self.gens) == 0: - if (self.titlefilter_list - or self.titlenotfilter_list - or self.articlefilter_list - or self.claimfilter_list - or self.catfilter_list - or self.subpage_max_depth is not None - or self.qualityfilter_list): - pywikibot.warning( - 'filter(s) specified but no generators.') + + if not self.gens: + if any((self.titlefilter_list, + self.titlenotfilter_list, + self.articlefilter_list, + self.claimfilter_list, + self.catfilter_list, + self.qualityfilter_list, + self.subpage_max_depth is not None)): + pywikibot.warning('filter(s) specified but no generators.') return None + elif len(self.gens) == 1: dupfiltergen = self.gens[0] if hasattr(self, '_single_gen_filter_unique'): @@ -544,13 +545,11 @@ if self.intersect: pywikibot.warning( '"-intersect" ignored as only one generator is specified.') + elif self.intersect: + # By definition no duplicates are possible. + dupfiltergen = intersect_generators(self.gens) else: - if self.intersect: - # By definition no duplicates are possible. - dupfiltergen = intersect_generators(self.gens) - else: - dupfiltergen = _filter_unique_pages(itertools.chain( - *self.gens)) + dupfiltergen = _filter_unique_pages(itertools.chain(*self.gens)) # Add on subpage filter generator if self.subpage_max_depth is not None: -- To view, visit https://gerrit.wikimedia.org/r/512116 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: I386e9ab3c2126d80d457053247368cf5226b6b23 Gerrit-Change-Number: 512116 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Lokal Profil <andre.costa(a)wikimedia.se> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

4 years, 11 months

[Gerrit] pywikibot/core[master]: [L10N] update languages_by_size

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/512158 ) Change subject: [L10N] update languages_by_size ...................................................................... [L10N] update languages_by_size Change-Id: I6358c6d71746902677b092cc1abcc69715e74997 --- M pywikibot/families/wikibooks_family.py M pywikibot/families/wikinews_family.py M pywikibot/families/wikipedia_family.py M pywikibot/families/wikiquote_family.py M pywikibot/families/wikisource_family.py M pywikibot/families/wikivoyage_family.py M pywikibot/families/wiktionary_family.py 7 files changed, 30 insertions(+), 30 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikibooks_family.py b/pywikibot/families/wikibooks_family.py index abf6e29..53abc28 100644 --- a/pywikibot/families/wikibooks_family.py +++ b/pywikibot/families/wikibooks_family.py @@ -36,9 +36,9 @@ 'en', 'hu', 'de', 'fr', 'pt', 'ja', 'it', 'nl', 'es', 'pl', 'th', 'he', 'id', 'fi', 'sq', 'az', 'fa', 'zh', 'ca', 'ru', 'vi', 'da', 'ko', 'sv', 'gl', 'sr', 'cs', 'hr', 'ba', 'no', 'ar', 'tr', 'ta', 'sa', 'uk', 'eo', - 'sk', 'is', 'ro', 'hi', 'si', 'bn', 'mk', 'bg', 'ka', 'ms', 'lt', 'tt', + 'sk', 'is', 'ro', 'hi', 'si', 'bn', 'mk', 'bg', 'ka', 'lt', 'ms', 'tt', 'el', 'li', 'ur', 'sl', 'km', 'tl', 'et', 'kk', 'ia', 'be', 'ml', 'oc', - 'hy', 'eu', 'ne', 'pa', 'tg', 'la', 'cv', 'fy', 'ku', 'bs', 'cy', 'af', + 'ne', 'hy', 'eu', 'pa', 'tg', 'la', 'cv', 'fy', 'ku', 'bs', 'cy', 'af', 'te', 'mr', 'mg', 'ky', ] diff --git a/pywikibot/families/wikinews_family.py b/pywikibot/families/wikinews_family.py index 7fbc464..b1928c8 100644 --- a/pywikibot/families/wikinews_family.py +++ b/pywikibot/families/wikinews_family.py @@ -24,8 +24,8 @@ languages_by_size = [ 'sr', 'en', 'fr', 'ru', 'pt', 'de', 'pl', 'es', 'zh', 'it', 'ar', 'cs', - 'ca', 'nl', 'el', 'ta', 'sv', 'uk', 'fa', 'ro', 'fi', 'tr', 'ja', 'li', - 'sq', 'no', 'eo', 'ko', 'bs', 'he', 'bg', + 'ca', 'nl', 'el', 'ta', 'sv', 'uk', 'fa', 'bg', 'ro', 'fi', 'tr', 'ja', + 'li', 'sq', 'no', 'eo', 'ko', 'bs', 'he', ] category_redirect_templates = { diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index 5679029..29c3d31 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -33,31 +33,31 @@ 'vi', 'ja', 'zh', 'pt', 'uk', 'ar', 'fa', 'sr', 'ca', 'no', 'id', 'fi', 'ko', 'hu', 'sh', 'cs', 'ro', 'eu', 'tr', 'ms', 'eo', 'bg', 'da', 'hy', 'he', 'sk', 'zh-min-nan', 'kk', 'min', 'ce', 'hr', 'lt', 'et', 'be', - 'sl', 'el', 'gl', 'az', 'ur', 'simple', 'nn', 'azb', 'uz', 'th', 'hi', + 'sl', 'el', 'gl', 'az', 'ur', 'simple', 'nn', 'azb', 'th', 'uz', 'hi', 'la', 'ka', 'vo', 'ta', 'cy', 'mk', 'ast', 'tg', 'lv', 'mg', 'oc', - 'tt', 'bs', 'ky', 'af', 'sq', 'tl', 'zh-yue', 'new', 'te', 'bn', + 'tt', 'bs', 'af', 'ky', 'sq', 'tl', 'zh-yue', 'new', 'te', 'bn', 'be-tarask', 'br', 'pms', 'ml', 'lb', 'jv', 'ht', 'sco', 'mr', 'ga', - 'sw', 'ba', 'nds', 'pnb', 'is', 'my', 'fy', 'cv', 'su', 'lmo', 'an', + 'sw', 'nds', 'ba', 'su', 'pnb', 'is', 'my', 'fy', 'cv', 'lmo', 'an', 'ne', 'yo', 'pa', 'gu', 'io', 'bar', 'scn', 'ku', 'als', 'bpy', 'kn', 'ckb', 'ia', 'qu', 'arz', 'wuu', 'mn', 'bat-smg', 'si', 'wa', 'or', - 'gd', 'yi', 'am', 'nap', 'cdo', 'bug', 'hsb', 'mai', 'map-bms', 'xmf', - 'fo', 'mzn', 'li', 'ilo', 'sah', 'eml', 'vec', 'os', 'sa', 'sd', 'mrj', - 'diq', 'mhr', 'ps', 'hif', 'roa-tara', 'zh-classical', 'bcl', 'ace', + 'gd', 'am', 'yi', 'nap', 'cdo', 'bug', 'hsb', 'mai', 'map-bms', 'xmf', + 'mzn', 'fo', 'li', 'ilo', 'eml', 'sah', 'vec', 'os', 'sa', 'sd', 'diq', + 'mrj', 'mhr', 'ps', 'hif', 'zh-classical', 'roa-tara', 'bcl', 'ace', 'hak', 'frr', 'pam', 'szl', 'nso', 'se', 'km', 'nv', 'hyw', 'mi', 'rue', 'nah', 'nds-nl', 'vls', 'bh', 'crh', 'gan', 'sc', 'vep', 'bo', - 'glk', 'co', 'myv', 'tk', 'fiu-vro', 'as', 'so', 'kv', 'lrc', 'csb', - 'gv', 'shn', 'udm', 'zea', 'ie', 'pcd', 'ay', 'sn', 'ug', 'nrm', 'stq', - 'lez', 'kw', 'lad', 'mwl', 'gom', 'gn', 'haw', 'rm', 'lij', 'ha', 'ab', - 'koi', 'kab', 'lo', 'mt', 'lfn', 'fur', 'frp', 'dsb', 'ln', 'ang', - 'ext', 'olo', 'cbk-zam', 'dty', 'dv', 'ksh', 'gag', 'pi', 'pag', 'pfl', - 'bjn', 'av', 'bxr', 'xal', 'gor', 'krc', 'pap', 'za', 'kaa', 'pdc', - 'rw', 'tyv', 'to', 'kl', 'nov', 'jam', 'arc', 'kbp', 'kbd', 'tpi', - 'tet', 'ig', 'ki', 'na', 'jbo', 'lbe', 'roa-rup', 'ty', 'bi', 'kg', - 'mdf', 'wo', 'lg', 'zu', 'srn', 'tcy', 'inh', 'atj', 'chr', 'ltg', - 'sm', 'xh', 'om', 'sat', 'pih', 'cu', 'rmy', 'tw', 'bm', 'tn', 'chy', - 'rn', 'got', 'ts', 'tum', 'ak', 'st', 'ny', 'ch', 'ss', 'pnt', 'fj', - 'iu', 'ady', 'ee', 'ks', 've', 'ik', 'sg', 'ff', 'dz', 'ti', 'cr', - 'din', + 'glk', 'co', 'myv', 'tk', 'as', 'fiu-vro', 'so', 'lrc', 'kv', 'csb', + 'gv', 'shn', 'udm', 'zea', 'ie', 'ay', 'pcd', 'sn', 'ug', 'nrm', 'stq', + 'lez', 'kw', 'lad', 'mwl', 'gom', 'gn', 'haw', 'rm', 'lij', 'ha', + 'kab', 'ab', 'koi', 'lo', 'mt', 'lfn', 'fur', 'frp', 'dsb', 'ln', + 'ang', 'ext', 'olo', 'dty', 'cbk-zam', 'dv', 'ksh', 'gag', 'pi', 'pag', + 'pfl', 'bjn', 'av', 'bxr', 'xal', 'gor', 'krc', 'za', 'pap', 'kaa', + 'pdc', 'rw', 'tyv', 'to', 'kl', 'nov', 'jam', 'arc', 'kbp', 'kbd', + 'tpi', 'tet', 'ig', 'ki', 'na', 'jbo', 'lbe', 'roa-rup', 'bi', 'ty', + 'kg', 'wo', 'mdf', 'lg', 'zu', 'srn', 'inh', 'tcy', 'atj', 'chr', + 'ltg', 'sm', 'xh', 'om', 'sat', 'pih', 'cu', 'rmy', 'tw', 'bm', 'tn', + 'chy', 'rn', 'got', 'ts', 'tum', 'ak', 'st', 'ny', 'ch', 'ss', 'pnt', + 'fj', 'iu', 'ady', 'ee', 'ks', 've', 'ik', 'sg', 'ff', 'dz', 'ti', + 'cr', 'din', ] # Sites we want to edit but not count as real languages diff --git a/pywikibot/families/wikiquote_family.py b/pywikibot/families/wikiquote_family.py index 25d2900..1805aaa 100644 --- a/pywikibot/families/wikiquote_family.py +++ b/pywikibot/families/wikiquote_family.py @@ -31,10 +31,10 @@ languages_by_size = [ 'en', 'it', 'pl', 'ru', 'cs', 'fa', 'de', 'pt', 'es', 'uk', 'fr', 'sk', - 'bs', 'he', 'ca', 'fi', 'tr', 'sl', 'th', 'lt', 'az', 'bg', 'zh', 'eo', + 'bs', 'he', 'ca', 'fi', 'tr', 'th', 'sl', 'lt', 'az', 'bg', 'zh', 'eo', 'hy', 'hr', 'el', 'su', 'nn', 'id', 'ar', 'sv', 'hu', 'li', 'ko', 'nl', - 'et', 'ja', 'la', 'sr', 'gu', 'gl', 'sah', 'ur', 'ta', 'te', 'be', - 'cy', 'no', 'ml', 'kn', 'ku', 'vi', 'eu', 'ro', 'hi', 'ka', 'da', 'sa', + 'et', 'ja', 'la', 'sr', 'gu', 'gl', 'sah', 'ur', 'ta', 'te', 'cy', + 'be', 'no', 'ml', 'kn', 'ku', 'eu', 'ro', 'vi', 'hi', 'ka', 'da', 'sa', 'is', 'sq', 'br', 'mr', 'af', 'uz', 'wo', 'ky', ] diff --git a/pywikibot/families/wikisource_family.py b/pywikibot/families/wikisource_family.py index 64d6d57..d9f7e7f 100644 --- a/pywikibot/families/wikisource_family.py +++ b/pywikibot/families/wikisource_family.py @@ -30,9 +30,9 @@ languages_by_size = [ 'en', 'pl', 'ru', 'de', 'fr', 'zh', 'he', 'it', 'es', 'ar', 'cs', 'pt', 'www', 'fa', 'gu', 'hu', 'ml', 'sv', 'ko', 'bn', 'sr', 'sa', 'sl', - 'hy', 'uk', 'te', 'el', 'th', 'ro', 'fi', 'vi', 'ja', 'az', 'ta', 'ca', + 'hy', 'uk', 'te', 'el', 'th', 'ro', 'fi', 'ja', 'vi', 'az', 'ta', 'ca', 'br', 'kn', 'nl', 'hr', 'la', 'no', 'is', 'vec', 'eo', 'tr', 'pms', - 'et', 'be', 'da', 'mk', 'id', 'yi', 'bg', 'li', 'as', 'mr', 'or', 'gl', + 'et', 'be', 'mk', 'da', 'id', 'yi', 'bg', 'li', 'as', 'mr', 'or', 'gl', 'bs', 'sah', 'lt', 'sk', 'eu', 'pa', 'cy', 'zh-min-nan', 'fo', 'nap', ] diff --git a/pywikibot/families/wikivoyage_family.py b/pywikibot/families/wikivoyage_family.py index 5dc5ae9..212b93b 100644 --- a/pywikibot/families/wikivoyage_family.py +++ b/pywikibot/families/wikivoyage_family.py @@ -18,7 +18,7 @@ name = 'wikivoyage' languages_by_size = [ - 'en', 'de', 'fa', 'it', 'pl', 'fr', 'ru', 'zh', 'nl', 'pt', 'es', 'he', + 'en', 'de', 'fa', 'pl', 'it', 'fr', 'ru', 'zh', 'nl', 'pt', 'es', 'he', 'fi', 'vi', 'sv', 'el', 'ro', 'uk', 'bn', 'ps', 'hi', ] diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index b64bd0b..c23f65c 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -43,7 +43,7 @@ 'an', 'yue', 'wo', 'ang', 'tt', 'mt', 'sd', 'gn', 'mr', 'ie', 'so', 'gd', 'csb', 'ug', 'ia', 'st', 'roa-rup', 'si', 'hif', 'mi', 'ay', 'kl', 'fo', 'jbo', 'ln', 'zu', 'na', 'gu', 'gv', 'kw', 'rw', 'ts', - 'ne', 'om', 'su', 'qu', 'ss', 'ha', 'iu', 'am', 'dv', 'tpi', 'yi', + 'ne', 'om', 'qu', 'ss', 'su', 'ha', 'iu', 'am', 'dv', 'tpi', 'yi', 'ti', 'sg', 'tn', 'ks', ] -- To view, visit https://gerrit.wikimedia.org/r/512158 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: I6358c6d71746902677b092cc1abcc69715e74997 Gerrit-Change-Number: 512158 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)

4 years, 11 months

[Gerrit] pywikibot/core[master]: [tests] use subTest with l10n_tests.TestSites

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/512134 ) Change subject: [tests] use subTest with l10n_tests.TestSites ...................................................................... [tests] use subTest with l10n_tests.TestSites Change-Id: If8565af684434d0a48f9aa1187739491f0d1e80a --- M tests/l10n_tests.py 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/l10n_tests.py b/tests/l10n_tests.py index 2b86318..f461ee3 100644 --- a/tests/l10n_tests.py +++ b/tests/l10n_tests.py @@ -107,9 +107,10 @@ for package in PACKAGES: keys = i18n.twget_keys(package) for key in keys: - self.assertIn(key, languages, - "'{}' - json key '{}' is not a site language" - .format(package, key)) + with self.subTest(package=package, key=key): + self.assertIn(key, languages, + "'{}' - json key '{}' is not a site language" + .format(package, key)) def setUpModule(): # noqa: N802 -- To view, visit https://gerrit.wikimedia.org/r/512134 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: If8565af684434d0a48f9aa1187739491f0d1e80a Gerrit-Change-Number: 512134 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)

4 years, 11 months

[Gerrit] pywikibot/core[master]: [cleanup] remove # TODO because it was done already

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/512110 ) Change subject: [cleanup] remove # TODO because it was done already ...................................................................... [cleanup] remove # TODO because it was done already logtype is checked in _handle_logevents() already Change-Id: I40e9416e094c1f1c31d2ef6f84633360ef498e88 --- M pywikibot/pagegenerators.py 1 file changed, 1 insertion(+), 4 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index ea2ae8e..53110f9 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -670,11 +670,8 @@ @return: The generator or None if invalid 'total' value. @rtype: LogeventsPageGenerator """ - # TODO: Check if logtype is one of the allowed log types - - # 'start or None', because start might be an empty string total = None - start = start or None + start = start or None # because start might be an empty string if isinstance(start, UnicodeType) and len(start) == 8: start = pywikibot.Timestamp.strptime(start, '%Y%m%d') elif start is not None: -- To view, visit https://gerrit.wikimedia.org/r/512110 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: I40e9416e094c1f1c31d2ef6f84633360ef498e88 Gerrit-Change-Number: 512110 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)

4 years, 11 months

[Gerrit] pywikibot/core[master]: [cleanup] Simplify range checking in proofreadpage.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/512107 ) Change subject: [cleanup] Simplify range checking in proofreadpage.py ...................................................................... [cleanup] Simplify range checking in proofreadpage.py Change-Id: I3cc966b44222aa2b48475b0980d6b35ceda2a2fc --- M pywikibot/proofreadpage.py 1 file changed, 1 insertion(+), 3 deletions(-) Approvals: Lokal Profil: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/proofreadpage.py b/pywikibot/proofreadpage.py index d05f932..4a72548 100644 --- a/pywikibot/proofreadpage.py +++ b/pywikibot/proofreadpage.py @@ -953,9 +953,7 @@ if end is None: end = self.num_pages - if not ((1 <= start <= self.num_pages) - and (1 <= end <= self.num_pages) - and (start <= end)): + if not (1 <= start <= end <= self.num_pages): raise ValueError('start=%s, end=%s are not in valid range (%s, %s)' % (start, end, 1, self.num_pages)) -- To view, visit https://gerrit.wikimedia.org/r/512107 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: I3cc966b44222aa2b48475b0980d6b35ceda2a2fc Gerrit-Change-Number: 512107 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Lokal Profil <andre.costa(a)wikimedia.se> Gerrit-Reviewer: jenkins-bot (75)

4 years, 11 months

← Newer
1
2
3
4
5
6
7
8
...
15
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits May 2019