Pywikibot-commits December 2017

pywikibot-commits@lists.wikimedia.org

1 participants
74 discussions

[Gerrit] pywikibot/core[master]: Migrate from flake8-putty to flake8-per-file-ignores

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/395483 ) Change subject: Migrate from flake8-putty to flake8-per-file-ignores ...................................................................... Migrate from flake8-putty to flake8-per-file-ignores This will allow us to use flake8 3 and its new features. - flake8-per-file-ignores is not fully compatible with flake8-putty. Update tox.ini accordingly. - Fix the new E722 errors (do not use bare except) by using `Exception`. - Replace all `flake8: disable=X` inline markers with `noqa:X`. This is a new feature in flake8 3 and there is no need to rely on flake8-putty for it anymore.[1] [1]: http://flake8.pycqa.org/en/3.1.1/user/ignoring-errors.html Change-Id: I6116089cb0b332f8dbd0cc454b0b02d7f919af2a --- M generate_user_files.py M pwb.py M pywikibot/__init__.py M pywikibot/config2.py M pywikibot/data/api.py M pywikibot/date.py M pywikibot/logentries.py M pywikibot/logging.py M pywikibot/page.py M pywikibot/pagegenerators.py M pywikibot/proofreadpage.py M pywikibot/site.py M pywikibot/tools/__init__.py M pywikibot/tools/djvu.py M pywikibot/tools/ip.py M pywikibot/userinterfaces/gui.py M pywikibot/version.py M scripts/casechecker.py M scripts/category.py M scripts/category_redirect.py M scripts/flickrripper.py M scripts/followlive.py M scripts/interwiki.py M scripts/maintenance/cache.py M scripts/maintenance/make_i18n_dict.py M scripts/makecat.py M scripts/noreferences.py M scripts/patrol.py M scripts/script_wui.py M scripts/weblinkchecker.py M tests/replacebot_tests.py M tests/tools_tests.py M tox.ini 33 files changed, 95 insertions(+), 87 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/generate_user_files.py b/generate_user_files.py index 4de8a47..faf7cda 100755 --- a/generate_user_files.py +++ b/generate_user_files.py @@ -295,10 +295,10 @@ config_text=config_text)) pywikibot.output(u"'%s' written." % _fnc) - except: + except Exception: try: os.remove(_fnc) - except: + except Exception: pass raise diff --git a/pwb.py b/pwb.py index cd99f5f..51e6632 100755 --- a/pwb.py +++ b/pwb.py @@ -78,7 +78,7 @@ remove_modules() os.environ['PYWIKIBOT2_NO_USER_CONFIG'] = '2' - import pywikibot # flake8: disable=E402 + import pywikibot # noqa: E402 pwb = pywikibot @@ -211,7 +211,7 @@ 'scripts.maintenance', 'scripts.archive', 'scripts.userscripts'] - from pywikibot import config # flake8: disable=E402 + from pywikibot import config # noqa: E402 if config.user_script_paths: if isinstance(config.user_script_paths, (tuple, list)): script_paths = config.user_script_paths + script_paths diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 6404b19..ede1369 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -164,7 +164,7 @@ return self.replace(microsecond=self.microsecond) @classproperty - def ISO8601Format(cls): # flake8: disable=N805 + def ISO8601Format(cls): # noqa: N805 """ISO8601 format string class property for compatibility purpose.""" return cls._ISO8601Format() diff --git a/pywikibot/config2.py b/pywikibot/config2.py index 35f248d..e42c75c 100644 --- a/pywikibot/config2.py +++ b/pywikibot/config2.py @@ -418,7 +418,7 @@ console_encoding = sys.stdout.encoding else: console_encoding = sys.stdout.encoding.decode('ascii') -except: +except Exception: # When using pywikibot inside a daemonized twisted application, # we get "StdioOnnaStick instance has no attribute 'encoding'" console_encoding = None @@ -474,7 +474,7 @@ try: # Don't print colorized when the output is, for example, piped to a file. colorized_output = sys.stdout.isatty() -except: +except Exception: colorized_output = False # An indication of the size of your screen, or rather the size of the screen diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index b0f3865..cdbcfea 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -1998,7 +1998,7 @@ self._params[param] = [str(int(value) // 2)] pywikibot.output(u"Set %s = %s" % (param, self._params[param])) - except: + except Exception: pass self.wait() continue diff --git a/pywikibot/date.py b/pywikibot/date.py index c1e2a49..a9b0e39 100644 --- a/pywikibot/date.py +++ b/pywikibot/date.py @@ -67,7 +67,7 @@ res = func(value) if pred(res): return res - except: + except Exception: pass else: # Find a predicate that gives true for this int value, and run a @@ -2358,7 +2358,7 @@ try: year = dict[lang](title) return dictName, year - except: + except Exception: pass # sometimes the title may begin with an upper case while its listed as # lower case, or the other way around @@ -2370,7 +2370,7 @@ else: title = first_upper(title) return getAutoFormat(lang, title, ignoreFirstLetterCase=False) - except: + except Exception: pass return None, None diff --git a/pywikibot/logentries.py b/pywikibot/logentries.py index b71c2d1..d309b4a 100644 --- a/pywikibot/logentries.py +++ b/pywikibot/logentries.py @@ -452,7 +452,7 @@ @classproperty @deprecated('LogEntryFactory.logtypes') - def _logtypes(cls): # flake8: disable=N805 + def _logtypes(cls): # noqa: N805 """DEPRECATED LogEntryFactory class attribute of log types.""" return cls.logtypes diff --git a/pywikibot/logging.py b/pywikibot/logging.py index e8edec6..4a23a45 100644 --- a/pywikibot/logging.py +++ b/pywikibot/logging.py @@ -180,7 +180,7 @@ Use directly after an 'except' statement:: ... - except: + except Exception: pywikibot.exception() ... diff --git a/pywikibot/page.py b/pywikibot/page.py index 10144b8..ad87584 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -2704,6 +2704,7 @@ """ return self.site.globalusage(self, total=total) + wrapper = _ModuleDeprecationWrapper(__name__) wrapper._add_deprecated_attr('ImagePage', FilePage) diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index abd8469..0389c7c 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -1008,7 +1008,7 @@ if value: try: total = int(value) - except: + except Exception: params = value.split(';') if len(params) == 2: value, total = params diff --git a/pywikibot/proofreadpage.py b/pywikibot/proofreadpage.py index a49e657..f4e6a08 100644 --- a/pywikibot/proofreadpage.py +++ b/pywikibot/proofreadpage.py @@ -271,7 +271,7 @@ return self._quality return self.ql - def decompose(fn): # flake8: disable=N805 + def decompose(fn): # noqa: N805 """Decorator. Decompose text if needed and recompose text. @@ -704,7 +704,7 @@ self._cached = False - def check_if_cached(fn): # flake8: disable=N805 + def check_if_cached(fn): # noqa: N805 """Decorator to check if data are cached and cache them if needed.""" def wrapper(self, *args, **kwargs): if self._cached is False: diff --git a/pywikibot/site.py b/pywikibot/site.py index 7b09c7f..9b82484 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -6136,7 +6136,7 @@ 3) if isinstance(ignore_warnings, Iterable): ignored_warnings = ignore_warnings - ignore_warnings = lambda warnings: all( # flake8: disable=E731 + ignore_warnings = lambda warnings: all( # noqa: E731 w.code in ignored_warnings for w in warnings) ignore_all_warnings = not callable(ignore_warnings) and ignore_warnings if text is None: diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py index c3e2d6f..472bdbe 100644 --- a/pywikibot/tools/__init__.py +++ b/pywikibot/tools/__init__.py @@ -180,7 +180,7 @@ return func -class classproperty(object): # flake8: disable=N801 +class classproperty(object): # noqa: N801 """ Metaclass to accesss a class method as a property. @@ -207,7 +207,7 @@ return self.method(owner) -class suppress_warnings(catch_warnings): # flake8: disable=N801 +class suppress_warnings(catch_warnings): # noqa: N801 """A context manager that temporarily suppresses warnings.""" diff --git a/pywikibot/tools/djvu.py b/pywikibot/tools/djvu.py index 3629611..cb842f9 100644 --- a/pywikibot/tools/djvu.py +++ b/pywikibot/tools/djvu.py @@ -123,7 +123,7 @@ """Deprecated file_djvu instance variable.""" return self.file - def check_cache(fn): # flake8: disable=N805 + def check_cache(fn): # noqa: N805 """Decorator to check if cache shall be cleared.""" cache = ['_page_count', '_has_text', '_page_info'] @@ -136,7 +136,7 @@ return _res return wrapper - def check_page_number(fn): # flake8: disable=N805 + def check_page_number(fn): # noqa: N805 """Decorator to check if page number is valid. @raises ValueError diff --git a/pywikibot/tools/ip.py b/pywikibot/tools/ip.py index 0b2a99f..50ffe97 100644 --- a/pywikibot/tools/ip.py +++ b/pywikibot/tools/ip.py @@ -33,7 +33,7 @@ else: _ipaddr_version = StrictVersion(_ipaddr_version) if _ipaddr_version >= StrictVersion('2.1.10'): - from ipaddr import IPAddress as ip_address # flake8: disable=N813 + from ipaddr import IPAddress as ip_address # noqa: N813 else: _ipaddr_e = ImportError('ipaddr %s is broken.' % _ipaddr_version) diff --git a/pywikibot/userinterfaces/gui.py b/pywikibot/userinterfaces/gui.py index 1cfe2df..21f866b 100644 --- a/pywikibot/userinterfaces/gui.py +++ b/pywikibot/userinterfaces/gui.py @@ -22,7 +22,7 @@ if sys.version_info[0] > 2: import tkinter as Tkinter from tkinter.scrolledtext import ScrolledText - from tkinter import simpledialog as tkSimpleDialog # flake8: disable=N812 + from tkinter import simpledialog as tkSimpleDialog # noqa: N812 else: import Tkinter import tkSimpleDialog diff --git a/pywikibot/version.py b/pywikibot/version.py index 6c62ab5..fe3010e 100644 --- a/pywikibot/version.py +++ b/pywikibot/version.py @@ -417,7 +417,7 @@ if line.find('__version__') == 0: try: exec(line) - except: + except Exception: pass break stat = os.stat(fn) diff --git a/scripts/casechecker.py b/scripts/casechecker.py index 9732227..0ed8f82 100755 --- a/scripts/casechecker.py +++ b/scripts/casechecker.py @@ -291,13 +291,13 @@ batchStart:batchStart + batchSize] for data in self.RunQuery(self.queryParams): self.ProcessDataBlock(data) - except: + except Exception: pywikibot.output(u'Exception at Title = %s, Next = %s' % (self.currentTitle, self.apfrom)) try: import traceback pywikibot.output(traceback.format_exc()) - except: + except Exception: pywikibot.output(u'Unable to print exception info') raise diff --git a/scripts/category.py b/scripts/category.py index 9edf5f4..6d09ada 100755 --- a/scripts/category.py +++ b/scripts/category.py @@ -195,7 +195,7 @@ # like the above, but for supercategories self.superclassDB = databases['superclassDB'] del databases - except: + except Exception: # If something goes wrong, just rebuild the database self.rebuild() diff --git a/scripts/category_redirect.py b/scripts/category_redirect.py index 64cbbd1..f17bc2b 100755 --- a/scripts/category_redirect.py +++ b/scripts/category_redirect.py @@ -171,7 +171,7 @@ continue except KeyboardInterrupt: raise - except: + except Exception: return (None, None) def readyToEdit(self, cat): @@ -342,7 +342,7 @@ # do a null edit on cat try: cat.save() - except: + except Exception: pass # delete record entries for non-existent categories @@ -380,7 +380,7 @@ # categories this wiki might maintain try: cat.save() - except: + except Exception: pass continue if dest.isCategoryRedirect(): @@ -392,7 +392,7 @@ # do a null edit on cat try: cat.save() - except: + except Exception: pass else: self.log_text.append( @@ -432,7 +432,7 @@ # do a null edit on cat try: cat.save() - except: + except Exception: pass with open(datafile, "wb") as f: diff --git a/scripts/flickrripper.py b/scripts/flickrripper.py index 6712a40..b03604d 100755 --- a/scripts/flickrripper.py +++ b/scripts/flickrripper.py @@ -352,7 +352,7 @@ user_id=user_id, tags=tags, per_page='100', page='1') pages = photos.find('photos').attrib['pages'] - gen = lambda i: flickr.groups_pools_getPhotos( # flake8: disable=E731 + gen = lambda i: flickr.groups_pools_getPhotos( # noqa: E731 group_id=group_id, user_id=user_id, tags=tags, per_page='100', page=i ).find('photos').getchildren() @@ -362,7 +362,7 @@ photos = flickr.photosets_getPhotos(photoset_id=photoset_id, per_page='100', page='1') pages = photos.find('photoset').attrib['pages'] - gen = lambda i: flickr.photosets_getPhotos( # flake8: disable=E731 + gen = lambda i: flickr.photosets_getPhotos( # noqa: E731 photoset_id=photoset_id, per_page='100', page=i ).find('photoset').getchildren() # https://www.flickr.com/services/api/flickr.people.getPublicPhotos.html @@ -371,7 +371,7 @@ photos = flickr.people_getPublicPhotos(user_id=user_id, per_page='100', page='1') pages = photos.find('photos').attrib['pages'] - gen = lambda i: flickr.people_getPublicPhotos( # flake8: disable=E731 + gen = lambda i: flickr.people_getPublicPhotos( # noqa: E731 user_id=user_id, per_page='100', page=i ).find('photos').getchildren() for i in range(1, int(pages) + 1): diff --git a/scripts/followlive.py b/scripts/followlive.py index 50a7af0..9b0098e 100644 --- a/scripts/followlive.py +++ b/scripts/followlive.py @@ -542,5 +542,6 @@ bot = CleaningBot(questions, questionlist) bot.run() + if __name__ == '__main__': main() diff --git a/scripts/interwiki.py b/scripts/interwiki.py index 2648618..5b90a34 100755 --- a/scripts/interwiki.py +++ b/scripts/interwiki.py @@ -1459,8 +1459,7 @@ f.write("\n") f.close() # FIXME: What errors are we catching here? - # except: should be avoided!! - except: + except Exception: # raise pywikibot.output( 'File autonomous_problems.dat open or corrupted! ' @@ -2360,10 +2359,10 @@ if not summary and \ len(adding) + len(removing) + len(modifying) <= 3: # Use an extended format for the string linking to all added pages. - fmt = lambda d, site: unicode(d[site]) # flake8: disable=E731 + fmt = lambda d, site: unicode(d[site]) # noqa: E731 else: # Use short format, just the language code - fmt = lambda d, site: site.code # flake8: disable=E731 + fmt = lambda d, site: site.code # noqa: E731 mods = mcomment = u'' @@ -2631,7 +2630,7 @@ bot.run() except KeyboardInterrupt: dumpFileName = bot.dump(append) - except: + except Exception: dumpFileName = bot.dump(append) raise finally: diff --git a/scripts/maintenance/cache.py b/scripts/maintenance/cache.py index ac66b35..efde576 100755 --- a/scripts/maintenance/cache.py +++ b/scripts/maintenance/cache.py @@ -304,7 +304,7 @@ else: try: return eval('lambda entry: ' + command) - except: + except Exception: pywikibot.exception() pywikibot.error( 'Cannot compile {0} command: {1}'.format(name, command)) diff --git a/scripts/maintenance/make_i18n_dict.py b/scripts/maintenance/make_i18n_dict.py index edb32a5..1ceb233 100755 --- a/scripts/maintenance/make_i18n_dict.py +++ b/scripts/maintenance/make_i18n_dict.py @@ -45,7 +45,7 @@ from pywikibot import config -class i18nBot(object): # flake8: disable=N801 +class i18nBot(object): # noqa: N801 """I18n bot.""" diff --git a/scripts/makecat.py b/scripts/makecat.py index 5946c18..c4c6f1b 100755 --- a/scripts/makecat.py +++ b/scripts/makecat.py @@ -285,5 +285,5 @@ finally: try: excludefile.close() - except: + except Exception: pass diff --git a/scripts/noreferences.py b/scripts/noreferences.py index 7f0a213..932e10c 100755 --- a/scripts/noreferences.py +++ b/scripts/noreferences.py @@ -735,7 +735,7 @@ try: cat = site.expand_text( site.mediawiki_message(maintenance_category)) - except: + except Exception: pass else: cat = pywikibot.Category(site, "%s:%s" % ( diff --git a/scripts/patrol.py b/scripts/patrol.py index 98de168..a20484e 100755 --- a/scripts/patrol.py +++ b/scripts/patrol.py @@ -279,7 +279,7 @@ author_ns = 0 try: author_ns = self.site.family.authornamespaces[self.site.lang][0] - except: + except Exception: pass if author_ns: author_ns_prefix = self.site.namespace(author_ns) diff --git a/scripts/script_wui.py b/scripts/script_wui.py index 839bf24..9fadbeb 100755 --- a/scripts/script_wui.py +++ b/scripts/script_wui.py @@ -93,7 +93,7 @@ if sys.version_info[0] > 2: import _thread as thread else: - import thread # flake8: disable=H237 (module does not exist in Python 3) + import thread # noqa: H237 (module does not exist in Python 3) try: import resource @@ -220,7 +220,7 @@ try: thread.start_new_thread(main_script, (self.refs[page_title], rev, params)) - except: + except Exception: # (done according to subster in trunk and submit in # rewrite/.../data/api.py) # TODO: is this error handling here needed at all??!? @@ -263,7 +263,7 @@ code = page.getOldVersion(rev) # crontab; scheduled try: exec(code) - except: + except Exception: # (done according to subster in trunk and submit in # rewrite/.../data/api.py) @@ -355,7 +355,7 @@ bot = ScriptWUIBot(site, chan, site.user() + "_WUI", "irc.wikimedia.org") try: bot.start() - except: + except Exception: bot.t.cancel() raise diff --git a/scripts/weblinkchecker.py b/scripts/weblinkchecker.py index c17a41e..54ac583 100755 --- a/scripts/weblinkchecker.py +++ b/scripts/weblinkchecker.py @@ -360,7 +360,7 @@ conn.request('HEAD', '/', None, self.header) self.response = conn.getresponse() self.readEncodingFromResponse(self.response) - except: + except Exception: pass if not self.serverEncoding: # TODO: We might also load a page, then check for an encoding @@ -379,7 +379,7 @@ charsetR = re.compile('charset=(.+)') charset = charsetR.search(ct).group(1) self.serverEncoding = charset - except: + except Exception: pass def changeUrl(self, url): @@ -605,7 +605,7 @@ message = i18n.twtranslate(self.page.site, 'weblinkchecker-badurl_msg', {'URL': self.url}) - except: + except Exception: pywikibot.output('Exception while processing URL %s in page %s' % (self.url, self.page.title())) raise diff --git a/tests/replacebot_tests.py b/tests/replacebot_tests.py index 938574d..eb67f37 100644 --- a/tests/replacebot_tests.py +++ b/tests/replacebot_tests.py @@ -43,14 +43,14 @@ changed_pages = -42 # show that weird number to show this was used - def __init__(inner_self, *args, **kwargs): # flake8: disable=N805 + def __init__(inner_self, *args, **kwargs): # noqa: N805 # Unpatch already here, as otherwise super calls will use # this class' super which is the class itself replace.ReplaceRobot = self._original_bot super(FakeReplaceBot, inner_self).__init__(*args, **kwargs) self.bots.append(inner_self) - def run(inner_self): # flake8: disable=N805 + def run(inner_self): # noqa: N805 """Nothing to do here.""" inner_self.changed_pages = -47 # show that run was called diff --git a/tests/tools_tests.py b/tests/tools_tests.py index 791ab57..9039a54 100644 --- a/tests/tools_tests.py +++ b/tests/tools_tests.py @@ -828,7 +828,7 @@ _bar = 'baz' @classproperty - def bar(cls): # flake8: disable=N805 + def bar(cls): # noqa: N805 """Class property method.""" return cls._bar diff --git a/tox.ini b/tox.ini index e7ad918..a378065 100644 --- a/tox.ini +++ b/tox.ini @@ -54,12 +54,12 @@ flake8 --version flake8 --doctests {posargs} basepython = python2.7 -deps = flake8<3 +deps = flake8 pyflakes >= 1.1 pydocstyle == 2.0.0 hacking flake8-docstrings>=1.1.0 - flake8-putty>=0.3.2 + flake8-per-file-ignores flake8-coding<1.3.0 flake8-comprehensions flake8-future-import @@ -78,7 +78,7 @@ deps = flake8-diff https://github.com/erikrose/blessings/archive/4a226d07.zip flake8-docstrings<0.2.2 - flake8-putty + flake8-per-file-ignores pep8-naming flake8-quotes flake8-blind-except @@ -160,44 +160,51 @@ # D413: Missing blank line after last section # D412: No blank lines allowed between a section header and its content -ignore = C401,C402,C405,E402,D105,D211,FI10,FI12,FI13,FI15,FI16,FI17,FI5,H101,H201,H236,H301,H404,H405,I100,I101,I202,N802,N803,N806,D401,D413,D103,D412 +ignore = C401,C402,C405,E402,D105,D211,FI10,FI12,FI13,FI15,FI16,FI17,FI5,H101,H201,H236,H301,H404,H405,H903,I100,I101,I202,N802,N803,N806,D401,D413,D103,D412 exclude = .tox,.git,./*.egg,ez_setup.py,build,externals,user-config.py,./scripts/i18n/* min-version = 2.6 max_line_length = 100 accept-encodings = utf-8 require-code = true -putty-auto-ignore = true -putty-ignore = - generate_family_file.py : +T001 - pwb.py : +T001 - setup.py : +T001 - pywikibot/comms/http.py : +T001 - pywikibot/date.py,pywikibot/family.py,pywikibot/fixes.py,pywikibot/textlib.py,pywikibot/userinterfaces/terminal_interface_unix.py,pywikibot/userinterfaces/terminal_interface_win32.py,pywikibot/families/wikipedia_family.py : +E241 - pywikibot/textlib.py : +N801 - pywikibot/userinterfaces/transliteration.py : +N801 - pywikibot/userinterfaces/win32_unicode.py : +N801, N812, T001 - tests/page_tests.py : +E241 - scripts/,/pagegenerators.parameterHelp/ : +E241 - scripts/imagetransfer.py,scripts/maintenance/wikimedia_sites.py : +E241 - tests/ui_tests.py : +D102, D103, N801 - tests/__init__.py,tests/aspects.py,tests/script_tests.py,tests/pwb/ : +T001 - tests/,/from pywikibot.tools import/ : +N813 - scripts/checkimages.py,scripts/imagecopy.py,scripts/imagecopy_self.py : +N801 - scripts/maintenance/make_i18n_dict.py : +T001 - scripts/archive/featured.py : +D102, D103 - scripts/flickrripper.py : +T001 - scripts/harvest_template.py : +T001 - scripts/script_wui.py : +D102 - scripts/makecat.py : +D103 - scripts/interwiki.py,/""/ : +P102 - pywikibot/__init__.py,/link_regex/ : +P103 +per-file-ignores = + generate_family_file.py : T001 + pwb.py : T001 + setup.py : T001 + pywikibot/comms/http.py : T001 + pywikibot/date.py : E241 + pywikibot/family.py : E241 + pywikibot/fixes.py : E241 + pywikibot/textlib.py : E241 + pywikibot/userinterfaces/terminal_interface_unix.py : E241 + pywikibot/userinterfaces/terminal_interface_win32.py : E241 + pywikibot/textlib.py : N801 + pywikibot/userinterfaces/transliteration.py : N801 + pywikibot/userinterfaces/win32_unicode.py : N801, N812, T001 + tests/page_tests.py : E241 + scripts/imagetransfer.py : E241 + tests/ui_tests.py : D102, D103, N801 + tests/* : N813 + scripts/checkimages.py : N801 + scripts/imagecopy.py : N801 + scripts/imagecopy_self.py : N801 + scripts/archive/featured.py : D102, D103 + scripts/flickrripper.py : T001 + scripts/harvest_template.py : T001 + scripts/script_wui.py : D102 + scripts/makecat.py : D103 + scripts/interwiki.py : P102 + pywikibot/__init__.py : P103 # valid N805 naming convention exceptions - pywikibot/userinterfaces/terminal_interface.py,/from pywikibot.userinterfaces.terminal_interface_.* import .* as UI/ : +N814 + pywikibot/userinterfaces/terminal_interface.py : N814 # invalidly detected as {} format string: - tests/textlib_tests.py,/self.assert.*{{/ : +P103 + tests/textlib_tests.py : P103 # __dict__ used in a discouraged manner # regex matches the first physical line of logical line of the error - pywikibot/exceptions.py , /PageRelatedError.*__init__/ : +H501 + pywikibot/exceptions.py : H501 + # Todo: E741: ambiguous variable name + tests/link_tests.py : E741 + tests/page_tests.py : E741 + scripts/category_redirect.py : E741 [pep8] # see explanations above -- To view, visit https://gerrit.wikimedia.org/r/395483 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6116089cb0b332f8dbd0cc454b0b02d7f919af2a Gerrit-PatchSet: 6 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Siebrand <siebrand(a)kitano.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 5 months

