Pywikibot-commits April 2018

pywikibot-commits@lists.wikimedia.org

1 participants
88 discussions

[Gerrit] pywikibot/core[master]: Enable pip caching

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/225105 ) Change subject: Enable pip caching ...................................................................... Enable pip caching Bug: T106070 Change-Id: I5a14d3e124cdb2833760dd2eaded396c8ba80550 --- M .travis.yml 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified Objections: John Vandenberg: There's a problem with this change, please improve diff --git a/.travis.yml b/.travis.yml index 4108055..70efc91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,8 @@ - graphviz - liblua5.1-0-dev +cache: pip + before_install: # When PYSETUP_TEST_EXTRAS is not enabled, do not allow the # default 'install' step to install all dependencies listed in -- To view, visit https://gerrit.wikimedia.org/r/225105 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5a14d3e124cdb2833760dd2eaded396c8ba80550 Gerrit-Change-Number: 225105 Gerrit-PatchSet: 2 Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

6 years

[Gerrit] pywikibot/core[master]: [IMPR] Simplify expression for old_position in Link.parse()

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/425832 ) Change subject: [IMPR] Simplify expression for old_position in Link.parse() ...................................................................... [IMPR] Simplify expression for old_position in Link.parse() str.find(':') is not 0 if it not starts with that token. In that case old_position should become 0 and 1 if it starts with ':'. This can be simplified with int(str.startswith(':')) because int(True) is 1. Change-Id: I97c474391c427287b2aaa68ee8ee392238e770d1 --- M pywikibot/page.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Framawiki: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index 46a43e1..3fcdf15 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -5543,7 +5543,7 @@ self._is_interwiki = False ns_prefix = False - old_position = 0 if self._text.find(':') != 0 else 1 + old_position = int(self._text.startswith(':')) colon_position = self._text.find(':', old_position) first_other_site = None while colon_position >= 0: -- To view, visit https://gerrit.wikimedia.org/r/425832 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I97c474391c427287b2aaa68ee8ee392238e770d1 Gerrit-Change-Number: 425832 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: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years

[Gerrit] pywikibot/core[master]: [IMPR] Simplify event data checking

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/425825 ) Change subject: [IMPR] Simplify event data checking ...................................................................... [IMPR] Simplify event data checking Change-Id: I4909e9c09bb5c7b54678f165b07348d2f1e9ed3a --- M pywikibot/comms/eventstreams.py 1 file changed, 12 insertions(+), 11 deletions(-) Approvals: Framawiki: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/comms/eventstreams.py b/pywikibot/comms/eventstreams.py index fe34d66..fb86530 100644 --- a/pywikibot/comms/eventstreams.py +++ b/pywikibot/comms/eventstreams.py @@ -280,18 +280,19 @@ if event is not None: self.sse_kwargs['last_id'] = event.id continue - if event.event == 'message' and event.data: - try: - element = json.loads(event.data) - except ValueError as e: - warning('Could not load json data from\n{0}\n{1}' - .format(event, e)) + if event.event == 'message': + if event.data: + try: + element = json.loads(event.data) + except ValueError as e: + warning('Could not load json data from\n{0}\n{1}' + .format(event, e)) + else: + if self.streamfilter(element): + n += 1 + yield element else: - if self.streamfilter(element): - n += 1 - yield element - elif event.event == 'message' and not event.data: - warning('Empty message found.') + warning('Empty message found.') elif event.event == 'error': warning('Encountered error: {0}'.format(event.data)) else: -- To view, visit https://gerrit.wikimedia.org/r/425825 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4909e9c09bb5c7b54678f165b07348d2f1e9ed3a Gerrit-Change-Number: 425825 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: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years

