Pywikipedia-svn April 2009

pywikipedia-svn@lists.wikimedia.org

8 participants
162 discussions

SVN: [6680] branches/rewrite
by nicdumz＠svn.wikimedia.org 23 Apr '09

23 Apr '09

Revision: 6680 Author: nicdumz Date: 2009-04-23 05:57:01 +0000 (Thu, 23 Apr 2009) Log Message: ----------- Making sure that Link.__hash__ is consistent with Link.__cmp__ Adding a relevant unit test Modified Paths: -------------- branches/rewrite/pywikibot/page.py branches/rewrite/tests/page_tests.py Modified: branches/rewrite/pywikibot/page.py =================================================================== --- branches/rewrite/pywikibot/page.py 2009-04-23 05:21:30 UTC (rev 6679) +++ branches/rewrite/pywikibot/page.py 2009-04-23 05:57:01 UTC (rev 6680) @@ -1947,7 +1947,9 @@ return self.astext() def __hash__(self): - return hash(self.astext()) + return hash(u'%s:%s:%s' % (self.site.family.name, + self.site.code, + self.title)) @staticmethod def fromPage(page, source=None): Modified: branches/rewrite/tests/page_tests.py =================================================================== --- branches/rewrite/tests/page_tests.py 2009-04-23 05:21:30 UTC (rev 6679) +++ branches/rewrite/tests/page_tests.py 2009-04-23 05:57:01 UTC (rev 6680) @@ -24,6 +24,9 @@ """Test cases for Link objects""" enwiki = pywikibot.Site("en", "wikipedia") + frwiki = pywikibot.Site("fr", "wikipedia") + itwikt = pywikibot.Site("it", "wiktionary") + namespaces = {0: [u""], # en.wikipedia.org namespaces for testing 1: [u"Talk:"], # canonical form first, then others 2: [u"User:"], # must end with : @@ -84,7 +87,25 @@ m = pywikibot.page.Link(":"+self.namespaces[num][0]+title) self.assertEqual(m.title, self.titles[title]) + def testHashCmp(self): + # All links point to en:wikipedia:Test + l1 = pywikibot.page.Link('Test', source=self.enwiki) + l2 = pywikibot.page.Link('en:Test', source=self.frwiki) + l3 = pywikibot.page.Link('wikipedia:en:Test', source=self.itwikt) + def assertHashCmp(link1, link2): + self.assertEqual(link1, link2) + self.assertEqual(hash(link1), hash(link2)) + assertHashCmp(l1, l2) + assertHashCmp(l1, l3) + assertHashCmp(l2, l3) + + # fr:wikipedia:Test + other = pywikibot.page.Link('Test', source=self.frwiki) + + self.assertNotEqual(l1, other) + self.assertNotEqual(hash(l1), hash(other)) + class TestPageObject(unittest.TestCase): def testGeneral(self): self.assertEqual(str(mainpage), "[[%s:%s]]"

1 0

SVN: [6679] branches/rewrite/pywikibot/page.py
by nicdumz＠svn.wikimedia.org 23 Apr '09

23 Apr '09

Revision: 6679 Author: nicdumz Date: 2009-04-23 05:21:30 +0000 (Thu, 23 Apr 2009) Log Message: ----------- Allow fromPage to define a source parameter too Modified Paths: -------------- branches/rewrite/pywikibot/page.py Modified: branches/rewrite/pywikibot/page.py =================================================================== --- branches/rewrite/pywikibot/page.py 2009-04-23 05:18:08 UTC (rev 6678) +++ branches/rewrite/pywikibot/page.py 2009-04-23 05:21:30 UTC (rev 6679) @@ -1950,8 +1950,11 @@ return hash(self.astext()) @staticmethod - def fromPage(page): - """Create a Link from a Page object""" + def fromPage(page, source=None): + """ + Create a Link to a Page. + @param source: Link from site source + """ link = Link.__new__(Link) link._site = page.site() @@ -1961,6 +1964,7 @@ allowInterwiki=False, withSection=False) link._anchor = None + link._source = source or pywikibot.Site() return link

1 0

SVN: [6678] branches/rewrite/pywikibot/page.py
by nicdumz＠svn.wikimedia.org 23 Apr '09

23 Apr '09

