Pywikibot-commits May 2022

pywikibot-commits@lists.wikimedia.org

1 participants
116 discussions

[Gerrit] ...core[master]: apisite: fix type of editpage() `page` parameter
by jenkins-bot (Code Review) 22 May '22

22 May '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/795258 ) Change subject: apisite: fix type of editpage() `page` parameter ...................................................................... apisite: fix type of editpage() `page` parameter Should be pywikibot.page.BasePage instead of pywikibot.page.BasBaseePage, likely an accidental paste of "Base" without realizing it. Change-Id: Ib1377f4a084aa8061a1f5513f4c37f87849e7e26 --- M pywikibot/site/_apisite.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Zabe: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site/_apisite.py b/pywikibot/site/_apisite.py index 1768333..c164bb0 100644 --- a/pywikibot/site/_apisite.py +++ b/pywikibot/site/_apisite.py @@ -1711,7 +1711,7 @@ @need_right('edit') def editpage( self, - page: 'pywikibot.page.BasBaseePage', + page: 'pywikibot.page.BasePage', summary: Optional[str] = None, minor: bool = True, notminor: bool = False, -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/795258 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: Ib1377f4a084aa8061a1f5513f4c37f87849e7e26 Gerrit-Change-Number: 795258 Gerrit-PatchSet: 2 Gerrit-Owner: DannyS712 <dannys712.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zabe <zabe(a)avorwerk.net> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: typo fix: successfull -> successful
by jenkins-bot (Code Review) 22 May '22

22 May '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/795253 ) Change subject: typo fix: successfull -> successful ...................................................................... typo fix: successfull -> successful Bug: T201491 Change-Id: I72df8f8b3eac368ff34a938300740f3624703849 --- M pywikibot/page/_filepage.py M pywikibot/site/_apisite.py 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Thiemo Kreuz (WMDE): Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page/_filepage.py b/pywikibot/page/_filepage.py index 9ff917d..170626a 100644 --- a/pywikibot/page/_filepage.py +++ b/pywikibot/page/_filepage.py @@ -282,7 +282,7 @@ sha1 = compute_file_hash(filename) return sha1 == revision.sha1 pywikibot.warning( - 'Unsuccessfull request ({}): {}' + 'Unsuccessful request ({}): {}' .format(req.status_code, req.url)) return False diff --git a/pywikibot/site/_apisite.py b/pywikibot/site/_apisite.py index 1768333..d525cdb 100644 --- a/pywikibot/site/_apisite.py +++ b/pywikibot/site/_apisite.py @@ -406,7 +406,7 @@ self._loginstatus = _LoginStatus.AS_USER return - pywikibot.error('{} != {} after {}.login() and successfull ' + pywikibot.error('{} != {} after {}.login() and successful ' '{}.login()' .format(self.userinfo['name'], self.username(), -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/795253 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I72df8f8b3eac368ff34a938300740f3624703849 Gerrit-Change-Number: 795253 Gerrit-PatchSet: 2 Gerrit-Owner: DannyS712 <dannys712.wiki(a)gmail.com> Gerrit-Reviewer: Thiemo Kreuz (WMDE) <thiemo.kreuz(a)wikimedia.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: apisite: remove TODO about implementing undelete, long since done
by Xqt (Code Review) 22 May '22

22 May '22

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/795259 ) Change subject: apisite: remove TODO about implementing undelete, long since done ...................................................................... apisite: remove TODO about implementing undelete, long since done Undelete was implemented back in 2014, but the todo was never removed Follow-up to I1eb2c158f6450bf7b4e9c3f26c83bb7674b9f766 Change-Id: Iaa99b5d7254cd2d226e051dadff2ab2799db9606 --- M pywikibot/site/_apisite.py 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/site/_apisite.py b/pywikibot/site/_apisite.py index 1768333..25929af 100644 --- a/pywikibot/site/_apisite.py +++ b/pywikibot/site/_apisite.py @@ -2481,8 +2481,6 @@ finally: self.unlock_page(page) - # TODO: implement undelete - @need_right('block') def blockuser( self, -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/795259 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: Iaa99b5d7254cd2d226e051dadff2ab2799db9606 Gerrit-Change-Number: 795259 Gerrit-PatchSet: 3 Gerrit-Owner: DannyS712 <dannys712.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: Fix doc in APISite.blockuser
by jenkins-bot (Code Review) 22 May '22

