changeset 2592:89948636e3e8

update interwiki, fix tests broken by update
author RogerHaase <haaserd@gmail.com>
date Wed, 02 Apr 2014 21:55:02 -0700
parents 0984f6600d3c
children 00ac542e9153
files MoinMoin/util/_tests/test_interwiki.py contrib/interwiki/intermap.txt
diffstat 2 files changed, 19 insertions(+), 45 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/util/_tests/test_interwiki.py	Wed Apr 02 21:14:43 2014 -0700
+++ b/MoinMoin/util/_tests/test_interwiki.py	Wed Apr 02 21:55:02 2014 -0700
@@ -210,11 +210,11 @@
         testfile = os.path.join(abspath, 'contrib', 'interwiki', 'intermap.txt')
         testiwm = InterWikiMap.from_file(testfile)
 
-        assert 'MoinSrc' in testiwm.iwmap
+        assert 'MoinMaster' in testiwm.iwmap
         assert testiwm.iwmap['MoinMaster'] == 'http://master.moinmo.in/'
         assert 'PythonInfo' in testiwm.iwmap
         assert 'this' not in testiwm.iwmap
-        assert testiwm.iwmap['MoinCVS'] == 'http://hg.moinmo.in/moin/2.0?f=-1;file='
+        assert testiwm.iwmap['MoinMoin'] == 'http://moinmo.in/'
 
 
 coverage_modules = ['MoinMoin.util.interwiki']
--- a/contrib/interwiki/intermap.txt	Wed Apr 02 21:14:43 2014 -0700
+++ b/contrib/interwiki/intermap.txt	Wed Apr 02 21:55:02 2014 -0700
@@ -12,52 +12,40 @@
 # if you do not want to modify the file directly.
 
 
-# MoinMoin additions
-MoinMaster http://master.moinmo.in/
-MoinCVS http://hg.moinmo.in/moin/2.0?f=-1;file=
-MoinSrc http://hg.moinmo.in/moin/2.0?f=-1;file=
-MoinDoc http://hg.moinmo.in/moin/2.0/
-
 # for Germany: bookzilla.de instead of amazon == supporting GNU/Linux and 5% for FSF Europe
 # ISBN http://bookzilla.de/shop/action/advancedSearch?action=search&isbn=
+RFC http://www.ietf.org/rfc/rfc$PAGE.txt
 ISBN http://isbndb.com/search-all.html?kw=
-RFC http://www.ietf.org/rfc/rfc
 FreshMeat http://freshmeat.net/
-Thinki http://www.thinkware.se/cgi-bin/thinki.cgi/
-py2exe http://www.py2exe.org/index.cgi/
-PythonFaq http://www.python.org/cgi-bin/faqw.py?req=show&file=faq$PAGE.htp
-DocBook http://docbook.org/wiki/moin.cgi/
-SpackOrg http://www.spack.org/index.cgi/
+py2exe http://www.py2exe.org/index.cgi/ 
 ESW http://esw.w3.org/topic/
 OSPedia http://ospedia.osdir.com/
 MsgID http://groups.google.com/groups?as_umsgid=
-PyWebMail http://pywebmail.sourceforge.net/docs/
 BcWireless http://www.bcwireless.net/moin.cgi/
 Debian http://wiki.debian.org/
 DebianBug http://bugs.debian.org/
 DebianPackage http://packages.debian.org/
-CAKE http://www.cakem.net/mywiki/
-TrustixWiki http://doc.trustix.org/cgi-bin/trustixdoc.cgi?
+DocBook http://wiki.docbook.org/  
+CAKE http://www.cakem.net/mywiki/	
 WLUG http://www.wlug.org.nz/
 OpenOfficeWiki http://www.ooowiki.de/
-Parawiki http://parawiki.plm.eecs.uni-kassel.de/
 CPAN http://search.cpan.org/perldoc?
 NemWiki http://nematologists.org.au/nemwiki
 PostWiki http://www.postwiki.net/
 GentooLinux http://gentoo-wiki.com/
 Ubuntu https://wiki.ubuntu.com/
-CoLinux http://wiki.colinux.org/cgi-bin/
 LinuxMM http://linux-mm.org/
 LinuxNet http://linux-net.osdl.org/index.php/
 KernelNewbies http://wiki.kernelnewbies.org/
 Spamikaze http://spamikaze.org/
-Ulteo http://www.ulteo.com/main/wiki/index.cgi/
+SpackOrg http://www.spack.org/index.cgi/
 CsWikiPedia http://cs.wikipedia.org/wiki/
 RuWikiPedia http://ru.wikipedia.org/wiki/
 MBWiki http://wiki.musicbrainz.org/
 SquidWiki http://wiki.squid-cache.org/
 AltLinux http://altlinux.org/
 AltLinuxEn http://en.altlinux.org/
+hg http://mercurial.selenic.com/wiki/
 
 ## Updated 2004-11-19 from http://www.usemod.com/cgi-bin/mb.pl?InterMapTxt
 ## Please modify the upper part of this page only
@@ -65,16 +53,14 @@
 AbbeNormal http://ourpla.net/cgi/pikie?
 Acronym http://www.acronymfinder.com/af-query.asp?String=exact&Acronym=
 Advogato http://www.advogato.org/
-AnnotationWiki http://www.seedwiki.com/page.cfm?wikiid=368&doc=
 AtomWiki http://intertwingly.net/wiki/pie/
 BitTorrentFAQ http://www.bamber.org/wiki/ow.asp?
 BookShelved http://bookshelved.org/cgi-bin/wiki.pl?