Revision: 6678 Author: nicdumz Date: 2009-04-23 05:18:08 +0000 (Thu, 23 Apr 2009) Log Message: ----------- When rendering a Link, what matters is the Site where the Link comes from, not the Site where the Link points to: def example(): ensite = pywikibot.Site('en') link = pywikibot.Link('fr:Test', source=ensite) return link.astext() Before : [[Test]] After : [[fr:Test]] Modified Paths: -------------- branches/rewrite/pywikibot/page.py Modified: branches/rewrite/pywikibot/page.py =================================================================== --- branches/rewrite/pywikibot/page.py 2009-04-23 00:24:10 UTC (rev 6677) +++ branches/rewrite/pywikibot/page.py 2009-04-23 05:18:08 UTC (rev 6678) @@ -1903,7 +1903,7 @@ """ if onsite is None: - onsite = self.site + onsite = self._source title = self.title if self.namespace: title = onsite.namespace(self.namespace) + ":" + title

1 0

SVN: [6677] branches/rewrite/pywikibot/textlib.py
by purodha＠svn.wikimedia.org 22 Apr '09

22 Apr '09

Revision: 6677 Author: purodha Date: 2009-04-23 00:24:10 +0000 (Thu, 23 Apr 2009) Log Message: ----------- typo in comment Modified Paths: -------------- branches/rewrite/pywikibot/textlib.py Modified: branches/rewrite/pywikibot/textlib.py =================================================================== --- branches/rewrite/pywikibot/textlib.py 2009-04-22 20:39:10 UTC (rev 6676) +++ branches/rewrite/pywikibot/textlib.py 2009-04-23 00:24:10 UTC (rev 6677) @@ -351,7 +351,7 @@ """Replace interlanguage links in the text with a new set of links. 'new' should be a dict with the Site objects as keys, and Page or Link - object as values (i.e., just like the dict returned by getLanguageLinks + objects as values (i.e., just like the dict returned by getLanguageLinks function). """

1 0

SVN: [6676] branches/rewrite/pywikibot/page.py
by russblau＠svn.wikimedia.org 22 Apr '09

22 Apr '09

Revision: 6676 Author: russblau Date: 2009-04-22 20:39:10 +0000 (Wed, 22 Apr 2009) Log Message: ----------- Revert r6675: interwiki links are *not* interlanguage links; see Page.langlinks() (this is different from old framework) Modified Paths: -------------- branches/rewrite/pywikibot/page.py Modified: branches/rewrite/pywikibot/page.py =================================================================== --- branches/rewrite/pywikibot/page.py 2009-04-22 20:13:42 UTC (rev 6675) +++ branches/rewrite/pywikibot/page.py 2009-04-22 20:39:10 UTC (rev 6676) @@ -781,7 +781,7 @@ # are not language links try: if link.site != self.site(): - if not linktitle.lstrip().startswith(":"): + if linktitle.lstrip().startswith(":"): # initial ":" indicates not a language link yield link elif link.site.family != self.site().family:

1 0

SVN: [6675] branches/rewrite/pywikibot/page.py
by nicdumz＠svn.wikimedia.org 22 Apr '09

22 Apr '09

Revision: 6675 Author: nicdumz Date: 2009-04-22 20:13:42 +0000 (Wed, 22 Apr 2009) Log Message: ----------- Page.interwiki : yield interwiki links if they _dont_ start by : Modified Paths: -------------- branches/rewrite/pywikibot/page.py Modified: branches/rewrite/pywikibot/page.py =================================================================== --- branches/rewrite/pywikibot/page.py 2009-04-22 18:31:25 UTC (rev 6674) +++ branches/rewrite/pywikibot/page.py 2009-04-22 20:13:42 UTC (rev 6675) @@ -781,7 +781,7 @@ # are not language links try: if link.site != self.site(): - if linktitle.lstrip().startswith(":"): + if not linktitle.lstrip().startswith(":"): # initial ":" indicates not a language link yield link elif link.site.family != self.site().family:

1 0

SVN: [6674] trunk/pywikipedia/pagegenerators.py
by shizhao＠svn.wikimedia.org 22 Apr '09

22 Apr '09

Revision: 6674 Author: shizhao Date: 2009-04-22 18:31:25 +0000 (Wed, 22 Apr 2009) Log Message: ----------- add new parameter: "-gorandom". Specifies that the robot should starting at the random pages returned by [[Special:Random]]. Modified Paths: -------------- trunk/pywikipedia/pagegenerators.py Modified: trunk/pywikipedia/pagegenerators.py =================================================================== --- trunk/pywikipedia/pagegenerators.py 2009-04-22 18:00:51 UTC (rev 6673) +++ trunk/pywikipedia/pagegenerators.py 2009-04-22 18:31:25 UTC (rev 6674) @@ -131,6 +131,9 @@ [[Special:Randomredirect]]. Can also be given as "-randomredirect:n" where n is the number of pages to be returned, else 100 pages are returned. + +-gorandom Specifies that the robot should starting at the random pages + returned by [[Special:Random]]. """ @@ -1009,6 +1012,14 @@ transclusionPageTitle)) gen = ReferringPageGenerator(transclusionPage, onlyTemplateInclusion=True) + elif arg.startswith('-gorandom'): + for firstPage in RandomPageGenerator(number = 1): + firstPageTitle = firstPage.title() + namespace = wikipedia.Page(site, firstPageTitle).namespace() + firstPageTitle = wikipedia.Page(site, + firstPageTitle).titleWithoutNamespace() + gen = AllpagesPageGenerator(firstPageTitle, namespace, + includeredirects=False) elif arg.startswith('-start'): if arg.startswith('-startxml'): wikipedia.output(u'-startxml : wrong parameter')

1 0