22 May '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/795374 ) Change subject: Fix doc in APISite.blockuser ...................................................................... Fix doc in APISite.blockuser Bug: T100521 Change-Id: I10aad5f2311d562616b6f3ca4f63b0f9565908ac --- M pywikibot/site/_apisite.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: DannyS712: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site/_apisite.py b/pywikibot/site/_apisite.py index 1d6e174..1768333 100644 --- a/pywikibot/site/_apisite.py +++ b/pywikibot/site/_apisite.py @@ -2499,7 +2499,7 @@ """ Block a user for certain amount of time and for a certain reason. - .. seealso:: :api:`Block + .. seealso:: :api:`Block` :param user: The username/IP to be blocked without a namespace. :param expiry: The length or date/time when the block expires. If -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/795374 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I10aad5f2311d562616b6f3ca4f63b0f9565908ac Gerrit-Change-Number: 795374 Gerrit-PatchSet: 2 Gerrit-Owner: Hongsy <hongsy2006+wikimedia(a)gmail.com> Gerrit-Reviewer: DannyS712 <dannys712.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [IMPR] Improve pywikibot.Site() documentation
by Xqt (Code Review) 22 May '22

22 May '22

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/794791 ) Change subject: [IMPR] Improve pywikibot.Site() documentation ...................................................................... [IMPR] Improve pywikibot.Site() documentation Change-Id: I04eafbae47cd32bb34a9eabbc5084bf9acaae4bb --- M pywikibot/__init__.py 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 1df2fb1..e6231e6 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -1132,8 +1132,8 @@ site = pywikibot.Site('wikisource:fr') - :Note: An already created site is cached an a new variable points to - the same object if interface, family, code and user are equal: + .. note:: An already created site is cached an a new variable points + to the same object if interface, family, code and user are equal: >>> import pywikibot >>> site_1 = pywikibot.Site('wikisource:fr') @@ -1143,11 +1143,11 @@ >>> site_1 APISite("fr", "wikisource") - ``APISite`` is the default interface. Refer :py:obj:`pywikibot.site` for - other interface types. + :class:`APISite<pywikibot.site._apisite.APISite>` is the default + interface. Refer :py:obj:`pywikibot.site` for other interface types. - **Never create a site object via interface class directly.** - Always use this factory method. + .. warning:: Never create a site object via interface class directly. + Always use this factory method. .. versionchanged:: 7.3 Short creation if site code is equal to family name like -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/794791 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I04eafbae47cd32bb34a9eabbc5084bf9acaae4bb Gerrit-Change-Number: 794791 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: pin sseclient to < 0.0.23
by jenkins-bot (Code Review) 21 May '22

21 May '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/789999 ) Change subject: pin sseclient to < 0.0.23 ...................................................................... pin sseclient to < 0.0.23 Bug: T222885 Change-Id: I52e2aa20d586f8d4a773744712a508c151a4eb71 --- M requirements.txt M setup.py 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Matěj Suchánek: Looks good to me, but someone else must approve JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/requirements.txt b/requirements.txt index d6c9ab8..d0b2209 100644 --- a/requirements.txt +++ b/requirements.txt @@ -47,7 +47,7 @@ # core pagegenerators google >= 1.7 -sseclient >= 0.0.18,!=0.0.23,!=0.0.24 +sseclient >= 0.0.18,< 0.0.23 # The mysql generator in pagegenerators depends on PyMySQL PyMySQL >= 0.7.11, < 1.0.0 ; python_version < '3.6' diff --git a/setup.py b/setup.py index f669576..18099cb 100755 --- a/setup.py +++ b/setup.py @@ -63,7 +63,7 @@ # ------- setup extra_requires ------- # extra_deps = { # Core library dependencies - 'eventstreams': ['sseclient!=0.0.23,!=0.0.24,>=0.0.18'], + 'eventstreams': ['sseclient<0.0.23,>=0.0.18'], # T222885 'isbn': ['python-stdnum>=1.17'], 'Graphviz': ['pydot>=1.2'], 'Google': ['google>=1.7'], -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/789999 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I52e2aa20d586f8d4a773744712a508c151a4eb71 Gerrit-Change-Number: 789999 Gerrit-PatchSet: 2 Gerrit-Owner: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-CC: Xqt <info(a)gno.de> Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [fix] Enable installing pre-releases over stable versions
by jenkins-bot (Code Review) 21 May '22

