jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1328364?usp=email )
Change subject: family: Add new WikimediaSubdomainFamily
......................................................................
family: Add new WikimediaSubdomainFamily
WikimediaSubdomainFamily combines SubdomainFamily and WikimediaFamily.
Derive all Wikimedia subdomain families from it.
Change-Id: I376afbdcc1635c7a6feb531620d7d0511529b9f9
---
M pywikibot/families/wikibooks_family.py
M pywikibot/families/wikimania_family.py
M pywikibot/families/wikimediachapter_family.py
M pywikibot/families/wikinews_family.py
M pywikibot/families/wikipedia_family.py
M pywikibot/families/wikiquote_family.py
M pywikibot/families/wikisource_family.py
M pywikibot/families/wikiversity_family.py
M pywikibot/families/wikivoyage_family.py
M pywikibot/families/wiktionary_family.py
M pywikibot/family.py
11 files changed, 18 insertions(+), 19 deletions(-)
Approvals:
Mahveotm: Looks good to me, but someone else must approve
jenkins-bot: Verified
Xqt: Looks good to me, approved
diff --git a/pywikibot/families/wikibooks_family.py
b/pywikibot/families/wikibooks_family.py
index 7e75b08..d22505e 100644
--- a/pywikibot/families/wikibooks_family.py
+++ b/pywikibot/families/wikibooks_family.py
@@ -9,8 +9,7 @@
from pywikibot import family
-# The Wikimedia family that is known as Wikibooks
-class Family(family.SubdomainFamily, family.WikimediaFamily):
+class Family(family.WikimediaSubdomainFamily):
"""Family class for Wikibooks."""
diff --git a/pywikibot/families/wikimania_family.py
b/pywikibot/families/wikimania_family.py
index 330513a..2e202a8 100644
--- a/pywikibot/families/wikimania_family.py
+++ b/pywikibot/families/wikimania_family.py
@@ -13,8 +13,7 @@
from pywikibot.tools import classproperty
-# The Wikimania family
-class Family(family.SubdomainFamily, family.WikimediaFamily):
+class Family(family.WikimediaSubdomainFamily):
"""Family class for Wikimania wikis.
diff --git a/pywikibot/families/wikimediachapter_family.py
b/pywikibot/families/wikimediachapter_family.py
index 6054c45..db76f9b 100644
--- a/pywikibot/families/wikimediachapter_family.py
+++ b/pywikibot/families/wikimediachapter_family.py
@@ -9,7 +9,7 @@
from pywikibot import family
-class Family(family.SubdomainFamily, family.WikimediaFamily):
+class Family(family.WikimediaSubdomainFamily):
"""Family class for WCH, WTO and WUG wikis hosted on wikimedia.org."""
diff --git a/pywikibot/families/wikinews_family.py
b/pywikibot/families/wikinews_family.py
index c853157..e0ca19f 100644
--- a/pywikibot/families/wikinews_family.py
+++ b/pywikibot/families/wikinews_family.py
@@ -14,8 +14,7 @@
from pywikibot import family
-# The Wikimedia family that is known as Wikinews
-class Family(family.SubdomainFamily, family.WikimediaFamily):
+class Family(family.WikimediaSubdomainFamily):
"""Family class for Wikinews."""
diff --git a/pywikibot/families/wikipedia_family.py
b/pywikibot/families/wikipedia_family.py
index e8d8423..b3bc6fe 100644
--- a/pywikibot/families/wikipedia_family.py
+++ b/pywikibot/families/wikipedia_family.py
@@ -9,8 +9,7 @@
from pywikibot import family
-# The Wikimedia family that is known as Wikipedia, the Free Encyclopedia
-class Family(family.SubdomainFamily, family.WikimediaFamily):
+class Family(family.WikimediaSubdomainFamily):
"""Family module for Wikipedia."""
diff --git a/pywikibot/families/wikiquote_family.py
b/pywikibot/families/wikiquote_family.py
index 2aca53f..ec68356 100644
--- a/pywikibot/families/wikiquote_family.py
+++ b/pywikibot/families/wikiquote_family.py
@@ -9,8 +9,7 @@
from pywikibot import family
-# The Wikimedia family that is known as Wikiquote
-class Family(family.SubdomainFamily, family.WikimediaFamily):
+class Family(family.WikimediaSubdomainFamily):
"""Family class for Wikiquote."""
diff --git a/pywikibot/families/wikisource_family.py
b/pywikibot/families/wikisource_family.py
index 316f28a..87fe192 100644
--- a/pywikibot/families/wikisource_family.py
+++ b/pywikibot/families/wikisource_family.py
@@ -10,8 +10,7 @@
from pywikibot.tools import classproperty
-# The Wikimedia family that is known as Wikisource
-class Family(family.SubdomainFamily, family.WikimediaFamily):
+class Family(family.WikimediaSubdomainFamily):
"""Family class for Wikisource."""
diff --git a/pywikibot/families/wikiversity_family.py
b/pywikibot/families/wikiversity_family.py
index 2ea2391..11a3427 100644
--- a/pywikibot/families/wikiversity_family.py
+++ b/pywikibot/families/wikiversity_family.py
@@ -10,8 +10,7 @@
from pywikibot.tools import classproperty
-# The Wikimedia family that is known as Wikiversity
-class Family(family.SubdomainFamily, family.WikimediaFamily):
+class Family(family.WikimediaSubdomainFamily):
"""Family class for Wikiversity."""
diff --git a/pywikibot/families/wikivoyage_family.py
b/pywikibot/families/wikivoyage_family.py
index 82dff02..5c0668e 100644
--- a/pywikibot/families/wikivoyage_family.py
+++ b/pywikibot/families/wikivoyage_family.py
@@ -6,11 +6,10 @@
"""Family module for Wikivoyage."""
from __future__ import annotations
-# The new Wikivoyage family that is hosted at Wikimedia
from pywikibot import family
-class Family(family.SubdomainFamily, family.WikimediaFamily):
+class Family(family.WikimediaSubdomainFamily):
"""Family class for Wikivoyage."""
diff --git a/pywikibot/families/wiktionary_family.py
b/pywikibot/families/wiktionary_family.py
index c75aec8..2c37b1e 100644
--- a/pywikibot/families/wiktionary_family.py
+++ b/pywikibot/families/wiktionary_family.py
@@ -9,8 +9,7 @@
from pywikibot import family
-# The Wikimedia family that is known as Wiktionary
-class Family(family.SubdomainFamily, family.WikimediaFamily):
+class Family(family.WikimediaSubdomainFamily):
"""Family class for Wiktionary.
diff --git a/pywikibot/family.py b/pywikibot/family.py
index 3770782..4e4fa21 100644
--- a/pywikibot/family.py
+++ b/pywikibot/family.py
@@ -1103,6 +1103,14 @@
return f'{cls.name}.wikimedia.org'
+class WikimediaSubdomainFamily(SubdomainFamily, WikimediaFamily):
+
+ """Family class for Wikimedia projects using subdomains.
+
+ .. version-added:: 11.8
+ """
+
+
class WikibaseFamily(Family):
"""A base class for a Wikibase Family.
--
To view, visit
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1328364?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: I376afbdcc1635c7a6feb531620d7d0511529b9f9
Gerrit-Change-Number: 1328364
Gerrit-PatchSet: 2
Gerrit-Owner: Xqt <[email protected]>
Gerrit-Reviewer: Mahveotm <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
Pywikibot-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
