Pywikipedia-svn May 2009

pywikipedia-svn@lists.wikimedia.org

8 participants
154 discussions

SVN: [6824] trunk/pywikipedia/commonscat.py
by siebrand＠svn.wikimedia.org 05 May '09

05 May '09

Revision: 6824 Author: siebrand Date: 2009-05-05 06:37:36 +0000 (Tue, 05 May 2009) Log Message: ----------- Update ignoreTemplates for 'ja' Modified Paths: -------------- trunk/pywikipedia/commonscat.py Modified: trunk/pywikipedia/commonscat.py =================================================================== --- trunk/pywikipedia/commonscat.py 2009-05-05 03:48:13 UTC (rev 6823) +++ trunk/pywikipedia/commonscat.py 2009-05-05 06:37:36 UTC (rev 6824) @@ -159,7 +159,7 @@ 'en' : [u'Category redirect', u'Commons', u'Commonscat', u'Commonscat1A', u'Commoncats', u'Commonscat4Ra', u'Sisterlinks', u'Sisterlinkswp', u'Tracking category', u'Template category', u'Wikipedia category'], 'fr' : [u'Commons', u'Commons cat'], 'it' : [(u'Ip', 'commons='), ('Interprogetto', 'commons=')], - 'ja' : [u'CommonscatS', u'Commons cat'], + 'ja' : [u'CommonscatS', u'Commons cat', u'SisterlinksN', u'Interwikicat'], 'nl' : [u'Commons', u'Commonsklein', u'Commonscatklein', u'Catbeg', u'Catsjab', u'Catwiki'], }

1 0

SVN: [6823] trunk/pywikipedia
by philip＠svn.wikimedia.org 05 May '09

05 May '09

Revision: 6823 Author: philip Date: 2009-05-05 03:48:13 +0000 (Tue, 05 May 2009) Log Message: ----------- * Modified the Site.search. We can't get a page title though '-search' due to a html-code change of MediaWiki. * Fixed a bug of Site.search. The query string should be encoded to utf-8, otherwise we can't search a unicode string with this function. * Fixed a bug of Family.search_address. We need to start i(ns) from 0 because the main namespace's id is 0. Modified Paths: -------------- trunk/pywikipedia/family.py trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/family.py =================================================================== --- trunk/pywikipedia/family.py 2009-05-04 22:04:07 UTC (rev 6822) +++ trunk/pywikipedia/family.py 2009-05-05 03:48:13 UTC (rev 6823) @@ -3580,7 +3580,7 @@ # add all namespaces namespaces = self.namespaces.keys() for i in namespaces: - if i > 0: + if i >= 0: namespace_params = namespace_params + '&ns%d=1' % i return "%s?title=%s:Search&search=%s&limit=%d%s&fulltext=1&useskin=monobook" % (self.path(code), Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2009-05-04 22:04:07 UTC (rev 6822) +++ trunk/pywikipedia/wikipedia.py 2009-05-05 03:48:13 UTC (rev 6823) @@ -5052,14 +5052,14 @@ def search(self, query, number = 10, namespaces = None): """Yield search results (using Special:Search page) for query.""" throttle = True - path = self.search_address(urllib.quote_plus(query), + path = self.search_address(urllib.quote_plus(query.encode('utf-8')), n=number, ns=namespaces) get_throttle() html = self.getUrl(path) - entryR = re.compile(ur'<li[^>]*><a href=".+?" title="(?P<title>.+?)">.+?</a>' - '<br />(?P<match>.*?)<span style="color[^>]*>.+?: ' - '(?P<relevance>[0-9.]+)% - ' + entryR = re.compile(ur'<li><a href=".+?" title="(?P<title>.+?)">.+?</a>' +# '<br />(?P<match>.*?)<span style="color[^>]*>.+?: ' +# '(?P<relevance>[0-9.]+)% - ' # '(?P<size>[0-9.]*) ' # '(?P<sizeunit>[A-Za-z]) ' # '\((?P<words>.+?) \w+\) - ' @@ -5068,8 +5068,8 @@ for m in entryR.finditer(html): page = Page(self, m.group('title')) - match = m.group('match') - relevance = m.group('relevance') + #match = m.group('match') + #relevance = m.group('relevance') #size = m.group('size') ## sizeunit appears to always be "KB" #words = m.group('words') @@ -5078,7 +5078,7 @@ #print "%s - %s %s (%s words) - %s" % (relevance, size, sizeunit, words, date) #yield page, match, relevance, size, words, date - yield page, match, relevance, '', '', '' + yield page, '', '', '', '', '' # TODO: avoid code duplication for the following methods def newpages(self, number = 10, get_redirect = False, repeat = False, namespace = 0):

