Pywikibot-commits February 2019

pywikibot-commits@lists.wikimedia.org

1 participants
103 discussions

[Gerrit] pywikibot/core[master]: [cleanup] remove pre mw 1.14 code
by jenkins-bot (Code Review) 16 Feb '19

16 Feb '19

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/463775 ) Change subject: [cleanup] remove pre mw 1.14 code ...................................................................... [cleanup] remove pre mw 1.14 code Lowest supported mw version of pywikibot core release is 1.14. Remove old code stuff for previous releases. Refer https://www.mediawiki.org/wiki/Special:Code/pywikipedia/6185 Also simplify Namespace initialzer and remove duplicate alias assignment and reduce code complexity from C16 to B9 Bug: T106121 Change-Id: If85dec45e51d453fac6cb285b8d0c35b22c2bdcc --- M pywikibot/data/api.py M pywikibot/page.py M pywikibot/site.py M tests/api_tests.py M tests/dry_api_tests.py M tests/dry_site_tests.py M tests/namespace_tests.py 7 files changed, 51 insertions(+), 311 deletions(-) Approvals: Mpaa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index de32f17..bae4e87 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -168,10 +168,6 @@ Provides cache aware fetching of parameter information. - Full support for MW 1.12+, when 'paraminfo' was introduced to the API. - Partially supports MW 1.11, using data extracted from API 'help'. - MW 1.10 not supported as module prefixes are not extracted from API 'help'. - It does not support the format modules. """ @@ -239,7 +235,7 @@ mw_ver = self.site.mw_version if mw_ver < '1.15': - self._parse_help(mw_ver) + self._parse_help() # The paraminfo api deprecated the old request syntax of # querymodules='info'; to avoid warnings sites with 1.25wmf4+ @@ -300,11 +296,8 @@ 'parameters': self._paraminfo['query']['parameters'] } - def _parse_help(self, _mw_ver): - """Emulate paraminfo data using help.""" - # 1.14 paraminfo 'main' module doesnt exist. - # paraminfo only exists 1.12+. - + def _parse_help(self): + """Emulate paraminfo['main'] data using help for mw 1.14.""" # Request need ParamInfo to determine use_get request = self.site._request(expiry=config.API_config_expiry, use_get=True, @@ -353,181 +346,6 @@ ], } - if _mw_ver >= '1.12': - return - - query_help_list_prefix = "Values (separate with '|'): " - - start = help_text.find('Which properties to get') - start = help_text.find(query_help_list_prefix, start) - start += len(query_help_list_prefix) - end = help_text.find('\n', start) - - prop_modules = help_text[start:end].split(', ') - - start = help_text.find('Which lists to get') - start = help_text.find(query_help_list_prefix, start) - start += len(query_help_list_prefix) - end = help_text.find('\n', start) - - list_modules = help_text[start:end].split(', ') - - start = help_text.find('Which meta data to get') - start = help_text.find(query_help_list_prefix, start) - start += len(query_help_list_prefix) - end = help_text.find('\n', start) - - meta_modules = help_text[start:end].split(', ') - - start = help_text.find('Use the output of a list as the input') - start = help_text.find('One value: ', start) - start += len('One value: ') - end = help_text.find('\n', start) - - gen_modules = help_text[start:end].split(', ') - - self._paraminfo['paraminfo'] = { - 'name': 'paraminfo', - 'path': 'paraminfo', - 'classname': 'ApiParamInfo', - 'prefix': '', - 'readrights': '', - 'helpurls': [], - 'parameters': [ - { - 'name': 'querymodules', - 'type': (prop_modules + list_modules - + meta_modules + gen_modules), - 'limit': 50, - }, - ], - } - - self._paraminfo['query'] = { - 'name': 'query', - 'path': 'query', - 'classname': 'ApiQuery', - 'prefix': '', - 'readrights': '', - 'helpurls': [], - 'parameters': [ - { - 'name': 'prop', - 'type': prop_modules, - 'submodules': '', - }, - { - 'name': 'list', - 'type': list_modules, - 'submodules': '', - }, - { - 'name': 'meta', - 'type': meta_modules, - 'submodules': '', - }, - { - 'name': 'generator', - 'type': gen_modules, - }, - ], - } - # Converted entries added, now treat them like they have been fetched - self._generate_submodules(['main', 'query']) - - # TODO: rewrite 'help' parser to determine prefix from the parameter - # names, as API 1.10 help does not include prefix on the first line. - - for mod_type in ['action', 'prop', 'list', 'meta', 'generator']: - if mod_type == 'action': - submodules = self.parameter('main', mod_type)['type'] - path_prefix = '' - else: - submodules = self.parameter('query', mod_type) - submodules = submodules['type'] - path_prefix = 'query+' - - for submodule in submodules: - mod_begin_string = '* %s=%s' % (mod_type, submodule) - start = help_text.find(mod_begin_string) - assert(start) - start += len(mod_begin_string) - end = help_text.find('\n*', start) - - if help_text[start + 1] == '(' and help_text[start + 4] == ')': - prefix = help_text[start + 2:start + 4] - else: - prefix = '' - - path = path_prefix + submodule - - # query is added above; some query modules appear as both - # prop and generator, and the generator doesnt have a - # prefix in the help. - if path not in self._paraminfo: - php_class = 'Api' - if mod_type == 'action': - php_class += 'Query' - # This doesnt correctly derive PHP class names where there - # are additional uppercase letters in the class name. - php_class += submodule.title() - - self._paraminfo[path] = { - 'name': submodule, - 'path': path, - 'classname': php_class, - 'prefix': prefix, - 'readrights': '', - 'helpurls': [], - 'parameters': [], - } - - if not prefix: - continue - - params = {} - - # Check existence of parameters used frequently by pywikibot. - # TODO: for each parameter, parse list of values ('type') - if prefix + 'limit' in help_text: - params['limit'] = { - 'name': 'limit', - 'type': 'limit', - 'max': 50, - } - - if prefix + 'namespace' in help_text: - params['namespace'] = { - 'name': 'namespace', - 'type': 'namespace', - } - if not submodule.startswith('all'): - params['namespace']['multi'] = '' - - for param_name in ['token', 'prop', 'type', 'show']: - if prefix + param_name in help_text: - params[param_name] = { - 'name': param_name, - 'type': [], - 'multi': '', - } - - self._paraminfo[path]['parameters'] = params.values() - if (help_text.find('\n\nThis module only accepts POST ' - 'requests.\n', start) < end): - self._paraminfo[path]['mustbeposted'] = '' - # All actions which must be POSTed are write actions except for - # login. Because Request checks if the user is logged in when - # doing a write action the check would always fail on login. - # Purge is the only action which isn't POSTed but actually does - # require writerights. This was checked with the data from - # 1.25wmf22 on en.wikipedia.org. - if ('mustbeposted' in self._paraminfo[path] - and path != 'login') or path == 'purge': - self._paraminfo[path]['writerights'] = '' - - self._emulate_pageset() - @staticmethod def _modules_to_set(modules): """Return modules as a set. @@ -592,13 +410,6 @@ assert 'query' in self._modules or 'paraminfo' not in self._paraminfo - if self.site.mw_version < '1.12': - # When the help is parsed, all paraminfo should already be loaded - # and the caller is responsible for detecting missing modules. - pywikibot.log('ParamInfo did not detect modules: %s' - % modules, _logger=_logger) - return - # If something went wrong in a batch it can add each module to the # batch and the generator will on the next iteration yield each module # separately diff --git a/pywikibot/page.py b/pywikibot/page.py index d2be85c..657bbf8 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -2954,7 +2954,6 @@ if total == 0: return - @need_version('1.13') def isEmptyCategory(self): """ Return True if category has no members (including subcategories). @@ -2964,7 +2963,6 @@ ci = self.categoryinfo return sum(ci[k] for k in ['files', 'pages', 'subcats']) == 0 - @need_version('1.11') def isHiddenCategory(self): """ Return True if the category is hidden. diff --git a/pywikibot/site.py b/pywikibot/site.py index bf135f5..0a2c5c6 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -159,10 +159,7 @@ namespace alias*] If the canonical_name is not provided for a namespace between -2 - and 15, the MediaWiki 1.14+ built-in names are used. - Enable use_image_name to use built-in names from MediaWiki 1.13 - and earlier as the details. - + and 15, the MediaWiki built-in names are used. Image and File are aliases of each other by default. If only one of canonical_name and custom_name are available, both @@ -212,8 +209,9 @@ 15: 'Category talk', } + @deprecated_args(use_image_name=None) def __init__(self, id, canonical_name=None, custom_name=None, - aliases=None, use_image_name=False, **kwargs): + aliases=None, **kwargs): """Initializer. @param custom_name: Name defined in server LocalSettings.php @@ -222,27 +220,9 @@ @type canonical_name: str @param aliases: Aliases @type aliases: list of unicode - @param use_image_name: Use 'Image' as default canonical - for 'File' namespace - @param use_image_name: bool - """ self.id = id - - if aliases is None: - self.aliases = [] - else: - self.aliases = aliases - - if not canonical_name and id in self.canonical_namespaces: - if use_image_name: - if id == 6: - canonical_name = 'Image' - elif id == 7: - canonical_name = 'Image talk' - - if not canonical_name: - canonical_name = self.canonical_namespaces[id] + canonical_name = canonical_name or self.canonical_namespaces.get(id) assert custom_name is not None or canonical_name is not None, \ 'Namespace needs to have at least one name' @@ -252,19 +232,15 @@ self.canonical_name = canonical_name \ if canonical_name is not None else custom_name - if not aliases: - if id in (6, 7): - if use_image_name: - alias = 'File' - else: - alias = 'Image' - if id == 7: - alias += ' talk' - self.aliases = [alias] - else: - self.aliases = [] - else: + if aliases: self.aliases = aliases + elif id in (6, 7): + alias = 'Image' + if id == 7: + alias += ' talk' + self.aliases = [alias] + else: + self.aliases = [] for key, value in kwargs.items(): setattr(self, key, value) @@ -422,10 +398,16 @@ return default_case @classmethod - def builtin_namespaces(cls, use_image_name=False, case='first-letter'): + @deprecated_args(use_image_name=None) + def builtin_namespaces(cls, use_image_name=None, case='first-letter'): """Return a dict of the builtin namespaces.""" - return {i: cls(i, use_image_name=use_image_name, - case=cls.default_case(i, case)) for i in range(-2, 16)} + if use_image_name is not None: + issue_deprecation_warning( + 'positional argument of "use_image_name"', None, 3, + DeprecationWarning, since='20181015') + + return {i: cls(i, case=cls.default_case(i, case)) + for i in range(-2, 16)} @staticmethod def normalize_name(name): @@ -1032,9 +1014,7 @@ def _build_namespaces(self): """Create default namespaces.""" - use_image_name = MediaWikiVersion( - self.version()) < MediaWikiVersion('1.14') - return Namespace.builtin_namespaces(use_image_name) + return Namespace.builtin_namespaces() @property def namespaces(self): @@ -2530,7 +2510,6 @@ return msgs['comma-separator'].join( args[:-2] + [concat.join(args[-2:])]) - @need_version('1.12') @deprecated_args(string='text') def expand_text(self, text, title=None, includecomments=None): """Parse the given text for preprocessing and rendering. @@ -2603,7 +2582,6 @@ getcurrenttime = redirect_func(server_time, old_name='getcurrenttime', class_name='APISite', since='20141225') - @need_version('1.14') def getmagicwords(self, word): """Return list of localized "word" magic words for the site.""" if not hasattr(self, '_magicwords'): @@ -2660,12 +2638,6 @@ def _build_namespaces(self): _namespaces = {} - # In MW 1.14, API siprop 'namespaces' added 'canonical', - # and Image became File with Image as an alias. - # For versions lower than 1.14, APISite needs to override - # the defaults defined in Namespace. - is_mw114 = self.mw_version >= '1.14' - for nsdata in self.siteinfo.get('namespaces', cache=False).values(): ns = nsdata.pop('id') custom_name = None @@ -2675,8 +2647,7 @@ custom_name = canonical_name else: custom_name = nsdata.pop('*') - if is_mw114: - canonical_name = nsdata.pop('canonical') + canonical_name = nsdata.pop('canonical') if 'content' not in nsdata: # mw < 1.16 nsdata['content'] = ns == 0 @@ -2688,9 +2659,7 @@ assert default_case == nsdata['case'], \ 'Default case is not consistent' - namespace = Namespace(ns, canonical_name, custom_name, - use_image_name=not is_mw114, - **nsdata) + namespace = Namespace(ns, canonical_name, custom_name, **nsdata) _namespaces[ns] = namespace for item in self.siteinfo.get('namespacealiases'): @@ -2706,7 +2675,6 @@ return _namespaces - @need_version('1.14') @deprecated('has_extension', since='20140819') def hasExtension(self, name, unknown=None): """Determine whether extension `name` is loaded. @@ -2729,7 +2697,6 @@ return True return False - @need_version('1.14') def has_extension(self, name): """Determine whether extension `name` is loaded. @@ -3566,7 +3533,7 @@ # patrol token require special handling. # TODO: try to catch exceptions? if 'patrol' in valid_tokens: - if '1.14' <= mw_ver < '1.17': + if mw_ver < '1.17': if 'edit' in user_tokens: user_tokens['patrol'] = user_tokens['edit'] else: @@ -3947,10 +3914,7 @@ if isinstance(member_type, basestring): member_type = {member_type} - if member_type and (sortby == 'timestamp' or self.mw_version < '1.12'): - # Retrofit cmtype/member_type, available on MW API 1.12+, - # to use namespaces available on earlier versions. - + if member_type and sortby == 'timestamp': # Covert namespaces to a known type namespaces = set(self.namespaces.resolve(namespaces or [])) @@ -4840,10 +4804,7 @@ issue_deprecation_warning("where='titles'", "where='title'", 2, since='20160224') - if self.mw_version < '1.11': - where = 'titles' - else: - where = 'title' + where = 'title' if not namespaces and namespaces != 0: namespaces = [ns_id for ns_id in self.namespaces if ns_id >= 0] srgen = self._generator(api.PageGenerator, type_arg='search', @@ -5887,7 +5848,6 @@ yield result['patrol'] - @need_version('1.12') @must_be(group='sysop') def blockuser(self, user, expiry, reason, anononly=True, nocreate=True, autoblock=True, noemail=False, reblock=False): @@ -5939,7 +5899,6 @@ data = req.submit() return data - @need_version('1.12') @must_be(group='sysop') def unblockuser(self, user, reason=None): """ diff --git a/tests/api_tests.py b/tests/api_tests.py index cd68929..2f99b16 100644 --- a/tests/api_tests.py +++ b/tests/api_tests.py @@ -194,9 +194,7 @@ self.assertIn('main', pi._paraminfo) self.assertIn('paraminfo', pi._paraminfo) - if self.site.mw_version >= '1.12': - self.assertEqual(len(pi), - len(pi.preloaded_modules)) + self.assertEqual(len(pi), len(pi.preloaded_modules)) self.assertIn('info', pi.query_modules) self.assertIn('login', pi._action_modules) @@ -234,9 +232,6 @@ self.assertIn('paraminfo', pi._paraminfo) self.assertIn('pageset', pi._paraminfo) - if self.site.mw_version < '1.12': - return - if 'query' in pi.preloaded_modules: self.assertIn('query', pi._paraminfo) self.assertEqual(len(pi), 4) @@ -281,9 +276,7 @@ self.assertIn('main', pi._paraminfo) self.assertIn('paraminfo', pi._paraminfo) - if self.site.mw_version >= '1.12': - self.assertEqual(len(pi), - 1 + len(pi.preloaded_modules)) + self.assertEqual(len(pi), 1 + len(pi.preloaded_modules)) self.assertEqual(pi['info']['prefix'], 'in') @@ -295,9 +288,6 @@ self.assertIsInstance(param['type'], list) - if self.site.mw_version < '1.12': - return - self.assertIn('protection', param['type']) def test_with_module_revisions(self): @@ -310,9 +300,7 @@ self.assertIn('main', pi._paraminfo) self.assertIn('paraminfo', pi._paraminfo) - if self.site.mw_version >= '1.12': - self.assertEqual(len(pi), - 1 + len(pi.preloaded_modules)) + self.assertEqual(len(pi), 1 + len(pi.preloaded_modules)) self.assertEqual(pi['revisions']['prefix'], 'rv') @@ -324,9 +312,6 @@ self.assertIsInstance(param['type'], list) - if self.site.mw_version < '1.12': - return - self.assertIn('user', param['type']) def test_multiple_modules(self): @@ -341,11 +326,7 @@ self.assertIn('main', pi._paraminfo) self.assertIn('paraminfo', pi._paraminfo) - if self.site.mw_version < '1.12': - return - - self.assertEqual(len(pi), - 2 + len(pi.preloaded_modules)) + self.assertEqual(len(pi), 2 + len(pi.preloaded_modules)) def test_with_invalid_module(self): """Test requesting different kind of invalid modules.""" @@ -364,11 +345,7 @@ self.assertIn('main', pi._paraminfo) self.assertIn('paraminfo', pi._paraminfo) - if self.site.mw_version < '1.12': - return - - self.assertEqual(len(pi), - len(pi.preloaded_modules)) + self.assertEqual(len(pi), len(pi.preloaded_modules)) def test_submodules(self): """Test another module apart from query having submodules.""" @@ -467,9 +444,7 @@ self.assertIn('main', pi._paraminfo) self.assertIn('paraminfo', pi._paraminfo) - if self.site.mw_version >= '1.12': - self.assertEqual(len(pi), - 1 + len(pi.preloaded_modules)) + self.assertEqual(len(pi), 1 + len(pi.preloaded_modules)) self.assertIn('query+revisions', pi.prefix_map) diff --git a/tests/dry_api_tests.py b/tests/dry_api_tests.py index f93a98c..285637d 100644 --- a/tests/dry_api_tests.py +++ b/tests/dry_api_tests.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """API tests which do not interact with a site.""" # -# (C) Pywikibot team, 2012-2018 +# (C) Pywikibot team, 2012-2019 # # Distributed under the terms of the MIT license. # @@ -155,7 +155,7 @@ self._siteinfo = DummySiteinfo({'case': 'first-letter'}) def version(self): - return '1.13' # pre 1.14 + return '1.14' # lowest supported release def protocol(self): return 'http' diff --git a/tests/dry_site_tests.py b/tests/dry_site_tests.py index bc240e4..b49aadc 100644 --- a/tests/dry_site_tests.py +++ b/tests/dry_site_tests.py @@ -140,7 +140,7 @@ self._logged_in_as = None self.obsolete = False super(TestMustBe, self).setUp() - self.version = lambda: '1.13' # pre 1.14 + self.version = lambda: '1.14' # lowest supported release def login(self, sysop): """Fake the log in and just store who logged in.""" @@ -213,43 +213,43 @@ def setUp(self): """Set up test method.""" super(TestNeedVersion, self).setUp() - self.version = lambda: '1.13' + self.version = lambda: '1.23' - @need_version('1.14') + @need_version('1.24') def too_new(self): """Method which is to new.""" return True - @need_version('1.13') + @need_version('1.23') def old_enough(self): """Method which is as new as the server.""" return True - @need_version('1.12') + @need_version('1.22') def older(self): """Method which is old enough.""" return True - @need_version('1.14') + @need_version('1.24') @deprecated def deprecated_unavailable_method(self): """Method which is to new and then deprecated.""" return True @deprecated - @need_version('1.14') + @need_version('1.24') def deprecated_unavailable_method2(self): """Method which is deprecated first and then to new.""" return True - @need_version('1.12') + @need_version('1.22') @deprecated def deprecated_available_method(self): """Method which is old enough and then deprecated.""" return True @deprecated - @need_version('1.12') + @need_version('1.22') def deprecated_available_method2(self): """Method which is deprecated first and then old enough.""" return True diff --git a/tests/namespace_tests.py b/tests/namespace_tests.py index 08f9c86..e8e364f 100644 --- a/tests/namespace_tests.py +++ b/tests/namespace_tests.py @@ -19,7 +19,8 @@ UnicodeType as unicode, ) -from tests.aspects import unittest, TestCase, AutoDeprecationTestCase +from tests.aspects import (CapturingTestCase, DeprecationTestCase, + TestCase, unittest) # Default namespaces which should work in any MW wiki _base_builtin_ns = { @@ -230,7 +231,7 @@ self.assertEqual(a, b) -class TestNamespaceDictDeprecated(AutoDeprecationTestCase): +class TestNamespaceDictDeprecated(CapturingTestCase, DeprecationTestCase): """Test static/classmethods in Namespace replaced by NamespacesDict.""" @@ -316,17 +317,13 @@ def test_lookup_name(self): """Test Namespace.lookup_name.""" - file_nses = Namespace.builtin_namespaces(use_image_name=False) - image_nses = Namespace.builtin_namespaces(use_image_name=True) + file_nses = Namespace.builtin_namespaces() for name, ns_id in builtin_ns.items(): file_ns = Namespace.lookup_name(name, file_nses) self.assertIsInstance(file_ns, Namespace) - image_ns = Namespace.lookup_name(name, image_nses) - self.assertIsInstance(image_ns, Namespace) with self.disable_assert_capture(): self.assertEqual(file_ns.id, ns_id) - self.assertEqual(image_ns.id, ns_id) class TestNamespaceCollections(TestCase): -- To view, visit https://gerrit.wikimedia.org/r/463775 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If85dec45e51d453fac6cb285b8d0c35b22c2bdcc Gerrit-Change-Number: 463775 Gerrit-PatchSet: 13 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75) Gerrit-CC: Dalba <dalba.wiki(a)gmail.com>

