Pywikibot-commits October 2015

pywikibot-commits@lists.wikimedia.org

2 participants
187 discussions

[Gerrit] [IMPROV] Split cosmetic changes tests into dry and live - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: [IMPROV] Split cosmetic changes tests into dry and live ...................................................................... [IMPROV] Split cosmetic changes tests into dry and live Most of the tests work fine with just the basic `DrySite` and can be run on a dry wiki. Change-Id: I981c651537647f66eab22cd77d27c1a7b163c88f --- M tests/cosmetic_changes_tests.py 1 file changed, 106 insertions(+), 94 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/cosmetic_changes_tests.py b/tests/cosmetic_changes_tests.py index 209d27b..a591f18 100644 --- a/tests/cosmetic_changes_tests.py +++ b/tests/cosmetic_changes_tests.py @@ -28,12 +28,118 @@ cls.cct = CosmeticChangesToolkit(cls.site, namespace=0, pageTitle='Test') + +class TestDryCosmeticChanges(TestCosmeticChanges): + + """Test cosmetic_changes not requiring a live wiki.""" + + dry = True + def test_fixSelfInterwiki(self): """Test fixSelfInterwiki method.""" self.assertEqual('[[Foo bar]]', self.cct.fixSelfInterwiki('[[de:Foo bar]]')) self.assertEqual('[[en:Foo bar]]', self.cct.fixSelfInterwiki('[[en:Foo bar]]')) + + def test_resolveHtmlEntities(self): + """Test resolveHtmlEntities method.""" + self.assertEqual( + '&# # #0#>#x', + self.cct.resolveHtmlEntities('&# # #0#>#x')) + + def test_removeUselessSpaces(self): + """Test removeUselessSpaces method.""" + self.assertEqual('Foo bar', + self.cct.removeUselessSpaces('Foo bar ')) + # inside comments + self.assertEqual('', + self.cct.removeUselessSpaces('')) + # startspace + self.assertEqual(' Foo bar ', + self.cct.removeUselessSpaces(' Foo bar ')) + + def test_removeNonBreakingSpaceBeforePercent(self): + """Test removeNonBreakingSpaceBeforePercent method.""" + self.assertEqual( + '42 %', self.cct.removeNonBreakingSpaceBeforePercent('42 %')) + + def test_cleanUpSectionHeaders(self): + """Test cleanUpSectionHeaders method.""" + self.assertEqual('=== Header ===\n', + self.cct.cleanUpSectionHeaders('===Header===\n')) + + def test_putSpacesInLists(self): + """Test putSpacesInLists method.""" + self.assertEqual('* Foo bar', + self.cct.putSpacesInLists('*Foo bar')) + self.assertEqual('** Foo bar', + self.cct.putSpacesInLists('**Foo bar')) + self.assertEqual('# Foo bar', + self.cct.putSpacesInLists('#Foo bar')) + self.assertEqual('## Foo bar', + self.cct.putSpacesInLists('##Foo bar')) + # right except the page is a redirect page + self.assertEqual('# redirect', + self.cct.putSpacesInLists('#redirect')) + self.assertEqual('#: Foo bar', + self.cct.putSpacesInLists('#:Foo bar')) + self.assertEqual(':Foo bar', + self.cct.putSpacesInLists(':Foo bar')) + self.assertEqual(':* Foo bar', + self.cct.putSpacesInLists(':*Foo bar')) + + def test_fixSyntaxSave(self): + """Test fixSyntaxSave method.""" + self.assertEqual( + '[https://de.wikipedia.org]', + self.cct.fixSyntaxSave('[[https://de.wikipedia.org]]')) + self.assertEqual( + '[https://de.wikipedia.org]', + self.cct.fixSyntaxSave('[[https://de.wikipedia.org]')) + self.assertEqual( + '[https://de.wikipedia.org/w/api.php API]', + self.cct.fixSyntaxSave('[https://de.wikipedia.org/w/api.php|API]')) + + def test_fixHtml(self): + """Test fixHtml method.""" + self.assertEqual("'''Foo''' bar", + self.cct.fixHtml('Foo bar')) + self.assertEqual("Foo '''bar'''", + self.cct.fixHtml('Foo bar')) + self.assertEqual("''Foo'' bar", + self.cct.fixHtml('Foo bar')) + self.assertEqual("Foo ''bar''", + self.cct.fixHtml('Foo bar')) + self.assertEqual('\n----\n', + self.cct.fixHtml('\n<hr />\n')) + self.assertEqual('\n=== Header ===\n', + self.cct.fixHtml('\n<h3>Header</h3>\n')) + + def test_fixReferences(self): + """Test fixReferences method.""" + self.assertEqual('<ref name="Foo" />', + self.cct.fixReferences('<ref name= "Foo" />')) + self.assertEqual('<ref name="Foo">bar</ref>', + self.cct.fixReferences('<ref name ="Foo">bar</ref>')) + self.assertEqual('<ref name="Foo"/>', + self.cct.fixReferences('<ref name="Foo"></ref>')) + self.assertEqual('', + self.cct.fixReferences('<ref />')) + self.assertEqual('', + self.cct.fixReferences('<ref> \n</ref>')) + + def test_fixTypo(self): + """Test fixTypo method.""" + self.assertEqual('42 cm³', + self.cct.fixTypo('42 ccm')) + self.assertEqual('42 °C', + self.cct.fixTypo('42 ºC')) + + +class TestLiveCosmeticChanges(TestCosmeticChanges): + + """Test cosmetic_changes requiring a live wiki.""" def test_translateAndCapitalizeNamespaces(self): """Test translateAndCapitalizeNamespaces method.""" @@ -95,106 +201,12 @@ self.assertEqual('text [[title|name]]text', self.cct.cleanUpLinks('text[[title| name]]text')) - def test_resolveHtmlEntities(self): - """Test resolveHtmlEntities method.""" - self.assertEqual( - '&# # #0#>#x', - self.cct.resolveHtmlEntities('&# # #0#>#x')) - - def test_removeUselessSpaces(self): - """Test removeUselessSpaces method.""" - self.assertEqual('Foo bar', - self.cct.removeUselessSpaces('Foo bar ')) - # inside comments - self.assertEqual('', - self.cct.removeUselessSpaces('')) - # startspace - self.assertEqual(' Foo bar ', - self.cct.removeUselessSpaces(' Foo bar ')) - - def test_removeNonBreakingSpaceBeforePercent(self): - """Test removeNonBreakingSpaceBeforePercent method.""" - self.assertEqual( - '42 %', self.cct.removeNonBreakingSpaceBeforePercent('42 %')) - - def test_cleanUpSectionHeaders(self): - """Test cleanUpSectionHeaders method.""" - self.assertEqual('=== Header ===\n', - self.cct.cleanUpSectionHeaders('===Header===\n')) - - def test_putSpacesInLists(self): - """Test putSpacesInLists method.""" - self.assertEqual('* Foo bar', - self.cct.putSpacesInLists('*Foo bar')) - self.assertEqual('** Foo bar', - self.cct.putSpacesInLists('**Foo bar')) - self.assertEqual('# Foo bar', - self.cct.putSpacesInLists('#Foo bar')) - self.assertEqual('## Foo bar', - self.cct.putSpacesInLists('##Foo bar')) - # right except the page is a redirect page - self.assertEqual('# redirect', - self.cct.putSpacesInLists('#redirect')) - self.assertEqual('#: Foo bar', - self.cct.putSpacesInLists('#:Foo bar')) - self.assertEqual(':Foo bar', - self.cct.putSpacesInLists(':Foo bar')) - self.assertEqual(':* Foo bar', - self.cct.putSpacesInLists(':*Foo bar')) - def test_replaceDeprecatedTemplates(self): """Test replaceDeprecatedTemplates method.""" self.assertEqual('{{Belege fehlen}}', self.cct.replaceDeprecatedTemplates('{{Belege}}')) self.assertEqual('{{Belege fehlen|Test}}', self.cct.replaceDeprecatedTemplates('{{Quelle|Test}}')) - - def test_fixSyntaxSave(self): - """Test fixSyntaxSave method.""" - self.assertEqual( - '[https://de.wikipedia.org]', - self.cct.fixSyntaxSave('[[https://de.wikipedia.org]]')) - self.assertEqual( - '[https://de.wikipedia.org]', - self.cct.fixSyntaxSave('[[https://de.wikipedia.org]')) - self.assertEqual( - '[https://de.wikipedia.org/w/api.php API]', - self.cct.fixSyntaxSave('[https://de.wikipedia.org/w/api.php|API]')) - - def test_fixHtml(self): - """Test fixHtml method.""" - self.assertEqual("'''Foo''' bar", - self.cct.fixHtml('Foo bar')) - self.assertEqual("Foo '''bar'''", - self.cct.fixHtml('Foo bar')) - self.assertEqual("''Foo'' bar", - self.cct.fixHtml('Foo bar')) - self.assertEqual("Foo ''bar''", - self.cct.fixHtml('Foo bar')) - self.assertEqual('\n----\n', - self.cct.fixHtml('\n<hr />\n')) - self.assertEqual('\n=== Header ===\n', - self.cct.fixHtml('\n<h3>Header</h3>\n')) - - def test_fixReferences(self): - """Test fixReferences method.""" - self.assertEqual('<ref name="Foo" />', - self.cct.fixReferences('<ref name= "Foo" />')) - self.assertEqual('<ref name="Foo">bar</ref>', - self.cct.fixReferences('<ref name ="Foo">bar</ref>')) - self.assertEqual('<ref name="Foo"/>', - self.cct.fixReferences('<ref name="Foo"></ref>')) - self.assertEqual('', - self.cct.fixReferences('<ref />')) - self.assertEqual('', - self.cct.fixReferences('<ref> \n</ref>')) - - def test_fixTypo(self): - """Test fixTypo method.""" - self.assertEqual('42 cm³', - self.cct.fixTypo('42 ccm')) - self.assertEqual('42 °C', - self.cct.fixTypo('42 ºC')) if __name__ == '__main__': -- To view, visit https://gerrit.wikimedia.org/r/244659 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I981c651537647f66eab22cd77d27c1a7b163c88f Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