[Gerrit] pywikibot/core[master]: Revert "[FIX] W503 errors"

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/425840 ) Change subject: Revert "[FIX] W503 errors" ...................................................................... Revert "[FIX] W503 errors" Rule W503 (line break before binary operator) is against current PEP 8 recommendation This reverts commit 54e9727c0d5a99119be1f230d4498d8d0bc4efd6. Change-Id: I7bbcffc7c5d3488e2db8e746eb231e61d46e4385 --- M generate_family_file.py M pywikibot/data/api.py M pywikibot/page.py M pywikibot/site.py M pywikibot/userinterfaces/win32_unicode.py M scripts/archivebot.py M scripts/category_redirect.py M scripts/commonscat.py M scripts/solve_disambiguation.py M scripts/transferbot.py M tests/__init__.py M tests/aspects.py M tests/script_tests.py 13 files changed, 57 insertions(+), 57 deletions(-) Approvals: Framawiki: Looks good to me, approved jenkins-bot: Verified diff --git a/generate_family_file.py b/generate_family_file.py index cee2ad5..eef45c1 100755 --- a/generate_family_file.py +++ b/generate_family_file.py @@ -105,8 +105,8 @@ print(wiki['prefix'], wiki['url']) do_langs = raw_input("Which languages do you want: ") self.langs = [wiki for wiki in self.langs - if wiki['prefix'] in do_langs or - wiki['url'] == w.iwpath] + if wiki['prefix'] in do_langs + or wiki['url'] == w.iwpath] else: self.langs = [wiki for wiki in self.langs if wiki[u'url'] == w.iwpath] diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index 29030fe..c099574 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -630,8 +630,8 @@ params['modules'] = module_batch else: params['modules'] = [mod for mod in module_batch - if not mod.startswith('query+') and - mod not in self.root_modules] + if not mod.startswith('query+') + and mod not in self.root_modules] params['querymodules'] = [mod[6:] for mod in module_batch if mod.startswith('query+')] @@ -1460,8 +1460,8 @@ self["assert"] = 'user' # make sure user is logged in if (self.site.protocol() == 'http' and (config.use_SSL_always or ( - self.action == 'login' and config.use_SSL_onlogin)) and - self.site.family.name in config.available_ssl_project): + self.action == 'login' and config.use_SSL_onlogin)) + and self.site.family.name in config.available_ssl_project): self.site = EnableSSLSiteWrapper(self.site) @classmethod @@ -1767,9 +1767,9 @@ def __str__(self): """Return a string representation.""" - return unquote(self.site.scriptpath() + - '/api.php?' + - self._http_param_string()) + return unquote(self.site.scriptpath() + + '/api.php?' + + self._http_param_string()) def __repr__(self): """Return internal representation.""" diff --git a/pywikibot/page.py b/pywikibot/page.py index 46a43e1..a424abe 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -338,8 +338,8 @@ target_family = config.family if forceInterwiki or \ (allowInterwiki and - (self.site.family.name != target_family or - self.site.code != target_code)): + (self.site.family.name != target_family + or self.site.code != target_code)): if self.site.family.name != target_family \ and self.site.family.name != self.site.code: title = u'%s:%s:%s' % (self.site.family.name, @@ -1941,8 +1941,8 @@ """ if hasattr(self, "_deletedRevs"): if timestamp in self._deletedRevs and ( - (not retrieveText) or - 'content' in self._deletedRevs[timestamp]): + (not retrieveText) + or 'content' in self._deletedRevs[timestamp]): return self._deletedRevs[timestamp] for item in self.site.deletedrevs(self, start=timestamp, get_text=retrieveText, total=1): @@ -5622,11 +5622,11 @@ # * with 'relative' URLs. Forbid them explicitly. if u'.' in t and ( - t in ('.', '..') or - t.startswith(('./', '../')) or - u'/./' in t or - u'/../' in t or - t.endswith(('/.', '/..')) + t in ('.', '..') + or t.startswith(('./', '../')) + or '/./' in t + or '/../' in t + or t.endswith(('/.', '/..')) ): raise pywikibot.InvalidTitle( u"(contains . / combinations): '%s'" diff --git a/pywikibot/site.py b/pywikibot/site.py index 20c6d62..c19ec20 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -632,8 +632,8 @@ # int(None) raises TypeError; however, bool needs special handling. result = [NotImplemented if isinstance(ns, bool) else NamespacesDict._lookup_name(ns, namespaces) - if isinstance(ns, basestring) and - not ns.lstrip('-').isdigit() else + if isinstance(ns, basestring) + and not ns.lstrip('-').isdigit() else namespaces[int(ns)] if int(ns) in namespaces else None for ns in identifiers] @@ -2234,8 +2234,8 @@ @rtype: C{set} of L{Namespace} """ # TODO: Integrate into _userinfo - if (force or not hasattr(self, '_useroptions') or - self.user() != self._useroptions['_name']): + if (force or not hasattr(self, '_useroptions') + or self.user() != self._useroptions['_name']): uirequest = self._simple_request( action="query", meta="userinfo", @@ -6392,8 +6392,8 @@ final_request['filekey'] = _file_key else: file_contents = f.read() - filetype = (mimetypes.guess_type(source_filename)[0] or - 'application/octet-stream') + filetype = (mimetypes.guess_type(source_filename)[0] + or 'application/octet-stream') final_request.mime_params = { 'file': (file_contents, filetype.split('/'), {'filename': mime_filename}) diff --git a/pywikibot/userinterfaces/win32_unicode.py b/pywikibot/userinterfaces/win32_unicode.py index 19ed9bb..41667b6 100755 --- a/pywikibot/userinterfaces/win32_unicode.py +++ b/pywikibot/userinterfaces/win32_unicode.py @@ -280,8 +280,8 @@ """Return whether the handle is not to a console.""" if handle == INVALID_HANDLE_VALUE or handle is None: return True - return ((GetFileType(handle) & ~FILE_TYPE_REMOTE) != FILE_TYPE_CHAR or - GetConsoleMode(handle, byref(DWORD())) == 0) + return ((GetFileType(handle) & ~FILE_TYPE_REMOTE) != FILE_TYPE_CHAR + or GetConsoleMode(handle, byref(DWORD())) == 0) old_stdin_fileno = old_fileno('in') old_stdout_fileno = old_fileno('out') diff --git a/scripts/archivebot.py b/scripts/archivebot.py index 33000c9..21a8eaa 100755 --- a/scripts/archivebot.py +++ b/scripts/archivebot.py @@ -579,8 +579,8 @@ def saveables(self): """Return a list of saveable attributes.""" - return [a for a in self.attributes if self.attributes[a][1] and - a != 'maxage'] + return [a for a in self.attributes if self.attributes[a][1] + and a != 'maxage'] def attr2text(self): """Return a template with archiver saveable attributes.""" diff --git a/scripts/category_redirect.py b/scripts/category_redirect.py index 285651c..4040eaf 100755 --- a/scripts/category_redirect.py +++ b/scripts/category_redirect.py @@ -443,12 +443,12 @@ newredirs.sort() comment = i18n.twtranslate(self.site, self.maint_comment) self.log_page.text = (u"\n== %i-%02i-%02iT%02i:%02i:%02iZ ==\n" - % time.gmtime()[:6] + - u'\n'.join(self.log_text) + - u'\n* New redirects since last report:\n' + - u'\n'.join(newredirs) + - u'\n' + u'\n'.join(self.problems) + - u'\n' + self.get_log_text()) + % time.gmtime()[:6] + + '\n'.join(self.log_text) + + '\n* New redirects since last report:\n' + + '\n'.join(newredirs) + + '\n' + '\n'.join(self.problems) + + '\n' + self.get_log_text()) self.log_page.save(comment) if self.edit_requests: edit_request_page.text = (self.edit_request_text diff --git a/scripts/commonscat.py b/scripts/commonscat.py index c7083b9..e1c37df 100755 --- a/scripts/commonscat.py +++ b/scripts/commonscat.py @@ -392,8 +392,8 @@ ipage = pywikibot.page.Page(ipageLink) pywikibot.log("Looking for template on %s" % (ipage.title())) try: - if (not ipage.exists() or ipage.isRedirectPage() or - ipage.isDisambig()): + if (not ipage.exists() or ipage.isRedirectPage() + or ipage.isDisambig()): continue commonscatLink = self.getCommonscatLink(ipage) if not commonscatLink: diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py index dc82dfb..2d662e8 100755 --- a/scripts/solve_disambiguation.py +++ b/scripts/solve_disambiguation.py @@ -944,8 +944,8 @@ new_page_title = answer[1] repPl = pywikibot.Page(pywikibot.Link(new_page_title, disambPage.site)) - if (new_page_title[0].isupper() or - link_text[0].isupper()): + if (new_page_title[0].isupper() + or link_text[0].isupper()): new_page_title = repPl.title() else: new_page_title = repPl.title() @@ -956,8 +956,8 @@ newlink = "[[%s%s]]%s" % (new_page_title, section, trailing_chars) - elif replaceit or (new_page_title == link_text and - not section): + elif replaceit or (new_page_title == link_text + and not section): newlink = "[[%s]]" % new_page_title # check if we can create a link with trailing characters # instead of a pipelink @@ -1006,8 +1006,8 @@ """ if disambPage.isRedirectPage() and not self.primary: - if (disambPage.site.lang in self.primary_redir_template and - self.primary_redir_template[disambPage.site.lang] + if (disambPage.site.lang in self.primary_redir_template + and self.primary_redir_template[disambPage.site.lang] in disambPage.templates()): baseTerm = disambPage.title() for template in disambPage.templatesWithParams(): diff --git a/scripts/transferbot.py b/scripts/transferbot.py index 092bad1..f6d2ee3 100755 --- a/scripts/transferbot.py +++ b/scripts/transferbot.py @@ -135,8 +135,8 @@ for page in gen: targetpage = pywikibot.Page(tosite, prefix + page.title()) - edithistpage = pywikibot.Page(tosite, prefix + page.title() + - '/edithistory') + edithistpage = pywikibot.Page(tosite, prefix + page.title() + + '/edithistory') summary = 'Moved page from {old} ([[{new}/edithistory|history]])'\ .format(old=page.title(asLink=True, insite=tosite), new=targetpage.title() if not diff --git a/tests/__init__.py b/tests/__init__.py index 75404a3..5050b9f 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -169,13 +169,13 @@ """List tests which are to be executed.""" dir_list = os.listdir(join_tests_path()) all_test_list = [name[0:-9] for name in dir_list # strip '_tests.py' - if name.endswith('_tests.py') and - not name.startswith('_')] # skip __init__.py and _* + if name.endswith('_tests.py') + and not name.startswith('_')] # skip __init__.py and _* unknown_test_modules = [name for name in all_test_list - if name not in library_test_modules and - name not in script_test_modules] + if name not in library_test_modules + and name not in script_test_modules] return unknown_test_modules diff --git a/tests/aspects.py b/tests/aspects.py index f51a627..268e460 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -845,9 +845,9 @@ if 'family' in dct or 'code' in dct: dct['site'] = True - if (('sites' not in dct or not len(dct['sites'])) and - 'family' in dct and - 'code' in dct and dct['code'] != '*'): + if (('sites' not in dct or not len(dct['sites'])) + and 'family' in dct + and 'code' in dct and dct['code'] != '*'): # Add entry to self.sites dct['sites'] = { str(dct['family'] + ':' + dct['code']): { diff --git a/tests/script_tests.py b/tests/script_tests.py index 7a70d5e..6e290d1 100644 --- a/tests/script_tests.py +++ b/tests/script_tests.py @@ -192,8 +192,8 @@ tests = (['test__login'] + ['test_' + name for name in sorted(script_list) - if name != 'login' and - name not in unrunnable_script_list + if name != 'login' + and name not in unrunnable_script_list ]) test_list = ['tests.script_tests.TestScriptHelp.' + name @@ -202,10 +202,10 @@ tests = (['test__login'] + ['test_' + name for name in sorted(script_list) - if name != 'login' and - name not in failed_dep_script_list and - name not in unrunnable_script_list and - (enable_autorun_tests or name not in auto_run_script_list) + if name != 'login' + and name not in failed_dep_script_list + and name not in unrunnable_script_list + and (enable_autorun_tests or name not in auto_run_script_list) ]) test_list += ['tests.script_tests.TestScriptSimulate.' + name -- To view, visit https://gerrit.wikimedia.org/r/425840 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7bbcffc7c5d3488e2db8e746eb231e61d46e4385 Gerrit-Change-Number: 425840 Gerrit-PatchSet: 3 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: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years