1 0

[Gerrit] pywikibot/core[master]: proofreadpage.py: handle http response code in OCR methods
by jenkins-bot (Code Review) 16 Feb '19

16 Feb '19

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/491008 ) Change subject: proofreadpage.py: handle http response code in OCR methods ...................................................................... proofreadpage.py: handle http response code in OCR methods Handle http response code in ProofreadPage._ocr_callback() Skip tests if a server error occurred. Review needed tests accordingly. Bug: T212076 Change-Id: I87b84d26902cc0f9f27d08d202e8d2bfae0fa0c2 --- M pywikibot/proofreadpage.py M tests/proofreadpage_tests.py 2 files changed, 16 insertions(+), 24 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/proofreadpage.py b/pywikibot/proofreadpage.py index 5cc311b..2c51e3c 100644 --- a/pywikibot/proofreadpage.py +++ b/pywikibot/proofreadpage.py @@ -608,6 +608,9 @@ _logger) break + if 400 <= response.status < 600: + return (True, 'Http response status {0}'.format(response.status)) + data = json.loads(response.text) if ocr_tool == self._PHETOOLS: # phetools diff --git a/tests/proofreadpage_tests.py b/tests/proofreadpage_tests.py index 2483bed..ebabb93 100644 --- a/tests/proofreadpage_tests.py +++ b/tests/proofreadpage_tests.py @@ -11,7 +11,6 @@ import pywikibot -from pywikibot.comms import http from pywikibot.data import api from pywikibot.proofreadpage import IndexPage, ProofreadPage @@ -344,7 +343,6 @@ 'the year 1572,\nBY D. APPLETON & CO.\n' 'In the Office of the Librarian of ' 'Congress, at Washington.\n4 334\n'), - 'ws_ocr_daemon_msg': 'ws_ocr_daemon robot is not running.', } def setUp(self): @@ -361,48 +359,39 @@ def test_do_hocr(self): """Test page._do_hocr().""" error, text = self.page._do_hocr() + if error: + self.skipTest(text) ref_error, ref_text = self.data['hocr'] self.assertEqual(error, ref_error) self.assertEqual(text, ref_text) - def test_do_ocr_phetools_raw_request(self): - """Test page._do_ocr connection with wmflabs.""" - uri = ('https://tools.wmflabs.org/phetools/ocr.php?cmd=ocr' - '&url=https://upload.wikimedia.org/wikipedia/commons/' - 'thumb/a/ac/Popular_Science_Monthly_Volume_1.djvu/' - 'page10-1024px-Popular_Science_Monthly_Volume_1.djvu.jpg' - '&lang=en&user=None') - response = http.fetch(uri) - self.assertEqual(response.status, 200) - - # Check that ws_ocr_daemon robot is running, otherwise skip test. - data = json.loads(response.text) - if data['text'].startswith(self.data['ws_ocr_daemon_msg']): - self.skipTest(self.data['ws_ocr_daemon_msg']) - def test_do_ocr_phetools(self): """Test page._do_ocr(ocr_tool='phetools').""" error, text = self.page._do_ocr(ocr_tool='phetools') ref_error, ref_text = self.data['ocr'] - - # Check that ws_ocr_daemon robot is running, otherwise skip test. - if text.startswith(self.data['ws_ocr_daemon_msg']): - self.skipTest(self.data['ws_ocr_daemon_msg']) + if error: + self.skipTest(text) self.assertEqual(error, ref_error) self.assertEqual(text, ref_text) def test_do_ocr_googleocr(self): """Test page._do_ocr(ocr_tool='googleOCR').""" error, text = self.page._do_ocr(ocr_tool='googleOCR') + if error: + self.skipTest(text) ref_error, ref_text = self.data['googleOCR'] self.assertEqual(error, ref_error) self.assertEqual(text, ref_text) def test_ocr_googleocr(self): """Test page.ocr(ocr_tool='googleOCR').""" - text = self.page.ocr(ocr_tool='googleOCR') - ref_error, ref_text = self.data['googleOCR'] - self.assertEqual(text, ref_text) + try: + text = self.page.ocr(ocr_tool='googleOCR') + except Exception as exc: + self.assertIsInstance(exc, ValueError) + else: + ref_error, ref_text = self.data['googleOCR'] + self.assertEqual(text, ref_text) @require_modules('bs4') -- To view, visit https://gerrit.wikimedia.org/r/491008 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I87b84d26902cc0f9f27d08d202e8d2bfae0fa0c2 Gerrit-Change-Number: 491008 Gerrit-PatchSet: 1 Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [Bugfix] Don't use sets in Claim.__eq__
by jenkins-bot (Code Review) 16 Feb '19