8 years, 6 months

Broken: wikimedia/pywikibot-core#2993 (master - 74f68eb)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2993 Status: Broken Duration: 34 minutes and 43 seconds Commit: 74f68eb (master) Author: jenkins-bot Message: Merge "Add coverage in travis builds" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/ecb1bb36e8a3...74f68eb1… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/84584969 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

8 years, 6 months

Broken: wikimedia/pywikibot-core#2992 (master - ecb1bb3)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2992 Status: Broken Duration: 32 minutes and 56 seconds Commit: ecb1bb3 (master) Author: jenkins-bot Message: Merge "Ignore pep257 D105" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/6b0ce5e82778...ecb1bb36… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/84583541 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

8 years, 6 months

[Gerrit] Add coverage in travis builds - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Add coverage in travis builds ...................................................................... Add coverage in travis builds It's based on the help in codecov.io [1] [1]: https://github.com/codecov/example-python Bug: T74863 Change-Id: I23a13a4664943044baa47ac501d498d28d0e977f --- M .travis.yml M dev-requirements.txt 2 files changed, 8 insertions(+), 3 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/.travis.yml b/.travis.yml index 01b04ad..b80851a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -90,14 +90,17 @@ nosetests --version ; if [[ "$SITE_ONLY" == "1" ]]; then echo "Running site tests only code ${LANGUAGE} on family ${FAMILY}" ; - python setup.py nosetests --tests tests --verbosity=2 -a "family=$FAMILY,code=$LANGUAGE" ; + python setup.py nosetests --tests tests --verbosity=2 -a "family=$FAMILY,code=$LANGUAGE" --with-coverage --cover-package=. ; else - python setup.py nosetests --tests tests --verbosity=2 ; + python setup.py nosetests --tests tests --verbosity=2 --with-coverage --cover-package=. ; fi ; else - python setup.py test ; + coverage run setup.py test ; fi +after_success: + codecov + env: global: # This is the encrypted password for Wikimedia SUL user 'Pywikibot-test', diff --git a/dev-requirements.txt b/dev-requirements.txt index 7329c3f..373c987 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -10,6 +10,8 @@ pep257>=0.6 pyflakes>=0.9 flake8 +codecov +coverage # pywin32 & pywinauto>=0.4.0 are Win32 UI test dependencies that have been # excluded from this file as they are quite expensive to install, and they -- To view, visit https://gerrit.wikimedia.org/r/240564 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I23a13a4664943044baa47ac501d498d28d0e977f Gerrit-PatchSet: 5 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

