Pywikibot-commits April 2019

pywikibot-commits@lists.wikimedia.org

1 participants
68 discussions

[Gerrit] pywikibot/core[master]: [cleanup] cleanup scriptpath for FandomFamily

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/503755 ) Change subject: [cleanup] cleanup scriptpath for FandomFamily ...................................................................... [cleanup] cleanup scriptpath for FandomFamily - Rename WikiaFamily to FandomFamily and deprecate the old identifier - FandomFamily does not have different domains for different site codes but distingued scriptpath except for "en". - update scriptpath for wowwiki_family.py and lyricwiki_family.py Bug: T220913 Change-Id: Idaca2928ed228cac32b975fbb8b4f044b66c5fe4 --- M pywikibot/families/lyricwiki_family.py M pywikibot/families/wowwiki_family.py M pywikibot/family.py 3 files changed, 14 insertions(+), 11 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/lyricwiki_family.py b/pywikibot/families/lyricwiki_family.py index 1819b3a..c35d262 100644 --- a/pywikibot/families/lyricwiki_family.py +++ b/pywikibot/families/lyricwiki_family.py @@ -15,7 +15,7 @@ # user-config.py: # usernames['lyricwiki']['en'] = 'user' -class Family(family.SubdomainFamily, family.WikiaFamily): +class Family(family.SubdomainFamily, family.FandomFamily): """Family class for LyricWiki.""" @@ -23,10 +23,6 @@ domain = 'lyrics.fandom.com' codes = ('en', 'ru') - def scriptpath(self, code): - """Return the script path for this family.""" - return '' if code == 'en' else ('/' + code) - @deprecated('APISite.version()', since='20141225') def version(self, code): return '1.19.24' diff --git a/pywikibot/families/wowwiki_family.py b/pywikibot/families/wowwiki_family.py index 5a468dd..55f55ea 100644 --- a/pywikibot/families/wowwiki_family.py +++ b/pywikibot/families/wowwiki_family.py @@ -11,7 +11,7 @@ from pywikibot.tools import deprecated, classproperty -class Family(family.SubdomainFamily, family.WikiaFamily): +class Family(family.SubdomainFamily, family.FandomFamily): """Family class for WOW Wiki.""" @@ -73,4 +73,6 @@ def scriptpath(self, code): """Return the script path for this family.""" - return '' if code in ('en', 'uk') else ('/' + code) + if code == 'uk': + return '' + return super(Family, self).scriptpath(code) diff --git a/pywikibot/family.py b/pywikibot/family.py index 5f5c932..73545be 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -23,7 +23,7 @@ from pywikibot.exceptions import UnknownFamily, FamilyMaintenanceWarning from pywikibot.tools import ( deprecated, deprecated_args, remove_last_args, issue_deprecation_warning, - FrozenDict, classproperty, PY2 + ModuleDeprecationWrapper, FrozenDict, classproperty, PY2 ) if not PY2: @@ -1571,13 +1571,13 @@ return [cls.domain] -class WikiaFamily(Family): +class FandomFamily(Family): - """Common features of Wikia families.""" + """Common features of Fandom families.""" def scriptpath(self, code): """Return the script path for this family.""" - return '' + return '' if code == 'en' else ('/' + code) class WikimediaFamily(Family): @@ -1762,3 +1762,8 @@ # str() used because py2 can't accept a unicode as the name of a class AutoFamily = type(str('AutoFamily'), (SingleSiteFamily,), locals()) return AutoFamily() + + +wrapper = ModuleDeprecationWrapper(__name__) +wrapper._add_deprecated_attr('WikiaFamily', replacement=FandomFamily, + since='20190420') -- To view, visit https://gerrit.wikimedia.org/r/503755 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: Idaca2928ed228cac32b975fbb8b4f044b66c5fe4 Gerrit-Change-Number: 503755 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

4 years, 12 months