[Gerrit] pywikibot/core[master]: [doc] fix doc description files

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/395046 ) Change subject: [doc] fix doc description files ...................................................................... [doc] fix doc description files Change-Id: I0dba1ae1d5d492783182caf5a0c25b9e53cca273 --- M docs/scripts/scripts.maintenance.rst M docs/scripts/scripts.rst 2 files changed, 8 insertions(+), 8 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/scripts/scripts.maintenance.rst b/docs/scripts/scripts.maintenance.rst index 0efc042..3680c91 100644 --- a/docs/scripts/scripts.maintenance.rst +++ b/docs/scripts/scripts.maintenance.rst @@ -46,7 +46,7 @@ scripts.maintenance.wikimedia_sites script ------------------------------------------ +------------------------------------------ .. automodule:: scripts.maintenance.wikimedia_sites :members: diff --git a/docs/scripts/scripts.rst b/docs/scripts/scripts.rst index 44ecbc9..b43271c 100644 --- a/docs/scripts/scripts.rst +++ b/docs/scripts/scripts.rst @@ -39,10 +39,10 @@ :show-inheritance: -scripts.blockpagechecker script -------------------------------- +scripts.blockpageschecker script +-------------------------------- -.. automodule:: scripts.blockpagechecker +.. automodule:: scripts.blockpageschecker :members: :undoc-members: :show-inheritance: @@ -105,7 +105,7 @@ scripts.clean_sandbox script ---------------------------- -.. automodule:: scripts.clean_sandboy +.. automodule:: scripts.clean_sandbox :members: :undoc-members: :show-inheritance: @@ -129,10 +129,10 @@ :show-inheritance: -scripts.coodinate_import script -------------------------------- +scripts.coordinate_import script +-------------------------------- -.. automodule:: scripts.coodinate_import +.. automodule:: scripts.coordinate_import :members: :undoc-members: :show-inheritance: -- To view, visit https://gerrit.wikimedia.org/r/395046 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0dba1ae1d5d492783182caf5a0c25b9e53cca273 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> 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, 5 months