1 0

SVN: [6822] trunk/pywikipedia/commonscat.py
by siebrand＠svn.wikimedia.org 05 May '09

05 May '09

Revision: 6822 Author: siebrand Date: 2009-05-04 22:04:07 +0000 (Mon, 04 May 2009) Log Message: ----------- Update ignoreTemplates for 'ja' Modified Paths: -------------- trunk/pywikipedia/commonscat.py Modified: trunk/pywikipedia/commonscat.py =================================================================== --- trunk/pywikipedia/commonscat.py 2009-05-04 20:43:01 UTC (rev 6821) +++ trunk/pywikipedia/commonscat.py 2009-05-04 22:04:07 UTC (rev 6822) @@ -159,7 +159,7 @@ 'en' : [u'Category redirect', u'Commons', u'Commonscat', u'Commonscat1A', u'Commoncats', u'Commonscat4Ra', u'Sisterlinks', u'Sisterlinkswp', u'Tracking category', u'Template category', u'Wikipedia category'], 'fr' : [u'Commons', u'Commons cat'], 'it' : [(u'Ip', 'commons='), ('Interprogetto', 'commons=')], - 'ja' : [u'CommonscatS'], + 'ja' : [u'CommonscatS', u'Commons cat'], 'nl' : [u'Commons', u'Commonsklein', u'Commonscatklein', u'Catbeg', u'Catsjab', u'Catwiki'], }

1 0

SVN: [6821] branches/rewrite/pywikibot/site.py
by russblau＠svn.wikimedia.org 05 May '09

05 May '09

Revision: 6821 Author: russblau Date: 2009-05-04 20:43:01 +0000 (Mon, 04 May 2009) Log Message: ----------- Fix bug 2784162 - pagebacklinks(followRedirects=True) doesn't yield redirects Modified Paths: -------------- branches/rewrite/pywikibot/site.py Modified: branches/rewrite/pywikibot/site.py =================================================================== --- branches/rewrite/pywikibot/site.py 2009-05-04 16:33:49 UTC (rev 6820) +++ branches/rewrite/pywikibot/site.py 2009-05-04 20:43:01 UTC (rev 6821) @@ -1011,7 +1011,7 @@ return page._redirtarget def preloadpages(self, pagelist, groupsize=50, templates=False, - langlinks=False): + langlinks=False): """Return a generator to a list of preloaded pages. Note that [at least in current implementation] pages may be iterated @@ -1114,17 +1114,16 @@ # links identified by MediaWiki as redirects may not really be, # so we have to check each "redirect" page and see if it # really redirects to this page - blgen.request["gblfilterredir"] = "nonredirects" redirgen = api.PageGenerator("backlinks", gbltitle=bltitle, site=self, gblfilterredir="redirects") - if "gblnamespace" in blgen.request: - redirgen.request["gblnamespace"] = blgen.request["gblnamespace"] genlist = [blgen] for redir in redirgen: if redir.getRedirectTarget() == page: genlist.append( self.pagebacklinks( - redir, True, None, namespaces)) + redir, followRedirects=True, + filterRedirects=filterRedirects, + namespaces=namespaces)) import itertools return itertools.chain(*genlist) return blgen

1 0

SVN: [6820] trunk/pywikipedia/wikipedia.py
by nicdumz＠svn.wikimedia.org 04 May '09

04 May '09