-BuildingControlsWiki http://wiki.buildingcontrols.de/CoMa.php?CoMa=
-C2find http://c2.com/cgi/wiki?FindPage&value=
+C2find http://c2.com/cgi/wiki?FindPage&value= 
 Cache http://www.google.com/search?q=cache:
 CarpeWiki http://carpe.com/wiki/wiki.pl?
+CoLinux http://colinux.wikia.com/wiki/
 CommunityWiki http://www.communitywiki.org/
-CraoWiki http://wiki.crao.net/index.php/
 CreationMatters http://www.ourpla.net/cgi-bin/wiki.pl?
 DebianforumDeWiki http://wiki.debianforum.de/
 Dictionary http://www.dict.org/bin/Dict?Database=*&Form=Dict1&Strategy=*&Query=
@@ -87,58 +73,46 @@
 Google http://www.google.com/search?q=
 GoogleGroups http://groups.google.com/groups?q=
 HammondWiki http://www.dairiki.org/HammondWiki/
-h2g2 http://www.bbc.co.uk/dna/h2g2/
-IAWiki http://www.IAwiki.net/
-IMDB http://us.imdb.com/Title?
-JargonFile http://downlode.org/perl/jargon-redirect.cgi?term=
+h2g2 http://h2g2.com/dna/h2g2/
+IAWiki http://www.IAwiki.net/ 	
+IMDB http://www.imdb.com/title/tt$PAGE/
+JargonFile http://www.google.com/search?btnI=Im+Feeling+Lucky&q=$PAGE+site:http://catb.org/jargon/html/ 
 JspWiki http://www.ecyrd.com/JSPWiki/Wiki.jsp?page=
 JuraWiki http://jurawiki.de/
-KnowHow http://www2.iro.umontreal.ca/~paquetse/cgi-bin/wiki.cgi?
 LinuxWiki http://linuxwiki.org/
-LiveJournal http://livejournal.com/users/
-Login http://www.usemod.com/cgi-bin/mb.pl?action=login&p_userid=
+LiveJournal http://www.livejournal.com/users/$PAGE/
 LyricWiki http://lyricwiki.org/
-MbTest http://www.usemod.com/cgi-bin/mbtest.pl?
 MeatBall http://www.usemod.com/cgi-bin/mb.pl?
 MetaWiki http://sunir.org/apps/meta.pl?
 MetaWikiPedia http://meta.wikipedia.org/wiki/
+MoinMaster http://master.moinmo.in/
 MoinMoin http://moinmo.in/
 OddMuse http://www.oddmuse.org/
-OPAG http://opag.ca/wiki?
-OpenMind http://www2.iro.umontreal.ca/~paquetse/cgi-bin/om.cgi?
 OpenWiki http://openwiki.com/ow.asp?
-OrgPatterns http://www.easycomp.org/cgi-bin/OrgPatterns?
-PeriPeri http://www.srcf.ucam.org/~cjp39/Peri/
+Parawiki http://www.parawiki.org/index.php/ 
 PersonalTelco http://www.personaltelco.net/index.cgi/
-PhpWiki http://phpwiki.sourceforge.net/phpwiki/index.php?
-Pikie http://pikie.darktech.org/cgi/pikie?
-PythonInfo http://wiki.python.org/moin/
+PythonInfo http://wiki.python.org/moin/ 
 PythonWiki http://wiki.python.de/
-PyWiki http://www.voght.com/cgi-bin/pywiki?
 ReformSociety http://www.reformsociety.com/
 SeattleWireless http://seattlewireless.net/?
 SenseisLibrary http://senseis.xmp.net/?
 SL4Wiki http://sl4.org/wiki/
-SoLaSI http://www.solasi.org/moin.cgi?
 StrikiWiki http://ch.twi.tudelft.nl/~mostert/striki/teststriki.pl?
 ReseauCitoyen http://reseaucitoyen.be/?
-Tavi http://tavi.sourceforge.net/
 ThoughtStorms http://www.nooranch.com/synaesmedia/wiki/wiki.cgi?
 TWiki http://twiki.org/cgi-bin/view/
 UPC http://www.upcdatabase.com/item/
 Unreal http://wiki.beyondunreal.com/wiki/
 UseMod http://www.usemod.com/cgi-bin/wiki.pl?
 WebSeitzWiki http://webseitz.fluxent.com/wiki/
-WcsWiki http://www.myelin.co.nz/cgi-bin/wcswiki.pl?
-Why http://clublet.com/c/c/why?
 Wiki http://c2.com/cgi/wiki?
 WikiPedia http://en.wikipedia.org/wiki/
 DeWikiPedia http://de.wikipedia.org/wiki/
 FrWikiPedia http://fr.wikipedia.org/wiki/
+WcsWiki http://www.myelin.co.nz/wcswiki/w/
 WikiTravel http://www.wikitravel.org/article/
 WikiWorld http://WikiWorld.com/wiki/index.php/
 WikiZnanie http://www.wikiznanie.ru/wiki/wiki.phtml?title=
 WriteHere http://www.writehere.net/moin.cgi/
 WorldWideWiki http://www.worldwidewiki.net/wiki/
-YpsiEyeball http://sknkwrks.dyndns.org:1957/writewiki/wiki.pl?
 ZWiki http://www.zwiki.org/