[Gerrit] pywikibot/core[master]: [python 3.8] threading.Thread.isAlive() method is deprecated

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/505459 ) Change subject: [python 3.8] threading.Thread.isAlive() method is deprecated ...................................................................... [python 3.8] threading.Thread.isAlive() method is deprecated The isAlive() method of threading.Thread has been deprecated. The renaming to is_alive() was done in python 2.6 Change-Id: I7322d86a73133fa28f97d3b1e0b406fd08645137 --- M pywikibot/__init__.py M pywikibot/tools/__init__.py M scripts/weblinkchecker.py 3 files changed, 5 insertions(+), 5 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 2caa6f0..a4cbfdc 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -1366,7 +1366,7 @@ '{lightblue}Waiting for {num} pages to be put. ' 'Estimated time remaining: {sec}{default}', num=num, sec=sec)) - while _putthread.isAlive() and page_put_queue.qsize() > 0: + while _putthread.is_alive() and page_put_queue.qsize() > 0: try: _putthread.join(1) except KeyboardInterrupt: @@ -1400,7 +1400,7 @@ def async_request(request, *args, **kwargs): """Put a request on the queue, and start the daemon if necessary.""" - if not _putthread.isAlive(): + if not _putthread.is_alive(): try: page_put_queue.mutex.acquire() try: diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py index 4515301..8bd43d5 100644 --- a/pywikibot/tools/__init__.py +++ b/pywikibot/tools/__init__.py @@ -842,7 +842,7 @@ def __iter__(self): """Iterate results from the queue.""" - if not self.isAlive() and not self.finished.isSet(): + if not self.is_alive() and not self.finished.isSet(): self.start() # if there is an item in the queue, yield it, otherwise wait while not self.finished.isSet(): @@ -985,7 +985,7 @@ """Return the number of alive threads and delete all non-alive ones.""" cnt = 0 for item in self[:]: - if item.isAlive(): + if item.is_alive(): cnt += 1 else: self.remove(item) diff --git a/scripts/weblinkchecker.py b/scripts/weblinkchecker.py index e3d5d69..320c8b8 100755 --- a/scripts/weblinkchecker.py +++ b/scripts/weblinkchecker.py @@ -1031,7 +1031,7 @@ # wait until the report thread is shut down; the user can # interrupt it by pressing CTRL-C. try: - while bot.history.reportThread.isAlive(): + while bot.history.reportThread.is_alive(): time.sleep(0.1) except KeyboardInterrupt: pywikibot.output('Report thread interrupted.') -- To view, visit https://gerrit.wikimedia.org/r/505459 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: I7322d86a73133fa28f97d3b1e0b406fd08645137 Gerrit-Change-Number: 505459 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

4 years, 12 months

[Gerrit] pywikibot/core[master]: [TEST] add tests for new create_short_link()

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/505461 ) Change subject: [TEST] add tests for new create_short_link() ...................................................................... [TEST] add tests for new create_short_link() Bug: T220876 Change-Id: Ia6ecb56a72457e9748873b66bee013f7142827df --- M tests/page_tests.py 1 file changed, 16 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/page_tests.py b/tests/page_tests.py index 4f361ce..f538463 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -1175,6 +1175,22 @@ 'Framawiki%2Fpwb_tests%2Fpermalink&oldid=340685') +class TestShortLink(DefaultSiteTestCase): + """Test that short link management is correct.""" + + family = 'test' + code = 'test' + + def test_create_short_link(self): + """Test create_short_link function.""" + site = self.get_site() + p1 = pywikibot.Page(site, 'User:Framawiki/pwb_tests/shortlink') + self.assertEqual(p1.create_short_link(), 'w.wiki/3Cy') + self.assertEqual(p1.create_short_link(with_protocol=True), + 'https://w.wiki/3Cy') + self.assertEqual(p1.create_short_link(permalink=True), 'w.wiki/3Cz') + + if __name__ == '__main__': # pragma: no cover try: unittest.main() -- To view, visit https://gerrit.wikimedia.org/r/505461 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: Ia6ecb56a72457e9748873b66bee013f7142827df Gerrit-Change-Number: 505461 Gerrit-PatchSet: 1 Gerrit-Owner: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

4 years, 12 months

[Gerrit] pywikibot/core[master]: [doc] Update HISTORY.rst

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/505460 ) Change subject: [doc] Update HISTORY.rst ...................................................................... [doc] Update HISTORY.rst Change-Id: Iffed28a5235050942f18148497f3ad6ad86866d0 --- M HISTORY.rst 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Framawiki: Looks good to me, approved jenkins-bot: Verified diff --git a/HISTORY.rst b/HISTORY.rst index 136cf3d..2e210b8 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -4,6 +4,7 @@ Current release --------------- +* Implement create_short_link Page method to use Extension:UrlShortener (T220876) * Remove wikia family file (T220921) * Remove deprecated ez_setup.py * Changed requirements for sseclient (T219024) -- To view, visit https://gerrit.wikimedia.org/r/505460 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: Iffed28a5235050942f18148497f3ad6ad86866d0 Gerrit-Change-Number: 505460 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