16 Feb '19

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/489733 ) Change subject: [Bugfix] Don't use sets in Claim.__eq__ ...................................................................... [Bugfix] Don't use sets in Claim.__eq__ Since Claim doesn't have __hash__, it cannot be added to a set. Unless it's implemented (unlikely since it's a mutable object), we have to use lists and linear searching. Change-Id: I0647429af6653c9b8f2d8dc346e7df39dcad73c0 --- M pywikibot/page.py M tests/wikibase_tests.py 2 files changed, 176 insertions(+), 8 deletions(-) Approvals: Mpaa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index d2be85c..b29e7a3 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -4878,9 +4878,17 @@ if getattr(self, attr) != getattr(other, attr): return False - my_qualifiers = set(chain.from_iterable(self.qualifiers.values())) - other_qualifiers = set(chain.from_iterable(other.qualifiers.values())) - return my_qualifiers == other_qualifiers + my_qualifiers = list(chain.from_iterable(self.qualifiers.values())) + other_qualifiers = list(chain.from_iterable(other.qualifiers.values())) + if len(my_qualifiers) != len(other_qualifiers): + return False + for q in my_qualifiers: + if q not in other_qualifiers: + return False + for q in other_qualifiers: + if q not in my_qualifiers: + return False + return True def __ne__(self, other): return not self.__eq__(other) diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index c979a41..b5d609e 100644 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Tests for the Wikidata parts of the page module.""" # -# (C) Pywikibot team, 2008-2018 +# (C) Pywikibot team, 2008-2019 # # Distributed under the terms of the MIT license. # @@ -1281,7 +1281,7 @@ ItemPage.from_entity_uri(repo, entity_uri) def test_from_entity_uri_no_item(self): - """Test ItemPage.from_entity_uri with non-exitent item.""" + """Test ItemPage.from_entity_uri with non-existent item.""" repo = self.get_repo() entity_uri = 'http://www.wikidata.org/entity/Q999999999999999999' regex = r"^Page .+ doesn't exist\.$" @@ -1289,7 +1289,7 @@ ItemPage.from_entity_uri(repo, entity_uri) def test_from_entity_uri_no_item_lazy(self): - """Test ItemPage.from_entity_uri with lazy loaded non-exitent item.""" + """Test ItemPage.from_entity_uri with lazy loaded non-existent item.""" repo = self.get_repo() entity_uri = 'http://www.wikidata.org/entity/Q999999999999999999' expected_item = ItemPage(repo, 'Q999999999999999999') @@ -1393,6 +1393,166 @@ self.assertEqual(claim.target, property_page) +class TestClaim(WikidataTestCase): + + """Test Claim object functionality.""" + + def test_claim_eq_simple(self): + """ + Test comparing two claims. + + If they have the same property and value, they are equal. + """ + wikidata = self.get_repo() + claim1 = pywikibot.Claim(wikidata, 'P31') + claim1.setTarget(pywikibot.ItemPage(wikidata, 'Q5')) + claim2 = pywikibot.Claim(wikidata, 'P31') + claim2.setTarget(pywikibot.ItemPage(wikidata, 'Q5')) + self.assertEqual(claim1, claim2) + self.assertEqual(claim2, claim1) + + def test_claim_eq_simple_different_value(self): + """ + Test comparing two claims. + + If they have the same property and different values, + they are not equal. + """ + wikidata = self.get_repo() + claim1 = pywikibot.Claim(wikidata, 'P31') + claim1.setTarget(pywikibot.ItemPage(wikidata, 'Q5')) + claim2 = pywikibot.Claim(wikidata, 'P31') + claim2.setTarget(pywikibot.ItemPage(wikidata, 'Q1')) + self.assertNotEqual(claim1, claim2) + self.assertNotEqual(claim2, claim1) + + def test_claim_eq_simple_different_rank(self): + """ + Test comparing two claims. + + If they have the same property and value and different ranks, + they are equal. + """ + wikidata = self.get_repo() + claim1 = pywikibot.Claim(wikidata, 'P31') + claim1.setTarget(pywikibot.ItemPage(wikidata, 'Q5')) + claim1.setRank('preferred') + claim2 = pywikibot.Claim(wikidata, 'P31') + claim2.setTarget(pywikibot.ItemPage(wikidata, 'Q5')) + self.assertEqual(claim1, claim2) + self.assertEqual(claim2, claim1) + + def test_claim_eq_simple_different_snaktype(self): + """ + Test comparing two claims. + + If they have the same property and different snaktypes, + they are not equal. + """ + wikidata = self.get_repo() + claim1 = pywikibot.Claim(wikidata, 'P31') + claim1.setTarget(pywikibot.ItemPage(wikidata, 'Q5')) + claim2 = pywikibot.Claim(wikidata, 'P31') + claim2.setSnakType('novalue') + self.assertNotEqual(claim1, claim2) + self.assertNotEqual(claim2, claim1) + + def test_claim_eq_simple_different_property(self): + """ + Test comparing two claims. + + If they have the same value and different properties, + they are not equal. + """ + wikidata = self.get_repo() + claim1 = pywikibot.Claim(wikidata, 'P31') + claim1.setTarget(pywikibot.ItemPage(wikidata, 'Q5')) + claim2 = pywikibot.Claim(wikidata, 'P21') + claim2.setTarget(pywikibot.ItemPage(wikidata, 'Q5')) + self.assertNotEqual(claim1, claim2) + self.assertNotEqual(claim2, claim1) + + def test_claim_eq_with_qualifiers(self): + """ + Test comparing two claims. + + If they have the same property, value and qualifiers, they are equal. + """ + wikidata = self.get_repo() + claim1 = pywikibot.Claim(wikidata, 'P31') + claim1.setTarget(pywikibot.ItemPage(wikidata, 'Q5')) + qualifier1 = pywikibot.Claim(wikidata, 'P214', is_qualifier=True) + qualifier1.setTarget('foo') + claim1.addQualifier(qualifier1) + claim2 = pywikibot.Claim(wikidata, 'P31') + claim2.setTarget(pywikibot.ItemPage(wikidata, 'Q5')) + qualifier2 = pywikibot.Claim(wikidata, 'P214', is_qualifier=True) + qualifier2.setTarget('foo') + claim2.addQualifier(qualifier2) + self.assertEqual(claim1, claim2) + self.assertEqual(claim2, claim1) + + def test_claim_eq_with_different_qualifiers(self): + """ + Test comparing two claims. + + If they have the same property and value and different qualifiers, + they are not equal. + """ + wikidata = self.get_repo() + claim1 = pywikibot.Claim(wikidata, 'P31') + claim1.setTarget(pywikibot.ItemPage(wikidata, 'Q5')) + qualifier1 = pywikibot.Claim(wikidata, 'P214', is_qualifier=True) + qualifier1.setTarget('foo') + claim1.addQualifier(qualifier1) + claim2 = pywikibot.Claim(wikidata, 'P31') + claim2.setTarget(pywikibot.ItemPage(wikidata, 'Q5')) + qualifier2 = pywikibot.Claim(wikidata, 'P214', is_qualifier=True) + qualifier2.setTarget('bar') + claim2.addQualifier(qualifier2) + self.assertNotEqual(claim1, claim2) + self.assertNotEqual(claim2, claim1) + + def test_claim_eq_one_without_qualifiers(self): + """ + Test comparing two claims. + + If they have the same property and value and one of them has + no qualifiers while the other one does, they are not equal. + """ + wikidata = self.get_repo() + claim1 = pywikibot.Claim(wikidata, 'P31') + claim1.setTarget(pywikibot.ItemPage(wikidata, 'Q5')) + qualifier = pywikibot.Claim(wikidata, 'P214', is_qualifier=True) + qualifier.setTarget('foo') + claim1.addQualifier(qualifier) + claim2 = pywikibot.Claim(wikidata, 'P31') + claim2.setTarget(pywikibot.ItemPage(wikidata, 'Q5')) + self.assertNotEqual(claim1, claim2) + self.assertNotEqual(claim2, claim1) + + def test_claim_eq_with_different_sources(self): + """ + Test comparing two claims. + + If they have the same property and value and different sources, + they are equal. + """ + wikidata = self.get_repo() + claim1 = pywikibot.Claim(wikidata, 'P31') + claim1.setTarget(pywikibot.ItemPage(wikidata, 'Q5')) + source1 = pywikibot.Claim(wikidata, 'P143', is_reference=True) + source1.setTarget(pywikibot.ItemPage(wikidata, 'Q328')) + claim1.addSource(source1) + claim2 = pywikibot.Claim(wikidata, 'P31') + claim2.setTarget(pywikibot.ItemPage(wikidata, 'Q5')) + source2 = pywikibot.Claim(wikidata, 'P143', is_reference=True) + source2.setTarget(pywikibot.ItemPage(wikidata, 'Q48183')) + claim2.addSource(source2) + self.assertEqual(claim1, claim2) + self.assertEqual(claim2, claim1) + + class TestClaimSetValue(WikidataTestCase): """Test setting claim values.""" @@ -1437,8 +1597,8 @@ wikidata = self.get_repo() claim = pywikibot.Claim(wikidata, 'P214') self.assertEqual(claim.type, 'external-id') - claim.setTarget('Any string is avalid identifier') - self.assertEqual(claim.target, 'Any string is avalid identifier') + claim.setTarget('Any string is a valid identifier') + self.assertEqual(claim.target, 'Any string is a valid identifier') def test_set_date(self): """Test setting claim of time type.""" -- To view, visit https://gerrit.wikimedia.org/r/489733 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0647429af6653c9b8f2d8dc346e7df39dcad73c0 Gerrit-Change-Number: 489733 Gerrit-PatchSet: 8 Gerrit-Owner: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Lokal Profil <andre.costa(a)wikimedia.se> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/i18n[master]: Localisation updates from https://translatewiki.net.
by jenkins-bot (Code Review) 14 Feb '19

14 Feb '19

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/490546 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: I3bfcb856e18b94db7ae02fa06b9b594894e07410 --- M add_text/pt.json M add_text/ru.json M archivebot/bg.json M archivebot/pt.json M basic/pt.json M blockpageschecker/pt.json M capitalize_redirects/pt.json M casechecker/bg.json M casechecker/pt.json M catall/pt.json M category/bg.json M category/pt.json M category_redirect/es.json A checkimages/bg.json M commons/bg.json A disambredir/bg.json A editarticle/bg.json M editarticle/pt.json A featured/bg.json A followlive/bg.json M image/bg.json A listpages/bg.json A makecat/bg.json A movepages/bg.json A pagefromfile/bg.json M piper/ru.json A protect/bg.json M pywikibot/ar.json M pywikibot/de.json M pywikibot/fa.json M pywikibot/mk.json M pywikibot/pt.json M pywikibot/ru.json M pywikibot/uk.json M remove_edp_images/ru.json M weblinkchecker/diq.json M weblinkchecker/pt.json M welcome/pt.json 38 files changed, 179 insertions(+), 60 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/add_text/pt.json b/add_text/pt.json index 2abf8de..4040ccb 100644 --- a/add_text/pt.json +++ b/add_text/pt.json @@ -1,8 +1,9 @@ { "@metadata": { "authors": [ - "Vitorvicentevalente" + "Vitorvicentevalente", + "Hamilton Abreu" ] }, - "add_text-adding": "Robô: A adicionar %(adding)s" + "add_text-adding": "Robô: adição de %(adding)s" } diff --git a/add_text/ru.json b/add_text/ru.json index 611155d..2a66aaa 100644 --- a/add_text/ru.json +++ b/add_text/ru.json @@ -3,8 +3,9 @@ "authors": [ "Rubin16", "Volkov", - "Dima st bk" + "Dima st bk", + "Movses" ] }, - "add_text-adding": "Бот добавил: %(adding)s" + "add_text-adding": "Бот: добавлено %(adding)s" } diff --git a/archivebot/bg.json b/archivebot/bg.json index cc51497..0c44bfb 100644 --- a/archivebot/bg.json +++ b/archivebot/bg.json @@ -2,9 +2,11 @@ "@metadata": { "authors": [ "Xqt", - "Vodnokon4e" + "Vodnokon4e", + "Vlad5250" ] }, "archivebot-archive-full": "(АРХИВЪТ Е ПЪЛЕН)", - "archivebot-archiveheader": "{{Архив беседа}}" + "archivebot-archiveheader": "{{Архив беседа}}", + "archivebot-older-than": "по-старо от %(duration)s" } diff --git a/archivebot/pt.json b/archivebot/pt.json index b626db7..88f41ba 100644 --- a/archivebot/pt.json +++ b/archivebot/pt.json @@ -5,12 +5,13 @@ "Waldir", "Xqt", "Macofe", - "Mansil" + "Mansil", + "Hamilton Abreu" ] }, "archivebot-archive-full": "(ARQUIVO CHEIO)", - "archivebot-archive-summary": "Robô: A arquivar {{PLURAL:%(count)d|thread|threads}} de [[%(from)s]]", + "archivebot-archive-summary": "Robô: arquivamento de %(count)d {{PLURAL:%(count)d|tópico|tópicos}} de [[%(from)s]]", "archivebot-archiveheader": "{{Arquivo de discussão}}", "archivebot-older-than": "mais antigo que %(duration)s", - "archivebot-page-summary": "Robô: A arquivar {{PLURAL:%(count)d|thread|threads}} (%(why)s) em %(archives)s" + "archivebot-page-summary": "Robô: arquivamento de %(count)d {{PLURAL:%(count)d|tópico|tópicos}} (%(why)s) em %(archives)s" } diff --git a/basic/pt.json b/basic/pt.json index b686c5f..9ec83b1 100644 --- a/basic/pt.json +++ b/basic/pt.json @@ -4,5 +4,5 @@ "Hamilton Abreu" ] }, - "basic-changing": "Robô: A alterar ..." + "basic-changing": "Robô: alteração..." } diff --git a/blockpageschecker/pt.json b/blockpageschecker/pt.json index 0ea14e4..6363e41 100644 --- a/blockpageschecker/pt.json +++ b/blockpageschecker/pt.json @@ -1,8 +1,9 @@ { "@metadata": { "authors": [ - "Vitorvicentevalente" + "Vitorvicentevalente", + "Hamilton Abreu" ] }, - "blockpageschecker-summary": "Robô: A retirar predefinição de proteção" + "blockpageschecker-summary": "Robô: remoção de predefinição obsoleta" } diff --git a/capitalize_redirects/pt.json b/capitalize_redirects/pt.json index 2ed0434..26ea19d 100644 --- a/capitalize_redirects/pt.json +++ b/capitalize_redirects/pt.json @@ -1,8 +1,9 @@ { "@metadata": { "authors": [ - "Giro720" + "Giro720", + "Hamilton Abreu" ] }, - "capitalize_redirects-create-redirect": "Robô: A criar redirecionamento para [[%(to)s]]" + "capitalize_redirects-create-redirect": "Robô: criação de redirecionamento para [[%(to)s]]" } diff --git a/casechecker/bg.json b/casechecker/bg.json index 21b7240..14a72ba 100644 --- a/casechecker/bg.json +++ b/casechecker/bg.json @@ -1,8 +1,11 @@ { "@metadata": { "authors": [ - "Vodnokon4e" + "Vodnokon4e", + "Vlad5250" ] }, - "casechecker-replacement-linklist": "%(source)s→%(target)s" + "casechecker-rename": "Бот: преименуване с мешани големи/малки букви", + "casechecker-replacement-linklist": "%(source)s→%(target)s", + "casechecker-replacement-summary": "Бот: Замени на големи/малки букви:" } diff --git a/casechecker/pt.json b/casechecker/pt.json index 1cf19da..60cd18b 100644 --- a/casechecker/pt.json +++ b/casechecker/pt.json @@ -7,9 +7,9 @@ "Hamilton Abreu" ] }, - "casechecker-delete-reason": "Este redirecionamento é usado para apontar a %(target)s", - "casechecker-delete-summary": "Robô: Este redirecionamento contém caracteres cirílicos e latinos no título", - "casechecker-rename": "Robô: renomear com maiúsculas/minúsculas combinadas", + "casechecker-delete-reason": "Este redirecionamento apontava para %(target)s", + "casechecker-delete-summary": "Robô: este redirecionamento contém caracteres cirílicos e latinos de aparência idêntica no título", + "casechecker-rename": "Robô: alteração do nome por mistura de alfabetos", "casechecker-replacement-linklist": "%(source)s→%(target)s", - "casechecker-replacement-summary": "Robô: Modificações de casos:" + "casechecker-replacement-summary": "Robô: substituição de maiúsculas/minúsculas:" } diff --git a/catall/pt.json b/catall/pt.json index c10de09..80b9cbe 100644 --- a/catall/pt.json +++ b/catall/pt.json @@ -2,8 +2,9 @@ "@metadata": { "authors": [ "Xqt", - "Vitorvicentevalente" + "Vitorvicentevalente", + "Hamilton Abreu" ] }, - "catall-changing": "Robô: A alterar categorias" + "catall-changing": "Robô: alteração de categorias" } diff --git a/category/bg.json b/category/bg.json index 95715e8..50fc742 100644 --- a/category/bg.json +++ b/category/bg.json @@ -2,10 +2,12 @@ "@metadata": { "authors": [ "DCLXVI", - "Vodnokon4e" + "Vodnokon4e", + "Vlad5250" ] }, "category-adding": "Бот: Добавяне на категория [[:Category:%(newcat)s|%(newcat)s]]", + "category-also-in": "(също така в %(alsocat)s)", "category-removing": "Бот: Премахване от %(oldcat)s", "category-replacing": "Бот: Замяна на категория %(oldcat)s с %(newcat)s" } diff --git a/category/pt.json b/category/pt.json index 6b184d3..713e67d 100644 --- a/category/pt.json +++ b/category/pt.json @@ -6,12 +6,12 @@ "Waldir" ] }, - "category-adding": "Robô: A adicionar a categoria [[:Category:%(newcat)s|%(newcat)s]]", + "category-adding": "Robô: adição da categoria [[:Category:%(newcat)s|%(newcat)s]]", "category-also-in": "(também em %(alsocat)s)", - "category-listifying": "Robô: A listar a partir de %(fromcat)s ({{PLURAL:%(num)d|1 entrada|%(num)d entradas}})", - "category-removing": "Robô: A remover de %(oldcat)s", - "category-renamed": "Robô: Movida de %(oldcat)s. Autores: %(authors)s", - "category-replacing": "Robô: A substituir a categoria %(oldcat)s por %(newcat)s", + "category-listifying": "Robô: listagem dos artigos da categoria %(fromcat)s ({{PLURAL:%(num)d|1 entrada|%(num)d entradas}})", + "category-removing": "Robô: remoção da categoria %(oldcat)s", + "category-renamed": "Robô: movida de %(oldcat)s. Autores: %(authors)s", + "category-replacing": "Robô: substituição da categoria %(oldcat)s por %(newcat)s", "category-section-title": "Histórico de versões da antiga %(oldcat)s", "category-strip-cfd-templates": "Robô: Remoção de predefinições de discussão para ação concluída", "category-strip-sort-keys": "Robô: Remoção de chaves de ordenação para ação concluída", diff --git a/category_redirect/es.json b/category_redirect/es.json index 5382ff6..682c8dd 100644 --- a/category_redirect/es.json +++ b/category_redirect/es.json @@ -12,7 +12,7 @@ "category_redirect-change-category": "Bot: cambio de categoría redirigida de «[[:%(oldCatLink)s|%(oldCatTitle)s]]» a «[[:%(newCatLink)s|%(newCatTitle)s]]»", "category_redirect-comment": "Robot de mantenimento de categorías redirigidas", "category_redirect-edit-request": "Se necesita actualizar los enlaces a categorías en estas páginas protegidas: %(itemlist)s", - "category_redirect-edit-request-item": "* %(title)s está en %(oldcat)s, el cual redirecciona a %(newcat)s", + "category_redirect-edit-request-item": "* %(title)s está en %(oldcat)s, el cual redirige a %(newcat)s", "category_redirect-fix-double": "Robot: arreglo de redirección doble", "category_redirect-log-added": "* Añadido [[%(ns)s%(template)s]] a %(oldcat)s", "category_redirect-log-add-failed": "* Falló al añadirse [[%(ns)s%(template)s]] a %(oldcat)s", diff --git a/checkimages/bg.json b/checkimages/bg.json new file mode 100644 index 0000000..8ff7c6e --- /dev/null +++ b/checkimages/bg.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Vlad5250" + ] + }, + "checkimages-source-notice-comment": "Робот: Търси източник на информацията." +} diff --git a/commons/bg.json b/commons/bg.json index 1173a63..ee51892 100644 --- a/commons/bg.json +++ b/commons/bg.json @@ -1,8 +1,10 @@ { "@metadata": { "authors": [ - "DCLXVI" + "DCLXVI", + "Vlad5250" ] }, + "commons-file-moved": "[[:File:%(localfile)s|Файлът]] е преместен на [[:commons:File:%(commonsfile)s|Общомедия]].", "commons-file-now-available": "Файлът вече е наличен в [[:commons:File:%(commonsfile)s|Общомедия]]." } diff --git a/disambredir/bg.json b/disambredir/bg.json new file mode 100644 index 0000000..c357421 --- /dev/null +++ b/disambredir/bg.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Vlad5250" + ] + }, + "disambredir-msg": "Промяна на пренасочвания на пояснителна страница" +} diff --git a/editarticle/bg.json b/editarticle/bg.json new file mode 100644 index 0000000..9183585 --- /dev/null +++ b/editarticle/bg.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Vlad5250" + ] + }, + "editarticle-edit": "Ръчно редактиране с робот: %(description)s" +} diff --git a/editarticle/pt.json b/editarticle/pt.json index 9af892d..adfc8eb 100644 --- a/editarticle/pt.json +++ b/editarticle/pt.json @@ -1,8 +1,9 @@ { "@metadata": { "authors": [ - "Giro720" + "Giro720", + "Hamilton Abreu" ] }, - "editarticle-edit": "A editar manualmente com bot: %(description)s" + "editarticle-edit": "Edição manual com robô: %(description)s" } diff --git a/featured/bg.json b/featured/bg.json new file mode 100644 index 0000000..a645dd1 --- /dev/null +++ b/featured/bg.json @@ -0,0 +1,11 @@ +{ + "@metadata": { + "authors": [ + "Vlad5250" + ] + }, + "featured-featured": "Бот: %(page)s е избрана статия", + "featured-former": "Робот: %(page)s е бивша избрана статия", + "featured-good": "Робот: %(page)s е добра статия", + "featured-list": "Робот: %(page)s е избран списък" +} diff --git a/followlive/bg.json b/followlive/bg.json new file mode 100644 index 0000000..6a929ee --- /dev/null +++ b/followlive/bg.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Vlad5250" + ] + }, + "followlive-blanking": "Изпразнено. Съдържанието беше „%(content)s“." +} diff --git a/image/bg.json b/image/bg.json index 5912778..47a3967 100644 --- a/image/bg.json +++ b/image/bg.json @@ -1,8 +1,10 @@ { "@metadata": { "authors": [ - "Vodnokon4e" + "Vodnokon4e", + "Vlad5250" ] }, - "image-remove": "Бот: Премахване на картинка %(file)s" + "image-remove": "Бот: Премахване на картинка %(file)s", + "image-replace": "Бот: Заменяне на картинката %(old)s с %(new)s" } diff --git a/listpages/bg.json b/listpages/bg.json new file mode 100644 index 0000000..f2c5bb7 --- /dev/null +++ b/listpages/bg.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Vlad5250" + ] + }, + "listpages-save-list": "Бот: Запазване на създадения списък на страници." +} diff --git a/makecat/bg.json b/makecat/bg.json new file mode 100644 index 0000000..cd17bb0 --- /dev/null +++ b/makecat/bg.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Vlad5250" + ] + }, + "makecat-create": "Робот: Създаване или поднова на категорията [[:Category:%(cat)s|]]" +} diff --git a/movepages/bg.json b/movepages/bg.json new file mode 100644 index 0000000..4228300 --- /dev/null +++ b/movepages/bg.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Vlad5250" + ] + }, + "movepages-moving": "Робот: Преместена страницата" +} diff --git a/pagefromfile/bg.json b/pagefromfile/bg.json new file mode 100644 index 0000000..aeb56a4 --- /dev/null +++ b/pagefromfile/bg.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Vlad5250" + ] + }, + "pagefromfile-msg": "Бот: Автоматизирано внасяне на статии" +} diff --git a/piper/ru.json b/piper/ru.json index 2ad55aa..1b40faa 100644 --- a/piper/ru.json +++ b/piper/ru.json @@ -1,8 +1,9 @@ { "@metadata": { "authors": [ - "Amire80" + "Amire80", + "Movses" ] }, - "piper-edit-summary": "Робот: статья пропущена через %(filters)s" + "piper-edit-summary": "Бот: статья пропущена через %(filters)s" } diff --git a/protect/bg.json b/protect/bg.json new file mode 100644 index 0000000..55112c7 --- /dev/null +++ b/protect/bg.json @@ -0,0 +1,12 @@ +{ + "@metadata": { + "authors": [ + "Vlad5250" + ] + }, + "protect-category": "Робот: Защитаване на всички страници от категорията „%(cat)s“", + "protect-images": "Робот: Защитаване на всички изображения на страницата „%(page)s“", + "protect-links": "Робот: Защитаване на всички страници, свързани с „%(page)s“", + "protect-ref": "Робот: Защитаване на всички страници, отнасящи се до „%(page)s“", + "protect-simple": "Робот: Защитаване на списъка с файлове." +} diff --git a/pywikibot/ar.json b/pywikibot/ar.json index 8d717f4..ffe85b5 100644 --- a/pywikibot/ar.json +++ b/pywikibot/ar.json @@ -16,5 +16,6 @@ "pywikibot-enter-xml-filename": "الرجاء إدخال اسم ملف تفريغ XML:", "pywikibot-fixes-fckeditor": "بوت: تصحيح rich-editor html", "pywikibot-fixes-html": "بوت: تحويل/تصليح HTML", - "pywikibot-fixes-syntax": "بوت: تصليح تهيئة الويكي" + "pywikibot-fixes-syntax": "بوت: تصليح تهيئة الويكي", + "pywikibot-touch": "تحرير لمس بايثون ويكي بوت" } diff --git a/pywikibot/de.json b/pywikibot/de.json index 6123962..f6e76e1 100644 --- a/pywikibot/de.json +++ b/pywikibot/de.json @@ -16,5 +16,6 @@ "pywikibot-enter-xml-filename": "Bitte gib den Dateinamen des XML-Dumps ein:", "pywikibot-fixes-fckeditor": "Bot: Korrigiere Rich-Editor-HTML", "pywikibot-fixes-html": "Bot: konvertiere/korrigiere HTML", - "pywikibot-fixes-syntax": "Bot: Korrigiere Wiki-Syntax" + "pywikibot-fixes-syntax": "Bot: Korrigiere Wiki-Syntax", + "pywikibot-touch": "Pywikibot Nulledit-Bearbeitung" } diff --git a/pywikibot/fa.json b/pywikibot/fa.json index 9900b84..3f936c8 100644 --- a/pywikibot/fa.json +++ b/pywikibot/fa.json @@ -5,7 +5,8 @@ "Huji", "Ladsgroup", "Reza1615", - "ZxxZxxZ" + "ZxxZxxZ", + "Dalba" ] }, "pywikibot-enter-category-name": "لطفاً نام رده را وارد کنید:", @@ -17,5 +18,5 @@ "pywikibot-enter-xml-filename": "لطفاً نام پروندهٔ نسخه‌بردارى XML را وارد کنید:", "pywikibot-fixes-fckeditor": "ربات: تصحیح اچ‌تی‌ام‌ال ویرایشگر پیشرفته", "pywikibot-fixes-html": "ربات:تبدیل/تصحیح کدهای اچ‌تی‌ام‌ال", - "pywikibot-fixes-syntax": "ربات:تصحیح قالب ویکی‌نویسی" + "pywikibot-fixes-syntax": "ربات: اصلاح نحو ویکی" } diff --git a/pywikibot/mk.json b/pywikibot/mk.json index 37b2871..d4632d8 100644 --- a/pywikibot/mk.json +++ b/pywikibot/mk.json @@ -13,5 +13,6 @@ "pywikibot-enter-xml-filename": "Внесете го името на XML-складот:", "pywikibot-fixes-fckeditor": "Робот: Исправка на збогатен HMTL", "pywikibot-fixes-html": "Робот: Претворање/исправка на HTML", - "pywikibot-fixes-syntax": "Робот: Исправка на викисинтакса" + "pywikibot-fixes-syntax": "Робот: Исправка на викисинтакса", + "pywikibot-touch": "Ништовно уредување со Pywikibot" } diff --git a/pywikibot/pt.json b/pywikibot/pt.json index ab50470..42c4407 100644 --- a/pywikibot/pt.json +++ b/pywikibot/pt.json @@ -4,7 +4,8 @@ "Alchimista", "Leonardo Gregianin", "Malafaya", - "Vitorvicentevalente" + "Vitorvicentevalente", + "Hamilton Abreu" ] }, "pywikibot-enter-category-name": "Por favor, introduza o nome da categoria:", @@ -15,6 +16,7 @@ "pywikibot-enter-page-processing": "Que página deve ser processada?", "pywikibot-enter-xml-filename": "Por favor introduza o nome do ficheiro XML:", "pywikibot-fixes-fckeditor": "Robô: A corrigir o HTML gerado pelo editor visual.", - "pywikibot-fixes-html": "Robô: Corrigindo HTML", - "pywikibot-fixes-syntax": "Robô: Corrigindo sintaxe wiki" + "pywikibot-fixes-html": "Robô: Conversão ou correção de HTML", + "pywikibot-fixes-syntax": "Robô: Correção da sintaxe wiki", + "pywikibot-touch": "Edição por toque de Pywikibot" } diff --git a/pywikibot/ru.json b/pywikibot/ru.json index 891f9b6..47d0961 100644 --- a/pywikibot/ru.json +++ b/pywikibot/ru.json @@ -5,7 +5,8 @@ "Eleferen", "Rubin16", "Volkov", - "Okras" + "Okras", + "Movses" ] }, "pywikibot-enter-category-name": "Пожалуйста, введите название категории:", @@ -15,7 +16,8 @@ "pywikibot-enter-new-text": "Пожалуйста, введите новый текст:", "pywikibot-enter-page-processing": "Какая страница должна обрабатываться?", "pywikibot-enter-xml-filename": "Пожалуйста, введите имя файла дампа XML:", - "pywikibot-fixes-fckeditor": "Робот: Исправление HTML-кода редактора форматированного текста", + "pywikibot-fixes-fckeditor": "Бот: Исправление HTML-кода после редактора форматированного текста", "pywikibot-fixes-html": "Бот: коррекция HTML", - "pywikibot-fixes-syntax": "Бот: Коррекция вики синтаксиса" + "pywikibot-fixes-syntax": "Бот: Коррекция вики синтаксиса", + "pywikibot-touch": "Правка Pywikibot" } diff --git a/pywikibot/uk.json b/pywikibot/uk.json index c6e8998..d4baff8 100644 --- a/pywikibot/uk.json +++ b/pywikibot/uk.json @@ -5,7 +5,8 @@ "Base", "DixonD", "Dmitry Nikitin", - "Ата" + "Ата", + "Movses" ] }, "pywikibot-enter-category-name": "Введіть назву категорії:", @@ -17,5 +18,6 @@ "pywikibot-enter-xml-filename": "Будь ласка, введіть назву файлу дампу XML:", "pywikibot-fixes-fckeditor": "Робот: Виправлення html після редактора форматованого тексту", "pywikibot-fixes-html": "Бот: корекцiя HTML", - "pywikibot-fixes-syntax": "Бот: Корекцiя вiкi-синтаксису" + "pywikibot-fixes-syntax": "Бот: Корекцiя вiкi-синтаксису", + "pywikibot-touch": "Правка Pywikibot" } diff --git a/remove_edp_images/ru.json b/remove_edp_images/ru.json index 439f854..fe46150 100644 --- a/remove_edp_images/ru.json +++ b/remove_edp_images/ru.json @@ -1,8 +1,9 @@ { "@metadata": { "authors": [ - "Amire80" + "Amire80", + "Movses" ] }, - "remove_edp_images-edit-summary": "Робот: Исправления использования изображений EDP: [[%(title)s]]" + "remove_edp_images-edit-summary": "Бот: Исправления использования изображений EDP: [[%(title)s]]" } diff --git a/weblinkchecker/diq.json b/weblinkchecker/diq.json index efb4ae6..963a684 100644 --- a/weblinkchecker/diq.json +++ b/weblinkchecker/diq.json @@ -10,5 +10,5 @@ "weblinkchecker-badurl": "Gıreyo ke dayo ravêrde tew URL nêaseno", "weblinkchecker-caption": "Gıreyo merde", "weblinkchecker-report": "Cerdi tay otomatik bot de finayisdi xirabin vicyaya.Cerd bewnire gri ya bivirni yana hewadi!", - "weblinkchecker-summary": "Bot: Teber gre de rapera xeberkerdış" + "weblinkchecker-summary": "Robot: Gıreyê teberiyo ke nêgureniyeno, rapor beno" } diff --git a/weblinkchecker/pt.json b/weblinkchecker/pt.json index 7fa99c7..a380fba 100644 --- a/weblinkchecker/pt.json +++ b/weblinkchecker/pt.json @@ -1,12 +1,13 @@ { "@metadata": { "authors": [ - "Vitorvicentevalente" + "Vitorvicentevalente", + "Hamilton Abreu" ] }, - "weblinkchecker-archive_msg": "Esta página web foi gravada na Internet Archive. Por favor, considere a ligação para a versão arquivada: [%(URL)s].", - "weblinkchecker-badurl": "A ligação fornecida não parece ser uma URL válida", + "weblinkchecker-archive_msg": "A página foi gravada pelo site Internet Archive. Pondere criar uma hiperligação para uma versão arquivada que seja adequada: [%(URL)s].", + "weblinkchecker-badurl": "A hiperligação fornecida não parece ser um URL válido", "weblinkchecker-caption": "Ligação inativa", - "weblinkchecker-report": "Foi checado os links externos deste artigo por vários minutos. Alguém verifique por favor se a ligação estiver fora do ar e tente arrumá-lo ou removê-la!", - "weblinkchecker-summary": "Robô: A denunciar ligação externa inativa" + "weblinkchecker-report": "Foi detetado, durante várias execuções automáticas do robô, que a seguinte hiperligação externa estava indisponível. Verifique se a hiperligação está efetivamente em baixo e, se for esse o caso, corrija-a ou remova-a, por favor!", + "weblinkchecker-summary": "Robô: reportar hiperligação externa indisponível" } diff --git a/welcome/pt.json b/welcome/pt.json index ea04a10..cce5865 100644 --- a/welcome/pt.json +++ b/welcome/pt.json @@ -2,10 +2,11 @@ "@metadata": { "authors": [ "Giro720", - "Vitorvicentevalente" + "Vitorvicentevalente", + "Hamilton Abreu" ] }, - "welcome-bad_username": "Robô : A adicionar um nome de utilizador que precisa ser verificado", - "welcome-updating": "Robô: A atualizar registo", + "welcome-bad_username": "Robô : adição de um nome de utilizador que precisa de ser verificado", + "welcome-updating": "Robô: atualização de registo", "welcome-welcome": "Bem-vindo(a)!" } -- To view, visit https://gerrit.wikimedia.org/r/490546 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3bfcb856e18b94db7ae02fa06b9b594894e07410 Gerrit-Change-Number: 490546 Gerrit-PatchSet: 1 Gerrit-Owner: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [i18n] Use touch edit summary from twn
by jenkins-bot (Code Review) 13 Feb '19