[Gerrit] pywikibot/core[master]: [bugfix] fix cache attribute Page._depth

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/425855 ) Change subject: [bugfix] fix cache attribute Page._depth ...................................................................... [bugfix] fix cache attribute Page._depth currently the depth isn't cached Change-Id: I192c791d626a25a3c3384653c8d9f6c51e3ba51b --- M pywikibot/page.py 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Framawiki: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index 46a43e1..1eac027 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -274,12 +274,12 @@ if not hasattr(self, '_depth'): # Check if the namespace allows subpages if self._namespace_obj.subpages: - _depth = self.title().count('/') + self._depth = self.title().count('/') else: # Does not allow subpages, which means depth is always 0 - _depth = 0 + self._depth = 0 - return _depth + return self._depth @property def pageid(self): -- To view, visit https://gerrit.wikimedia.org/r/425855 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I192c791d626a25a3c3384653c8d9f6c51e3ba51b Gerrit-Change-Number: 425855 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: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years

[Gerrit] pywikibot/core[master]: [FEAT] Show a warning if user does not exists on a given site

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/425548 ) Change subject: [FEAT] Show a warning if user does not exists on a given site ...................................................................... [FEAT] Show a warning if user does not exists on a given site Also use any to set the default behavior Bug: T191950 Change-Id: Ia6cac9f966c9dadde621dff6534bad25138ad9d7 --- M scripts/patrol.py 1 file changed, 8 insertions(+), 2 deletions(-) Approvals: Zoranzoki21: Looks good to me, but someone else must approve Framawiki: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/patrol.py b/scripts/patrol.py index 659b76a..08f03c9 100755 --- a/scripts/patrol.py +++ b/scripts/patrol.py @@ -499,9 +499,15 @@ site.login() if usercontribs: - pywikibot.output(u'Processing user: %s' % usercontribs) + user = pywikibot.User(site, usercontribs) + if user.isAnonymous() or user.isRegistered(): + pywikibot.output('Processing user: {}'.format(usercontribs)) + else: + pywikibot.warning('User {} does not exist on site {}.' + .format(usercontribs, site)) - if not newpages and not recentchanges and not usercontribs: + # default behaviour + if not any((newpages, recentchanges, usercontribs)): if site.family.name == 'wikipedia': newpages = True else: -- To view, visit https://gerrit.wikimedia.org/r/425548 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia6cac9f966c9dadde621dff6534bad25138ad9d7 Gerrit-Change-Number: 425548 Gerrit-PatchSet: 5 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> 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: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years