21 May '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/794511 ) Change subject: [fix] Enable installing pre-releases over stable versions ...................................................................... [fix] Enable installing pre-releases over stable versions Bug: T308916 Change-Id: Iba33dd39654b31579ea2e96031bf29cb2cb5852d --- M make_dist.py 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/make_dist.py b/make_dist.py index 574800c..dd67875 100644 --- a/make_dist.py +++ b/make_dist.py @@ -18,6 +18,8 @@ .. note:: Requires Python 3.6+ .. versionadded:: 7.3 +.. versionchanged:: 7.4 + installs pre-releases over stable versions """ # # (C) Pywikibot team, 2022 @@ -114,7 +116,8 @@ if local: subprocess.run('pip uninstall pywikibot -y') - subprocess.run('pip install --no-index --find-links=dist pywikibot') + subprocess.run( + 'pip install --no-index --pre --find-links=dist pywikibot') if remote and input_yn( '<<lightblue>>Upload dist to pypi', automatic_quit=False): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/794511 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: Iba33dd39654b31579ea2e96031bf29cb2cb5852d Gerrit-Change-Number: 794511 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: Revert "[tests] ignore failing pg test until WD item was deleted"
by jenkins-bot (Code Review) 21 May '22

21 May '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/793793 ) Change subject: Revert "[tests] ignore failing pg test until WD item was deleted" ...................................................................... Revert "[tests] ignore failing pg test until WD item was deleted" This reverts commit 1e71469c134617b72cff7535ca6faecd96b9dce3. Reason for revert: Solved upstream, Q112079466 was deleted Bug: T308879 Change-Id: Id9d882e22a735ce4e6c3532752276fe31279a425 --- M tests/pagegenerators_tests.py 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index 6155707..81f833f 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -667,7 +667,6 @@ gen = WikibaseItemFilterPageGenerator(pages, has_item=False) self.assertLength(list(gen), 0) - @unittest.expectedFailure def test_filter_pages_without_item(self): """Test WikibaseItemFilterPageGenerator on pages without item.""" gf = pagegenerators.GeneratorFactory(site=self.site) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/793793 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: Id9d882e22a735ce4e6c3532752276fe31279a425 Gerrit-Change-Number: 793793 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [fix] Fix spelling mistakes
by Xqt (Code Review) 21 May '22

21 May '22

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/794478 ) Change subject: [fix] Fix spelling mistakes ...................................................................... [fix] Fix spelling mistakes Change-Id: I16dcac2012a1246b2808070daf2544c31552ee9d --- M scripts/README.rst M scripts/replace.py 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: DannyS712: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/README.rst b/scripts/README.rst index 113ab36..1253758 100644 --- a/scripts/README.rst +++ b/scripts/README.rst @@ -165,7 +165,7 @@ | make_i18n_dict.py | Generate an i18n file from a given script. | +------------------------+---------------------------------------------------------+ | preload_sites.py | Preload and cache site information for each WikiMedia | - | | family. Usefull for bots running on multiple sites. | + | | family. Useful for bots running on multiple sites. | +------------------------+---------------------------------------------------------+ | sorting_order.py | Updates interwiki sorting order in family.py file. | +------------------------+---------------------------------------------------------+ diff --git a/scripts/replace.py b/scripts/replace.py index d421283..3e932e8 100755 --- a/scripts/replace.py +++ b/scripts/replace.py @@ -93,7 +93,7 @@ -quiet Don't prompt a message if a page keeps unchanged --nopreload Do not preload pages. Usefull if disabled on a wiki. +-nopreload Do not preload pages. Useful if disabled on a wiki. -recursive Recurse replacement as long as possible. Be careful, this might lead to an infinite loop. -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/794478 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I16dcac2012a1246b2808070daf2544c31552ee9d Gerrit-Change-Number: 794478 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: DannyS712 <dannys712.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [IMPR] Use AutomaticTWSummaryBot to implement listpages
by jenkins-bot (Code Review) 21 May '22