4 years, 12 months

[Gerrit] pywikibot/core[master]: Implement create_short_link function to use Extension:UrlShortener

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/505409 ) Change subject: Implement create_short_link function to use Extension:UrlShortener ...................................................................... Implement create_short_link function to use Extension:UrlShortener Implement create_short_link in APISite then in BasePage. Bug: T220876 Change-Id: I57280c24e0049cda751bf5646f58079763316b55 --- M pywikibot/family.py M pywikibot/page.py M pywikibot/site.py 3 files changed, 52 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/family.py b/pywikibot/family.py index 5f5c932..97ed83e 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -933,6 +933,10 @@ # 'pt': { '_default': [0]} # } + # Some wiki farms have UrlShortener extension enabled only on the main + # site. This value can specify this last one with (lang, family) tuple. + shared_urlshortner_wiki = None + _families = {} def __getattribute__(self, name): @@ -1676,6 +1680,10 @@ # wikibase code and item number: disambcatname = {'wikidata': 'Q1982926'} + # UrlShortener extension is only usable on metawiki, and this wiki can + # process links to all WM domains. + shared_urlshortner_wiki = ('meta', 'meta') + @classproperty def domain(cls): """Domain property.""" diff --git a/pywikibot/page.py b/pywikibot/page.py index 05c05f8..b4cfd5f 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -2212,6 +2212,33 @@ """ return self.content_model == 'flow-board' + def create_short_link(self, permalink=False, with_protocol=False): + """ + Return a shortened link that points to that page. + + If shared_urlshortner_wiki is defined in family config, it'll use + that site to create the link instead of the current wiki. + + @param permalink: If true, the link will point to the actual revision + of the page. + @type permalink: bool + @param with_protocol: If true, the link will have https propotol + prepend. + @type with_protocol: bool + @return: The reduced link. + @rtype: str + """ + wiki = self.site + if self.site.family.shared_urlshortner_wiki: + wiki = pywikibot.Site(*self.site.family.shared_urlshortner_wiki) + + url = self.permalink() if permalink else self.full_url() + + link = wiki.create_short_link(url) + if with_protocol: + return '{}://{}'.format(wiki.protocol(), link) + return link + # ####### DEPRECATED METHODS ######## @deprecated('Site.encoding()', since='20090307') diff --git a/pywikibot/site.py b/pywikibot/site.py index 0373533..12de127 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -7454,6 +7454,23 @@ gen.set_maximum_items(total) return gen + @need_extension('UrlShortener') + def create_short_link(self, url): + """ + Return a shortened link. + + Note that on Wikimedia wikis only metawiki supports this action, + and this wiki can process links to all WM domains. + + @param url: The link to reduce, with propotol prefix. + @type url: str + @return: The reduced link, without protocol prefix. + @rtype: str + """ + req = self._simple_request(action='shortenurl', url=url) + data = req.submit() + return data['shortenurl']['shorturl'] + # aliases for backwards compatibility isBlocked = redirect_func(is_blocked, old_name='isBlocked', class_name='APISite', since='20141218') -- To view, visit https://gerrit.wikimedia.org/r/505409 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: I57280c24e0049cda751bf5646f58079763316b55 Gerrit-Change-Number: 505409 Gerrit-PatchSet: 2 Gerrit-Owner: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

4 years, 12 months