[Gerrit] pywikibot/core[master]: [FEAT] Add quit option in patrol.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/425981 ) Change subject: [FEAT] Add quit option in patrol.py ...................................................................... [FEAT] Add quit option in patrol.py Bug: T192084 Change-Id: Ifc6120888dda972130df3e2f3a9fbd93323d3246 --- M scripts/patrol.py 1 file changed, 8 insertions(+), 5 deletions(-) Approvals: Framawiki: Looks good to me, approved jenkins-bot: Verified Objections: Zoranzoki21: There's a problem with this change, please improve diff --git a/scripts/patrol.py b/scripts/patrol.py index 659b76a..743005b 100755 --- a/scripts/patrol.py +++ b/scripts/patrol.py @@ -63,7 +63,7 @@ from pywikibot import pagegenerators -from pywikibot.bot import SingleSiteBot +from pywikibot.bot import SingleSiteBot, QuitKeyboardInterrupt _logger = 'patrol' @@ -303,8 +303,12 @@ self.load_whitelist() if not feed: feed = self.getOption('feed') - for page in feed: - self.treat(page) + try: + for page in feed: + self.treat(page) + except QuitKeyboardInterrupt: + pywikibot.output('\nUser quit {} bot run.' + .format(self.__class__.__name__)) def treat(self, page): """It loads the given page, does some changes, and saves it.""" @@ -349,8 +353,7 @@ if self.getOption('ask'): choice = pywikibot.input_yn( - 'Do you want to mark page as patrolled?', - automatic_quit=False) + 'Do you want to mark page as patrolled?') # Patrol the page if choice: -- To view, visit https://gerrit.wikimedia.org/r/425981 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ifc6120888dda972130df3e2f3a9fbd93323d3246 Gerrit-Change-Number: 425981 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: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years

