Pywikipedia-svn December 2009

pywikipedia-svn@lists.wikimedia.org

6 participants
127 discussions

SVN: [7839] trunk/pywikipedia/interwiki.py

by xqt＠svn.wikimedia.org

Revision: 7839 Author: xqt Date: 2009-12-28 17:30:12 +0000 (Mon, 28 Dec 2009) Log Message: ----------- revert r7835: page must be preloaded for this test Modified Paths: -------------- trunk/pywikipedia/interwiki.py Modified: trunk/pywikipedia/interwiki.py =================================================================== --- trunk/pywikipedia/interwiki.py 2009-12-28 17:19:09 UTC (rev 7838) +++ trunk/pywikipedia/interwiki.py 2009-12-28 17:30:12 UTC (rev 7839) @@ -1924,9 +1924,10 @@ if page.isTalkPage(): pywikibot.output(u'Skipping: %s is a talk page' % page.title()) continue - if page.isEmpty(): - pywikibot.output(u'Skipping: %s is a empty page' % page.title()) - continue + #doesn't work: page must be preloaded for this test + #if page.isEmpty(): + # pywikibot.output(u'Skipping: %s is a empty page' % page.title()) + # continue if page.namespace() == 10: loc = None try:

14 years, 4 months

SVN: [7838] trunk/pywikipedia/cosmetic_changes.py

by xqt＠svn.wikimedia.org

Revision: 7838 Author: xqt Date: 2009-12-28 17:19:09 +0000 (Mon, 28 Dec 2009) Log Message: ----------- use site.namespace() instead of site.family.namespace(site.lang) Modified Paths: -------------- trunk/pywikipedia/cosmetic_changes.py Modified: trunk/pywikipedia/cosmetic_changes.py =================================================================== --- trunk/pywikipedia/cosmetic_changes.py 2009-12-28 16:59:04 UTC (rev 7837) +++ trunk/pywikipedia/cosmetic_changes.py 2009-12-28 17:19:09 UTC (rev 7838) @@ -355,7 +355,7 @@ if not family.isDefinedNSLanguage(nsNumber, self.site.lang): # Skip undefined namespaces continue - namespaces = list(family.namespace(self.site.lang, nsNumber, all = True)) + namespaces = list(self.site.namespace(nsNumber, all = True)) thisNs = namespaces.pop(0) if nsNumber == 6 and family.name == 'wikipedia' and \ self.site.lang in ('en', 'fr'):

14 years, 4 months

SVN: [7837] trunk/pywikipedia/cosmetic_changes.py

by xqt＠svn.wikimedia.org

Revision: 7837 Author: xqt Date: 2009-12-28 16:59:04 +0000 (Mon, 28 Dec 2009) Log Message: ----------- use interwiki_text_separator from family-file Modified Paths: -------------- trunk/pywikipedia/cosmetic_changes.py Modified: trunk/pywikipedia/cosmetic_changes.py =================================================================== --- trunk/pywikipedia/cosmetic_changes.py 2009-12-28 11:51:02 UTC (rev 7836) +++ trunk/pywikipedia/cosmetic_changes.py 2009-12-28 16:59:04 UTC (rev 7837) @@ -332,7 +332,7 @@ text = text + '\r\n\r\n' + nn_iw_msg # Adding stars templates if allstars != []: - text = text.strip()+'\r\n\r\n' + text = text.strip()+self.site.family.interwiki_text_separator allstars.sort() for element in allstars: text += '%s\r\n' % element.strip() @@ -357,7 +357,7 @@ continue namespaces = list(family.namespace(self.site.lang, nsNumber, all = True)) thisNs = namespaces.pop(0) - if nsNumber == 6 and self.site.family.name == 'wikipedia' and \ + if nsNumber == 6 and family.name == 'wikipedia' and \ self.site.lang in ('en', 'fr'): # do not change "Image" on en-wiki and fr-wiki for image in [u'Image', u'image']:

14 years, 4 months

SVN: [7836] trunk/pywikipedia/wikipedia.py