13 Feb '19

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/487580 ) Change subject: [i18n] Use touch edit summary from twn ...................................................................... [i18n] Use touch edit summary from twn Also import i18n on top of the file and reorder imports Bug: T199042 Change-Id: I552d6fc668515a0417910f069f9406480a77e8dc --- M pywikibot/page.py 1 file changed, 5 insertions(+), 7 deletions(-) Approvals: Dvorapa: Looks good to me, but someone else must approve Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index 1fbd1c2..6f21abd 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -29,18 +29,17 @@ from warnings import warn import pywikibot +from pywikibot import config, i18n, textlib from pywikibot.comms import http -from pywikibot import config +from pywikibot.data.api import APIError from pywikibot.exceptions import ( AutoblockUser, NotEmailableError, SiteDefinitionError, UserRightsError, ) -from pywikibot.data.api import APIError from pywikibot.family import Family from pywikibot.site import DataSite, Namespace, need_version -from pywikibot import textlib from pywikibot.tools import ( compute_file_hash, UnicodeMixin, ComparableMixin, DotReadableDict, @@ -49,8 +48,7 @@ ModuleDeprecationWrapper as _ModuleDeprecationWrapper, PY2, first_upper, redirect_func, remove_last_args, ) -from pywikibot.tools.ip import ip_regexp -from pywikibot.tools.ip import is_IP +from pywikibot.tools.ip import is_IP, ip_regexp if not PY2: unicode = basestring = str @@ -1338,7 +1336,6 @@ self.text = cc_toolkit.change(old) if summary and old.strip().replace( '\r\n', '\n') != self.text.strip().replace('\r\n', '\n'): - from pywikibot import i18n summary += i18n.twtranslate(self.site, 'cosmetic_changes-append') return summary @@ -1425,7 +1422,8 @@ if self.exists(): # ensure always get the page text and not to change it. del self.text - self.save(summary='Pywikibot touch edit', watch='nochange', + summary = i18n.twtranslate(self.site, 'pywikibot-touch') + self.save(summary=summary, watch='nochange', minor=False, botflag=botflag, force=True, asynchronous=False, callback=callback, apply_cosmetic_changes=False, nocreate=True, **kwargs) -- To view, visit https://gerrit.wikimedia.org/r/487580 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I552d6fc668515a0417910f069f9406480a77e8dc Gerrit-Change-Number: 487580 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> 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: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: Drop Python 2.7.2/2.7.3 support
by jenkins-bot (Code Review) 13 Feb '19