[Gerrit] pywikibot/core[master]: Fix spelling mistake

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/425750 ) Change subject: Fix spelling mistake ...................................................................... Fix spelling mistake Change-Id: Iaa4d54cda8219d696a06c832f12a9c00f6d466a9 --- M .appveyor.yml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.appveyor.yml b/.appveyor.yml index 2755449..88fc37f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -5,7 +5,7 @@ APPVEYOR_PYTHON_URL: "https://raw.githubusercontent.com/ogrisel/python-appveyor-demo/master/appve…" # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the - # /E:ON and /V:ON options are not enabled in the batch script intepreter + # /E:ON and /V:ON options are not enabled in the batch script interpreter # See: http://stackoverflow.com/a/13751649/163740 CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\appveyor\\run_with_env.cmd" -- To view, visit https://gerrit.wikimedia.org/r/425750 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iaa4d54cda8219d696a06c832f12a9c00f6d466a9 Gerrit-Change-Number: 425750 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years

[Gerrit] pywikibot/core[master]: Revert "Create a python installer script for appveyor builds"

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/425555 ) Change subject: Revert "Create a python installer script for appveyor builds" ...................................................................... Revert "Create a python installer script for appveyor builds" This reverts commit e4e2d33a3caa140c888d6cede9197eb841aaed4b. Bug: T191188 Change-Id: Iadbfb5a72212ced0400488417e8345b9fc49b704 --- M .appveyor.yml D scripts/maintenance/appveyor_python_setup.py 2 files changed, 26 insertions(+), 124 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.appveyor.yml b/.appveyor.yml index 6d84aa7..2755449 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -2,25 +2,32 @@ environment: global: + APPVEYOR_PYTHON_URL: "https://raw.githubusercontent.com/ogrisel/python-appveyor-demo/master/appve…" + + # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the + # /E:ON and /V:ON options are not enabled in the batch script intepreter + # See: http://stackoverflow.com/a/13751649/163740 + CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\appveyor\\run_with_env.cmd" PYWIKIBOT2_DIR: "%appdata%\\Pywikibot" PYWIKIBOT2_USER_CONFIG: "%appdata%\\Pywikibot\\user-config.py" + PYSETUP_TEST_EXTRAS: "1" matrix: # Test the lowest supported release of each major Python version. - - PYTHON: "C:\\Python277" - PYTHON_VERSION: "2.7.7" + - PYTHON: "C:\\Python272" + PYTHON_VERSION: "2.7.2" PYTHON_ARCH: "32" - PYTHON: "C:\\Python340" PYTHON_VERSION: "3.4.0" PYTHON_ARCH: "32" - - PYTHON: "C:\\Python277-x64" - PYTHON_VERSION: "2.7.7" + - PYTHON: "C:\\Python272-x64" + PYTHON_VERSION: "2.7.2" PYTHON_ARCH: "64" - PYTHON: "C:\\Python340-x64" @@ -66,9 +73,19 @@ install: - git submodule update --init - - python scripts\maintenance\appveyor_python_setup.py - - pip install -r dev-requirements.txt -r requests-requirements.txt - - where python pip + # Download the Appveyor Python build accessories into subdirectory .\appveyor + - mkdir appveyor + - ps: $wc = new-object net.webclient + - ps: $run = $wc.DownloadString($env:APPVEYOR_PYTHON_URL + 'run_with_env.cmd') + - ps: $run | Out-File -Encoding ascii -FilePath appveyor\run_with_env.cmd + + # This is needed for Python versions not installed on Appveyor build machines + - ps: if (-not(Test-Path($env:PYTHON))) { iex $wc.DownloadString($env:APPVEYOR_PYTHON_URL + 'install.ps1') } + - pip install virtualenv + - virtualenv env + - env\Scripts\activate.bat + - pip install -r dev-requirements.txt + - pip install -r requests-requirements.txt build: off @@ -77,11 +94,11 @@ - set PYTHONIOENCODING=utf8 - "mkdir %PYWIKIBOT2_DIR%" - - "%PYTHON%/python.exe -Werror::UserWarning -m generate_user_files -dir:%PYWIKIBOT2_DIR% -family:wikipedia -lang:en -v -debug" + - "python -Werror::UserWarning -m generate_user_files -dir:%PYWIKIBOT2_DIR% -family:wikipedia -lang:en -v -debug" - ps: "[IO.File]::AppendAllText($env:PYWIKIBOT2_USER_CONFIG, 'max_retries = 2; maximum_GET_length = 5000; transliteration_target = None;')" - set PYSETUP_TEST_NO_UI=1 - - coverage run setup.py test + - "%CMD_IN_ENV% coverage run setup.py test" on_failure: - codecov diff --git a/scripts/maintenance/appveyor_python_setup.py b/scripts/maintenance/appveyor_python_setup.py deleted file mode 100644 index f5eaaac..0000000 --- a/scripts/maintenance/appveyor_python_setup.py +++ /dev/null @@ -1,115 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- -"""Ensure the right version of Python and pip are installed on AppVeyor.""" -from __future__ import ( - absolute_import, division, print_function, unicode_literals) - -from io import open -from os import getenv, listdir -from os.path import exists -from subprocess import CalledProcessError, check_call -try: - from urllib.request import urlretrieve -except ImportError: # Python 2 - from urllib import urlretrieve - - -def get_installer_info(version, arch64): - """Return the download url and filename for given version and arch.""" - # See https://www.python.org/downloads/windows/ - msi_installer = version < '3.5.0' - filename = 'python-{version}{amd64}{extension}'.format( - amd64=(('.' if msi_installer else '-') - + 'amd64' if arch64 else ''), - extension=('.msi' if msi_installer else '.exe'), - **locals()) - url = 'https://www.python.org/ftp/python/{version}/{filename}'.format( - **locals()) - return filename, url - - -def download_python(version, arch64): - """Download Python installer and return its filename.""" - filename, download_url = get_installer_info(version, arch64) - print('Downloading Python installer from', download_url) - urlretrieve(download_url, filename) - return filename - - -def print_python_install_log(version): - """Print the log for Python installation.""" - # appveyor's %temp% points to "C:\Users\appveyor\AppData\Local\Temp\1" - # but python log files are stored in "C:\Users\appveyor\AppData\Local\Temp - temp_dir = 'C:/Users/appveyor/AppData/Local/Temp/' - for file in listdir(temp_dir): - if file[-4:] == '.log' and file.startswith('Python ' + version): - with open(temp_dir + file, encoding='utf-8') as log: - print(file + ':\n' + log.read()) - break - else: - print('There was no Python log file.') - - -def install_python(installer, python_dir, python_ver): - """Install Python using specified installer file.""" - common_args = [ - installer, '/quiet', 'TargetDir=' + python_dir, 'AssociateFiles=0', - 'Shortcuts=0', 'Include_doc=0', 'Include_launcher=0', - 'InstallLauncherAllUsers=0', 'Include_tcltk=0', 'Include_test=0'] - try: - if installer[-4:] == '.msi': - check_call(['msiexec', '/norestart', '/i'] + common_args) - else: # executable installer - # uninstall first, otherwise the install won't do anything - check_call(common_args) - except CalledProcessError: - print_python_install_log(python_ver) - raise SystemExit('install_python failed') - - -def download_packages(packages, python_dir): - """Download packages and return their paths.""" - preinstalled_py_dir = python_dir[:11] + python_dir[12:] \ - if len(python_dir) in (16, 12) else python_dir - preinstalled_pip = preinstalled_py_dir + '/scripts/pip.exe' - # It is not possible to use --python-version due to cryptography - # requirements on py2.7 which leads to - # https://stackoverflow.com/questions/46287077/ - check_call([ - preinstalled_pip, 'download', '--dest', '.pip_downloads', - '--disable-pip-version-check'] + packages) - downloads = listdir('.pip_downloads') - assert downloads, 'pip did not download anything' - return ['.pip_downloads/' + fn for fn in downloads] - - -def install_packages(python_dir, python_ver): - """Install/upgrade pip, setuptools, and other packages if required.""" - python = python_dir + '/python.exe' - packages = ['pip', 'setuptools'] - pip_installer = [python, '-m', 'pip', 'install', '-U'] - if python_ver < '2.7.9': - check_call([python, 'ez_setup.py']) # bootstrap setuptools - urlretrieve('https://bootstrap.pypa.io/get-pip.py', 'get-pip.py') - pip_installer = [python, '-m', 'get-pip', '-U'] - packages.remove('setuptools') # can't upgrade bootstrapped setuptools - packages.extend(('wheel', 'pip')) - packages = download_packages(packages, python_dir) - check_call(pip_installer + packages) - - -def main(): - python_ver = getenv('PYTHON_VERSION') - python_dir = getenv('PYTHON') - if not python_ver[-2:] == '.x': # .x is for pre-installed Python versions - arch64 = getenv('PYTHON_ARCH') == '64' - filename = download_python(python_ver, arch64) - install_python(filename, python_dir, python_ver) - if not exists(python_dir + r'\python.exe'): - print_python_install_log(python_ver) - raise SystemExit(python_dir + r'\python.exe not found') - install_packages(python_dir, python_ver) - - -if __name__ == '__main__': - main() -- To view, visit https://gerrit.wikimedia.org/r/425555 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iadbfb5a72212ced0400488417e8345b9fc49b704 Gerrit-Change-Number: 425555 Gerrit-PatchSet: 1 Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years

