jenkins-bot merged this change.
[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(-)
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 change 503765. To unsubscribe, or for help writing mail filters, visit settings.