13 Feb '19

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/445095 ) Change subject: Drop Python 2.7.2/2.7.3 support ...................................................................... Drop Python 2.7.2/2.7.3 support Bug: T191192 Change-Id: I694c8e1a483f3637939db43a8ea2f154a05f710e --- M .appveyor.yml M HISTORY.rst M dev-requirements.txt M docs/index.rst M pwb.py M pywikibot/README.rst M pywikibot/__init__.py M pywikibot/site_detect.py M pywikibot/textlib.py M requirements.txt M setup.py M tests/__init__.py M tests/utils.py 13 files changed, 44 insertions(+), 103 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/.appveyor.yml b/.appveyor.yml index aa5f763..315f09c 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -17,16 +17,16 @@ # Test the lowest supported release of each major Python version. - - PYTHON: "C:\\Python272" - PYTHON_VERSION: "2.7.2" + - PYTHON: "C:\\Python274" + PYTHON_VERSION: "2.7.4" PYTHON_ARCH: "32" - PYTHON: "C:\\Python341" PYTHON_VERSION: "3.4.1" PYTHON_ARCH: "32" - - PYTHON: "C:\\Python272-x64" - PYTHON_VERSION: "2.7.2" + - PYTHON: "C:\\Python274-x64" + PYTHON_VERSION: "2.7.4" PYTHON_ARCH: "64" - PYTHON: "C:\\Python341-x64" diff --git a/HISTORY.rst b/HISTORY.rst index 0033fb2..2c30039 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -3,7 +3,7 @@ Current release --------------- - +* Dropped support for py2.7.2 and py2.7.3 (T191192) * Bugfixes and improvements * Localisation updates diff --git a/dev-requirements.txt b/dev-requirements.txt index ea8424c..828eac5 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,7 +1,5 @@ # This is a PIP 6+ requirements file for development dependencies # -unittest2==0.8.0 ; python_full_version == '2.7.2' - pytest>=3.6.0 pytest-timeout pytest-runner diff --git a/docs/index.rst b/docs/index.rst index 2b780e2..b471ea5 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -13,7 +13,7 @@ Pywikibot is a Python library and collection of scripts that automate work on `MediaWiki <https://mediawiki.org>`_ sites. -Pywikibot supports Python 2.7.2+ and 3.4+. +Pywikibot supports Python 2.7.4+ and 3.4+. Pywikibot and this documentation are licensed under the :ref:`MIT license <licenses-MIT>`; manual pages on mediawiki.org are licensed under the `CC-BY-SA 3.0`_ license. diff --git a/pwb.py b/pwb.py index 26d6d66..d6211ef 100755 --- a/pwb.py +++ b/pwb.py @@ -9,7 +9,7 @@ and it will use the package directory to store all user files, will fix up search paths so the package does not need to be installed, etc. """ -# (C) Pywikibot team, 2012-2018 +# (C) Pywikibot team, 2012-2019 # # Distributed under the terms of the MIT license. # @@ -29,14 +29,14 @@ Pywikibot is not available on: {version} -This version of Pywikibot only supports Python 2.7.2+ or 3.4+. +This version of Pywikibot only supports Python 2.7.4+ or 3.4+. """ def python_is_supported(): """Check that Python is supported.""" # Any change to this must be copied to setup.py - return PYTHON_VERSION >= (3, 4, 0) or PY2 and PYTHON_VERSION >= (2, 7, 2) + return PYTHON_VERSION >= (3, 4, 0) or PY2 and PYTHON_VERSION >= (2, 7, 4) if not python_is_supported(): diff --git a/pywikibot/README.rst b/pywikibot/README.rst index a817648..7303b28 100644 --- a/pywikibot/README.rst +++ b/pywikibot/README.rst @@ -30,7 +30,7 @@ * python-tkinter (optional, used by some experimental GUI stuff) -You need to have at least python version `2.7.2 <http://www.python.org/download/>`_ +You need to have at least python version `2.7.4 <http://www.python.org/download/>`_ or newer installed on your computer to be able to run any of the code in this package, but not 3.0-3.3. It works fine with 3.4+ versions of python installed. Support for older versions of python is not planned. Some scripts could run with diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 899710a..61b2699 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """The initialization file for the Pywikibot framework.""" # -# (C) Pywikibot team, 2008-2018 +# (C) Pywikibot team, 2008-2019 # # Distributed under the terms of the MIT license. # @@ -133,14 +133,6 @@ deprecate_arg = redirect_func(_deprecate_arg) -if sys.version_info[:2] == (2, 7) and sys.version_info[2] in (2, 3): - warn( - 'Pywikibot will soon drop support for Python 2.7.2 and 2.7.3, ' - 'please update your Python.', - FutureWarning, - ) - - class Timestamp(datetime.datetime): """Class for handling MediaWiki timestamps. diff --git a/pywikibot/site_detect.py b/pywikibot/site_detect.py index c8d6f13..5bc6a74 100644 --- a/pywikibot/site_detect.py +++ b/pywikibot/site_detect.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Classes for detecting a MediaWiki site.""" # -# (C) Pywikibot team, 2010-2018 +# (C) Pywikibot team, 2010-2019 # # Distributed under the terms of the MIT license. # @@ -23,10 +23,7 @@ from html.parser import HTMLParser from urllib.parse import urljoin, urlparse else: - if PYTHON_VERSION == (2, 7, 2): - from future.backports.html.parser import HTMLParser # T175873 - else: - from HTMLParser import HTMLParser + from HTMLParser import HTMLParser from urlparse import urljoin, urlparse diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index 83cade7..500ebd0 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -7,7 +7,7 @@ """ # -# (C) Pywikibot team, 2008-2018 +# (C) Pywikibot team, 2008-2019 # # Distributed under the terms of the MIT license. # @@ -110,44 +110,32 @@ # [[ or ]]. # The namespace names must be substituted into this regex. # e.g. FILE_LINK_REGEX % 'File' or FILE_LINK_REGEX % '|'.join(site.namespaces) -if sys.version_info[:3] >= (2, 7, 4): - FILE_LINK_REGEX = r""" - \[\[\s* - (?:%s) # namespace aliases - \s*: - (?=(?P<filename> - [^]|]* - ))(?P=filename) +FILE_LINK_REGEX = r""" + \[\[\s* + (?:%s) # namespace aliases + \s*: + (?=(?P<filename> + [^]|]* + ))(?P=filename) + ( + \| ( - \| ( - ( - (?=(?P<inner_link> - \[\[.*?\]\] - ))(?P=inner_link) - )? - (?=(?P<other_chars> - [^\[\]]* - ))(?P=other_chars) - | - (?=(?P<not_wikilink> - \[[^]]*\] - ))(?P=not_wikilink) - )*? - )?? - \]\] - """ -else: - # Python 2.7.2 and 2.7.3 re bug (T191161) - FILE_LINK_REGEX = r""" - \[\[\s*(?:%s)\s*:[^|]*?\s* - (\| - ( ( \[\[ .*? \]\] )? [^[]*? - | \[ [^]]*? \] - )* - )? + (?=(?P<inner_link> + \[\[.*?\]\] + ))(?P=inner_link) + )? + (?=(?P<other_chars> + [^\[\]]* + ))(?P=other_chars) + | + (?=(?P<not_wikilink> + \[[^]]*\] + ))(?P=not_wikilink) + )*? + )?? \]\] - """ +""" NON_LATIN_DIGITS = { 'ckb': '٠١٢٣٤٥٦٧٨٩', diff --git a/requirements.txt b/requirements.txt index 551d858..36d9ba7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -24,8 +24,6 @@ # requests security extra requests[security] ; python_full_version > '2.7.6' and python_full_version < '2.7.9' -future>=0.15.0 ; python_full_version < '2.7.3' - ipaddr>=2.1.10 ; python_version < '3' # OAuth support diff --git a/setup.py b/setup.py index a73a804..00745d1 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Installer script for Pywikibot 3.0 framework.""" # -# (C) Pywikibot team, 2009-2018 +# (C) Pywikibot team, 2009-2019 # # Distributed under the terms of the MIT license. # @@ -13,17 +13,6 @@ from setuptools import find_packages, setup -if sys.version_info[:3] < (2, 7, 4): - try: - # Work around a traceback on Python < 2.7.4 - # http://bugs.python.org/issue15881#msg170215 - import multiprocessing - except ImportError: - pass - else: - _unused = multiprocessing # pyflakes workaround - - PYTHON_VERSION = sys.version_info[:3] PY2 = (PYTHON_VERSION[0] == 2) @@ -31,14 +20,14 @@ Pywikibot is not available on: {version} -This version of Pywikibot only supports Python 2.7.2+ or 3.4+. +This version of Pywikibot only supports Python 2.7.4+ or 3.4+. """ def python_is_supported(): """Check that Python is supported.""" # Any change to this must be copied to pwb.py - return PYTHON_VERSION >= (3, 4, 0) or PY2 and PYTHON_VERSION >= (2, 7, 2) + return PYTHON_VERSION >= (3, 4, 0) or PY2 and PYTHON_VERSION >= (2, 7, 4) if not python_is_supported(): @@ -110,15 +99,6 @@ 'git+https://github.com/vasily-v-ryabov/pywinauto-64#egg=pywinauto', ] -if PYTHON_VERSION == (2, 7, 2): - # work around distutils hardcoded unittest dependency - # work around T106512 - import unittest - _unused = unittest - if 'test' in sys.argv: - import unittest2 - sys.modules['unittest'] = unittest2 - if PY2: # tools.ip does not have a hard dependency on an IP address module, # as it falls back to using regexes if one is not available. @@ -130,9 +110,6 @@ # ipaddr 2.1.10+ is distributed with Debian and Fedora. See T105443. dependencies.append('ipaddr>=2.1.10') - if PYTHON_VERSION == (2, 7, 2): - dependencies.append('future>=0.15.0') # Bug fixes for HTMLParser - if (2, 7, 6) < PYTHON_VERSION < (2, 7, 9): # Python versions before 2.7.9 will cause urllib3 to trigger # InsecurePlatformWarning warnings for all HTTPS requests. By @@ -240,7 +217,7 @@ packages=[str(name)] + [package for package in find_packages() if package.startswith('pywikibot.')], - python_requires='>=2.7.2, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*', + python_requires='>=2.7.4, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*', install_requires=dependencies, dependency_links=dependency_links, extras_require=extra_deps, diff --git a/tests/__init__.py b/tests/__init__.py index 7bddc15..7f47850 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Package tests.""" # -# (C) Pywikibot team, 2007-2018 +# (C) Pywikibot team, 2007-2019 # # Distributed under the terms of the MIT license. # @@ -19,9 +19,9 @@ # Verify that the unit tests have a base working environment: # - requests is mandatory # however if unavailable this will fail on use; see pywikibot/tools.py -# - unittest2; see below # - mwparserfromhell is optional, so is only imported in textlib_tests import requests +import unittest from pywikibot import config import pywikibot.data.api @@ -30,11 +30,6 @@ from pywikibot import i18n from pywikibot.tools import PYTHON_VERSION -if PYTHON_VERSION == (2, 7, 2): - # Use unittest2 for python 2.7.2 (T106512) - import unittest2 as unittest -else: - import unittest try: import unittest.mock as mock from unittest.mock import MagicMock, Mock, patch diff --git a/tests/utils.py b/tests/utils.py index c0ce35b..09d423f 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Test utilities.""" # -# (C) Pywikibot team, 2013-2018 +# (C) Pywikibot team, 2013-2019 # # Distributed under the terms of the MIT license. # @@ -643,10 +643,6 @@ @param command: executable to run and arguments to use @type command: list of unicode """ - if PYTHON_VERSION[:2] == (2, 7) and PYTHON_VERSION[2] in (2, 3): - command.insert(1, '-W ignore:{0}:DeprecationWarning'.format( - 'Pywikibot will soon drop support for Python 2.7.2 and 2.7.3, ' - 'please update your Python.')) if cryptography_version and cryptography_version < [1, 3, 4]: command.insert(1, '-W ignore:Old version of cryptography:Warning') # Any environment variables added on Windows must be of type -- To view, visit https://gerrit.wikimedia.org/r/445095 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I694c8e1a483f3637939db43a8ea2f154a05f710e Gerrit-Change-Number: 445095 Gerrit-PatchSet: 6 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: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: Zoranzoki21 (4879) Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/i18n[master]: [i18n] Translations for touch edits
by jenkins-bot (Code Review) 13 Feb '19

