jenkins-bot has submitted this change and it was merged.

Change subject: Update versions for families previously <1.20 ......................................................................

Update versions for families previously <1.20

Also removes methods that are the same as the method they override, so it is easier to see when families have non-standard setup.

Add custom nicepath() where appropriate.

Change-Id: Ide8126a97aa650c7ac8d1bc7de9011719a3b96c5 --- M families/anarchopedia_family.py M families/botwiki_family.py M families/lyricwiki_family.py M families/mozilla_family.py M families/omegawiki_family.py M families/openttd_family.py M families/piratenwiki_family.py M families/wekey_family.py M families/wikia_family.py M families/wikitravel_shared_family.py M families/wowwiki_family.py 11 files changed, 27 insertions(+), 42 deletions(-)

Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified

diff --git a/families/anarchopedia_family.py b/families/anarchopedia_family.py index 773efba..cbb19bb 100644 --- a/families/anarchopedia_family.py +++ b/families/anarchopedia_family.py @@ -5,6 +5,7 @@

# The Anarchopedia family +# Offline in July 2014 class Family(family.Family): def __init__(self): family.Family.__init__(self) @@ -149,8 +150,5 @@ def scriptpath(self, code): return ''

- def path(self, code): - return '/index.php' - - def apipath(self, code): - return '/api.php' + def nicepath(self, code): + return '/' diff --git a/families/botwiki_family.py b/families/botwiki_family.py index 1409318..898d00e 100644 --- a/families/botwiki_family.py +++ b/families/botwiki_family.py @@ -63,4 +63,4 @@ }

def version(self, code): - return "1.11.0" + return '1.17.0' diff --git a/families/lyricwiki_family.py b/families/lyricwiki_family.py index 7c87f40..2bd0688 100644 --- a/families/lyricwiki_family.py +++ b/families/lyricwiki_family.py @@ -34,10 +34,10 @@ self.namespaces[503] = { '_default': u'Blog talk', }

def version(self, code): - return "1.16.2" + return '1.19.17'

def scriptpath(self, code): return ''

- def apipath(self, code): - return '/api.php' + def nicepath(self, code): + return '/' diff --git a/families/mozilla_family.py b/families/mozilla_family.py index 6bb5295..4e10c83 100644 --- a/families/mozilla_family.py +++ b/families/mozilla_family.py @@ -20,17 +20,11 @@ '_default': [u'MozillaWiki talk', self.namespaces[5]['_default']], }

- self.content_id = "mainContent" - - def RversionTab(self, code): - return r'<li\s*><a href=".*?title=.*?&amp;action=history".*?>.*?</a></li>' - def version(self, code): - return "1.10.2" + return '1.19.11'

def scriptpath(self, code): return ''

- def apipath(self, code): - raise NotImplementedError( - "The mozilla family does not support api.php") + def nicepath(self, code): + return '/' diff --git a/families/omegawiki_family.py b/families/omegawiki_family.py index c8cabc4..44ba0e6 100644 --- a/families/omegawiki_family.py +++ b/families/omegawiki_family.py @@ -76,8 +76,5 @@ def scriptpath(self, code): return ''

- def path(self, code): - return '/index.php' - - def apipath(self, code): - return '/api.php' + def nicepath(self, code): + return '/' diff --git a/families/openttd_family.py b/families/openttd_family.py index 3ab7755..1c34636 100644 --- a/families/openttd_family.py +++ b/families/openttd_family.py @@ -31,8 +31,11 @@ def scriptpath(self, code): return ''

+ def nicepath(self, code): + return '/' + def version(self, code): - return "1.12.0" + return '1.19.1'

def apipath(self, code): raise NotImplementedError( diff --git a/families/piratenwiki_family.py b/families/piratenwiki_family.py index fb63a28..6670d18 100644 --- a/families/piratenwiki_family.py +++ b/families/piratenwiki_family.py @@ -144,11 +144,7 @@ return "/wiki/"

def nicepath(self, code): - return "" + return '/'

def version(self, code): - return "1.16.0" - - if family.config.SSL_connection: - def protocol(self, code): - return "https" + return '1.22.8' diff --git a/families/wekey_family.py b/families/wekey_family.py index 13267b2..f9f3866 100644 --- a/families/wekey_family.py +++ b/families/wekey_family.py @@ -77,11 +77,14 @@ return 'wekey.westart.tw'

def version(self, code): - return "1.12.0" + return '1.16.0'

def scriptpath(self, code): return ''

+ def nicepath(self, code): + return '/' + def apipath(self, code): raise NotImplementedError( "The %s family does not support api.php" % self.name) diff --git a/families/wikia_family.py b/families/wikia_family.py index a49576a..2a33f15 100644 --- a/families/wikia_family.py +++ b/families/wikia_family.py @@ -43,6 +43,3 @@

def scriptpath(self, code): return '' - - def apipath(self, code): - return '/api.php' diff --git a/families/wikitravel_shared_family.py b/families/wikitravel_shared_family.py index 6106e9f..79383f7 100644 --- a/families/wikitravel_shared_family.py +++ b/families/wikitravel_shared_family.py @@ -38,9 +38,12 @@ def scriptpath(self, code): return '/wiki/shared'

+ def nicepath(self, code): + return '/shared/' + def shared_image_repository(self, code): return ('wikitravel_shared', 'wikitravel_shared')

def version(self, code): - return "1.10.1" + return '1.22.2'

diff --git a/families/wowwiki_family.py b/families/wowwiki_family.py index d7ef27d..5acce57 100644 --- a/families/wowwiki_family.py +++ b/families/wowwiki_family.py @@ -351,11 +351,5 @@ def scriptpath(self, code): return ''

- def apipath(self, code): - return '%s/api.php' % self.scriptpath(code) - def version(self, code): - return '1.16.5' - - def code2encoding(self, code): - return 'utf-8' + return '1.19.17'