[Gerrit] pywikibot/core[master]: [bugfix] Fix automatic delete reason to not categorize marke...

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/395001 ) Change subject: [bugfix] Fix automatic delete reason to not categorize marked page ...................................................................... [bugfix] Fix automatic delete reason to not categorize marked page Category marked for deletion uses in {{delete}} template reason equal to summary. But i18n summary contains link to the category without ":" colon. This fix only adds ":" into a category link in order not to categorize category by template reason. Bug: T177724 Change-Id: I1455f0f6ec1877a0cfd68c0cd39f93fb278b8003 --- M scripts/category.py 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved Zoranzoki21: Looks good to me, but someone else must approve diff --git a/scripts/category.py b/scripts/category.py index 263b92d..9edf5f4 100755 --- a/scripts/category.py +++ b/scripts/category.py @@ -485,7 +485,11 @@ template_vars = {'oldcat': self.oldcat.title(withNamespace=False)} if self.newcat: template_vars.update({ - 'newcat': self.newcat.title(withNamespace=False, asLink=True), + 'newcat': self.newcat.title( + withNamespace=False, + asLink=True, + textlink=True + ), 'title': self.newcat.title(withNamespace=False)}) # Set edit summary for changed pages. if comment: -- To view, visit https://gerrit.wikimedia.org/r/395001 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1455f0f6ec1877a0cfd68c0cd39f93fb278b8003 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: Hashar <hashar(a)free.fr> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: MarcoAurelio <maurelio(a)tools.wmflabs.org> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Maven-release-user <maven-release-user(a)wikimedia.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 5 months