13 Feb '19

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/487578 ) Change subject: [i18n] Translations for touch edits ...................................................................... [i18n] Translations for touch edits Bug: T199042 Change-Id: Ia311a4863cca2cd2e5173e75fb38c1d8eda1e855 --- M pywikibot/en.json M pywikibot/qqq.json 2 files changed, 7 insertions(+), 4 deletions(-) Approvals: Tacsipacsi: Looks good to me, but someone else must approve Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/en.json b/pywikibot/en.json index 89d9255..77b682c 100644 --- a/pywikibot/en.json +++ b/pywikibot/en.json @@ -4,7 +4,9 @@ "Daniel Herding", "Huji", "Siebrand", - "Revi" + "Revi", + "Russell Blau", + "Xqt" ] }, "pywikibot-enter-category-name": "Please enter the category name:", @@ -16,5 +18,6 @@ "pywikibot-enter-xml-filename": "Please enter the XML dump's filename:", "pywikibot-fixes-fckeditor": "Bot: Fixing rich-editor html", "pywikibot-fixes-html": "Bot: Converting/fixing HTML", - "pywikibot-fixes-syntax": "Bot: Fixing wiki syntax" + "pywikibot-fixes-syntax": "Bot: Fixing wiki syntax", + "pywikibot-touch": "Pywikibot touch edit" } diff --git a/pywikibot/qqq.json b/pywikibot/qqq.json index 124c02a..7665c4f 100644 --- a/pywikibot/qqq.json +++ b/pywikibot/qqq.json @@ -4,7 +4,6 @@ "Als-Holder", "Fabian Neundorf", "TTMTT", - "संजीव कुमार", "Xqt" ] }, @@ -17,5 +16,6 @@ "pywikibot-enter-xml-filename": "Message displayed to the bot owner to enter the XML dump's filename.", "pywikibot-fixes-fckeditor": "Edit summary for fixes which convert HTML tags from FCK-editor to wiki syntax.", "pywikibot-fixes-html": "Edit summary for the HTML fixes.", - "pywikibot-fixes-syntax": "Edit summary for the syntax and syntax-safe fixes." + "pywikibot-fixes-syntax": "Edit summary for the syntax and syntax-safe fixes.", + "pywikibot-touch": "Edit summary if the bot touches a page and the content changes by MediaWiki software." } -- To view, visit https://gerrit.wikimedia.org/r/487578 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia311a4863cca2cd2e5173e75fb38c1d8eda1e855 Gerrit-Change-Number: 487578 Gerrit-PatchSet: 4 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Ankry <ankry.wiki(a)onet.pl> Gerrit-Reviewer: Bodhisattwa <bodhisattwa.rgkmc(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: JAn Dudík <jan.dudik(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Siebrand <siebrand(a)kitano.nl> Gerrit-Reviewer: Tacsipacsi <tacsipacsi(a)jnet.hu> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 (4879) Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [tests] Cleanup flake8 settings at tox.ini
by jenkins-bot (Code Review) 13 Feb '19