by xqt＠svn.wikimedia.org

Revision: 7836 Author: xqt Date: 2009-12-28 11:51:02 +0000 (Mon, 28 Dec 2009) Log Message: ----------- Bugfix for #2840660 Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2009-12-28 10:42:04 UTC (rev 7835) +++ trunk/pywikipedia/wikipedia.py 2009-12-28 11:51:02 UTC (rev 7836) @@ -4722,6 +4722,7 @@ else: includeOn = '<noinclude>' includeOff = '</noinclude>' + separator = '' # Do we have a noinclude at the end of the template? parts = s2.split(includeOff) lastpart = parts[-1]

14 years, 4 months

SVN: [7835] trunk/pywikipedia/interwiki.py

by xqt＠svn.wikimedia.org

Revision: 7835 Author: xqt Date: 2009-12-28 10:42:04 +0000 (Mon, 28 Dec 2009) Log Message: ----------- Skipping if page.isEmpty() (Fix for #2905091) Modified Paths: -------------- trunk/pywikipedia/interwiki.py Modified: trunk/pywikipedia/interwiki.py =================================================================== --- trunk/pywikipedia/interwiki.py 2009-12-28 10:32:45 UTC (rev 7834) +++ trunk/pywikipedia/interwiki.py 2009-12-28 10:42:04 UTC (rev 7835) @@ -1924,6 +1924,9 @@ if page.isTalkPage(): pywikibot.output(u'Skipping: %s is a talk page' % page.title()) continue + if page.isEmpty(): + pywikibot.output(u'Skipping: %s is a empty page' % page.title()) + continue if page.namespace() == 10: loc = None try:

14 years, 4 months

SVN: [7834] trunk/pywikipedia

by xqt＠svn.wikimedia.org

Revision: 7834 Author: xqt Date: 2009-12-28 10:32:45 +0000 (Mon, 28 Dec 2009) Log Message: ----------- Fix for #2920675 Modified Paths: -------------- trunk/pywikipedia/cosmetic_changes.py trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/cosmetic_changes.py =================================================================== --- trunk/pywikipedia/cosmetic_changes.py 2009-12-28 09:24:21 UTC (rev 7833) +++ trunk/pywikipedia/cosmetic_changes.py 2009-12-28 10:32:45 UTC (rev 7834) @@ -186,14 +186,43 @@ nn_iw_msg = u'' +# This is from interwiki.py; +# move it to family file and implement global instances +moved_links = { + 'ca' : (u'ús de la plantilla', u'/ús'), + 'cs' : (u'dokumentace', u'/doc'), + 'de' : (u'dokumentation', u'/Meta'), + 'en' : ([u'documentation', + u'template documentation', + u'template doc', + u'doc', + u'documentation, template'], u'/doc'), + 'es' : ([u'documentación', u'documentación de plantilla'], u'/doc'), + 'fr' : (u'/documentation', u'/Documentation'), + 'hu' : (u'sablondokumentáció', u'/doc'), + 'id' : (u'template doc', u'/doc'), + 'ja' : (u'documentation', u'/doc'), + 'ka' : (u'თარგის ინფო', u'/ინფო'), + 'ko' : (u'documentation', u'/설명문서'), + 'ms' : (u'documentation', u'/doc'), + 'pl' : (u'dokumentacja', u'/opis'), + 'pt' : ([u'documentação', u'/doc'], u'/doc'), + 'ro' : (u'documentaţie', u'/doc'), + 'ru' : (u'doc', u'/doc'), + 'sv' : (u'dokumentation', u'/dok'), + 'vi' : (u'documentation', u'/doc'), + 'zh' : ([u'documentation', u'doc'], u'/doc'), +} + class CosmeticChangesToolkit: - def __init__(self, site, debug=False, redirect=False, namespace=None): + def __init__(self, site, debug=False, redirect=False, namespace=None, pageTitle=None): self.site = site self.debug = debug self.redirect = redirect self.namespace = namespace self.template = (self.namespace == 10) self.talkpage = self.namespace >= 0 and self.namespace % 2 == 1 + self.title = pageTitle def change(self, text): """ @@ -260,7 +289,17 @@ categories = pywikibot.getCategoryLinks(text, site = self.site) if not self.talkpage:# and pywikibot.calledModuleName() <> 'interwiki': - interwikiLinks = pywikibot.getLanguageLinks(text, insite = self.site) + subpage = False + if self.template: + loc = None + try: + tmpl, loc = moved_links[self.site.lang] + del tmpl + except KeyError: + pass + if loc != None and loc in self.title: + subpage = True + interwikiLinks = pywikibot.getLanguageLinks(text, insite=self.site, template_subpage=subpage) # Removing the interwiki text = pywikibot.removeLanguageLinks(text, site = self.site) @@ -301,7 +340,7 @@ pywikibot.output(u'%s' %element.strip()) # Adding the interwiki if interwikiLinks != None: - text = pywikibot.replaceLanguageLinks(text, interwikiLinks, site = self.site, template = self.template) + text = pywikibot.replaceLanguageLinks(text, interwikiLinks, site = self.site, template = self.template, template_subpage = subpage) return text def translateAndCapitalizeNamespaces(self, text): @@ -560,7 +599,7 @@ # Show the title of the page we're working on. # Highlight the title in purple. pywikibot.output(u"\n\n>>> \03{lightpurple}%s\03{default} <<<" % page.title()) - ccToolkit = CosmeticChangesToolkit(page.site(), debug = True, namespace = page.namespace()) + ccToolkit = CosmeticChangesToolkit(page.site(), debug = True, namespace = page.namespace(), pageTitle=page.title()) changedText = ccToolkit.change(page.get()) if changedText.strip() != page.get().strip(): if not self.acceptall: Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2009-12-28 09:24:21 UTC (rev 7833) +++ trunk/pywikipedia/wikipedia.py 2009-12-28 10:32:45 UTC (rev 7834) @@ -1628,7 +1628,7 @@ if verbose: output(u'Cosmetic Changes for %s-%s enabled.' % (self.site().family.name, self.site().lang)) import cosmetic_changes - ccToolkit = cosmetic_changes.CosmeticChangesToolkit(self.site(), redirect=self.isRedirectPage(), namespace = self.namespace()) + ccToolkit = cosmetic_changes.CosmeticChangesToolkit(self.site(), redirect=self.isRedirectPage(), namespace = self.namespace(), pageTitle=self.title()) newtext = ccToolkit.change(newtext) if comment and old.strip().replace('\r\n', '\n') != newtext.strip().replace('\r\n', '\n'): comment += translate(self.site(), cosmetic_changes.msg_append) @@ -4587,7 +4587,7 @@ # or change links to a different project, or any that are formatted # as in-line interwiki links (e.g., "[[:es:Articulo]]". (CONFIRM) -def getLanguageLinks(text, insite = None, pageLink = "[[]]"): +def getLanguageLinks(text, insite = None, pageLink="[[]]", template_subpage=False): """ Return a dict of interlanguage links found in text. @@ -4601,7 +4601,10 @@ result = {} # Ignore interwiki links within nowiki tags, includeonly tags, pre tags, # and HTML comments - text = removeDisabledParts(text) + tags = ['comments', 'nowiki', 'pre', 'source'] + if not template_subpage: + tags += ['includeonly'] + text = removeDisabledParts(text, tags) # This regular expression will find every link that is possibly an # interwiki link. @@ -4669,7 +4672,7 @@ else: return removeLanguageLinks(text, site, marker) -def replaceLanguageLinks(oldtext, new, site = None, addOnly = False, template = False): +def replaceLanguageLinks(oldtext, new, site = None, addOnly = False, template = False, template_subpage = 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 @@ -4712,17 +4715,23 @@ s = separator + s + separator newtext = s2[:firstafter].replace(marker,'') + s + s2[firstafter:] else: - if template: + if template or template_subpage: + if template_subpage: + includeOn = '<includeonly>' + includeOff = '</includeonly>' + else: + includeOn = '<noinclude>' + includeOff = '</noinclude>' # Do we have a noinclude at the end of the template? - parts = s2.split('</noinclude>') + parts = s2.split(includeOff) 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) + regexp = re.compile('%s\s*%s' % (includeOff, marker)) + newtext = regexp.sub(s + includeOff, s2) else: # Put the langlinks at the end, inside noinclude's - newtext = s2.replace(marker,'').strip() + separator + u'<noinclude>\n%s</noinclude>\n' % s + newtext = s2.replace(marker,'').strip() + separator + u'%s\n%s%s\n' % (includeOn, s, includeOff) else: newtext = s2.replace(marker,'').strip() + separator + s else:

14 years, 4 months

SVN: [7833] trunk/pywikipedia/noreferences.py

by xqt＠svn.wikimedia.org

Revision: 7833 Author: xqt Date: 2009-12-28 09:24:21 +0000 (Mon, 28 Dec 2009) Log Message: ----------- update for it, fr, pl, sk Modified Paths: -------------- trunk/pywikipedia/noreferences.py Modified: trunk/pywikipedia/noreferences.py =================================================================== --- trunk/pywikipedia/noreferences.py 2009-12-28 08:50:09 UTC (rev 7832) +++ trunk/pywikipedia/noreferences.py 2009-12-28 09:24:21 UTC (rev 7833) @@ -10,17 +10,17 @@ &params; - -xml Retrieve information from a local XML dump (pages-articles - or pages-meta-current, see http://download.wikimedia.org). - Argument can also be given as "-xml:filename". + -xml Retrieve information from a local XML dump (pages-articles + or pages-meta-current, see http://download.wikimedia.org). + Argument can also be given as "-xml:filename". - -namespace:n Number or name of namespace to process. The parameter can be - used multiple times. It works in combination with all other - parameters, except for the -start parameter. If you e.g. - want to iterate over all categories starting at M, use - -start:Category:M. + -namespace:n Number or name of namespace to process. The parameter can be + used multiple times. It works in combination with all other + parameters, except for the -start parameter. If you e.g. + want to iterate over all categories starting at M, use + -start:Category:M. - -always Don't prompt you for each replacement. + -always Don't prompt you for each replacement. All other parameters will be regarded as part of the title of a single page, and the bot will only work on that single page. @@ -111,9 +111,11 @@ u'Lásd még', ], 'it': [ - u'Note', + u'Bibliografia', + u'Voci correlate', + u'Altri progetti', + u'Collegamenti esterni', u'Vedi anche', - u'Riferimenti', ], 'ja':[ u'関連項目', @@ -151,7 +153,10 @@ u'Ver também', u'Notas', ], - 'zh':[ + 'sk': [ + u'Pozri aj', + ], + 'zh': [ u'外部連结', u'外部链接', ], @@ -186,7 +191,8 @@ u'Lähteet', u'Viitteet', ], - 'fr': [ + 'fr': [ # [[fr:Aide:Note]] + u'Notes et références', u'Références', u'References', u'Notes' @@ -203,8 +209,9 @@ ], 'it': [ u'Note', + u'Riferimenti', ], - 'ja':[ + 'ja': [ u'脚注', u'脚注欄', u'脚注・出典', @@ -212,7 +219,7 @@ u'注釈', u'註', ], - 'ko':[ + 'ko': [ u'주석', u'각주' u'주석 및 참고 자료' @@ -232,11 +239,16 @@ ], 'pl': [ u'Przypisy', + u'Ogólne przypisy', + u'Notatki', ], 'pt': [ u'Referências', ], - 'zh':[ + 'sk': [ + u'Referencie', + ], + 'zh': [ u'參考文獻', u'参考文献', u'參考資料',

14 years, 4 months

SVN: [7832] trunk/pywikipedia/noreferences.py

by xqt＠svn.wikimedia.org

Revision: 7832 Author: xqt Date: 2009-12-28 08:50:09 +0000 (Mon, 28 Dec 2009) Log Message: ----------- new referenceSections for de-wiki [[de:WP:REF]] Modified Paths: -------------- trunk/pywikipedia/noreferences.py Modified: trunk/pywikipedia/noreferences.py =================================================================== --- trunk/pywikipedia/noreferences.py 2009-12-28 07:34:35 UTC (rev 7831) +++ trunk/pywikipedia/noreferences.py 2009-12-28 08:50:09 UTC (rev 7832) @@ -165,11 +165,13 @@ u'مراجع', u'ملاحظات', ], - 'de': [ - u'Einzelnachweise', # The "Einzelnachweise" title is disputed, some people prefer the other variants + 'de': [ #see [[de:WP:REF]] + u'Einzelnachweise', + u'Fußnoten', + u'Anmerkungen', + u'Belege', u'Quellen', u'Quellenangaben', - u'Fußnoten', ], 'en': [ # not sure about which ones are preferred. u'References', @@ -210,7 +212,7 @@ u'注釈', u'註', ], - 'ko':[ # + 'ko':[ u'주석', u'각주' u'주석 및 참고 자료'

14 years, 4 months

SVN: [7831] trunk/pywikipedia/redirect.py

by xqt＠svn.wikimedia.org

Revision: 7831 Author: xqt Date: 2009-12-28 07:34:35 +0000 (Mon, 28 Dec 2009) Log Message: ----------- use -number parameter retrieving moved_pages via api Modified Paths: -------------- trunk/pywikipedia/redirect.py Modified: trunk/pywikipedia/redirect.py =================================================================== --- trunk/pywikipedia/redirect.py 2009-12-27 14:20:21 UTC (rev 7830) +++ trunk/pywikipedia/redirect.py 2009-12-28 07:34:35 UTC (rev 7831) @@ -189,6 +189,8 @@ self.api_start = start self.api_until = until self.api_number = number + if self.api_number is None: + self.api_number = 'max' def get_redirects_from_dump(self, alsoGetPageTitles=False): ''' @@ -271,8 +273,6 @@ 'apdir': 'ascending', #'':'', } - if self.api_number is None: - params['aplimit'] = "max" for ns in self.namespaces: params['apnamespace'] = ns if self.api_start: @@ -467,10 +467,10 @@ 'list' :'logevents', 'letype' :'move', 'leprop' :'title|details', - 'lelimit' : '500', + 'lelimit' : self.api_number, 'lestart' : offset_time, } - data = query.GetData(params, encodeTitle = False)#['query']['logevents'] + data = query.GetData(params, encodeTitle = False) if 'warnings' in data: raise allmoves = data['query']['logevents']

14 years, 4 months

SVN: [7830] trunk/pywikipedia/wikipedia.py

by xqt＠svn.wikimedia.org

Revision: 7830 Author: xqt Date: 2009-12-27 14:20:21 +0000 (Sun, 27 Dec 2009) Log Message: ----------- patch #2921525 for bug #2901213 (login failure) Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2009-12-27 13:17:49 UTC (rev 7829) +++ trunk/pywikipedia/wikipedia.py 2009-12-27 14:20:21 UTC (rev 7830) @@ -8618,6 +8618,15 @@ #Redirect Handler for urllib2 class U2RedirectHandler(urllib2.HTTPRedirectHandler): + + def redirect_request(self, req, fp, code, msg, headers, newurl): + newreq = urllib2.HTTPRedirectHandler.redirect_request(self, req, fp, code, msg, headers, newurl) + if (newreq.get_method() == "GET"): + for cl in "Content-Length", "Content-length", "content-length", "CONTENT-LENGTH": + if newreq.has_header(cl): + del newreq.headers[cl] + return newreq + def http_error_301(self, req, fp, code, msg, headers): result = urllib2.HTTPRedirectHandler.http_error_301( self, req, fp, code, msg, headers)

14 years, 4 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Pywikipedia-svn December 2009