SVN: [6673] branches/rewrite/pywikibot/textlib.py
by nicdumz＠svn.wikimedia.org 22 Apr '09

22 Apr '09

Revision: 6673 Author: nicdumz Date: 2009-04-22 18:00:51 +0000 (Wed, 22 Apr 2009) Log Message: ----------- Allow replaceLanguageLinks to take Links or Page as 'new' dictionary values Modified Paths: -------------- branches/rewrite/pywikibot/textlib.py Modified: branches/rewrite/pywikibot/textlib.py =================================================================== --- branches/rewrite/pywikibot/textlib.py 2009-04-22 17:45:07 UTC (rev 6672) +++ branches/rewrite/pywikibot/textlib.py 2009-04-22 18:00:51 UTC (rev 6673) @@ -350,8 +350,8 @@ def replaceLanguageLinks(oldtext, new, site = None, addOnly = False): """Replace interlanguage links in the text with a new set of links. - 'new' should be a dict with the Site objects as keys, and Page objects - as values (i.e., just like the dict returned by getLanguageLinks + 'new' should be a dict with the Site objects as keys, and Page or Link + object as values (i.e., just like the dict returned by getLanguageLinks function). """ @@ -404,7 +404,7 @@ """Convert interwiki link dict into a wikitext string. 'links' should be a dict with the Site objects as keys, and Page - objects as values. + or Link objects as values. Return a unicode string that is formatted for inclusion in insite (defaulting to the current site). @@ -417,12 +417,13 @@ ar = interwikiSort(links.keys(), insite) s = [] for site in ar: - try: - link = links[site].title(asLink=True, forceInterwiki=True) - s.append(link) - except AttributeError: - s.append(pywikibot.Link(links[site], \ - pywikibot.getSite(site)).astext(insite)) + obj = links[site] + if isinstance(obj, pywikibot.Link): + link = obj.astext(insite) + else: + # Page + link = obj.title(asLink=True, forceInterwiki=True) + s.append(link) if insite.lang in insite.family.interwiki_on_one_line: sep = u' ' else:

1 0

SVN: [6672] trunk/pywikipedia/interwiki.py
by nicdumz＠svn.wikimedia.org 22 Apr '09

22 Apr '09

Revision: 6672 Author: nicdumz Date: 2009-04-22 17:45:07 +0000 (Wed, 22 Apr 2009) Log Message: ----------- Do not parse the page N+1 times for interwikis, where N is the number of commented interwiki links. *Kof* *Kof*... =) Modified Paths: -------------- trunk/pywikipedia/interwiki.py Modified: trunk/pywikipedia/interwiki.py =================================================================== --- trunk/pywikipedia/interwiki.py 2009-04-22 17:09:48 UTC (rev 6671) +++ trunk/pywikipedia/interwiki.py 2009-04-22 17:45:07 UTC (rev 6672) @@ -1191,6 +1191,8 @@ # clone original newPages dictionary, so that we can modify it to the local page's needs new = dict(newPages) + interwikis = page.interwiki() + # remove interwiki links to ignore for iw in re.finditer('', pagetext): try: @@ -1200,7 +1202,8 @@ try: if (new[ignorepage.site()] == ignorepage) and (ignorepage.site() != page.site()): - if (ignorepage not in page.interwiki()): + + if (ignorepage not in interwikis): wikipedia.output(u"Ignoring link to %(to)s for %(from)s" % {'to': ignorepage.aslink(), 'from': page.aslink()}) new.pop(ignorepage.site()) else: @@ -1222,7 +1225,7 @@ # Put interwiki links into a map old={} try: - for page2 in page.interwiki(): + for page2 in interwikis: old[page2.site()] = page2 except wikipedia.NoPage: wikipedia.output(u"BUG>>> %s no longer exists?" % page.aslink(True))

1 0

SVN: [6671] branches/rewrite/pywikibot/page.py
by nicdumz＠svn.wikimedia.org 22 Apr '09

22 Apr '09

Revision: 6671 Author: nicdumz Date: 2009-04-22 17:09:48 +0000 (Wed, 22 Apr 2009) Log Message: ----------- Adding a Link.fromPage staticmethod Modified Paths: -------------- branches/rewrite/pywikibot/page.py Modified: branches/rewrite/pywikibot/page.py =================================================================== --- branches/rewrite/pywikibot/page.py 2009-04-22 16:51:44 UTC (rev 6670) +++ branches/rewrite/pywikibot/page.py 2009-04-22 17:09:48 UTC (rev 6671) @@ -1949,6 +1949,21 @@ def __hash__(self): return hash(self.astext()) + @staticmethod + def fromPage(page): + """Create a Link from a Page object""" + + link = Link.__new__(Link) + link._site = page.site() + link._section = page.section() + link._namespace = page.namespace() + link._title = page.title(withNamespace=False, + allowInterwiki=False, + withSection=False) + link._anchor = None + + return link + # Utility functions for parsing page titles def html2unicode(text, ignore = []):

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Pywikipedia-svn April 2009