[Gerrit] pywikibot/core[master]: Create a python installer script for appveyor builds

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/424992 ) Change subject: Create a python installer script for appveyor builds ...................................................................... Create a python installer script for appveyor builds Currently the installer is not able to install Python 3.5.0+ or 2.7.7-. Bug: T191188 Change-Id: I19405b7fc5219940f998b6c316c8cafc597ec37e --- M .appveyor.yml A scripts/maintenance/appveyor_python_setup.py 2 files changed, 124 insertions(+), 26 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.appveyor.yml b/.appveyor.yml index 2755449..6d84aa7 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -2,32 +2,25 @@ environment: global: - APPVEYOR_PYTHON_URL: "https://raw.githubusercontent.com/ogrisel/python-appveyor-demo/master/appve…" - - # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the - # /E:ON and /V:ON options are not enabled in the batch script intepreter - # See: http://stackoverflow.com/a/13751649/163740 - CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\appveyor\\run_with_env.cmd" PYWIKIBOT2_DIR: "%appdata%\\Pywikibot" PYWIKIBOT2_USER_CONFIG: "%appdata%\\Pywikibot\\user-config.py" - PYSETUP_TEST_EXTRAS: "1" matrix: # Test the lowest supported release of each major Python version. - - PYTHON: "C:\\Python272" - PYTHON_VERSION: "2.7.2" + - PYTHON: "C:\\Python277" + PYTHON_VERSION: "2.7.7" PYTHON_ARCH: "32" - PYTHON: "C:\\Python340" PYTHON_VERSION: "3.4.0" PYTHON_ARCH: "32" - - PYTHON: "C:\\Python272-x64" - PYTHON_VERSION: "2.7.2" + - PYTHON: "C:\\Python277-x64" + PYTHON_VERSION: "2.7.7" PYTHON_ARCH: "64" - PYTHON: "C:\\Python340-x64" @@ -73,19 +66,9 @@ install: - git submodule update --init - # Download the Appveyor Python build accessories into subdirectory .\appveyor - - mkdir appveyor - - ps: $wc = new-object net.webclient - - ps: $run = $wc.DownloadString($env:APPVEYOR_PYTHON_URL + 'run_with_env.cmd') - - ps: $run | Out-File -Encoding ascii -FilePath appveyor\run_with_env.cmd - - # This is needed for Python versions not installed on Appveyor build machines - - ps: if (-not(Test-Path($env:PYTHON))) { iex $wc.DownloadString($env:APPVEYOR_PYTHON_URL + 'install.ps1') } - - pip install virtualenv - - virtualenv env - - env\Scripts\activate.bat - - pip install -r dev-requirements.txt - - pip install -r requests-requirements.txt + - python scripts\maintenance\appveyor_python_setup.py + - pip install -r dev-requirements.txt -r requests-requirements.txt + - where python pip build: off @@ -94,11 +77,11 @@ - set PYTHONIOENCODING=utf8 - "mkdir %PYWIKIBOT2_DIR%" - - "python -Werror::UserWarning -m generate_user_files -dir:%PYWIKIBOT2_DIR% -family:wikipedia -lang:en -v -debug" + - "%PYTHON%/python.exe -Werror::UserWarning -m generate_user_files -dir:%PYWIKIBOT2_DIR% -family:wikipedia -lang:en -v -debug" - ps: "[IO.File]::AppendAllText($env:PYWIKIBOT2_USER_CONFIG, 'max_retries = 2; maximum_GET_length = 5000; transliteration_target = None;')" - set PYSETUP_TEST_NO_UI=1 - - "%CMD_IN_ENV% coverage run setup.py test" + - coverage run setup.py test on_failure: - codecov diff --git a/scripts/maintenance/appveyor_python_setup.py b/scripts/maintenance/appveyor_python_setup.py new file mode 100644 index 0000000..f5eaaac --- /dev/null +++ b/scripts/maintenance/appveyor_python_setup.py @@ -0,0 +1,115 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +"""Ensure the right version of Python and pip are installed on AppVeyor.""" +from __future__ import ( + absolute_import, division, print_function, unicode_literals) + +from io import open +from os import getenv, listdir +from os.path import exists +from subprocess import CalledProcessError, check_call +try: + from urllib.request import urlretrieve +except ImportError: # Python 2 + from urllib import urlretrieve + + +def get_installer_info(version, arch64): + """Return the download url and filename for given version and arch.""" + # See https://www.python.org/downloads/windows/ + msi_installer = version < '3.5.0' + filename = 'python-{version}{amd64}{extension}'.format( + amd64=(('.' if msi_installer else '-') + + 'amd64' if arch64 else ''), + extension=('.msi' if msi_installer else '.exe'), + **locals()) + url = 'https://www.python.org/ftp/python/{version}/{filename}'.format( + **locals()) + return filename, url + + +def download_python(version, arch64): + """Download Python installer and return its filename.""" + filename, download_url = get_installer_info(version, arch64) + print('Downloading Python installer from', download_url) + urlretrieve(download_url, filename) + return filename + + +def print_python_install_log(version): + """Print the log for Python installation.""" + # appveyor's %temp% points to "C:\Users\appveyor\AppData\Local\Temp\1" + # but python log files are stored in "C:\Users\appveyor\AppData\Local\Temp + temp_dir = 'C:/Users/appveyor/AppData/Local/Temp/' + for file in listdir(temp_dir): + if file[-4:] == '.log' and file.startswith('Python ' + version): + with open(temp_dir + file, encoding='utf-8') as log: + print(file + ':\n' + log.read()) + break + else: + print('There was no Python log file.') + + +def install_python(installer, python_dir, python_ver): + """Install Python using specified installer file.""" + common_args = [ + installer, '/quiet', 'TargetDir=' + python_dir, 'AssociateFiles=0', + 'Shortcuts=0', 'Include_doc=0', 'Include_launcher=0', + 'InstallLauncherAllUsers=0', 'Include_tcltk=0', 'Include_test=0'] + try: + if installer[-4:] == '.msi': + check_call(['msiexec', '/norestart', '/i'] + common_args) + else: # executable installer + # uninstall first, otherwise the install won't do anything + check_call(common_args) + except CalledProcessError: + print_python_install_log(python_ver) + raise SystemExit('install_python failed') + + +def download_packages(packages, python_dir): + """Download packages and return their paths.""" + preinstalled_py_dir = python_dir[:11] + python_dir[12:] \ + if len(python_dir) in (16, 12) else python_dir + preinstalled_pip = preinstalled_py_dir + '/scripts/pip.exe' + # It is not possible to use --python-version due to cryptography + # requirements on py2.7 which leads to + # https://stackoverflow.com/questions/46287077/ + check_call([ + preinstalled_pip, 'download', '--dest', '.pip_downloads', + '--disable-pip-version-check'] + packages) + downloads = listdir('.pip_downloads') + assert downloads, 'pip did not download anything' + return ['.pip_downloads/' + fn for fn in downloads] + + +def install_packages(python_dir, python_ver): + """Install/upgrade pip, setuptools, and other packages if required.""" + python = python_dir + '/python.exe' + packages = ['pip', 'setuptools'] + pip_installer = [python, '-m', 'pip', 'install', '-U'] + if python_ver < '2.7.9': + check_call([python, 'ez_setup.py']) # bootstrap setuptools + urlretrieve('https://bootstrap.pypa.io/get-pip.py', 'get-pip.py') + pip_installer = [python, '-m', 'get-pip', '-U'] + packages.remove('setuptools') # can't upgrade bootstrapped setuptools + packages.extend(('wheel', 'pip')) + packages = download_packages(packages, python_dir) + check_call(pip_installer + packages) + + +def main(): + python_ver = getenv('PYTHON_VERSION') + python_dir = getenv('PYTHON') + if not python_ver[-2:] == '.x': # .x is for pre-installed Python versions + arch64 = getenv('PYTHON_ARCH') == '64' + filename = download_python(python_ver, arch64) + install_python(filename, python_dir, python_ver) + if not exists(python_dir + r'\python.exe'): + print_python_install_log(python_ver) + raise SystemExit(python_dir + r'\python.exe not found') + install_packages(python_dir, python_ver) + + +if __name__ == '__main__': + main() -- To view, visit https://gerrit.wikimedia.org/r/424992 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I19405b7fc5219940f998b6c316c8cafc597ec37e Gerrit-Change-Number: 424992 Gerrit-PatchSet: 12 Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits April 2018