21 May '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/791307 ) Change subject: [IMPR] Use AutomaticTWSummaryBot to implement listpages ...................................................................... [IMPR] Use AutomaticTWSummaryBot to implement listpages - use AutomaticTWSummaryBot and SingleSiteBot for ListPagesBot - adjust base directory in ListPagesBot.setup - process every page in ListPagesBot.treat - print the list in ListPagesBot.teardown - also print the list if -get option is used (except for -notitle) - update arg parsing - use suggest_help only once and also collect unknown parameters - add 'save' counter - with bot class the 'page(s) found summary can be omitted - the script terminates gracefully when KeyboardInterrupt occcures - decrease cognitive complexity in listpages.main() Bug: T196851 Change-Id: Ib25f6ed07b785e8676575466c154f74abba43c43 --- M scripts/listpages.py 1 file changed, 105 insertions(+), 87 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/listpages.py b/scripts/listpages.py index d812ffd..dfedc77 100755 --- a/scripts/listpages.py +++ b/scripts/listpages.py @@ -92,10 +92,10 @@ # Distributed under the terms of the MIT license. # import os -import re import pywikibot -from pywikibot import config, i18n +from pywikibot import config +from pywikibot.bot import AutomaticTWSummaryBot, SingleSiteBot, suggest_help from pywikibot.exceptions import ArgumentDeprecationWarning, Error from pywikibot.pagegenerators import GeneratorFactory, parameterHelp from pywikibot.tools import issue_deprecation_warning @@ -167,6 +167,82 @@ return fmt.format(num=num, page=self) +class ListPagesBot(AutomaticTWSummaryBot, SingleSiteBot): + + """Print a list of pages.""" + + summary_key = 'listpages-save-list' + + available_options = { + 'always': True, + 'save': None, + 'encode': config.textfile_encoding, + 'format': '1', + 'notitle': False, + 'outputlang': None, + 'overwrite': False, + 'summary': '', + 'get': False, + 'put': None, + } + + def treat(self, page) -> None: + """Process one page and add it to the `output_list`.""" + self.num += 1 + if not self.opt.notitle: + page_fmt = Formatter(page, self.opt.outputlang) + self.output_list += [page_fmt.output(num=self.num, + fmt=self.opt.format)] + if self.opt['get']: + try: + pywikibot.stdout(page.text) + except Error as err: + pywikibot.error(err) + + if self.opt.save: + filename = os.path.join(self.opt.save, + page.title(as_filename=True)) + pywikibot.info('Saving {} to {}'.format(page.title(), filename)) + with open(filename, mode='wb') as f: + f.write(page.text.encode(self.opt.encode)) + self.counter['save'] += 1 + + def setup(self) -> None: + """Initialize `output_list` and `num` and adjust base directory.""" + self.output_list = [] + self.num = 0 + + if self.opt.save is not None: + base_dir = os.path.expanduser(self.opt.save or '.') + if not os.path.isabs(base_dir): + base_dir = os.path.normpath(os.path.join(os.getcwd(), + base_dir)) + + if not os.path.exists(base_dir): + pywikibot.info('Directory "{}" does not exist.' + .format(base_dir)) + choice = pywikibot.input_yn('Do you want to create it ("No" ' + 'to continue without saving)?') + if choice: + os.makedirs(base_dir, mode=0o744) + else: + base_dir = None + elif not os.path.isdir(base_dir): + # base_dir is a file. + pywikibot.warning('Not a directory: "{}"\nSkipping saving ...' + .format(base_dir)) + base_dir = None + self.opt.save = base_dir + + def teardown(self) -> None: + """Print the list and put it to the target page if specified.""" + text = '\n'.join(self.output_list) + if self.opt.put: + self.current_page = self.opt.put + self.put_current(text, summary=self.opt.summary, show_diff=False) + pywikibot.stdout(text) + + def main(*args: str) -> None: """ Process command line arguments and invoke bot. @@ -175,24 +251,22 @@ :param args: command line arguments """ - notitle = False - fmt = '1' - outputlang = None - page_get = False - base_dir = None - encoding = config.textfile_encoding + options = {} page_target = None - overwrite = False - summary = 'listpages-save-list' - # Process global args and prepare generator args parser - local_args = pywikibot.handle_args(args) + additional_text = '' + unknown_args = [] + + # Process global args and generator args gen_factory = GeneratorFactory() + local_args = pywikibot.handle_args(args) + local_args = gen_factory.handle_args(local_args) for arg in local_args: option, _, value = arg.partition(':') - if option == '-notitle': - notitle = True + opt = option[1:] + if option in ('-get', '-notitle', '-overwrite'): + options[opt] = True elif option == '-format': if '\\03{{' not in value: fmt = value @@ -204,87 +278,31 @@ warning_class=ArgumentDeprecationWarning, since='7.3.0') if not fmt.strip(): - notitle = True - elif option == '-outputlang': - outputlang = value - elif option == '-get': - page_get = True - elif option == '-save': - base_dir = value or '.' - elif option == '-encode': - encoding = value + options['notitle'] = True + options['format'] = fmt + elif option in ('-encode', '-outputlang', '-save', '-summary'): + options[opt] = value elif option == '-put': page_target = value - elif option == '-overwrite': - overwrite = True - elif option == '-summary': - summary = value else: - gen_factory.handle_arg(arg) + unknown_args.append(arg) - if base_dir: - base_dir = os.path.expanduser(base_dir) - if not os.path.isabs(base_dir): - base_dir = os.path.normpath(os.path.join(os.getcwd(), base_dir)) - - if not os.path.exists(base_dir): - pywikibot.output('Directory "{}" does not exist.' - .format(base_dir)) - choice = pywikibot.input_yn( - 'Do you want to create it ("No" to continue without saving)?') - if choice: - os.makedirs(base_dir, mode=0o744) - else: - base_dir = None - elif not os.path.isdir(base_dir): - # base_dir is a file. - pywikibot.warning('Not a directory: "{}"\n' - 'Skipping saving ...' - .format(base_dir)) - base_dir = None - + site = pywikibot.Site() if page_target: - site = pywikibot.Site() page_target = pywikibot.Page(site, page_target) - if not overwrite and page_target.exists(): - pywikibot.bot.suggest_help( - additional_text='Page {} already exists.\n' - 'You can use the -overwrite argument to ' - 'replace the content of this page.' - .format(page_target.title(as_link=True))) - return - if re.match('[a-z_-]+$', summary): - summary = i18n.twtranslate(site, summary) + if not options.get('overwrite') and page_target.exists(): + additional_text = ('Page {} already exists.\n' + 'You can use the -overwrite argument to ' + 'replace the content of this page.' + .format(page_target)) gen = gen_factory.getCombinedGenerator() - if gen: - i = 0 - output_list = [] - for i, page in enumerate(gen, start=1): - if not notitle: - page_fmt = Formatter(page, outputlang) - output_list += [page_fmt.output(num=i, fmt=fmt)] - if page_get: - if output_list: - pywikibot.stdout(output_list.pop(-1)) - try: - pywikibot.stdout(page.text) - except Error as err: - pywikibot.output(err) - if base_dir: - filename = os.path.join(base_dir, page.title(as_filename=True)) - pywikibot.output('Saving {} to {}' - .format(page.title(), filename)) - with open(filename, mode='wb') as f: - f.write(page.text.encode(encoding)) - text = '\n'.join(output_list) - if page_target: - page_target.text = text - page_target.save(summary=summary) - pywikibot.stdout(text) - pywikibot.output('{} page(s) found'.format(i)) - else: - pywikibot.bot.suggest_help(missing_generator=True) + if not suggest_help(missing_generator=not gen, + unknown_parameters=unknown_args, + additional_text=additional_text): + bot = ListPagesBot(site=site, generator=gen, put=page_target, + **options) + bot.run() if __name__ == '__main__': -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/791307 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: Ib25f6ed07b785e8676575466c154f74abba43c43 Gerrit-Change-Number: 791307 Gerrit-PatchSet: 8 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits May 2022