Revision: 6820 Author: nicdumz Date: 2009-05-04 16:33:49 +0000 (Mon, 04 May 2009) Log Message: ----------- Updating message when XML is incomplete, per http://lists.wikimedia.org/pipermail/pywikipedia-l/2009-May/005845.html Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2009-05-04 15:54:19 UTC (rev 6819) +++ trunk/pywikipedia/wikipedia.py 2009-05-04 16:33:49 UTC (rev 6820) @@ -2977,8 +2977,7 @@ elif "</mediawiki>" not in data[-20:]: # HTML error Page got thrown because of an internal # error when fetching a revision. - output(u'Remote site has a problem, it probably ' \ - 'exited our query with an internal Error. ' \ + output(u'Received incomplete XML data. ' \ 'Sleeping for %d seconds...' % self.sleeptime) self.sleep() elif "<siteinfo>" not in data: # This probably means we got a 'temporary unaivalable'

1 0

SVN: [6819]
by nicdumz＠svn.wikimedia.org 04 May '09

04 May '09

Revision: 6819 Author: nicdumz Date: 2009-05-04 15:54:19 +0000 (Mon, 04 May 2009) Log Message: ----------- ReplaceLanguageLinks : 'match'.split(str) should be str.split('match') Modified Paths: -------------- branches/rewrite/pywikibot/textlib.py trunk/pywikipedia/wikipedia.py Modified: branches/rewrite/pywikibot/textlib.py =================================================================== --- branches/rewrite/pywikibot/textlib.py 2009-05-04 13:43:47 UTC (rev 6818) +++ branches/rewrite/pywikibot/textlib.py 2009-05-04 15:54:19 UTC (rev 6819) @@ -397,7 +397,7 @@ else: if template: # Do we have a noinclude at the end of the template? - parts = '</noinclude>'.split(s2) + parts = s2.split('</noinclude>') lastpart = parts[-1] if re.match('\s*%s' % marker, lastpart): # Put the langlinks back into the noinclude's Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2009-05-04 13:43:47 UTC (rev 6818) +++ trunk/pywikipedia/wikipedia.py 2009-05-04 15:54:19 UTC (rev 6819) @@ -3700,7 +3700,7 @@ else: if template: # Do we have a noinclude at the end of the template? - parts = '</noinclude>'.split(s2) + parts = s2.split('</noinclude>') lastpart = parts[-1] if re.match('\s*%s' % marker, lastpart): # Put the langlinks back into the noinclude's

1 0

SVN: [6818] branches/rewrite/pywikibot/page.py
by russblau＠svn.wikimedia.org 04 May '09

04 May '09

Revision: 6818 Author: russblau Date: 2009-05-04 13:43:47 +0000 (Mon, 04 May 2009) Log Message: ----------- Bug in r6807: str.title() capitalizes all words, not just the first one, which is undesirable Modified Paths: -------------- branches/rewrite/pywikibot/page.py Modified: branches/rewrite/pywikibot/page.py =================================================================== --- branches/rewrite/pywikibot/page.py 2009-05-04 01:41:41 UTC (rev 6817) +++ branches/rewrite/pywikibot/page.py 2009-05-04 13:43:47 UTC (rev 6818) @@ -130,7 +130,7 @@ self._revisions = {} # Always capitalize the first letter - self._title = self._title.title() + self._title = self._title[:1].upper() + self._title[1:] def site(self): """Return the Site object for the wiki on which this Page resides."""

1 0

SVN: [6817]
by nicdumz＠svn.wikimedia.org 04 May '09

04 May '09