8 years, 6 months

[Gerrit] Ignore pep257 D105 - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Ignore pep257 D105 ...................................................................... Ignore pep257 D105 D105 reports missing docstrings in 'magic' methods, such as __str__ and __repr__. These methods have a well defined interface that is documented by Python itself. At times it is useful to augment the standard documentation with a custom docstring, but often it is not necessary. Change-Id: I5a5f5f5dafff3b175da28023f8ec4b03d901fff6 --- M tox.ini 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Mpaa: Looks good to me, approved jenkins-bot: Verified diff --git a/tox.ini b/tox.ini index 59ef274..339afde 100644 --- a/tox.ini +++ b/tox.ini @@ -239,7 +239,7 @@ -rdocs/requirements-py3.txt [flake8] -ignore = E241,E402,E731,D211,FI10,FI12,FI13,FI15,FI5,H101,H201,H202,H236,H237,H301,H306,H404,H405,H501,P102,P103 +ignore = E241,E402,E731,D105,D211,FI10,FI12,FI13,FI15,FI5,H101,H201,H202,H236,H237,H301,H306,H404,H405,H501,P102,P103 exclude = .tox,.git,./*.egg,ez_setup.py,build,externals,user-config.py,./scripts/i18n/* max_line_length = 130 accept-encodings = utf-8 @@ -251,4 +251,4 @@ max_line_length = 130 [pep257] -ignore = D211 +ignore = D105,D211 -- To view, visit https://gerrit.wikimedia.org/r/244751 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5a5f5f5dafff3b175da28023f8ec4b03d901fff6 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

8 years, 6 months

Fixed: wikimedia/pywikibot-core#2991 (master - 6b0ce5e)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2991 Status: Fixed Duration: 30 minutes and 31 seconds Commit: 6b0ce5e (master) Author: John Vandenberg Message: Use explicit site for cosmetic changes fixTypo and fixArabicLetters used textlib.replaceExcept without an explicit site while using exception 'interwiki' which requires a site. This meant textlib.replaceExcept used pywikibot.Site to implicitly create a Site object, which could be the wrong site. Also convert a hidden u+200C character to '\u200c'. Change-Id: Id11c23560800b66a5fccc95459abc28685a98bb9 View the changeset: https://github.com/wikimedia/pywikibot-core/compare/20b2b6bcd7be...6b0ce5e8… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/84479645 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

8 years, 6 months

[Gerrit] Use explicit site for cosmetic changes - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Use explicit site for cosmetic changes ...................................................................... Use explicit site for cosmetic changes fixTypo and fixArabicLetters used textlib.replaceExcept without an explicit site while using exception 'interwiki' which requires a site. This meant textlib.replaceExcept used pywikibot.Site to implicitly create a Site object, which could be the wrong site. Also convert a hidden u+200C character to '\u200c'. Change-Id: Id11c23560800b66a5fccc95459abc28685a98bb9 --- M pywikibot/cosmetic_changes.py M pywikibot/textlib.py 2 files changed, 18 insertions(+), 10 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/cosmetic_changes.py b/pywikibot/cosmetic_changes.py index ef8bfc3..485769d 100755 --- a/pywikibot/cosmetic_changes.py +++ b/pywikibot/cosmetic_changes.py @@ -799,7 +799,8 @@ text = textlib.replaceExcept(text, r'(\d)\s*(?: )?[º°]([CF])', r'\1 °\2', exceptions, site=self.site) text = textlib.replaceExcept(text, u'º([CF])', u'°' + r'\1', - exceptions) + exceptions, + site=self.site) return text def fixArabicLetters(self, text): @@ -843,12 +844,17 @@ text = textlib.replaceExcept(text, u',', u'،', exceptions) if self.site.code == 'ckb': text = textlib.replaceExcept(text, - u'\u0647([.\u060c_<\\]\\s])', - u'\u06d5\\1', exceptions) - text = textlib.replaceExcept(text, u'ه‌', u'ە', exceptions) - text = textlib.replaceExcept(text, u'ه', u'ھ', exceptions) - text = textlib.replaceExcept(text, u'ك', u'ک', exceptions) - text = textlib.replaceExcept(text, u'[ىي]', u'ی', exceptions) + '\u0647([.\u060c_<\\]\\s])', + '\u06d5\\1', exceptions, + site=self.site) + text = textlib.replaceExcept(text, 'ه\u200c', 'ە', exceptions, + site=self.site) + text = textlib.replaceExcept(text, 'ه', 'ھ', exceptions, + site=self.site) + text = textlib.replaceExcept(text, 'ك', 'ک', exceptions, + site=self.site) + text = textlib.replaceExcept(text, '[ىي]', 'ی', exceptions, + site=self.site) return text diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index d80ca1a..54d20eb 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -187,9 +187,6 @@ def _get_regexes(keys, site): """Fetch compiled regexes.""" - if site is None: - site = pywikibot.Site() - if not _regex_cache: _create_default_regexes() @@ -203,6 +200,11 @@ # which may not yet have a site specific re compiled. if exc in _regex_cache: if type(_regex_cache[exc]) is tuple: + if not site: + issue_deprecation_warning( + 'site=None', 'a valid site', 3) + site = pywikibot.Site() + if (exc, site) not in _regex_cache: re_text, re_var = _regex_cache[exc] _regex_cache[(exc, site)] = re.compile( -- To view, visit https://gerrit.wikimedia.org/r/244055 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id11c23560800b66a5fccc95459abc28685a98bb9 Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

8 years, 6 months

[Gerrit] [IMPROV] cosmetic_changes: merge similar regexes - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: [IMPROV] cosmetic_changes: merge similar regexes ...................................................................... [IMPROV] cosmetic_changes: merge similar regexes Instead of having two pretty similar regexes it's in most cases possible to combine them easily. This is also fixing “dash” into “pipe” in the comment explaining how the external link fixer works. It also adds the site parameter to each changed call. Change-Id: I8513e34f873730ee9c92abb75c499f67cb3d86fc --- M pywikibot/cosmetic_changes.py 1 file changed, 14 insertions(+), 26 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/cosmetic_changes.py b/pywikibot/cosmetic_changes.py index 169359f..ef8bfc3 100755 --- a/pywikibot/cosmetic_changes.py +++ b/pywikibot/cosmetic_changes.py @@ -706,17 +706,13 @@ # r'\[https?://%s\.%s\.org/wiki/(?P<link>\S+)\s+(?P<title>.+?)\s?\]' # % (self.site.code, self.site.family.name), # r'[[\g<link>|\g<title>]]', exceptions) - # external link in double brackets + # external link in/starting with double brackets text = textlib.replaceExcept( text, - r'\[\[(?P<url>https?://[^\]]+?)\]\]', - r'[\g<url>]', exceptions) - # external link starting with double bracket - text = textlib.replaceExcept(text, - r'\[\[(?P<url>https?://.+?)\]', - r'[\g<url>]', exceptions) - # external link and description separated by a dash, with - # whitespace in front of the dash, so that it is clear that + r'\[\[(?P<url>https?://[^\]]+?)\]\]?', + r'[\g<url>]', exceptions, site=self.site) + # external link and description separated by a pipe, with + # whitespace in front of the pipe, so that it is clear that # the dash is not a legitimate part of the URL. text = textlib.replaceExcept( text, @@ -739,14 +735,10 @@ # Keep in mind that MediaWiki automatically converts to exceptions = ['nowiki', 'comment', 'math', 'pre', 'source', 'startspace'] - text = textlib.replaceExcept(text, r'(?i)(.*?)', r"'''\1'''", - exceptions) - text = textlib.replaceExcept(text, r'(?i)(.*?)', - r"'''\1'''", exceptions) - text = textlib.replaceExcept(text, r'(?i)(.*?)', r"''\1''", - exceptions) - text = textlib.replaceExcept(text, r'(?i)(.*?)', r"''\1''", - exceptions) + text = textlib.replaceExcept(text, r'(?i)<(b|strong)>(.*?)</\1>', + r"'''\2'''", exceptions, site=self.site) + text = textlib.replaceExcept(text, r'(?i)<(i|em)>(.*?)</\1>', + r"''\2''", exceptions, site=self.site) # horizontal line without attributes in a single line text = textlib.replaceExcept(text, r'(?i)([\r\n])<hr[ /]*>([\r\n])', r'\1----\2', exceptions) @@ -797,19 +789,15 @@ exceptions = ['nowiki', 'comment', 'math', 'pre', 'source', 'startspace', 'gallery', 'hyperlink', 'interwiki', 'link'] # change <number> ccm -> <number> cm³ - text = textlib.replaceExcept(text, r'(\d)\s* ccm', - r'\1 ' + u'cm³', exceptions) - text = textlib.replaceExcept(text, - r'(\d)\s*ccm', r'\1 ' + u'cm³', - exceptions) + text = textlib.replaceExcept(text, r'(\d)\s*(?: )?ccm', + r'\1 cm³', exceptions, + site=self.site) # Solve wrong Nº sign with °C or °F # additional exception requested on fr-wiki for this stuff pattern = re.compile(u'«.*?»', re.UNICODE) exceptions.append(pattern) - text = textlib.replaceExcept(text, r'(\d)\s* ' + u'[º°]([CF])', - r'\1 ' + u'°' + r'\2', exceptions) - text = textlib.replaceExcept(text, r'(\d)\s*' + u'[º°]([CF])', - r'\1 ' + u'°' + r'\2', exceptions) + text = textlib.replaceExcept(text, r'(\d)\s*(?: )?[º°]([CF])', + r'\1 °\2', exceptions, site=self.site) text = textlib.replaceExcept(text, u'º([CF])', u'°' + r'\1', exceptions) return text -- To view, visit https://gerrit.wikimedia.org/r/244628 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8513e34f873730ee9c92abb75c499f67cb3d86fc Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

8 years, 6 months

[Gerrit] [IMPROV] i18n: Deprecate twntranslate - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: [IMPROV] i18n: Deprecate twntranslate ...................................................................... [IMPROV] i18n: Deprecate twntranslate This deprecates `twntranslate` in favor of `twtranslate`. It also modifies `_extract_plural` to require a mapping. `twntranslate` creates a dummy mapping to simulate the deprecated types like lists to be used by `_extract_plural`. This dummy mapping is also used by `translate` in order to deprecate the non-mapping usage of parameters there. Not using a mapping for parameters in i18n is only sensible if there is just one value but otherwise it might be that parameters change the order in which case a list or tuple will produce incorrect results. For the sake of consistency this deprecates all usage of non-mapping parameters. Change-Id: I5b97b10fbe0bab53993781c983db92c0aec30b30 --- M pywikibot/i18n.py M scripts/archivebot.py M scripts/category.py M scripts/djvutext.py M scripts/template.py M tests/aspects.py M tests/i18n_tests.py 7 files changed, 161 insertions(+), 120 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py index 212906d..fe06672 100644 --- a/pywikibot/i18n.py +++ b/pywikibot/i18n.py @@ -26,7 +26,6 @@ __version__ = '$Id$' # -import sys import re import locale import json @@ -41,10 +40,7 @@ from pywikibot import Error from pywikibot import config from pywikibot.plural import plural_rules -from pywikibot.tools import issue_deprecation_warning - -if sys.version_info[0] > 2: - basestring = (str, ) +from pywikibot.tools import deprecated, issue_deprecation_warning, StringTypes PLURAL_PATTERN = r'{{PLURAL:(?:%$)?([^$]*?)(?:\)d)?\|(.*?)}}' @@ -346,22 +342,16 @@ """ plural_items = re.findall(PLURAL_PATTERN, message) + assert isinstance(parameters, Mapping), \ + 'parameters is not Mapping but {0}'.format(type(parameters)) if plural_items: # we found PLURAL patterns, process it - if len(plural_items) > 1 and isinstance(parameters, (tuple, list)) and \ - len(plural_items) != len(parameters): - raise ValueError("Length of parameter does not match PLURAL " - "occurrences.") - i = 0 for selector, variants in plural_items: - if isinstance(parameters, dict): - num = int(parameters[selector]) - elif isinstance(parameters, basestring): - num = int(parameters) - elif isinstance(parameters, (tuple, list)): - num = int(parameters[i]) - i += 1 - else: - num = parameters + num = parameters[selector] + if not isinstance(num, int): + issue_deprecation_warning( + 'type {0} for value {1} ({2})'.format(type(num), selector, num), + 'an int', 1) + num = int(num) # TODO: check against plural_rules[code]['nplurals'] try: index = plural_rules[code]['plural'](num) @@ -373,6 +363,40 @@ repl = variants.split('|')[index] message = re.sub(PLURAL_PATTERN, repl, message, count=1) return message + + +class _PluralMappingAlias(Mapping): + + """ + Aliasing class to allow non mappings in _extract_plural. + + That function only uses __getitem__ so this is only implemented here. + """ + + def __init__(self, source): + if isinstance(source, StringTypes): + source = int(source) + self.source = source + self.index = -1 + super(_PluralMappingAlias, self).__init__() + + def __getitem__(self, key): + self.index += 1 + if isinstance(self.source, dict): + return int(self.source[key]) + elif isinstance(self.source, (tuple, list)): + if self.index < len(self.source): + return int(self.source[self.index]) + raise ValueError('Length of parameter does not match PLURAL ' + 'occurrences.') + else: + return self.source + + def __iter__(self): + raise NotImplementedError + + def __len__(self): + raise NotImplementedError DEFAULT_FALLBACK = ('_default', ) @@ -392,14 +416,14 @@ not be always the same. When fallback is iterable it'll return None if no code applies (instead of returning one). - For PLURAL support have a look at the twntranslate method + For PLURAL support have a look at the twtranslate method. @param code: The language code @type code: string or Site object @param xdict: dictionary with language codes as keys or extended dictionary with family names as keys containing language dictionaries or a single (unicode) string. May contain PLURAL tags as - described in twntranslate + described in twtranslate @type xdict: dict, string, unicode @param parameters: For passing (plural) parameters @type parameters: dict, string, unicode, int @@ -451,9 +475,12 @@ if not isinstance(parameters, Mapping): issue_deprecation_warning('parameters not being a mapping', None, 2) + plural_parameters = _PluralMappingAlias(parameters) + else: + plural_parameters = parameters # else we check for PLURAL variants - trans = _extract_plural(code, trans, parameters) + trans = _extract_plural(code, trans, plural_parameters) if parameters: try: return trans % parameters @@ -463,21 +490,64 @@ return trans -def twtranslate(code, twtitle, parameters=None, fallback=True): +def twtranslate(code, twtitle, parameters=None, fallback=True, + only_plural=False): """ - Translate a message. - - The translations are retrieved from json files in messages_package_name. + Translate a message using JSON files in messages_package_name. fallback parameter must be True for i18n and False for L10N or testing purposes. + + Support for plural is implemented like in MediaWiki extension. If the + TranslateWiki message contains a plural tag inside which looks like:: + + {{PLURAL:<number>|<variant1>|<variant2>[|<variantn>]}} + + it takes that variant calculated by the plural_rules depending on the number + value. Multiple plurals are allowed. + + As an examples, if we had several json dictionaries in test folder like: + + en.json:: + + { + "test-plural": "Bot: Changing %(num)s {{PLURAL:%(num)d|page|pages}}.", + } + + fr.json:: + + { + "test-plural": "Robot: Changer %(descr)s {{PLURAL:num|une page|quelques pages}}.", + } + + and so on. + + >>> from pywikibot import i18n + >>> i18n.set_messages_package('tests.i18n') + >>> # use a dictionary + >>> str(i18n.twtranslate('en', 'test-plural', {'num':2})) + 'Bot: Changing 2 pages.' + >>> # use additional format strings + >>> str(i18n.twtranslate('fr', 'test-plural', {'num': 1, 'descr': 'seulement'})) + 'Robot: Changer seulement une page.' + >>> # use format strings also outside + >>> str(i18n.twtranslate('fr', 'test-plural', {'num': 10}, only_plural=True) + ... % {'descr': 'seulement'}) + 'Robot: Changer seulement quelques pages.' @param code: The language code @param twtitle: The TranslateWiki string title, in <package>-<key> format @param parameters: For passing parameters. It should be a mapping but for backwards compatibility can also be a list, tuple or a single value. + They are also used for plural entries in which case they must be a + Mapping and will cause a TypeError otherwise. @param fallback: Try an alternate language code @type fallback: boolean + @param only_plural: Define whether the parameters should be only applied to + plural instances. If this is False it will apply the parameters also + to the resulting string. If this is True the placeholders must be + manually applied afterwards. + @type only_plural: bool """ if not messages_available(): raise TranslationError( @@ -518,87 +588,40 @@ if code_needed: code.append(alt) + if '{{PLURAL:' in trans: + # _extract_plural supports in theory non-mappings, but they are + # deprecated + if not isinstance(parameters, Mapping): + raise TypeError('parameters must be a mapping.') + trans = _extract_plural(alt, trans, parameters) + + # this is only the case when called in twntranslate, and that didn't apply + # parameters when it wasn't a dict + if isinstance(parameters, _PluralMappingAlias): + # This is called due to the old twntranslate function which ignored + # KeyError. Instead only_plural should be used. + if isinstance(parameters.source, dict): + try: + trans %= parameters.source + except KeyError: + pass + parameters = None + if parameters is not None and not isinstance(parameters, Mapping): issue_deprecation_warning('parameters not being a Mapping', None, 2) - if parameters: + if not only_plural and parameters: return trans % parameters else: return trans -# Maybe this function should be merged with twtranslate +@deprecated('twtranslate') def twntranslate(code, twtitle, parameters=None): - r"""Translate a message with plural support. - - Support is implemented like in MediaWiki extension. If the TranslateWiki - message contains a plural tag inside which looks like:: - - {{PLURAL:<number>|<variant1>|<variant2>[|<variantn>]}} - - it takes that variant calculated by the plural_rules depending on the number - value. Multiple plurals are allowed. - - As an examples, if we had several json dictionaries in test folder like: - - en.json:: - - { - "test-plural": "Bot: Changing %(num)s {{PLURAL:%(num)d|page|pages}}.", - } - - fr.json:: - - { - "test-plural": "Robot: Changer %(descr)s {{PLURAL:num|une page|quelques pages}}.", - } - - and so on. - - >>> from pywikibot import i18n - >>> i18n.set_messages_package('tests.i18n') - >>> # use a number - >>> str(i18n.twntranslate('en', 'test-plural', 0) % {'num': 'no'}) - 'Bot: Changing no pages.' - >>> # use a string - >>> str(i18n.twntranslate('en', 'test-plural', '1') % {'num': 'one'}) - 'Bot: Changing one page.' - >>> # use a dictionary - >>> str(i18n.twntranslate('en', 'test-plural', {'num':2})) - 'Bot: Changing 2 pages.' - >>> # use additional format strings - >>> str(i18n.twntranslate('fr', 'test-plural', {'num': 1, 'descr': 'seulement'})) - 'Robot: Changer seulement une page.' - >>> # use format strings also outside - >>> str(i18n.twntranslate('fr', 'test-plural', 10) % {'descr': 'seulement'}) - 'Robot: Changer seulement quelques pages.' - - The translations are retrieved from i18n.<package>, based on the callers - import table. - - @param code: The language code - @param twtitle: The TranslateWiki string title, in <package>-<key> format - @param parameters: For passing (plural) parameters. - - """ - # If a site is given instead of a code, use its language - if hasattr(code, 'code'): - code = code.code - # we send the code via list and get the alternate code back - code = [code] - trans = twtranslate(code, twtitle) - # get the alternate language code modified by twtranslate - lang = code.pop() - # check for PLURAL variants - trans = _extract_plural(lang, trans, parameters) - # we always have a dict for replacement of translatewiki messages - if parameters and isinstance(parameters, dict): - try: - return trans % parameters - except KeyError: - # parameter is for PLURAL variants only, don't change the string - pass - return trans + """DEPRECATED: Get translated string for the key.""" + if parameters is not None: + parameters = _PluralMappingAlias(parameters) + return twtranslate(code, twtitle, parameters) def twhas_key(code, twtitle): diff --git a/scripts/archivebot.py b/scripts/archivebot.py index 6cbb002..069e986 100755 --- a/scripts/archivebot.py +++ b/scripts/archivebot.py @@ -567,9 +567,9 @@ # Save the archives first (so that bugs don't cause a loss of data) for a in sorted(self.archives.keys()): self.comment_params['count'] = self.archives[a].archived_threads - comment = i18n.twntranslate(self.site.code, - 'archivebot-archive-summary', - self.comment_params) + comment = i18n.twtranslate(self.site.code, + 'archivebot-archive-summary', + self.comment_params) self.archives[a].update(comment) # Save the page itself @@ -580,9 +580,9 @@ = comma.join(a.title(asLink=True) for a in self.archives.values()) self.comment_params['why'] = comma.join(whys) - comment = i18n.twntranslate(self.site.code, - 'archivebot-page-summary', - self.comment_params) + comment = i18n.twtranslate(self.site.code, + 'archivebot-page-summary', + self.comment_params) self.page.update(comment) diff --git a/scripts/category.py b/scripts/category.py index 484dd13..cf7308b 100755 --- a/scripts/category.py +++ b/scripts/category.py @@ -791,10 +791,10 @@ if self.subCats: setOfArticles = setOfArticles.union(set(self.cat.subcategories())) if not self.editSummary: - self.editSummary = i18n.twntranslate(self.site, - 'category-listifying', - {'fromcat': self.cat.title(), - 'num': len(setOfArticles)}) + self.editSummary = i18n.twtranslate(self.site, + 'category-listifying', + {'fromcat': self.cat.title(), + 'num': len(setOfArticles)}) listString = "" for article in setOfArticles: diff --git a/scripts/djvutext.py b/scripts/djvutext.py index 5f0ee09..bdf442a 100644 --- a/scripts/djvutext.py +++ b/scripts/djvutext.py @@ -83,7 +83,7 @@ # Get edit summary message if it's empty. if not self.getOption('summary'): - self.options['summary'] = i18n.twntranslate( + self.options['summary'] = i18n.twtranslate( self._index.site, 'djvutext-creating') def page_number_gen(self): diff --git a/scripts/template.py b/scripts/template.py index e789176..27cd99a 100755 --- a/scripts/template.py +++ b/scripts/template.py @@ -202,13 +202,13 @@ site = self.site if self.getOption('remove'): - self.options['summary'] = i18n.twntranslate( + self.options['summary'] = i18n.twtranslate( site, 'template-removing', params) elif self.getOption('subst'): - self.options['summary'] = i18n.twntranslate( + self.options['summary'] = i18n.twtranslate( site, 'template-substituting', params) else: - self.options['summary'] = i18n.twntranslate( + self.options['summary'] = i18n.twtranslate( site, 'template-changing', params) # regular expression to find the original template. diff --git a/tests/aspects.py b/tests/aspects.py index 1f6861c..8e94e38 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -1039,9 +1039,20 @@ if not nested: self._patched = False + @contextmanager + def _delay_assertion(self, context, assertion, args, kwargs): + with self.disable_assert_capture(): + with context as ctx: + yield ctx + self.after_assert(assertion, *args, **kwargs) + def process_assert(self, assertion, *args, **kwargs): - """Handle the assertion.""" - assertion(*args, **kwargs) + """Handle the assertion call.""" + return assertion(*args, **kwargs) + + def after_assert(self, assertion, *args, **kwargs): + """Handle after the assertion.""" + pass def patch_assert(self, assertion): """Execute process_assert when the assertion is called.""" @@ -1049,7 +1060,12 @@ assert self._patched is False self._patched = True try: - self.process_assert(assertion, *args, **kwargs) + context = self.process_assert(assertion, *args, **kwargs) + if hasattr(context, '__enter__'): + return self._delay_assertion(context, assertion, args, kwargs) + else: + self.after_assert(assertion, *args, **kwargs) + return context finally: self._patched = False return inner_assert @@ -1584,14 +1600,13 @@ C{assertOneDeprecation}. """ - def process_assert(self, assertion, *args, **kwargs): + def after_assert(self, assertion, *args, **kwargs): """Handle assertion and call C{assertOneDeprecation} after it.""" - super(AutoDeprecationTestCase, self).process_assert( + super(AutoDeprecationTestCase, self).after_assert( assertion, *args, **kwargs) self.assertOneDeprecation() skip_list = DeprecationTestCase.skip_list + [ CapturingTestCase.process_assert, CapturingTestCase.patch_assert, - process_assert, ] diff --git a/tests/i18n_tests.py b/tests/i18n_tests.py index 3b5340d..c24f261 100644 --- a/tests/i18n_tests.py +++ b/tests/i18n_tests.py @@ -14,7 +14,10 @@ from pywikibot import i18n, bot, plural from pywikibot.tools import StringTypes -from tests.aspects import unittest, TestCase, DefaultSiteTestCase, PwbTestCase +from tests.aspects import ( + unittest, TestCase, DefaultSiteTestCase, PwbTestCase, + AutoDeprecationTestCase, +) class TestTranslate(TestCase): @@ -184,7 +187,7 @@ 'en', 'test-no-english') -class TestTWNTranslate(TWNTestCaseBase): +class TestTWNTranslate(TWNTestCaseBase, AutoDeprecationTestCase): """Test {{PLURAL:}} support.""" -- To view, visit https://gerrit.wikimedia.org/r/244431 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5b97b10fbe0bab53993781c983db92c0aec30b30 Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

8 years, 6 months

[Gerrit] [IMPROV] i18n_tests: Assert equality - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: [IMPROV] i18n_tests: Assert equality ...................................................................... [IMPROV] i18n_tests: Assert equality Instead of asserting an exception it could directly assert the result from `twntranslate`. It's not testing that the %-operator is raising a `KeyError` but it's testing that when not all parameters are applied it just applies plural parameters. Change-Id: Ifa02edeff1e70c278ec0011712135f538078a00a --- M tests/i18n_tests.py 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/i18n_tests.py b/tests/i18n_tests.py index 3b5340d..bac92a0 100644 --- a/tests/i18n_tests.py +++ b/tests/i18n_tests.py @@ -304,10 +304,10 @@ def testAllParametersExist(self): """Test that all parameters are required when using a dict.""" - with self.assertRaisesRegex(KeyError, repr(u'line')): - # all parameters must be inside twntranslate - i18n.twntranslate('de', 'test-multiple-plurals', - {'line': 1, 'page': 1}) % {'action': u'Ändere'} + # all parameters must be inside twntranslate + self.assertEqual(i18n.twntranslate('de', 'test-multiple-plurals', + {'line': 1, 'page': 1}), + 'Bot: %(action)s %(line)s Zeile von einer Seite.') def test_fallback_lang(self): """ -- To view, visit https://gerrit.wikimedia.org/r/244621 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifa02edeff1e70c278ec0011712135f538078a00a Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Siebrand <siebrand(a)kitano.nl> Gerrit-Reviewer: jenkins-bot <>

8 years, 6 months

← Newer
1
...
7
8
9
10
11
12
13
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits October 2015