[Gerrit] pywikibot/core[master]: [L10N] Add new Western Armenian site "hyw" to wikipedia_family.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/505458 ) Change subject: [L10N] Add new Western Armenian site "hyw" to wikipedia_family.py ...................................................................... [L10N] Add new Western Armenian site "hyw" to wikipedia_family.py Bug: T212597 Change-Id: I5113108c3951b86f627efec6d638812e0d7c44a4 --- M pywikibot/families/wikipedia_family.py 1 file changed, 8 insertions(+), 8 deletions(-) Approvals: Framawiki: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index f3e4902..fb64c10 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Family module for Wikipedia.""" # -# (C) Pywikibot team, 2004-2018 +# (C) Pywikibot team, 2004-2019 # # Distributed under the terms of the MIT license. # @@ -31,7 +31,7 @@ languages_by_size = [ 'en', 'ceb', 'sv', 'de', 'fr', 'nl', 'ru', 'it', 'es', 'pl', 'war', 'vi', 'ja', 'zh', 'pt', 'uk', 'ar', 'fa', 'sr', 'ca', 'no', 'id', 'fi', - 'ko', 'sh', 'hu', 'cs', 'ro', 'eu', 'tr', 'ms', 'eo', 'bg', 'da', 'hy', + 'ko', 'hu', 'sh', 'cs', 'ro', 'eu', 'tr', 'ms', 'eo', 'bg', 'da', 'hy', 'he', 'sk', 'zh-min-nan', 'kk', 'min', 'ce', 'hr', 'lt', 'et', 'be', 'sl', 'el', 'gl', 'az', 'ur', 'simple', 'nn', 'azb', 'uz', 'th', 'hi', 'la', 'ka', 'vo', 'ta', 'cy', 'mk', 'ast', 'tg', 'lv', 'mg', 'oc', @@ -43,21 +43,21 @@ 'yi', 'am', 'nap', 'cdo', 'bug', 'hsb', 'map-bms', 'mai', 'xmf', 'fo', 'mzn', 'li', 'ilo', 'sah', 'eml', 'vec', 'os', 'sa', 'sd', 'mrj', 'mhr', 'ps', 'hif', 'diq', 'roa-tara', 'zh-classical', 'bcl', 'hak', - 'frr', 'pam', 'ace', 'szl', 'nso', 'se', 'km', 'nv', 'mi', 'rue', + 'ace', 'frr', 'pam', 'szl', 'nso', 'se', 'km', 'nv', 'mi', 'rue', 'nah', 'nds-nl', 'vls', 'bh', 'gan', 'crh', 'sc', 'vep', 'bo', 'glk', 'co', 'tk', 'myv', 'fiu-vro', 'so', 'as', 'lrc', 'kv', 'csb', 'gv', 'shn', 'zea', 'udm', 'pcd', 'ie', 'ay', 'sn', 'ug', 'nrm', 'stq', 'lez', 'lad', 'kw', 'mwl', 'gom', 'gn', 'haw', 'rm', 'lij', 'ha', - 'koi', 'ab', 'mt', 'lfn', 'fur', 'frp', 'lo', 'dsb', 'ln', 'ang', - 'kab', 'ext', 'cbk-zam', 'olo', 'dty', 'dv', 'ksh', 'gag', 'pi', 'pag', - 'pfl', 'av', 'bjn', 'bxr', 'xal', 'gor', 'krc', 'pap', 'za', 'kaa', + 'koi', 'mt', 'ab', 'lfn', 'fur', 'frp', 'lo', 'dsb', 'ln', 'ang', + 'kab', 'ext', 'olo', 'cbk-zam', 'dty', 'dv', 'ksh', 'gag', 'pi', 'pfl', + 'pag', 'av', 'bjn', 'bxr', 'xal', 'krc', 'gor', 'pap', 'za', 'kaa', 'pdc', 'rw', 'tyv', 'to', 'kl', 'nov', 'jam', 'arc', 'kbp', 'kbd', 'tpi', 'tet', 'ig', 'ki', 'na', 'jbo', 'lbe', 'roa-rup', 'ty', 'bi', 'kg', 'mdf', 'wo', 'lg', 'zu', 'srn', 'tcy', 'atj', 'inh', 'chr', - 'ltg', 'sm', 'xh', 'om', 'pih', 'sat', 'cu', 'rmy', 'bm', 'tw', 'tn', + 'ltg', 'sm', 'xh', 'om', 'pih', 'sat', 'cu', 'rmy', 'tw', 'bm', 'tn', 'chy', 'rn', 'got', 'ts', 'tum', 'ak', 'st', 'ny', 'ch', 'ss', 'pnt', 'fj', 'iu', 'ady', 'ee', 'ks', 've', 'ik', 'sg', 'ff', 'dz', 'ti', - 'cr', 'din', + 'cr', 'din', 'hyw', ] # Sites we want to edit but not count as real languages -- To view, visit https://gerrit.wikimedia.org/r/505458 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: I5113108c3951b86f627efec6d638812e0d7c44a4 Gerrit-Change-Number: 505458 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

4 years, 12 months

[Gerrit] pywikibot/core[master]: [families] remove wikia family file

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/503765 ) Change subject: [families] remove wikia family file ...................................................................... [families] remove wikia family file wikia starting page is no longer a mediawiki family. Remove it. Bug: T220921 Change-Id: I2592febcb022594292e4e2fafaae5ed2bc09b998 --- M .travis.yml M HISTORY.rst M docs/api_ref/pywikibot.families.rst D pywikibot/families/wikia_family.py M tests/site_tests.py 5 files changed, 2 insertions(+), 106 deletions(-) Approvals: Framawiki: Looks good to me, approved jenkins-bot: Verified diff --git a/.travis.yml b/.travis.yml index 4928fb2..6796027 100644 --- a/.travis.yml +++ b/.travis.yml @@ -147,8 +147,6 @@ env: LANGUAGE=zh FAMILY=wpbeta PYWIKIBOT_SITE_ONLY=1 OAUTH_DOMAIN="zh.wikipedia.beta.wmflabs.org" - python: '3.4' env: LANGUAGE=en FAMILY=wsbeta PYWIKIBOT_SITE_ONLY=1 PYWIKIBOT_NO_L10N_TESTS=0 - - python: '2.7' - env: LANGUAGE=wikia FAMILY=wikia PYWIKIBOT_TEST_NO_RC=1 - python: '3.5' env: LANGUAGE=en FAMILY=musicbrainz PYWIKIBOT_SITE_ONLY=1 - python: '3.4' diff --git a/HISTORY.rst b/HISTORY.rst index 863b476..136cf3d 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -4,6 +4,7 @@ Current release --------------- +* Remove wikia family file (T220921) * Remove deprecated ez_setup.py * Changed requirements for sseclient (T219024) * Set optional parameter namespace to None in site.logpages (T217664) diff --git a/docs/api_ref/pywikibot.families.rst b/docs/api_ref/pywikibot.families.rst index d830f43..d53e52a 100644 --- a/docs/api_ref/pywikibot.families.rst +++ b/docs/api_ref/pywikibot.families.rst @@ -113,14 +113,6 @@ :undoc-members: :show-inheritance: -pywikibot.families.wikia\_family module ---------------------------------------- - -.. automodule:: pywikibot.families.wikia_family - :members: - :undoc-members: - :show-inheritance: - pywikibot.families.wikibooks\_family module ------------------------------------------- diff --git a/pywikibot/families/wikia_family.py b/pywikibot/families/wikia_family.py deleted file mode 100644 index ec7379b..0000000 --- a/pywikibot/families/wikia_family.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -"""Family module for Wikia.""" -# -# (C) Pywikibot team, 2008-2018 -# -# Distributed under the terms of the MIT license. -# -from __future__ import absolute_import, division, unicode_literals - -from pywikibot import family -from pywikibot.tools import deprecated - - -# The Wikia Search family -# user-config.py: usernames['wikia']['wikia'] = 'User name' -class Family(family.SingleSiteFamily, family.WikiaFamily): - - """Family class for Wikia.""" - - name = 'wikia' - domain = 'www.wikia.com' - - @deprecated('APISite.version()', since='20141225') - def version(self, code): - """Return the version for this family.""" - return '1.19.24' - - def apipath(self, code): - """Return the path to api.php for this family.""" - return '/api.php' diff --git a/tests/site_tests.py b/tests/site_tests.py index d6de733..705d194 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -1069,16 +1069,6 @@ cached = True - @classmethod - def setUpClass(cls): - """Skip tests for wikia (T214263).""" - super(TestSiteGeneratorsUsers, cls).setUpClass() - mysite = cls.get_site() - if mysite.sitename == 'wikia:wikia': - raise unittest.SkipTest( - 'Skipping site_tests.TestSiteGeneratorsUsers tests for ' - 'Wikia due to T214265') - def setUp(self): """Initialize self.site and self.mainpage.""" super(TestSiteGeneratorsUsers, self).setUp() @@ -1592,13 +1582,6 @@ """Test search method.""" - def setUp(self): - """Skip tests for Wikia Search extension.""" - super(SearchTestCase, self).setUp() - if self.site.has_extension('Wikia Search'): - self.skipTest('The site {!r} does not use MediaWiki search' - .format(self.site)) - def test_search(self): """Test the site.search() method.""" mysite = self.site @@ -1708,16 +1691,6 @@ """Test site method site.usercontribs() without bot user.""" - @classmethod - def setUpClass(cls): - """Skip tests for wikia (T214263).""" - super(TestUserContribsWithoutUser, cls).setUpClass() - mysite = cls.get_site() - if mysite.sitename == 'wikia:wikia': - raise unittest.SkipTest( - 'Skipping site_tests.TestUserContribsWithoutUser tests for ' - 'Wikia due to T214263') - def test_user_prefix(self): """Test the site.usercontribs() method with userprefix.""" mysite = self.get_site() @@ -3447,50 +3420,12 @@ """Test single code family sites.""" sites = { - 'wikia': { - 'family': 'wikia', - 'code': 'wikia', - }, 'omegawiki': { 'family': 'omegawiki', 'code': 'omegawiki', }, } - def test_wikia(self): - """Test www.wikia.com.""" - url = 'www.wikia.com' - site = self.get_site('wikia') - self.assertEqual(site.hostname(), url) - self.assertEqual(site.code, 'wikia') - self.assertIsInstance(site.namespaces, Mapping) - self.assertFalse(site.obsolete) - self.assertEqual(site.family.hostname('en'), url) - self.assertEqual(site.family.hostname('wikia'), url) - self.assertEqual(site.family.hostname('www'), url) - - pywikibot.config.family = 'wikia' - pywikibot.config.mylang = 'de' - - site2 = pywikibot.Site('www', 'wikia') - self.assertEqual(site2.code, 'wikia') - self.assertFalse(site2.obsolete) - self.assertEqual(site, site2) - self.assertEqual(pywikibot.config.mylang, 'de') - - site2 = pywikibot.Site('really_invalid', 'wikia') - self.assertEqual(site2.code, 'wikia') - self.assertFalse(site2.obsolete) - self.assertEqual(site, site2) - self.assertEqual(pywikibot.config.mylang, 'de') - - site2 = pywikibot.Site('de', 'wikia') - self.assertEqual(site2.code, 'wikia') - self.assertFalse(site2.obsolete) - self.assertEqual(site, site2) - # When the code is the same as config.mylang, Site() changes mylang - self.assertEqual(pywikibot.config.mylang, 'wikia') - def test_omega(self): """Test www.omegawiki.org.""" url = 'www.omegawiki.org' @@ -3512,7 +3447,7 @@ family = 'lyricwiki' def test_lyrics(self): - """Test lyrics.wikia.com.""" + """Test lyrics.fandom.com.""" url = 'lyrics.fandom.com' site = self.site self.assertEqual(site.hostname(), url) -- To view, visit https://gerrit.wikimedia.org/r/503765 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: I2592febcb022594292e4e2fafaae5ed2bc09b998 Gerrit-Change-Number: 503765 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75) Gerrit-CC: Zoranzoki21 <zorandori4444(a)gmail.com>

4 years, 12 months

[Gerrit] pywikibot/core[master]: [bugfix] Update lyricwiki_family.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/503764 ) Change subject: [bugfix] Update lyricwiki_family.py ...................................................................... [bugfix] Update lyricwiki_family.py - lyricwiki has been moved to fandom.com domain and has a new subdomain "ru". Derive it from SubdomainFamily instead of SingleSiteFamily - update scriptpath, version, protocol methods and langs class property - test lyricwiki_family.py in new TestSubdomainFamilySite - use omegawiki_family.py as second SingleCodeFamily for tests - update protocol and ignore_certificate_error of omegawiki_family.py because https call does not work properly Bug: T220908 Change-Id: I921c309bfc3117f6dd2adcf8bb2816b9d9cf25d4 --- M pywikibot/families/lyricwiki_family.py M pywikibot/families/omegawiki_family.py M tests/family_tests.py M tests/site_tests.py 4 files changed, 60 insertions(+), 29 deletions(-) Approvals: D3r1ck01: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/lyricwiki_family.py b/pywikibot/families/lyricwiki_family.py index c60ded6..1819b3a 100644 --- a/pywikibot/families/lyricwiki_family.py +++ b/pywikibot/families/lyricwiki_family.py @@ -1,23 +1,41 @@ # -*- coding: utf-8 -*- """Family module for LyricWiki.""" # -# (C) Pywikibot team, 2007-2018 +# (C) Pywikibot team, 2007-2019 # # Distributed under the terms of the MIT license. # from __future__ import absolute_import, division, unicode_literals from pywikibot import family +from pywikibot.tools import classproperty, deprecated # The LyricWiki family # user-config.py: # usernames['lyricwiki']['en'] = 'user' -class Family(family.SingleSiteFamily, family.WikiaFamily): +class Family(family.SubdomainFamily, family.WikiaFamily): """Family class for LyricWiki.""" name = 'lyricwiki' - code = 'en' - domain = 'lyrics.wikia.com' + domain = 'lyrics.fandom.com' + codes = ('en', 'ru') + + def scriptpath(self, code): + """Return the script path for this family.""" + return '' if code == 'en' else ('/' + code) + + @deprecated('APISite.version()', since='20141225') + def version(self, code): + return '1.19.24' + + def protocol(self, code): + """Return 'https' as the protocol.""" + return 'https' + + @classproperty + def langs(cls): + """Property listing family languages.""" + return {code: cls.domain for code in cls.codes} diff --git a/pywikibot/families/omegawiki_family.py b/pywikibot/families/omegawiki_family.py index 10fae56..5ceabf0 100644 --- a/pywikibot/families/omegawiki_family.py +++ b/pywikibot/families/omegawiki_family.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Family module for Omega Wiki.""" # -# (C) Pywikibot team, 2006-2018 +# (C) Pywikibot team, 2006-2019 # # Distributed under the terms of the MIT license. # @@ -25,11 +25,3 @@ def scriptpath(self, code): """Return the script path for this family.""" return '' - - def protocol(self, code): - """Return https as the protocol for this family.""" - return 'https' - - def ignore_certificate_error(self, code): - """Ignore certificate errors.""" - return True # has an expired certificate. diff --git a/tests/family_tests.py b/tests/family_tests.py index b698e83..e529066 100644 --- a/tests/family_tests.py +++ b/tests/family_tests.py @@ -237,9 +237,10 @@ def test_each_family(self): """Test each family builds a working regex.""" for family in pywikibot.config.family_files: - if family == 'wowwiki': + if family in ('wowwiki', 'lyricwiki'): self.skipTest( - 'Family.from_url() does not work for wowwiki (T215077)') + 'Family.from_url() does not work for {} (T215077)' + .format(family)) self.current_family = family family = Family.load(family) for code in family.codes: diff --git a/tests/site_tests.py b/tests/site_tests.py index f9ef079..d6de733 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -3451,22 +3451,23 @@ 'family': 'wikia', 'code': 'wikia', }, - 'lyricwiki': { - 'family': 'lyricwiki', - 'code': 'en', + 'omegawiki': { + 'family': 'omegawiki', + 'code': 'omegawiki', }, } def test_wikia(self): """Test www.wikia.com.""" + url = 'www.wikia.com' site = self.get_site('wikia') - self.assertEqual(site.hostname(), 'www.wikia.com') + self.assertEqual(site.hostname(), url) self.assertEqual(site.code, 'wikia') self.assertIsInstance(site.namespaces, Mapping) self.assertFalse(site.obsolete) - self.assertEqual(site.family.hostname('en'), 'www.wikia.com') - self.assertEqual(site.family.hostname('wikia'), 'www.wikia.com') - self.assertEqual(site.family.hostname('www'), 'www.wikia.com') + self.assertEqual(site.family.hostname('en'), url) + self.assertEqual(site.family.hostname('wikia'), url) + self.assertEqual(site.family.hostname('www'), url) pywikibot.config.family = 'wikia' pywikibot.config.mylang = 'de' @@ -3490,21 +3491,40 @@ # When the code is the same as config.mylang, Site() changes mylang self.assertEqual(pywikibot.config.mylang, 'wikia') + def test_omega(self): + """Test www.omegawiki.org.""" + url = 'www.omegawiki.org' + site = self.get_site('omegawiki') + self.assertEqual(site.hostname(), url) + self.assertEqual(site.code, 'omegawiki') + self.assertIsInstance(site.namespaces, Mapping) + self.assertFalse(site.obsolete) + self.assertEqual(site.family.hostname('en'), url) + self.assertEqual(site.family.hostname('omega'), url) + self.assertEqual(site.family.hostname('omegawiki'), url) + + +class TestSubdomainFamilySite(TestCase): + + """Test subdomain family site.""" + + code = 'en' + family = 'lyricwiki' + def test_lyrics(self): """Test lyrics.wikia.com.""" - site = self.get_site('lyricwiki') - self.assertEqual(site.hostname(), 'lyrics.wikia.com') + url = 'lyrics.fandom.com' + site = self.site + self.assertEqual(site.hostname(), url) self.assertEqual(site.code, 'en') self.assertIsInstance(site.namespaces, Mapping) self.assertFalse(site.obsolete) - self.assertEqual(site.family.hostname('en'), 'lyrics.wikia.com') + self.assertEqual(site.family.hostname('en'), url) - self.assertEqual(site.family.hostname('lyrics'), 'lyrics.wikia.com') - self.assertEqual(site.family.hostname('lyricwiki'), 'lyrics.wikia.com') - + self.assertRaises(KeyError, site.family.hostname, 'lyrics') + self.assertRaises(KeyError, site.family.hostname, 'lyricwiki') self.assertRaises(pywikibot.UnknownSite, pywikibot.Site, 'lyricwiki', 'lyricwiki') - self.assertRaises(pywikibot.UnknownSite, pywikibot.Site, 'de', 'lyricwiki') -- To view, visit https://gerrit.wikimedia.org/r/503764 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: I921c309bfc3117f6dd2adcf8bb2816b9d9cf25d4 Gerrit-Change-Number: 503764 Gerrit-PatchSet: 4 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