Revision: 6817 Author: nicdumz Date: 2009-05-04 01:41:41 +0000 (Mon, 04 May 2009) Log Message: ----------- Interwikis in template namespace: applying patch #2780955, first submitted by Tieump Pushing those changes in the rewrite branch too. Modified Paths: -------------- branches/rewrite/pywikibot/textlib.py branches/rewrite/scripts/interwiki.py trunk/pywikipedia/interwiki.py trunk/pywikipedia/wikipedia.py Modified: branches/rewrite/pywikibot/textlib.py =================================================================== --- branches/rewrite/pywikibot/textlib.py 2009-05-04 01:26:35 UTC (rev 6816) +++ branches/rewrite/pywikibot/textlib.py 2009-05-04 01:41:41 UTC (rev 6817) @@ -347,7 +347,8 @@ return removeLanguageLinks(text, site, marker) -def replaceLanguageLinks(oldtext, new, site = None, addOnly = False): +def replaceLanguageLinks(oldtext, new, site = None, addOnly = False, + template = 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 or Link @@ -394,7 +395,19 @@ newtext = replaceCategoryLinks(s2, cats, site=site, addOnly=True) else: - newtext = s2.replace(marker,'').strip() + separator + s + if template: + # Do we have a noinclude at the end of the template? + parts = '</noinclude>'.split(s2) + lastpart = parts[-1] + if re.match('\s*%s' % marker, lastpart): + # Put the langlinks back into the noinclude's + regexp = re.compile('</noinclude>\s*%s' % marker) + newtext = regexp.sub(s + '</noinclude>', s2) + else: + # Put the langlinks at the end, inside noinclude's + newtext = s2.replace(marker,'').strip() + separator + u'<noinclude>\n%s</noinclude>\n' % s + else: + newtext = s2.replace(marker,'').strip() + separator + s else: newtext = s2.replace(marker,'') return newtext Modified: branches/rewrite/scripts/interwiki.py =================================================================== --- branches/rewrite/scripts/interwiki.py 2009-05-04 01:26:35 UTC (rev 6816) +++ branches/rewrite/scripts/interwiki.py 2009-05-04 01:41:41 UTC (rev 6817) @@ -1527,7 +1527,9 @@ pywikibot.output(u"Changes to be made: %s" % mods) oldtext = page.get() - newtext = pywikibot.replaceLanguageLinks(oldtext, new, site = page.site()) + newtext = pywikibot.replaceLanguageLinks(oldtext, new, + site = page.site(), + template = (page.namespace() == 10)) if newtext == oldtext: return False if globalvar.debug: Modified: trunk/pywikipedia/interwiki.py =================================================================== --- trunk/pywikipedia/interwiki.py 2009-05-04 01:26:35 UTC (rev 6816) +++ trunk/pywikipedia/interwiki.py 2009-05-04 01:41:41 UTC (rev 6817) @@ -1524,7 +1524,7 @@ wikipedia.output(u"Changes to be made: %s" % mods) oldtext = page.get() - newtext = wikipedia.replaceLanguageLinks(oldtext, new, site = page.site()) + newtext = wikipedia.replaceLanguageLinks(oldtext, new, site = page.site(), template = (page.namespace() == 10) ) if newtext == oldtext: return False if globalvar.debug: Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2009-05-04 01:26:35 UTC (rev 6816) +++ trunk/pywikipedia/wikipedia.py 2009-05-04 01:41:41 UTC (rev 6817) @@ -3658,7 +3658,7 @@ else: return removeLanguageLinks(text, site, marker) -def replaceLanguageLinks(oldtext, new, site = None, addOnly = False): +def replaceLanguageLinks(oldtext, new, site = None, addOnly = False, template = 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 @@ -3698,7 +3698,19 @@ s2 = removeCategoryLinksAndSeparator(s2.replace(marker,'',cseparatorstripped).strip(), site) + separator + s newtext = replaceCategoryLinks(s2, cats, site=site, addOnly=True) else: - newtext = s2.replace(marker,'').strip() + separator + s + if template: + # Do we have a noinclude at the end of the template? + parts = '</noinclude>'.split(s2) + lastpart = parts[-1] + if re.match('\s*%s' % marker, lastpart): + # Put the langlinks back into the noinclude's + regexp = re.compile('</noinclude>\s*%s' % marker) + newtext = regexp.sub(s + '</noinclude>', s2) + else: + # Put the langlinks at the end, inside noinclude's + newtext = s2.replace(marker,'').strip() + separator + u'<noinclude>\n%s</noinclude>\n' % s + else: + newtext = s2.replace(marker,'').strip() + separator + s else: newtext = s2.replace(marker,'') return newtext

1 0

SVN: [6816] branches/rewrite/scripts/interwiki.py
by nicdumz＠svn.wikimedia.org 04 May '09