13 Feb '19

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/487474 ) Change subject: [tests] Cleanup flake8 settings at tox.ini ...................................................................... [tests] Cleanup flake8 settings at tox.ini Change-Id: Idb20ef489b1547089c6a79f6ab3b80c9fb289df8 --- M tox.ini 1 file changed, 10 insertions(+), 10 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/tox.ini b/tox.ini index f830fd6..f73319a 100644 --- a/tox.ini +++ b/tox.ini @@ -118,24 +118,16 @@ # H301: Do not import more than one module per line; Pywikibot uses H306 (Alphabetically order your imports by the full module path) # H404: docstring multiline start # H405: docstring summary line +# H903: Use only UNIX style newlines, not Windows style # P101: format string does contain unindexed parameters # P102: docstring does contain unindexed parameters # P103: other string does contain unindexed parameters # W503: line break before binary operator; against current PEP 8 recommendation -# The following are to be fixed -# D102: Missing docstring in public method -# D103: Missing docstring in public function -# N802: function name should be lowercase -# N803: argument name should be lowercase -# N806: variable in function should be lowercase -# N815: mixedCase variable in class scope -# N816: mixedCase variable in global scope - # Errors occured after upgrade to pydocstyle 2.0.0 (T164142) # D401: First line should be in imperative mood; try rephrasing -# D413: Missing blank line after last section # D412: No blank lines allowed between a section header and its content +# D413: Missing blank line after last section ignore = D105,D211,D401,D413,D412,FI12,FI13,FI15,FI16,FI17,FI5,H101,H236,H301,H404,H405,H903,P101,P102,P103,W503 enable-extensions = H203,H204,H205 @@ -144,6 +136,14 @@ accept-encodings = utf-8 require-code = true classmethod-decorators = classmethod,classproperty + +# The following are to be fixed +# N802: function name should be lowercase +# N803: argument name should be lowercase +# N806: variable in function should be lowercase +# N815: mixedCase variable in class scope +# N816: mixedCase variable in global scope + per-file-ignores = generate_family_file.py : T001 pwb.py : T001 -- To view, visit https://gerrit.wikimedia.org/r/487474 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idb20ef489b1547089c6a79f6ab3b80c9fb289df8 Gerrit-Change-Number: 487474 Gerrit-PatchSet: 3 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: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: Re-added the warning() documentation
by jenkins-bot (Code Review) 13 Feb '19