[Gerrit] pywikibot/core[master]: version.py: Print uname of Toolforge environment

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/394998 ) Change subject: version.py: Print uname of Toolforge environment ...................................................................... version.py: Print uname of Toolforge environment Add `get_toolforge_info()` in `pywikibot/version.py` that intended to get the uname of a Wikimedia Toolforge environment. Print the uname of Toolforge environment if the current environment is in Toolforge. Bug: T113193 Change-Id: If5d390253dedfb92486a05741c3a7e773c008b2c --- M pywikibot/version.py M scripts/version.py 2 files changed, 19 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved Zoranzoki21: Looks good to me, but someone else must approve diff --git a/pywikibot/version.py b/pywikibot/version.py index f20209e..6c62ab5 100644 --- a/pywikibot/version.py +++ b/pywikibot/version.py @@ -16,6 +16,7 @@ import datetime import json import os +import socket import subprocess import sys import time @@ -56,6 +57,18 @@ return _program_dir +def get_toolforge_hostname(): + """Get hostname of the current Toolforge host. + + @return: The hostname of the currently running host, + if it is in Wikimedia Toolforge; otherwise return None. + @rtype: str or None + """ + if socket.getfqdn().endswith('.tools.eqiad.wmflabs'): + return socket.gethostname() + return None + + def getversion(online=True): """Return a pywikibot version string. diff --git a/scripts/version.py b/scripts/version.py index ad2ba84..9d7d26f 100755 --- a/scripts/version.py +++ b/scripts/version.py @@ -16,7 +16,7 @@ import pywikibot -from pywikibot.version import getversion +from pywikibot.version import getversion, get_toolforge_hostname try: import requests @@ -67,6 +67,11 @@ pywikibot.output('Python: %s' % sys.version) + toolforge_env_hostname = get_toolforge_hostname() + if toolforge_env_hostname: + pywikibot.output('Toolforge hostname: {0}'.format( + toolforge_env_hostname)) + check_environ('PYWIKIBOT2_DIR') check_environ('PYWIKIBOT2_DIR_PWB') check_environ('PYWIKIBOT2_NO_USER_CONFIG') -- To view, visit https://gerrit.wikimedia.org/r/394998 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If5d390253dedfb92486a05741c3a7e773c008b2c Gerrit-PatchSet: 5 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Rafidaslam <rafidteam(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Rafidaslam <rafidteam(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 5 months

[Gerrit] pywikibot/core[master]: Require PyOpenSSL<17.5.0 for Python 3.3

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/394822 ) Change subject: Require PyOpenSSL<17.5.0 for Python 3.3 ...................................................................... Require PyOpenSSL<17.5.0 for Python 3.3 Bug: T181912 Change-Id: Id37b8dd8dd4329ad39f386a811af2180821f450e --- M requests-requirements.txt M requirements.txt M setup.py 3 files changed, 8 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/requests-requirements.txt b/requests-requirements.txt index 57ad0bc..94cf204 100644 --- a/requests-requirements.txt +++ b/requests-requirements.txt @@ -2,7 +2,8 @@ # requests security extra # Bug T105767 on Python 2.7 release 9+ -pyOpenSSL>=0.14,!=17.2.0 ; python_full_version < '2.7.9' or python_version >= '3' +pyOpenSSL>=0.14,!=17.2.0 ; python_full_version < '2.7.9' or python_version > '3.3' +pyOpenSSL<17.5.0 ; python_version == '3.3' cryptography>=1.3.4 ; python_full_version < '2.7.9' or python_version > '3.3' cryptography>=1.3.4,<2.0 ; python_version == '3.3' idna>=2.0.0 ; python_full_version < '2.7.9' or python_version >= '3' diff --git a/requirements.txt b/requirements.txt index 13598af..f0a96f4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -23,7 +23,9 @@ # requests security extra pyOpenSSL>=0.14,!=17.2.0 ; python_full_version < '2.7.9' +PyOpenSSL<17.5.0 ; python_version == '3.3' cryptography>=1.3.4 ; python_full_version < '2.7.9' +cryptography>=1.3.4,<2.0 ; python_version == '3.3' idna>=2.0.0 ; python_full_version < '2.7.9' # https://github.com/eliben/pycparser/issues/147 pycparser != 2.14 diff --git a/setup.py b/setup.py index aa28872..6e895d5 100644 --- a/setup.py +++ b/setup.py @@ -74,9 +74,12 @@ 'unicode7': ['unicodedata2>=7.0.0-2'], }) elif PYTHON_VERSION[:2] == (3, 3): - # requests[security] requires cryptography, but cryptography does not + # requests[security] requires cryptography, but cryptography 2.0+ does not # support Python 3.3; T178241 extra_deps['security'].append('cryptography<2.0') + # PyOpenSSL is required by requests[security] but has dropped support for + # Python 3.3 since version 17.5.0 (2017-11-30); T181912 + extra_deps['security'].append('PyOpenSSL<17.5.0') script_deps = { 'flickrripper.py': ['Pillow<3.5.0' if PY26 else 'Pillow'], -- To view, visit https://gerrit.wikimedia.org/r/394822 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id37b8dd8dd4329ad39f386a811af2180821f450e Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> 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, 5 months

[Gerrit] pywikibot/core[master]: Add Korean value for lonelypages.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/394747 ) Change subject: Add Korean value for lonelypages.py ...................................................................... Add Korean value for lonelypages.py Change-Id: I8bff4a0c2293613ab167c2f239cb5f75a636c9e9 Signed-off-by: Yongmin Hong <revi(a)pobox.com> --- M scripts/lonelypages.py 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Mpaa: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/lonelypages.py b/scripts/lonelypages.py index f9b75f0..ca9f9c2 100755 --- a/scripts/lonelypages.py +++ b/scripts/lonelypages.py @@ -95,6 +95,7 @@ 'en': ('Orphan', 'date={{subst:CURRENTMONTHNAME}} {{subst:CURRENTYEAR}}', ['wi']), 'it': ('O', '||mese={{subst:CURRENTMONTHNAME}} {{subst:CURRENTYEAR}}', ['a']), 'ja': ('孤立', '{{subst:DATE}}'), + 'ko': ('외톨이', '{{{{{|안전풀기:}}}#timel:Y-m-d|now}}'), 'zh': ('Orphan/auto', '', ['orphan'], True), } -- To view, visit https://gerrit.wikimedia.org/r/394747 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8bff4a0c2293613ab167c2f239cb5f75a636c9e9 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Revi <wiki(a)ymhong.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 5 months

[Gerrit] pywikibot/core[master]: Change to use assertRaisesRegex in file_tests.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/393990 ) Change subject: Change to use assertRaisesRegex in file_tests.py ...................................................................... Change to use assertRaisesRegex in file_tests.py assertRaises is not as good of a test as asserRaisesRegex. The latter has an extra parameter to match the exception message, allowing more more precision when checking an error. Bug: T154281 Change-Id: I8a30b49dd6506e0e0f0d0c7cf7affcabc20bfa75 --- M tests/file_tests.py 1 file changed, 36 insertions(+), 7 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/file_tests.py b/tests/file_tests.py index 324f2c1..f4f8584 100644 --- a/tests/file_tests.py +++ b/tests/file_tests.py @@ -8,6 +8,7 @@ from __future__ import absolute_import, unicode_literals import os +import re import pywikibot @@ -73,7 +74,10 @@ self.assertTrue(commons_file.get_file_url()) self.assertIn('/wikipedia/commons/', itwp_file.get_file_url()) - self.assertRaises(pywikibot.NoPage, itwp_file.get) + with self.assertRaisesRegex( + pywikibot.NoPage, + (r'Page \[\[(wikipedia:|)it:%s\]\] doesn\'t exist.' % title)): + itwp_file.get() def testLocalOnly(self): """Test fileIsShared() on file page with local file only.""" @@ -93,10 +97,23 @@ self.assertFalse(commons_file.exists()) self.assertFalse(enwp_file.fileIsShared()) - self.assertRaises(pywikibot.NoPage, commons_file.fileIsShared) - self.assertRaises(pywikibot.NoPage, commons_file.get_file_url) - self.assertRaises(pywikibot.NoPage, commons_file.get) + page_doesnt_exist_exc_regex = re.escape( + 'Page [[commons:%s]] doesn\'t exist.' % title) + with self.assertRaisesRegex( + pywikibot.NoPage, + page_doesnt_exist_exc_regex): + commons_file.fileIsShared() + + with self.assertRaisesRegex( + pywikibot.NoPage, + page_doesnt_exist_exc_regex): + commons_file.get_file_url() + + with self.assertRaisesRegex( + pywikibot.NoPage, + page_doesnt_exist_exc_regex): + commons_file.get() def testOnBoth(self): """Test fileIsShared() on file page with both local and shared file.""" @@ -155,7 +172,11 @@ site = self.get_site() image = pywikibot.FilePage(site, u'File:NoPage') self.assertFalse(image.exists()) - with self.assertRaises(pywikibot.NoPage): + + with self.assertRaisesRegex( + pywikibot.NoPage, + (r'Page \[\[(wikipedia\:|)test:File:NoPage\]\] ' + r'doesn\'t exist\.')): image = image.latest_file_info def test_file_info_with_no_file(self): @@ -163,7 +184,11 @@ site = self.get_site() image = pywikibot.FilePage(site, u'File:Test with no image') self.assertTrue(image.exists()) - with self.assertRaises(pywikibot.PageRelatedError): + with self.assertRaisesRegex( + pywikibot.PageRelatedError, + (r'loadimageinfo: Query on ' + r'\[\[(wikipedia\:|)test:File:Test with no image\]\]' + r' returned no imageinfo')): image = image.latest_file_info @@ -278,7 +303,11 @@ """Test not existing download.""" page = pywikibot.FilePage(self.site, 'File:Albert Einstein.jpg_notexisting') filename = join_images_path('Albert Einstein.jpg') - with self.assertRaises(pywikibot.NoPage): + + with self.assertRaisesRegex( + pywikibot.NoPage, + re.escape('Page [[commons:File:Albert Einstein.jpg ' + 'notexisting]] doesn\'t exist.')): page.download(filename) -- To view, visit https://gerrit.wikimedia.org/r/393990 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8a30b49dd6506e0e0f0d0c7cf7affcabc20bfa75 Gerrit-PatchSet: 6 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Rafidaslam <rafidteam(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: Rafidaslam <rafidteam(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 5 months

[Gerrit] pywikibot/core[master]: proofreadpage_tests: fix TestProofreadPageIndexProperty

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/394746 ) Change subject: proofreadpage_tests: fix TestProofreadPageIndexProperty ...................................................................... proofreadpage_tests: fix TestProofreadPageIndexProperty Fix en.wikisource.org test page names. Bug: T181863 Change-Id: I00e8a94d9337458469e6c44efb777c32844b49c0 --- M tests/proofreadpage_tests.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/proofreadpage_tests.py b/tests/proofreadpage_tests.py index 461b550..2f8492f 100644 --- a/tests/proofreadpage_tests.py +++ b/tests/proofreadpage_tests.py @@ -331,8 +331,8 @@ } existing_multilinked = { - 'title': 'Page:Pywikibot test page 1/1', - 'index_1': 'Index:Pywikibot test page 1', + 'title': 'Page:Pywikibot test page.djvu/1', + 'index_1': 'Index:Pywikibot test page.djvu', 'index_2': 'Index:Pywikibot test page 2', } -- To view, visit https://gerrit.wikimedia.org/r/394746 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I00e8a94d9337458469e6c44efb777c32844b49c0 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 5 months

[Gerrit] pywikibot/core[master]: Update families files

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/394742 ) Change subject: Update families files ...................................................................... Update families files Change-Id: Ie39272a71ef0ebd638d5e17be53584c04c6a17ce --- M pywikibot/families/wikibooks_family.py M pywikibot/families/wikipedia_family.py M pywikibot/families/wikiquote_family.py M pywikibot/families/wikisource_family.py 4 files changed, 29 insertions(+), 30 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikibooks_family.py b/pywikibot/families/wikibooks_family.py index d716c24..43788bc 100644 --- a/pywikibot/families/wikibooks_family.py +++ b/pywikibot/families/wikibooks_family.py @@ -42,7 +42,7 @@ 'sv', 'da', 'hr', 'sr', 'tr', 'ko', 'ar', 'no', 'gl', 'ba', 'ro', 'ta', 'tl', 'mk', 'is', 'uk', 'sa', 'hi', 'ka', 'lt', 'sk', 'tt', 'eo', 'el', 'bg', 'bn', 'li', 'hy', 'si', 'ms', 'sl', 'ur', 'la', - 'ml', 'km', 'et', 'ia', 'cv', 'mr', 'eu', 'kk', 'oc', 'be', 'pa', + 'ml', 'km', 'ia', 'et', 'cv', 'mr', 'eu', 'kk', 'oc', 'be', 'pa', 'ne', 'fy', 'tg', 'te', 'af', 'ku', 'ky', 'bs', 'mg', 'cy', ] diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index 93a7124..4768a12 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -41,31 +41,30 @@ 'hu', 'id', 'ko', 'cs', 'ro', 'sr', 'ms', 'tr', 'eu', 'eo', 'bg', 'hy', 'da', 'zh-min-nan', 'sk', 'min', 'kk', 'he', 'lt', 'hr', 'et', 'ce', 'sl', 'be', 'gl', 'el', 'nn', 'simple', 'uz', 'az', - 'la', 'ur', 'hi', 'vo', 'th', 'ka', 'ta', 'cy', 'mk', 'tg', 'tl', - 'mg', 'oc', 'ky', 'lv', 'bs', 'tt', 'new', 'sq', 'te', 'pms', 'br', - 'zh-yue', 'be-tarask', 'bn', 'ast', 'ml', 'ht', 'lb', 'jv', 'mr', - 'azb', 'af', 'sco', 'pnb', 'ga', 'is', 'cv', 'ba', 'fy', 'su', - 'sw', 'my', 'lmo', 'an', 'yo', 'ne', 'gu', 'io', 'pa', 'nds', - 'scn', 'bpy', 'bar', 'als', 'ku', 'kn', 'ia', 'qu', 'ckb', 'mn', - 'arz', 'bat-smg', 'wa', 'gd', 'nap', 'yi', 'si', 'bug', 'am', - 'cdo', 'or', 'map-bms', 'fo', 'mzn', 'hsb', 'xmf', 'li', 'mai', - 'sah', 'sa', 'vec', 'ilo', 'os', 'mrj', 'hif', 'mhr', 'bh', 'eml', - 'roa-tara', 'ps', 'diq', 'pam', 'sd', 'hak', 'nso', 'se', 'bcl', - 'ace', 'zh-classical', 'mi', 'nah', 'nds-nl', 'szl', 'wuu', 'gan', - 'vls', 'rue', 'frr', 'km', 'bo', 'glk', 'vep', 'sc', 'fiu-vro', - 'crh', 'co', 'lrc', 'tk', 'kv', 'csb', 'so', 'gv', 'as', 'lad', - 'zea', 'myv', 'ay', 'udm', 'nv', 'lez', 'stq', 'kw', 'ie', 'nrm', - 'pcd', 'mwl', 'rm', 'koi', 'gom', 'ug', 'ab', 'lij', 'gn', 'mt', - 'fur', 'cbk-zam', 'dsb', 'dv', 'ang', 'sn', 'ln', 'ext', 'kab', - 'ksh', 'lo', 'gag', 'frp', 'pag', 'pi', 'olo', 'dty', 'av', 'xal', - 'pfl', 'bxr', 'haw', 'krc', 'kaa', 'pap', 'rw', 'pdc', 'bjn', 'to', - 'nov', 'kl', 'arc', 'jam', 'kbd', 'ha', 'tyv', 'tpi', 'tet', 'ig', - 'ki', 'na', 'lbe', 'roa-rup', 'jbo', 'ty', 'mdf', 'kg', 'za', 'wo', - 'lg', 'bi', 'srn', 'zu', 'chr', 'tcy', 'ltg', 'sm', 'om', 'xh', - 'tn', 'pih', 'cu', 'kbp', 'chy', 'rmy', 'tw', 'tum', 'ts', 'st', - 'got', 'rn', 'pnt', 'ss', 'bm', 'fj', 'ch', 'ady', 'iu', 'ny', - 'ee', 'ks', 'ak', 'atj', 'ik', 've', 'sg', 'dz', 'ff', 'ti', 'cr', - 'din', + 'la', 'ur', 'hi', 'vo', 'th', 'ka', 'ta', 'cy', 'tg', 'mk', 'tl', + 'mg', 'oc', 'lv', 'ky', 'bs', 'tt', 'new', 'sq', 'te', 'pms', 'br', + 'zh-yue', 'be-tarask', 'azb', 'bn', 'ast', 'ml', 'ht', 'lb', 'jv', + 'mr', 'af', 'sco', 'pnb', 'ga', 'is', 'cv', 'ba', 'fy', 'su', 'sw', + 'my', 'lmo', 'an', 'yo', 'ne', 'gu', 'pa', 'io', 'nds', 'scn', + 'bpy', 'bar', 'als', 'ku', 'kn', 'ia', 'qu', 'ckb', 'mn', 'arz', + 'bat-smg', 'wa', 'gd', 'nap', 'si', 'yi', 'bug', 'am', 'cdo', 'or', + 'map-bms', 'fo', 'mzn', 'hsb', 'xmf', 'li', 'mai', 'sah', 'sa', + 'vec', 'ilo', 'os', 'mrj', 'hif', 'mhr', 'bh', 'eml', 'roa-tara', + 'ps', 'diq', 'pam', 'sd', 'hak', 'nso', 'se', 'bcl', 'ace', + 'zh-classical', 'mi', 'nah', 'nds-nl', 'szl', 'wuu', 'gan', 'vls', + 'rue', 'frr', 'km', 'bo', 'glk', 'vep', 'sc', 'fiu-vro', 'crh', + 'co', 'lrc', 'tk', 'kv', 'csb', 'so', 'gv', 'as', 'lad', 'myv', + 'zea', 'ay', 'udm', 'nv', 'lez', 'stq', 'kw', 'ie', 'nrm', 'pcd', + 'koi', 'mwl', 'rm', 'gom', 'ug', 'ab', 'lij', 'cbk-zam', 'gn', + 'mt', 'fur', 'dsb', 'dv', 'ang', 'sn', 'ln', 'ext', 'kab', 'ksh', + 'lo', 'frp', 'gag', 'pag', 'pi', 'dty', 'olo', 'av', 'xal', 'pfl', + 'bxr', 'haw', 'krc', 'kaa', 'pap', 'rw', 'pdc', 'bjn', 'to', 'nov', + 'kl', 'arc', 'jam', 'kbd', 'ha', 'tyv', 'tpi', 'tet', 'ig', 'ki', + 'na', 'roa-rup', 'lbe', 'jbo', 'ty', 'mdf', 'kg', 'za', 'wo', 'lg', + 'bi', 'srn', 'zu', 'chr', 'tcy', 'ltg', 'sm', 'om', 'xh', 'tn', + 'pih', 'rmy', 'cu', 'kbp', 'chy', 'tw', 'tum', 'ts', 'st', 'got', + 'rn', 'pnt', 'ss', 'bm', 'fj', 'ch', 'ady', 'iu', 'ny', 'ee', 'ks', + 'ak', 'atj', 'ik', 've', 'sg', 'dz', 'ff', '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 d887445..f693d66 100644 --- a/pywikibot/families/wikiquote_family.py +++ b/pywikibot/families/wikiquote_family.py @@ -35,10 +35,10 @@ """Constructor.""" self.languages_by_size = [ 'en', 'it', 'pl', 'ru', 'cs', 'fa', 'de', 'pt', 'es', 'uk', 'sk', - 'fr', 'bs', 'he', 'tr', 'ca', 'fi', 'lt', 'th', 'bg', 'sl', 'eo', + 'fr', 'bs', 'he', 'tr', 'fi', 'ca', 'lt', 'th', 'bg', 'sl', 'eo', 'hy', 'el', 'nn', 'hr', 'id', 'zh', 'hu', 'su', 'li', 'az', 'ko', 'nl', 'ja', 'ar', 'gu', 'sv', 'sr', 'gl', 'ur', 'te', 'ta', 'cy', - 'la', 'no', 'ml', 'et', 'vi', 'kn', 'ku', 'be', 'ro', 'eu', 'hi', + 'la', 'no', 'ml', 'vi', 'et', 'kn', 'ku', 'be', 'ro', 'eu', 'hi', 'ka', 'da', 'sa', 'is', 'sq', 'mr', 'br', 'af', 'uz', 'zh-min-nan', 'wo', 'ky', ] diff --git a/pywikibot/families/wikisource_family.py b/pywikibot/families/wikisource_family.py index d44ba4d..b921d19 100644 --- a/pywikibot/families/wikisource_family.py +++ b/pywikibot/families/wikisource_family.py @@ -32,9 +32,9 @@ """Constructor.""" self.languages_by_size = [ 'en', 'pl', 'ru', 'de', 'fr', 'zh', 'he', 'it', 'es', 'ar', 'cs', - 'pt', 'fa', 'www', 'hu', 'ml', 'ko', 'sv', 'sr', 'gu', 'bn', 'sl', + 'pt', 'fa', 'www', 'hu', 'ml', 'ko', 'sv', 'gu', 'sr', 'bn', 'sl', 'te', 'sa', 'el', 'ro', 'fi', 'uk', 'vi', 'ja', 'az', 'th', 'hy', - 'ca', 'ta', 'br', 'hr', 'kn', 'nl', 'is', 'la', 'no', 'vec', 'eo', + 'ca', 'kn', 'ta', 'br', 'hr', 'nl', 'is', 'la', 'no', 'vec', 'eo', 'tr', 'be', 'et', 'mk', 'yi', 'id', 'da', 'bg', 'li', 'mr', 'as', 'or', 'bs', 'sah', 'lt', 'gl', 'sk', 'cy', 'pa', 'zh-min-nan', 'fo', -- To view, visit https://gerrit.wikimedia.org/r/394742 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie39272a71ef0ebd638d5e17be53584c04c6a17ce Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Framawiki <framawiki(a)tools.wmflabs.org> 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, 5 months

[Gerrit] pywikibot/core[master]: proofreadpage_tests: fix test_page_gen_redlink

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/394637 ) Change subject: proofreadpage_tests: fix test_page_gen_redlink ...................................................................... proofreadpage_tests: fix test_page_gen_redlink Recreated pages on en.wikisource.org and renamed pages in file. Bug: T181697 Change-Id: I41f6c0568b1fce41093afb9cddc58443c565a819 --- M tests/proofreadpage_tests.py 1 file changed, 4 insertions(+), 5 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/proofreadpage_tests.py b/tests/proofreadpage_tests.py index 4d76a2e..461b550 100644 --- a/tests/proofreadpage_tests.py +++ b/tests/proofreadpage_tests.py @@ -651,11 +651,11 @@ cached = True - index_name = 'Index:Pywikibot test page 1' - page_names = ['Page:Pywikibot test page 1/1', - 'Page:Pywikibot test page 2/2', + index_name = 'Index:Pywikibot test page.djvu' + page_names = ['Page:Pywikibot test page.djvu/1', + 'Page:Pywikibot test page.djvu/2', ] - missing_name = 'Page:Pywikibot test page 2/2' + missing_name = 'Page:Pywikibot test page.djvu/2' @classmethod def setUpClass(cls): @@ -675,7 +675,6 @@ n = self.index.get_number(page) self.assertEqual(self.index.get_page(n), page) - @unittest.expectedFailure # T181697 def test_page_gen_redlink(self): """Test Index page generator with redlinks.""" # Check start/end limits. -- To view, visit https://gerrit.wikimedia.org/r/394637 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I41f6c0568b1fce41093afb9cddc58443c565a819 Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 5 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits December 2017