04 May '09

Revision: 6816 Author: nicdumz Date: 2009-05-04 01:26:35 +0000 (Mon, 04 May 2009) Log Message: ----------- pywikibot.Error needs a basestring argument on init. Modified Paths: -------------- branches/rewrite/scripts/interwiki.py Modified: branches/rewrite/scripts/interwiki.py =================================================================== --- branches/rewrite/scripts/interwiki.py 2009-05-04 01:20:36 UTC (rev 6815) +++ branches/rewrite/scripts/interwiki.py 2009-05-04 01:26:35 UTC (rev 6816) @@ -1446,17 +1446,17 @@ if globalvar.localonly: # In this case only continue on the Page we started with if page != self.originPage: - raise SaveError + raise SaveError(u'-localonly and page != originPage') if page.section(): # This is not a page, but a subpage. Do not edit it. pywikibot.output(u"Not editing %s: not doing interwiki on subpages" % page) - raise SaveError + raise SaveError(u'Link has a #section') try: pagetext = page.get() except pywikibot.NoPage: pywikibot.output(u"Not editing %s: page does not exist" % page) - raise SaveError + raise SaveError(u'Page doesn\'t exist') # Show a message in purple. pywikibot.output(u"\03{lightpurple}Updating links on page %s.\03{default}" % page) @@ -1490,7 +1490,7 @@ s = u"None" if pltmp is not None: s = pltmp pywikibot.output(u"BUG>>> %s is not in the list of new links! Found %s." % (page, s)) - raise SaveError + raise SaveError(u'BUG: sanity check failed') # Avoid adding an iw link back to itself del new[page.site()] @@ -1580,16 +1580,16 @@ status, reason, data = page.put(newtext, comment = pywikibot.translate(page.site().lang, msg)[0] + mods) except pywikibot.LockedPage: pywikibot.output(u'Page %s is locked. Skipping.' % (page,)) - raise SaveError + raise SaveError(u'Locked') except pywikibot.EditConflict: pywikibot.output(u'ERROR putting page: An edit conflict occurred. Giving up.') - raise SaveError + raise SaveError(u'Edit conflict') except (pywikibot.SpamfilterError), error: pywikibot.output(u'ERROR putting page: %s blacklisted by spamfilter. Giving up.' % (error.url,)) - raise SaveError + raise SaveError(u'Spam filter') except (pywikibot.PageNotSaved), error: pywikibot.output(u'ERROR putting page: %s' % (error.args,)) - raise SaveError + raise SaveError(u'PageNotSaved') except (socket.error, IOError), error: if timeout>3600: raise @@ -1612,7 +1612,7 @@ pywikibot.output(u'%s %s' % (status, reason)) return False elif answer == 'g': - raise GiveUpOnPage + raise GiveUpOnPage(u'User asked us to give up') else: raise LinkMustBeRemoved(u'Found incorrect link to %s in %s'% (",".join([x.lang for x in removing]), page))

1 0

SVN: [6815] branches/rewrite/scripts/interwiki.py
by nicdumz＠svn.wikimedia.org 04 May '09

04 May '09

Revision: 6815 Author: nicdumz Date: 2009-05-04 01:20:36 +0000 (Mon, 04 May 2009) Log Message: ----------- sectionFreeTitle is obsolete, using title instead Modified Paths: -------------- branches/rewrite/scripts/interwiki.py Modified: branches/rewrite/scripts/interwiki.py =================================================================== --- branches/rewrite/scripts/interwiki.py 2009-05-04 01:19:22 UTC (rev 6814) +++ branches/rewrite/scripts/interwiki.py 2009-05-04 01:20:36 UTC (rev 6815) @@ -1448,7 +1448,7 @@ if page != self.originPage: raise SaveError - if page.title() != page.sectionFreeTitle(): + if page.section(): # This is not a page, but a subpage. Do not edit it. pywikibot.output(u"Not editing %s: not doing interwiki on subpages" % page) raise SaveError

1 0

← Newer
1
...
9
10
11
12
13
14
15
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Pywikipedia-svn May 2009