13 Feb '19

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/486715 ) Change subject: Re-added the warning() documentation ...................................................................... Re-added the warning() documentation Bug: T85271 Change-Id: I6dfef5a125a409e5e88238071e4dbca7c5f06847 --- M pywikibot/logging.py 1 file changed, 13 insertions(+), 2 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/logging.py b/pywikibot/logging.py index fd64b76..4cf2691 100644 --- a/pywikibot/logging.py +++ b/pywikibot/logging.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Logging functions.""" # -# (C) Pywikibot team, 2010-2018 +# (C) Pywikibot team, 2010-2019 # # Distributed under the terms of the MIT license. # @@ -149,7 +149,18 @@ def warning(text, decoder=None, newline=True, **kwargs): - """Output a warning message to the user via the userinterface.""" + """Output a warning message to the user via the userinterface. + + @param text: the message the user wants to display. + @type text: str + @param decoder: If None, text should be a unicode string. Otherwise it + should be encoded in the given encoding. + @type decoder: str + @param newline: If True, a line feed will be added after printing the text. + @type newline: bool + @param kwargs: The keyword arguments can be found in the python doc: + https://docs.python.org/2/howto/logging-cookbook.html#logging-cookbook. + """ logoutput(text, decoder, newline, WARNING, **kwargs) -- To view, visit https://gerrit.wikimedia.org/r/486715 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6dfef5a125a409e5e88238071e4dbca7c5f06847 Gerrit-Change-Number: 486715 Gerrit-PatchSet: 5 Gerrit-Owner: Kaushik Reddy <reddykaushik18(a)gmail.com> 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: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot (75) Gerrit-CC: Dvorapa <dvorapa(a)seznam.cz> Gerrit-CC: Xqt <info(a)gno.de>

1 0

[Gerrit] pywikibot/core[master]: [tests] Suppress warnings in api_tests.TestParamInfo
by jenkins-bot (Code Review) 13 Feb '19

13 Feb '19

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/490081 ) Change subject: [tests] Suppress warnings in api_tests.TestParamInfo ...................................................................... [tests] Suppress warnings in api_tests.TestParamInfo Change-Id: I18d9beac8003f2631df9976e6bf3f87139f0cbf0 --- M tests/api_tests.py 1 file changed, 8 insertions(+), 7 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/api_tests.py b/tests/api_tests.py index e1f9d2c..38302ae 100644 --- a/tests/api_tests.py +++ b/tests/api_tests.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """API test module.""" # -# (C) Pywikibot team, 2007-2018 +# (C) Pywikibot team, 2007-2019 # # Distributed under the terms of the MIT license. # @@ -405,8 +405,9 @@ site = self.get_site() pi = api.ParamInfo(site) with suppress_warnings( - r'pywikibot\.data\.api\.ParamInfo.modules is deprecated; ' - r'use submodules or module_paths instead\.', DeprecationWarning + r'pywikibot\.data\.api\.ParamInfo.modules is deprecated for ' + r'[\w ]+; use submodules or module_paths instead\.', + DeprecationWarning ): self.assertIn('revisions', pi.modules) self.assertIn('help', pi.modules) @@ -428,10 +429,10 @@ site = self.get_site() pi = api.ParamInfo(site) with suppress_warnings( - r'pywikibot.data.api.ParamInfo.prefixes is deprecated; ' - r'|pywikibot.data.api.ParamInfo.module_attribute_map is deprecated' - r'|pywikibot.data.api.ParamInfo.modules is deprecated', - DeprecationWarning, + r'pywikibot.data.api.ParamInfo.' + r'(?:prefixes|module_attribute_map|modules) ' + r'is deprecated for [\w ]+; ', + DeprecationWarning ): self.assertIn('revisions', pi.prefixes) self.assertIn('login', pi.prefixes) -- To view, visit https://gerrit.wikimedia.org/r/490081 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I18d9beac8003f2631df9976e6bf3f87139f0cbf0 Gerrit-Change-Number: 490081 Gerrit-PatchSet: 2 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: jenkins-bot (75)

1 0

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits February 2019