4 years, 12 months

[Gerrit] pywikibot/core[master]: [bugfix] Fix missing quotes

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/505393 ) Change subject: [bugfix] Fix missing quotes ...................................................................... [bugfix] Fix missing quotes follow up for Ieee94da641889ab22eac1bc8b4566d5f621b4363 Bug: T215874 Change-Id: I31fca3519d736f85fed0ab5fde053b9a3b381a2d --- M dev-requirements.txt 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: D3r1ck01: Looks good to me, approved jenkins-bot: Verified diff --git a/dev-requirements.txt b/dev-requirements.txt index 1aeeeec..cbcd58a 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,7 +1,7 @@ # This is a PIP 6+ requirements file for development dependencies # -pytest>=3.6.0,<5.0.0 ; python_full_version < 3.5 -pytest>=3.6.0 ; python_full_version >= 3.5 +pytest>=3.6.0,<5.0.0 ; python_full_version < '3.5' +pytest>=3.6.0 ; python_full_version >= '3.5' pytest-timeout pytest-runner pytest-cov>=2.6.1 -- To view, visit https://gerrit.wikimedia.org/r/505393 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: I31fca3519d736f85fed0ab5fde053b9a3b381a2d Gerrit-Change-Number: 505393 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

4 years, 12 months

[Gerrit] pywikibot/core[master]: textlib: add tests for sections headers with multiple levels

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/505225 ) Change subject: textlib: add tests for sections headers with multiple levels ...................................................................... textlib: add tests for sections headers with multiple levels Change-Id: I25218cc42c40951f7bfca2fa57f2253cb33e3ca3 --- M tests/textlib_tests.py 1 file changed, 29 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index 187f2b5..990e937 100644 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -1739,6 +1739,35 @@ ('text\n\n', [('==title==', '\ncontent\n')], '[[Category:A]]\n') ) + def test_with_h1_and_h2_sections(self): + """Test for text having h1 and h2 sections.""" + self.assertEqual( + extract_sections( + 'text\n\n' + '=first level=\n' + 'foo\n' + '==title==\n' + 'bar', + self.site), + ('text\n\n', + [('=first level=', '\nfoo\n'), ('==title==', '\nbar')], + '') + ) + + def test_with_h4_and_h2_sections(self): + """Test for text having h4 and h2 sections.""" + self.assertEqual( + extract_sections( + 'text\n\n' + '====title====\n' + '==title 2==\n' + 'content', + self.site), + ('text\n\n', + [('====title====', '\n'), ('==title 2==', '\ncontent')], + '') + ) + if __name__ == '__main__': # pragma: no cover try: -- To view, visit https://gerrit.wikimedia.org/r/505225 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: I25218cc42c40951f7bfca2fa57f2253cb33e3ca3 Gerrit-Change-Number: 505225 Gerrit-PatchSet: 2 Gerrit-Owner: Whym <whym(a)whym.org> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Siebrand <siebrand(a)kitano.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

4 years, 12 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits April 2019