Pywikipedia-svn September 2010

pywikipedia-svn@lists.wikimedia.org

5 participants
127 discussions

SVN: [8580] branches/rewrite/scripts/redirect.py

by xqt＠svn.wikimedia.org

Revision: 8580 Author: xqt Date: 2010-09-19 20:44:50 +0000 (Sun, 19 Sep 2010) Log Message: ----------- update from trunk r8678, not follow __STATICREDICT__s target Modified Paths: -------------- branches/rewrite/scripts/redirect.py Modified: branches/rewrite/scripts/redirect.py =================================================================== --- branches/rewrite/scripts/redirect.py 2010-09-19 20:40:20 UTC (rev 8579) +++ branches/rewrite/scripts/redirect.py 2010-09-19 20:44:50 UTC (rev 8580) @@ -47,18 +47,19 @@ # # (C) Daniel Herding, 2004. -# Purodha Blissenbach, 2009. +# (C) Purodha Blissenbach, 2009. +# (C) xqt, 2009-2010 +# (C) Pywikipedia bot team, 2004-2010 # # Distributed under the terms of the MIT license. # +__version__='$Id: redirect.py 7789 2009-12-17 19:20:12Z xqt $' # +import re, sys, datetime import pywikibot from pywikibot import config # import xmlreader -import re, sys -__version__='$Id: redirect.py 7789 2009-12-17 19:20:12Z xqt $' - # Summary message for fixing double redirects msg_double={ 'als':u'Bötli: Uflösig vun de doppleti Wyterleitig zue %s', @@ -271,7 +272,10 @@ ## return redict ## def get_redirect_pages_via_api(self): - """Return generator that yields Pages that are redirects.""" + """Return generator that yields + Pages that are redirects. + + """ for ns in self.namespaces: done = False gen = self.site.allpages(start=self.api_start, @@ -411,6 +415,7 @@ count += 1 if count >= self.api_number: break + # TODO: API cannot yet deliver contents of "special" pages ## elif self.xmlFilename == None: ## # retrieve information from the live wiki's maintenance page @@ -443,7 +448,6 @@ def get_moved_pages_redirects(self): '''generate redirects to recently-moved pages''' # this will run forever, until user interrupts it - import datetime if self.offset <= 0: self.offset = 1 @@ -507,53 +511,51 @@ break def delete_1_broken_redirect(self, redir_name, reason): - redir_page = pywikibot.Page(self.site, redir_name) - # 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} <<<" - % redir_page.title()) + redir_page = pywikibot.Page(self.site, redir_name) + # 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} <<<" + % redir_page.title()) + try: + targetPage = redir_page.getRedirectTarget() + except pywikibot.IsNotRedirectPage: + pywikibot.output(u'%s is not a redirect.' % redir_page.title()) + except pywikibot.NoPage: + pywikibot.output(u'%s doesn\'t exist.' % redir_page.title()) + else: try: - targetPage = redir_page.getRedirectTarget() - except pywikibot.IsNotRedirectPage: - pywikibot.output(u'%s is not a redirect.' % redir_page.title()) + targetPage.get() except pywikibot.NoPage: - pywikibot.output(u'%s doesn\'t exist.' % redir_page.title()) + if self.prompt( + u'Redirect target %s does not exist. Do you want to delete %s?' + % (targetPage.title(asLink=True), + redir_page.title(asLink=True))): + try: + redir_page.delete(reason, prompt = False) + except pywikibot.NoUsername: + if targetPage.site.lang in sd_template and \ + targetPage.site.lang in reason_broken: + pywikibot.output( + u"No sysop in user-config.py, put page to speedy deletion.") + content = redir_page.get(get_redirect=True) + content = pywikibot.translate( + targetPage.site.lang, + sd_template) + "\n" + content + summary = pywikibot.translate( + targetPage.site.lang, reason_broken) + redir_page.put(content, summary) + except pywikibot.IsRedirectPage: + pywikibot.output( + u'Redirect target %s is also a redirect! Won\'t delete anything.' + % targetPage.title(asLink=True)) else: - try: - targetPage.get() - except pywikibot.NoPage: - if self.prompt( - u'Redirect target %s does not exist. Do you want to delete %s?' - % (targetPage.title(asLink=True), - redir_page.title(asLink=True))): - try: - redir_page.delete(reason, prompt = False) - except pywikibot.NoUsername: - if targetPage.site.lang in sd_template \ - and targetPage.site.lang in reason_broken: - pywikibot.output( - u"No sysop in user-config.py, put page to speedy deletion.") - content = redir_page.get(get_redirect=True) - content = pywikibot.translate( - targetPage.site.lang, - sd_template)+"\n"+content - summary = pywikibot.translate( - targetPage.site.lang, - reason_broken) - redir_page.put(content, summary) + #we successfully get the target page, meaning that + #it exists and is not a redirect: no reason to touch it. + pywikibot.output( + u'Redirect target %s does exist! Won\'t delete anything.' + % targetPage.title(asLink=True)) + pywikibot.output(u'') - except pywikibot.IsRedirectPage: - pywikibot.output( - u'Redirect target %s is also a redirect! Won\'t delete anything.' - % targetPage.title(asLink=True)) - else: - #we successfully get the target page, meaning that - #it exists and is not a redirect: no reason to touch it. - pywikibot.output( - u'Redirect target %s does exist! Won\'t delete anything.' - % targetPage.title(asLink=True)) - pywikibot.output(u'') - def fix_double_redirects(self): for redir_name in self.generator.retrieve_double_redirects(): self.fix_1_double_redirect(redir_name) @@ -583,6 +585,8 @@ u'Skipping: Redirect target %s is not a redirect.' % newRedir.title(asLink=True)) break # do nothing + else: + pass # target found except pywikibot.SectionError: pywikibot.output( u'Warning: Redirect target section %s doesn\'t exist.' @@ -620,12 +624,13 @@ % targetPage.title(asLink=True)) if targetPage.site.sitename() == 'wikipedia:en' \ and targetPage.title() == 'Target page name': - pywikibot.output(u"Skipping: Redirect source is vandalized.") + pywikibot.output( + u"Skipping: Redirect source is vandalized.") break if targetPage.site != self.site: pywikibot.output( u'Warning: redirect target (%s) is on a different site.' - % (targetPage.title(asLink=True))) + % targetPage.title(asLink=True)) if self.always: break # skip if automatic # watch out for redirect loops @@ -644,8 +649,8 @@ targetPage.site, targetPage.title(withSection=False) ).get(get_redirect=True) - if targetPage.site.lang in sd_template \ - and targetPage.site.lang in sd_tagging_sum: + if targetPage.site.lang in sd_template and \ + targetPage.site.lang in sd_tagging_sum: pywikibot.output(u"Tagging redirect for deletion") # Delete the two redirects content = pywikibot.translate( @@ -656,22 +661,27 @@ targetPage.put(content, summ) redir.put(content, summ) break # TODO Better implement loop redirect - else: - newRedir = targetPage - continue + else: # redirect target found + if targetPage.isStaticRedirect(): + pywikibot.output( + u" Redirect target is STATICREDIRECT.") + pass + else: + newRedir = targetPage + continue try: oldText = redir.get(get_redirect=True) except pywikibot.BadTitle: pywikibot.output(u"Bad Title Error") break text = self.site.redirectRegex().sub( - '#%s %s' % - (self.site.redirect( True ), - targetPage.title(asLink=True)), - oldText) + '#%s %s' % (self.site.redirect(True), + targetPage.title(asLink=True)), oldText) if text == oldText: + pywikibot.output(u"Note: Nothing left to do on %s" + % redir.title(asLink=True)) break - summary = pywikibot.translate(self.site, msg_double)\ + summary = pywikibot.translate(self.site, msg_double) \ % targetPage.title(asLink=True) pywikibot.showDiff(oldText, text) if self.prompt(u'Do you want to accept the changes?'): @@ -682,14 +692,14 @@ except pywikibot.SpamfilterError, error: pywikibot.output( u"Saving page [[%s]] prevented by spam filter: %s" - % (redir.title(), error.url)) + % (redir.title(), error.url)) except pywikibot.PageNotSaved, error: pywikibot.output(u"Saving page [[%s]] failed: %s" - % (redir.title(), error)) + % (redir.title(), error)) except pywikibot.NoUsername: pywikibot.output( u"Page [[%s]] not saved; sysop privileges required." - % redir.title()) + % redir.title()) except pywikibot.Error, error: pywikibot.output( u"Unexpected error occurred trying to save [[%s]]: %s"

13 years, 7 months

SVN: [8579] branches/rewrite/pywikibot/page.py

by xqt＠svn.wikimedia.org

Revision: 8579 Author: xqt Date: 2010-09-19 20:40:20 +0000 (Sun, 19 Sep 2010) Log Message: ----------- new method Page.isStaticRedirect() from trunk Modified Paths: -------------- branches/rewrite/pywikibot/page.py Modified: branches/rewrite/pywikibot/page.py =================================================================== --- branches/rewrite/pywikibot/page.py 2010-09-19 20:06:43 UTC (rev 8578) +++ branches/rewrite/pywikibot/page.py 2010-09-19 20:40:20 UTC (rev 8579) @@ -358,15 +358,21 @@ return result["expandtemplates"]["*"] def userName(self): - """Return name or IP address of last user to edit page.""" + """Return name or IP address of last user to edit page. + + """ return self._revisions[self.latestRevision()].user def isIpEdit(self): - """Return True if last editor was unregistered.""" + """Return True if last editor was unregistered. + + """ return self._revisions[self.latestRevision()].anon def editTime(self): - """Return timestamp (in ISO 8601 format) of last revision to page.""" + """Return timestamp (in ISO 8601 format) of last revision to page. + + """ return self._revisions[self.latestRevision()].timestamp def previousRevision(self): @@ -388,6 +394,22 @@ """Return True if this is a redirect, False if not or not existing.""" return self.site.page_isredirect(self) + def isStaticRedirect(self, force=False): + """Return True if this is a redirect containing the magic word + __STATICREDIRECT__, False if not or not existing. + + """ + found = False + if self.isRedirectPage(): + staticKeys = self.site.getmagicwords('staticredirect') + text = self.get(get_redirect=True, force=force) + if staticKeys: + for key in staticKeys: + if key in text: + found = True + break + return found + def isCategoryRedirect(self): """Return True if this is a category redirect page, False otherwise.""" @@ -493,8 +515,8 @@ "MediaWiki:Disambiguationspage") self.site._disambigtemplates = [ link.title(withNamespace=False) - for link in disambigpages.linkedPages() - if link.namespace() == 10 + for link in disambigpages.linkedPages() + if link.namespace() == 10 ] except pywikibot.NoPage: self.site._disambigtemplates = ['Disambig']

13 years, 7 months

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

by xqt＠svn.wikimedia.org

Revision: 8578 Author: xqt Date: 2010-09-19 20:06:43 +0000 (Sun, 19 Sep 2010) Log Message: ----------- Enable __STATICREDIRECT__ and do not follow its target; change Page.aslink() to Page.title(asLink=True); cleanup identation of delete_1_broken_redirect() Modified Paths: -------------- trunk/pywikipedia/redirect.py Modified: trunk/pywikipedia/redirect.py =================================================================== --- trunk/pywikipedia/redirect.py 2010-09-19 17:12:24 UTC (rev 8577) +++ trunk/pywikipedia/redirect.py 2010-09-19 20:06:43 UTC (rev 8578) @@ -45,7 +45,7 @@ -until:title With -api, the possible last page title in each namespace. Otherwise ignored. Page needs not exist. --number:n With -api, the maximum count of redirects to work upon. +-total:n With -api, the maximum count of redirects to work upon. Otherwise ignored. Use 0 for unlimited -always Don't prompt you for each replacement. @@ -53,18 +53,21 @@ """ # # (C) Daniel Herding, 2004. -# Purodha Blissenbach, 2009. +# (C) Purodha Blissenbach, 2009. +# (C) xqt, 2009-2010 +# (C) Pywikipedia bot team, 2004-2010 # # Distributed under the terms of the MIT license. # +__version__='$Id$' # from __future__ import generators +import re, sys, datetime import wikipedia as pywikibot -import config, query +import config +import query import xmlreader -import re, sys, datetime -__version__='$Id$' # Summary message for fixing double redirects msg_double={ @@ -207,7 +210,7 @@ self.api_number = number if self.api_number is None: # since 'max' does not works with wikia 1.15.5 use a number instead - if self.site.versionnumber() < 16: + if self.site.versionnumber() < 16 or use_move_log: self.api_number = config.special_page_limit else: self.api_number = 'max' @@ -282,7 +285,10 @@ return redict def get_redirect_pageids_via_api(self): - """Return generator that yields page IDs of Pages that are redirects.""" + """Return generator that yields + page IDs of Pages that are redirects. + + """ params = { 'action': 'query', 'list': 'allpages', @@ -485,13 +491,13 @@ - datetime.timedelta(0, self.offset*3600) # self.offset hours ago offset_time = start.strftime("%Y%m%d%H%M%S") - pywikibot.output(u'Retrieving %d moved pages via API...' - % self.api_number) + pywikibot.output(u'Retrieving %s moved pages via API...' + % str(self.api_number)) if pywikibot.verbose: pywikibot.output(u"[%s]" % offset_time) - for moved_page,u,t,c in self.site.logpages(number=self.api_number, - mode='move', - start=offset_time): + for moved_page, u, t, c in self.site.logpages(number=self.api_number, + mode='move', + start=offset_time): try: if not moved_page.isRedirectPage(): continue @@ -594,53 +600,51 @@ break def delete_1_broken_redirect(self, redir_name, reason): - redir_page = pywikibot.Page(self.site, redir_name) - # 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} <<<" - % redir_page.title()) + redir_page = pywikibot.Page(self.site, redir_name) + # 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} <<<" + % redir_page.title()) + try: + targetPage = redir_page.getRedirectTarget() + except pywikibot.IsNotRedirectPage: + pywikibot.output(u'%s is not a redirect.' % redir_page.title()) + except pywikibot.NoPage: + pywikibot.output(u'%s doesn\'t exist.' % redir_page.title()) + else: try: - targetPage = redir_page.getRedirectTarget() - except pywikibot.IsNotRedirectPage: - pywikibot.output(u'%s is not a redirect.' % redir_page.title()) + targetPage.get() except pywikibot.NoPage: - pywikibot.output(u'%s doesn\'t exist.' % redir_page.title()) + if self.prompt( + u'Redirect target %s does not exist. Do you want to delete %s?' + % (targetPage.title(asLink=True), + redir_page.title(asLink=True))): + try: + redir_page.delete(reason, prompt = False) + except pywikibot.NoUsername: + if targetPage.site().lang in sd_template and \ + targetPage.site().lang in reason_broken: + pywikibot.output( + u"No sysop in user-config.py, put page to speedy deletion.") + content = redir_page.get(get_redirect=True) + content = pywikibot.translate( + targetPage.site().lang, + sd_template) + "\n" + content + summary = pywikibot.translate( + targetPage.site().lang, reason_broken) + redir_page.put(content, summary) + except pywikibot.IsRedirectPage: + pywikibot.output( + u'Redirect target %s is also a redirect! Won\'t delete anything.' + % targetPage.title(asLink=True)) else: - try: - targetPage.get() - except pywikibot.NoPage: - if self.prompt( - u'Redirect target %s does not exist. Do you want to delete %s?' - % (targetPage.aslink(), - redir_page.aslink())): - try: - redir_page.delete(reason, prompt = False) - except pywikibot.NoUsername: - if targetPage.site().lang in sd_template \ - and targetPage.site().lang in reason_broken: - pywikibot.output( - u"No sysop in user-config.py, put page to speedy deletion.") - content = redir_page.get(get_redirect=True) - content = pywikibot.translate( - targetPage.site().lang, - sd_template)+"\n"+content - summary = pywikibot.translate( - targetPage.site().lang, - reason_broken) - redir_page.put(content, summary) + #we successfully get the target page, meaning that + #it exists and is not a redirect: no reason to touch it. + pywikibot.output( + u'Redirect target %s does exist! Won\'t delete anything.' + % targetPage.title(asLink=True)) + pywikibot.output(u'') - except pywikibot.IsRedirectPage: - pywikibot.output( - u'Redirect target %s is also a redirect! Won\'t delete anything.' - % targetPage.aslink()) - else: - #we successfully get the target page, meaning that - #it exists and is not a redirect: no reason to touch it. - pywikibot.output( - u'Redirect target %s does exist! Won\'t delete anything.' - % targetPage.aslink()) - pywikibot.output(u'') - def fix_double_redirects(self): for redir_name in self.generator.retrieve_double_redirects(): self.fix_1_double_redirect(redir_name) @@ -663,17 +667,19 @@ except pywikibot.IsNotRedirectPage: if len(redirList) == 1: pywikibot.output(u'Skipping: Page %s is not a redirect.' - % redir.aslink()) + % redir.title(asLink=True)) break #do nothing elif len(redirList) == 2: pywikibot.output( u'Skipping: Redirect target %s is not a redirect.' - % newRedir.aslink()) + % newRedir.title(asLink=True)) break # do nothing + else: + pass # target found except pywikibot.SectionError: pywikibot.output( u'Warning: Redirect target section %s doesn\'t exist.' - % newRedir.aslink()) + % newRedir.title(asLink=True)) except pywikibot.BadTitle, e: # str(e) is in the format 'BadTitle: [[Foo]]' pywikibot.output( @@ -686,33 +692,34 @@ except pywikibot.NoPage: if len(redirList) == 1: pywikibot.output(u'Skipping: Page %s does not exist.' - % redir.aslink()) + % redir.title(asLink=True)) break else: if self.always: pywikibot.output( u"Skipping: Redirect target %s doesn't exist." - % newRedir.aslink()) + % newRedir.title(asLink=True)) break # skip if automatic else: pywikibot.output( u"Warning: Redirect target %s doesn't exist." - % newRedir.aslink()) + % newRedir.title(asLink=True)) except pywikibot.ServerError: pywikibot.output(u'Skipping: Server Error') break else: pywikibot.output( u' Links to: %s.' - % targetPage.aslink()) + % targetPage.title(asLink=True)) if targetPage.site().sitename() == 'wikipedia:en' \ and targetPage.title() == 'Target page name': - pywikibot.output(u"Skipping: Redirect source is vandalized.") + pywikibot.output( + u"Skipping: Redirect source is vandalized.") break if targetPage.site() != self.site: pywikibot.output( u'Warning: redirect target (%s) is on a different site.' - % (targetPage.aslink())) + % targetPage.title(asLink=True)) if self.always: break # skip if automatic # watch out for redirect loops @@ -722,7 +729,7 @@ ) > 0: pywikibot.output( u'Warning: Redirect target %s forms a redirect loop.' - % targetPage.aslink()) + % targetPage.title(asLink=True)) break ###xqt doesn't work. edits twice! try: content = targetPage.get(get_redirect=True) @@ -731,8 +738,8 @@ targetPage.site(), targetPage.sectionFreeTitle() ).get(get_redirect=True) - if targetPage.site().lang in sd_template \ - and targetPage.site().lang in sd_tagging_sum: + if targetPage.site().lang in sd_template and \ + targetPage.site().lang in sd_tagging_sum: pywikibot.output(u"Tagging redirect for deletion") # Delete the two redirects content = pywikibot.translate( @@ -743,23 +750,28 @@ targetPage.put(content, summ) redir.put(content, summ) break # TODO Better implement loop redirect - else: - newRedir = targetPage - continue + else: # redirect target found + if targetPage.isStaticRedirect(): + pywikibot.output( + u" Redirect target is STATICREDIRECT.") + pass + else: + newRedir = targetPage + continue try: oldText = redir.get(get_redirect=True) except pywikibot.BadTitle: pywikibot.output(u"Bad Title Error") break text = self.site.redirectRegex().sub( - '#%s %s' % - (self.site.redirect( True ), - targetPage.aslink()), - oldText) + '#%s %s' % (self.site.redirect(True), + targetPage.title(asLink=True)), oldText) if text == oldText: + pywikibot.output(u"Note: Nothing left to do on %s" + % redir.title(asLink=True)) break - summary = pywikibot.translate(self.site, msg_double)\ - % targetPage.aslink() + summary = pywikibot.translate(self.site, msg_double) \ + % targetPage.title(asLink=True) pywikibot.showDiff(oldText, text) if self.prompt(u'Do you want to accept the changes?'): try: @@ -769,14 +781,14 @@ except pywikibot.SpamfilterError, error: pywikibot.output( u"Saving page [[%s]] prevented by spam filter: %s" - % (redir.title(), error.url)) + % (redir.title(), error.url)) except pywikibot.PageNotSaved, error: pywikibot.output(u"Saving page [[%s]] failed: %s" - % (redir.title(), error)) + % (redir.title(), error)) except pywikibot.NoUsername: pywikibot.output( u"Page [[%s]] not saved; sysop privileges required." - % redir.title()) + % redir.title()) except pywikibot.Error, error: pywikibot.output( u"Unexpected error occurred trying to save [[%s]]: %s" @@ -872,6 +884,9 @@ start = arg[7:] elif arg.startswith('-until:'): until = arg[7:] + elif arg.startswith('-total:'): + number = int(arg[8:]) + # old param, use -total instead elif arg.startswith('-number:'): number = int(arg[8:]) elif arg == '-always':

13 years, 7 months

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

by xqt＠svn.wikimedia.org

Revision: 8577 Author: xqt Date: 2010-09-19 17:12:24 +0000 (Sun, 19 Sep 2010) Log Message: ----------- msg_standalone for commons Modified Paths: -------------- trunk/pywikipedia/cosmetic_changes.py Modified: trunk/pywikipedia/cosmetic_changes.py =================================================================== --- trunk/pywikipedia/cosmetic_changes.py 2010-09-19 17:10:15 UTC (rev 8576) +++ trunk/pywikipedia/cosmetic_changes.py 2010-09-19 17:12:24 UTC (rev 8577) @@ -51,7 +51,8 @@ """ __version__ = '$Id$' import wikipedia as pywikibot -import pagegenerators, isbn +import isbn +import pagegenerators import sys import re @@ -67,6 +68,7 @@ # Summary message when using this module as a stand-alone script msg_standalone = { + 'commons': u'Bot: [[Commons talk:Tools/pywiki file description cleanup|desc page fmt]]', 'als':u'Bötli: chleineri Änderige', 'ar': u'روبوت: تغييرات تجميلية', 'be-x-old': u'Робат: касмэтычныя зьмены', @@ -856,7 +858,8 @@ # Load default summary message. editSummary = pywikibot.translate(pywikibot.getSite(), msg_standalone) if pageTitle: - page = pywikibot.Page(pywikibot.getSite(), ' '.join(pageTitle)) + site = pywikibot.getSite() + page = pywikibot.Page(site, ' '.join(pageTitle)) gen = iter([page]) if not gen: gen = genFactory.getCombinedGenerator()

13 years, 7 months

SVN: [8576] branches/rewrite/scripts/cosmetic_changes.py

by xqt＠svn.wikimedia.org

Revision: 8576 Author: xqt Date: 2010-09-19 17:10:15 +0000 (Sun, 19 Sep 2010) Log Message: ----------- update cc from trunk Modified Paths: -------------- branches/rewrite/scripts/cosmetic_changes.py Modified: branches/rewrite/scripts/cosmetic_changes.py =================================================================== --- branches/rewrite/scripts/cosmetic_changes.py 2010-09-19 16:42:57 UTC (rev 8575) +++ branches/rewrite/scripts/cosmetic_changes.py 2010-09-19 17:10:15 UTC (rev 8576) @@ -32,7 +32,8 @@ all of them, but be careful if you do. """ __version__ = '$Id$' -import pywikibot, isbn +import pywikibot +import isbn from pywikibot import pagegenerators import sys import re @@ -49,6 +50,7 @@ # Summary message when using this module as a stand-alone script msg_standalone = { + 'commons': u'Bot: [[Commons talk:Tools/pywiki file description cleanup|desc page fmt]]', 'als':u'Bötli: chleineri Änderige', 'ar': u'روبوت: تغييرات تجميلية', 'be-x-old': u'Робат: касмэтычныя зьмены', @@ -111,6 +113,7 @@ # Summary message that will be appended to the normal message when # cosmetic changes are made on the fly msg_append = { + 'commons': u'; [[Commons talk:Tools/pywiki file description cleanup|desc page fmt]]', 'als':u'; chleineri Änderige', 'ar': u'; تغييرات تجميلية', 'be-x-old': u'; касмэтычныя зьмены', @@ -170,33 +173,97 @@ 'zh': u'; 細部更改', } +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'), +} + +# Template which should be replaced or removed. +# Use a list with two entries. The first entry will be replaced by the second. +# Examples: +# For removing {{Foo}}, the list must be: +# (u'Foo', None), +# +# The following also works: +# (u'Foo', ''), +# +# For replacing {{Foo}} with {{Bar}} the list must be: +# (u'Foo', u'Bar'), +# +# This also removes all template parameters of {{Foo}} +# For replacing {{Foo}} with {{Bar}} but keep the template +# parameters in its original order, please use: +# (u'Foo', u'Bar\g<parameters>'), + +deprecatedTemplates = { + 'wikipedia': { + 'de': [ + (u'Belege', u'Belege fehlen\g<parameters>'), + (u'Quelle', u'Belege fehlen\g<parameters>'), + (u'Quellen', u'Belege fehlen\g<parameters>'), + (u'Quellen fehlen', u'Belege fehlen\g<parameters>'), + ], + } +} + 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): """ Given a wiki source code text, return the cleaned up version. """ oldText = text + if self.site.sitename()== u'commons:commons' and self.namespace == 6: + text = self.commonsfiledesc(text) text = self.fixSelfInterwiki(text) - text = self.standardizeInterwiki(text) - text = self.standardizeCategories(text) + text = self.standardizePageFooter(text) text = self.cleanUpLinks(text) text = self.cleanUpSectionHeaders(text) text = self.putSpacesInLists(text) text = self.translateAndCapitalizeNamespaces(text) + text = self.replaceDeprecatedTemplates(text) text = self.resolveHtmlEntities(text) text = self.validXhtml(text) text = self.removeUselessSpaces(text) text = self.removeNonBreakingSpaceBeforePercent(text) text = self.fixSyntaxSave(text) text = self.fixHtml(text) + text = self.fixStyle(text) + text = self.fixTypo(text) + text = self.fixArabicLetters(text) try: text = isbn.hyphenateIsbnNumbers(text) except isbn.InvalidIsbnException, error: @@ -210,21 +277,13 @@ Interwiki links to the site itself are displayed like local links. Remove their language code prefix. """ - interwikiR = re.compile(r'\[\[%s\s?:([^\[\]\n]*)\]\]' % self.site.lang) - text = interwikiR.sub(r'[[\1]]', text) - return text - - def standardizeInterwiki(self, text): - """ - Makes sure that interwiki links are put to the correct position and - into the right order. - """ if not self.talkpage and pywikibot.calledModuleName() <> 'interwiki': - interwikiLinks = pywikibot.getLanguageLinks(text, insite = self.site) - text = pywikibot.replaceLanguageLinks(text, interwikiLinks, site = self.site, template = self.template) + interwikiR = re.compile(r'\[\[%s\s?:([^\[\]\n]*)\]\]' % self.site.lang) + text = interwikiR.sub(r'[[\1]]', text) return text - def standardizeCategories(self, text): + + def standardizePageFooter(self, text): """ Makes sure that categories are put to the correct position, but does not sort them. @@ -256,7 +315,12 @@ continue namespaces = list(family.namespace(self.site.lang, nsNumber, all = True)) thisNs = namespaces.pop(0) - + 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']: + if image in namespaces: + namespaces.remove(image) # skip main (article) namespace if thisNs and namespaces: text = pywikibot.replaceExcept(text, r'\[\[\s*(' + '|'.join(namespaces) + ') *:(?P<nameAndLabel>.*?)\]\]', r'[[' + thisNs + ':\g<nameAndLabel>]]', exceptions) @@ -435,10 +499,26 @@ and French Wikipedia. It might be that it is not wanted on other wikis. If there are any complaints, please file a bug report. """ - if not self.redirect: - text = pywikibot.replaceExcept(text, r'(?m)^(?P<bullet>[:;]*(\*+|#+)[:;\*#]*)(?P<char>[^\s\*#:;].+?)', '\g<bullet> \g<char>', ['comment', 'math', 'nowiki', 'pre']) + exceptions = ['comment', 'math', 'nowiki', 'pre', 'source', 'timeline'] + if not self.redirect and pywikibot.calledModuleName() <> 'capitalize_redirects': + text = pywikibot.replaceExcept(text, r'(?m)^(?P<bullet>[:;]*(\*+|#+)[:;\*#]*)(?P<char>[^\s\*#:;].+?)', '\g<bullet> \g<char>', exceptions) return text + def replaceDeprecatedTemplates(self, text): + exceptions = ['comment', 'math', 'nowiki', 'pre'] + if self.site.family.name in deprecatedTemplates and self.site.lang in deprecatedTemplates[self.site.family.name]: + for template in deprecatedTemplates[self.site.family.name][self.site.lang]: + old = template[0] + new = template[1] + if new == None: + new = '' + else: + new = '{{'+new+'}}' + if not self.site.nocapitalize: + old = '[' + old[0].upper() + old[0].lower() + ']' + old[1:] + text = pywikibot.replaceExcept(text, r'\{\{([mM][sS][gG]:)?' + old + '(?P<parameters>\|[^}]+|)}}', new, exceptions) + return text + #from fixes.py def fixSyntaxSave(self, text): exceptions = ['nowiki', 'comment', 'math', 'pre', 'source', 'startspace'] @@ -469,11 +549,131 @@ # horizontal line with attributes; can't be done with wiki syntax # so we only make it XHTML compliant text = pywikibot.replaceExcept(text, r'(?i)<hr ([^>/]+?)>', r'<hr \1 />', exceptions) + # a header where only spaces are in the same line + for level in range(1, 7): + equals = '\\1%s \\2 %s\\3' % ("="*level, "="*level) + text = pywikibot.replaceExcept(text, + r'(?i)([\r\n]) *<h%d> *([^<]+?) *</h%d> *([\r\n])'%(level, level), + r'%s'%equals, exceptions) + #remove empty <ref/>-tag + text = pywikibot.replaceExcept(text, r'(?i)<ref\s*/>', r'', exceptions) # TODO: maybe we can make the bot replace <p> tags with \r\n's. return text + def fixStyle(self, text): + exceptions = ['nowiki', 'comment', 'math', 'pre', 'source', 'startspace'] + # convert prettytable to wikitable class + if self.site.language in ('de', 'en'): + text = pywikibot.replaceExcept(text, ur'(class="[^"]*)prettytable([^"]*")', ur'\1wikitable\2', exceptions) + return text + + def fixTypo(self, text): + exceptions = ['nowiki', 'comment', 'math', 'pre', 'source', 'startspace', 'gallery', 'hyperlink', 'interwiki', 'link'] + # change <number> ccm -> <number> cm³ + text = pywikibot.replaceExcept(text, ur'(\d)\s* ccm', ur'\1 cm³', exceptions) + text = pywikibot.replaceExcept(text, ur'(\d)\s*ccm', ur'\1 cm³', exceptions) + # Solve wrong Nº sign with °C or °F + # additional exception requested on fr-wiki for this stuff + pattern = re.compile(u'«.*?»', re.UNICODE) + exceptions.append(pattern) + text = pywikibot.replaceExcept(text, ur'(\d)\s* [º°]([CF])', ur'\1 °\2', exceptions) + text = pywikibot.replaceExcept(text, ur'(\d)\s*[º°]([CF])', ur'\1 °\2', exceptions) + text = pywikibot.replaceExcept(text, ur'º([CF])', ur'°\1', exceptions) + return text + + def fixArabicLetters(self, text): + if self.site.lang=='ckb': + exceptions = [ + 'gallery', + 'hyperlink', + 'interwiki', + # but changes letters inside wikilinks + #'link', + 'math', + 'pre', + 'template', + 'timeline', + 'ref', + 'source', + 'startspace', + 'inputbox', + ] + # do not change inside file links + namespaces = list(self.site.namespace(6, all = True)) + pattern = re.compile(u'\[\[(' + '|'.join(namespaces) + '):.+?\..+?\]\]', re.UNICODE) + exceptions.append(pattern) + text = pywikibot.replaceExcept(text, u',', u'،', exceptions) + text = pywikibot.replaceExcept(text, ur'ه([.،_<\]\s])', ur'ە\1', exceptions) + text = pywikibot.replaceExcept(text, u'ه‌', u'ە', exceptions) + text = pywikibot.replaceExcept(text, u'ه', u'ھ', exceptions) + text = pywikibot.replaceExcept(text, u'ك', u'ک', exceptions) + text = pywikibot.replaceExcept(text, ur'[ىي]', u'ی', exceptions) + # replace persian digits + for i in range(0,10): + text = pywikibot.replaceExcept(text, u'۰۱۲۳۴۵۶۷۸۹'[i], u'٠١٢٣٤٥٦٧٨٩'[i], exceptions) + # do not change digits in class, style and table params + pattern = re.compile(u'=".*?"', re.UNICODE) + exceptions.append(pattern) + # do not change digits inside html-tags + pattern = re.compile(u'<[/]*?[^</]+?[/]*?>', re.UNICODE) + exceptions.append(pattern) + for i in range(0,10): + text = pywikibot.replaceExcept(text, str(i), u'٠١٢٣٤٥٦٧٨٩'[i], exceptions) + return text + + # Retrieved from "http://commons.wikimedia.org/wiki/Commons:Tools/pywiki_file_description_cle…" + def commonsfiledesc(self, text): + # section headers to {{int:}} versions + exceptions = ['comment', 'includeonly', 'math', 'noinclude', 'nowiki', + 'pre', 'source', 'ref', 'timeline'] + text = pywikibot.replaceExcept(text, + r"([\r\n]|^)\=\= *Summary *\=\=", + r"\1== {{int:filedesc}} ==", + exceptions, True) + text = pywikibot.replaceExcept( + text, + r"([\r\n])\=\= *\[\[Commons:Copyright tags\|Licensing\]\]: *\=\=", + r"\1== {{int:license}} ==", exceptions, True) + text = pywikibot.replaceExcept( + text, + r"([\r\n])\=\= *(Licensing|License information|{{int:license-header}}) *\=\=", + r"\1== {{int:license}} ==", exceptions, True) + + # frequent field values to {{int:}} versions + text = pywikibot.replaceExcept( + text, + r'([\r\n]\|[Ss]ource *\= *)(?:[Oo]wn work by uploader|[Oo]wn work|[Ee]igene [Aa]rbeit) *([\r\n])', + r'\1{{own}}\2', exceptions, True) + text = pywikibot.replaceExcept( + text, + r'(\| *Permission *\=) *(?:[Ss]ee below|[Ss]iehe unten) *([\r\n])', + r'\1\2', exceptions, True) + + # added to transwikied pages + text = pywikibot.replaceExcept(text, r'__NOTOC__', '', exceptions, True) + + # tracker element for js upload form + text = pywikibot.replaceExcept( + text, + r'', + '', exceptions[1:], True) + text = pywikibot.replaceExcept(text, r'{{ImageUpload\|(?:basic|full)}}', + '', exceptions, True) + + # duplicated section headers + text = pywikibot.replaceExcept( + text, + r'([\r\n]|^)\=\= *{{int:filedesc}} *\=\=(?:[\r\n ]*)\=\= *{{int:filedesc}} *\=\=', + r'\1== {{int:filedesc}} ==', exceptions, True) + text = pywikibot.replaceExcept( + text, + r'([\r\n]|^)\=\= *{{int:license}} *\=\=(?:[\r\n ]*)\=\= *{{int:license}} *\=\=', + r'\1== {{int:license}} ==', exceptions, True) + return text + class CosmeticChangesBot: - def __init__(self, generator, acceptall = False, comment=u'Robot: Cosmetic changes'): + def __init__(self, generator, acceptall = False, + comment=u'Robot: Cosmetic changes'): self.generator = generator self.acceptall = acceptall self.comment = comment @@ -483,13 +683,17 @@ try: # 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()) + pywikibot.output(u"\n\n>>> \03{lightpurple}%s\03{default} <<<" + % page.title()) + 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: - choice = pywikibot.inputChoice(u'Do you want to accept these changes?', - ['Yes', 'No', 'All', 'Quit'], ['y', 'N', 'a', 'q'], 'N') + choice = pywikibot.inputChoice( + u'Do you want to accept these changes?', + ['Yes', 'No', 'All', 'Quit'], ['y', 'N', 'a', 'q'], 'N') if choice == 'a': self.acceptall = True elif choice == 'q': @@ -498,15 +702,19 @@ if self.acceptall or choice == 'y': page.put(changedText, comment=self.comment) else: - pywikibot.output('No changes were necessary in %s' % page.title()) + pywikibot.output('No changes were necessary in %s' + % page.title()) except pywikibot.NoPage: - pywikibot.output("Page %s does not exist?!" % page.aslink()) + pywikibot.output("Page %s does not exist?!" + % page.title(asLink=True)) except pywikibot.IsRedirectPage: - pywikibot.output("Page %s is a redirect; skipping." % page.aslink()) + pywikibot.output("Page %s is a redirect; skipping." + % page.title(asLink=True)) except pywikibot.LockedPage: - pywikibot.output("Page %s is locked?!" % page.aslink()) + pywikibot.output("Page %s is locked?!" % page.title(asLink=True)) except pywikibot.EditConflict: - pywikibot.output("An edit conflict has occured at %s." % page.aslink()) + pywikibot.output("An edit conflict has occured at %s." + % page.title(asLink=True)) def run(self): try: @@ -540,16 +748,6 @@ if editSummary == '': # Load default summary message. editSummary = pywikibot.translate(pywikibot.getSite(), msg_standalone) - - # Disabled this check. Although the point is still valid, there - # is now a warning and a prompt (see below). - #if pywikibot.getSite() == pywikibot.getSite('nl','wikipedia'): - #print "Deze bot is op WikipediaNL niet gewenst." - #print "Het toevoegen van cosmetic changes bij andere wijzigingen is toegestaan," - #print "maar cosmetic_changes als stand-alone bot niet." - #print "Zoek alstublieft een nuttig gebruik voor uw bot." - #sys.exit() - if pageTitle: site = pywikibot.getSite() gen = iter([pywikibot.Page(pywikibot.Link(t, site)) for t in pageTitle]) @@ -558,11 +756,14 @@ if not gen: pywikibot.showHelp() elif not always: - answer = pywikibot.inputChoice(warning + '\nDo you really want to continue?', ['yes', 'no'], ['y', 'N'], 'N') + answer = pywikibot.inputChoice( + warning + '\nDo you really want to continue?', + ['yes', 'no'], ['y', 'N'], 'N') if answer == 'y': preloadingGen = pagegenerators.PreloadingGenerator(gen) - bot = CosmeticChangesBot(preloadingGen, acceptall=always, comment=editSummary) + bot = CosmeticChangesBot(preloadingGen, acceptall=always, + comment=editSummary) bot.run() if __name__ == "__main__":

13 years, 7 months

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

by xqt＠svn.wikimedia.org

Revision: 8575 Author: xqt Date: 2010-09-19 16:42:57 +0000 (Sun, 19 Sep 2010) Log Message: ----------- cosmetic changes for commons due to request bug #3070962 from http://commons.wikimedia.org/wiki/Commons:Tools/pywiki_file_description_cle… Modified Paths: -------------- trunk/pywikipedia/cosmetic_changes.py Modified: trunk/pywikipedia/cosmetic_changes.py =================================================================== --- trunk/pywikipedia/cosmetic_changes.py 2010-09-19 12:32:27 UTC (rev 8574) +++ trunk/pywikipedia/cosmetic_changes.py 2010-09-19 16:42:57 UTC (rev 8575) @@ -129,6 +129,7 @@ # Summary message that will be appended to the normal message when # cosmetic changes are made on the fly msg_append = { + 'commons': u'; [[Commons talk:Tools/pywiki file description cleanup|desc page fmt]]', 'als':u'; chleineri Änderige', 'ar': u'; تغييرات تجميلية', 'be-x-old': u'; касмэтычныя зьмены', @@ -261,6 +262,8 @@ Given a wiki source code text, return the cleaned up version. """ oldText = text + if self.site.sitename()== u'commons:commons' and self.namespace == 6: + text = self.commonsfiledesc(text) text = self.fixSelfInterwiki(text) text = self.standardizePageFooter(text) text = self.cleanUpLinks(text) @@ -726,8 +729,59 @@ text = pywikibot.replaceExcept(text, str(i), u'٠١٢٣٤٥٦٧٨٩'[i], exceptions) return text + # Retrieved from "http://commons.wikimedia.org/wiki/Commons:Tools/pywiki_file_description_cle…" + def commonsfiledesc(self, text): + # section headers to {{int:}} versions + exceptions = ['comment', 'includeonly', 'math', 'noinclude', 'nowiki', + 'pre', 'source', 'ref', 'timeline'] + text = pywikibot.replaceExcept(text, + r"([\r\n]|^)\=\= *Summary *\=\=", + r"\1== {{int:filedesc}} ==", + exceptions, True) + text = pywikibot.replaceExcept( + text, + r"([\r\n])\=\= *\[\[Commons:Copyright tags\|Licensing\]\]: *\=\=", + r"\1== {{int:license}} ==", exceptions, True) + text = pywikibot.replaceExcept( + text, + r"([\r\n])\=\= *(Licensing|License information|{{int:license-header}}) *\=\=", + r"\1== {{int:license}} ==", exceptions, True) + + # frequent field values to {{int:}} versions + text = pywikibot.replaceExcept( + text, + r'([\r\n]\|[Ss]ource *\= *)(?:[Oo]wn work by uploader|[Oo]wn work|[Ee]igene [Aa]rbeit) *([\r\n])', + r'\1{{own}}\2', exceptions, True) + text = pywikibot.replaceExcept( + text, + r'(\| *Permission *\=) *(?:[Ss]ee below|[Ss]iehe unten) *([\r\n])', + r'\1\2', exceptions, True) + + # added to transwikied pages + text = pywikibot.replaceExcept(text, r'__NOTOC__', '', exceptions, True) + + # tracker element for js upload form + text = pywikibot.replaceExcept( + text, + r'', + '', exceptions[1:], True) + text = pywikibot.replaceExcept(text, r'{{ImageUpload\|(?:basic|full)}}', + '', exceptions, True) + + # duplicated section headers + text = pywikibot.replaceExcept( + text, + r'([\r\n]|^)\=\= *{{int:filedesc}} *\=\=(?:[\r\n ]*)\=\= *{{int:filedesc}} *\=\=', + r'\1== {{int:filedesc}} ==', exceptions, True) + text = pywikibot.replaceExcept( + text, + r'([\r\n]|^)\=\= *{{int:license}} *\=\=(?:[\r\n ]*)\=\= *{{int:license}} *\=\=', + r'\1== {{int:license}} ==', exceptions, True) + return text + class CosmeticChangesBot: - def __init__(self, generator, acceptall = False, comment=u'Robot: Cosmetic changes'): + def __init__(self, generator, acceptall = False, + comment=u'Robot: Cosmetic changes'): self.generator = generator self.acceptall = acceptall self.comment = comment @@ -737,13 +791,17 @@ try: # 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(), pageTitle=page.title()) + pywikibot.output(u"\n\n>>> \03{lightpurple}%s\03{default} <<<" + % page.title()) + 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: - choice = pywikibot.inputChoice(u'Do you want to accept these changes?', - ['Yes', 'No', 'All', 'Quit'], ['y', 'N', 'a', 'q'], 'N') + choice = pywikibot.inputChoice( + u'Do you want to accept these changes?', + ['Yes', 'No', 'All', 'Quit'], ['y', 'N', 'a', 'q'], 'N') if choice == 'a': self.acceptall = True elif choice == 'q': @@ -752,15 +810,19 @@ if self.acceptall or choice == 'y': page.put(changedText, comment=self.comment) else: - pywikibot.output('No changes were necessary in %s' % page.title()) + pywikibot.output('No changes were necessary in %s' + % page.title()) except pywikibot.NoPage: - pywikibot.output("Page %s does not exist?!" % page.aslink()) + pywikibot.output("Page %s does not exist?!" + % page.title(asLink=True)) except pywikibot.IsRedirectPage: - pywikibot.output("Page %s is a redirect; skipping." % page.aslink()) + pywikibot.output("Page %s is a redirect; skipping." + % page.title(asLink=True)) except pywikibot.LockedPage: - pywikibot.output("Page %s is locked?!" % page.aslink()) + pywikibot.output("Page %s is locked?!" % page.title(asLink=True)) except pywikibot.EditConflict: - pywikibot.output("An edit conflict has occured at %s." % page.aslink()) + pywikibot.output("An edit conflict has occured at %s." + % page.title(asLink=True)) def run(self): try: @@ -793,16 +855,6 @@ if editSummary == '': # Load default summary message. editSummary = pywikibot.translate(pywikibot.getSite(), msg_standalone) - - # Disabled this check. Although the point is still valid, there - # is now a warning and a prompt (see below). - #if pywikibot.getSite() == pywikibot.getSite('nl','wikipedia'): - #print "Deze bot is op WikipediaNL niet gewenst." - #print "Het toevoegen van cosmetic changes bij andere wijzigingen is toegestaan," - #print "maar cosmetic_changes als stand-alone bot niet." - #print "Zoek alstublieft een nuttig gebruik voor uw bot." - #sys.exit() - if pageTitle: page = pywikibot.Page(pywikibot.getSite(), ' '.join(pageTitle)) gen = iter([page]) @@ -811,11 +863,14 @@ if not gen: pywikibot.showHelp() elif not always: - answer = pywikibot.inputChoice(warning + '\nDo you really want to continue?', ['yes', 'no'], ['y', 'N'], 'N') + answer = pywikibot.inputChoice( + warning + '\nDo you really want to continue?', + ['yes', 'no'], ['y', 'N'], 'N') if answer == 'y': preloadingGen = pagegenerators.PreloadingGenerator(gen) - bot = CosmeticChangesBot(preloadingGen, acceptall=always, comment=editSummary) + bot = CosmeticChangesBot(preloadingGen, acceptall=always, + comment=editSummary) bot.run() if __name__ == "__main__":

13 years, 7 months

SVN: [8574] trunk/pywikipedia/featured.py

by amir＠svn.wikimedia.org

Revision: 8574 Author: amir Date: 2010-09-19 12:32:27 +0000 (Sun, 19 Sep 2010) Log Message: ----------- -query feature for use at small amount of RAM(e.g. toolserver) Modified Paths: -------------- trunk/pywikipedia/featured.py Modified: trunk/pywikipedia/featured.py =================================================================== --- trunk/pywikipedia/featured.py 2010-09-19 12:30:58 UTC (rev 8573) +++ trunk/pywikipedia/featured.py 2010-09-19 12:32:27 UTC (rev 8574) @@ -37,6 +37,10 @@ -dry for debug purposes. No changes will be made. +-query:# a int. that determain number of pages will be checked each while + (use for computers with a small amount of RAM e.g. toolserver users) + default is 500 + usage: featured.py [-interactive] [-nocache] [-top] [-after:zzzz] [-fromlang:xx,yy--zz|-fromall] """ @@ -515,9 +519,120 @@ except KeyError: templates = template['_default'] return templates +def featuredbot(arts,cc,tosite,template_on_top,pType, quiet,dry): + templatelist = getTemplateList(tosite.lang, pType) + findtemplate = '(' + '|'.join(templatelist) + ')' + re_Link_FA=re.compile(ur"\{\{%s\|%s\}\}" + % (findtemplate.replace(u' ', u'[ _]'), + fromsite.lang), re.IGNORECASE) + re_this_iw=re.compile(ur"\[\[%s:[^]]+\]\]" % fromsite.lang) + pairs=[] + for a in arts: + if a.title()<afterpage: + continue + if u"/" in a.title() and a.namespace() != 0: + pywikibot.output(u"%s is a subpage" % a.title()) + continue + if a.title() in cc: + pywikibot.output(u"(cached) %s -> %s"%(a.title(), cc[a.title()])) + continue + if a.isRedirectPage(): + a=a.getRedirectTarget() + try: + if not a.exists(): + pywikibot.output(u"source page doesn't exist: %s" % a.title()) + continue + atrans = findTranslated(a, tosite, quiet) + if pType!='former': + if atrans: + text=atrans.get() + m=re_Link_FA.search(text) + if m: + pywikibot.output(u"(already done)") + else: + # insert just before interwiki + if (not interactive or + pywikibot.input( + u'Connecting %s -> %s. Proceed? [Y/N]' + % (a.title(), atrans.title())) in ['Y','y'] + ): + m=re_this_iw.search(text) + if not m: + pywikibot.output( + u"no interwiki record, very strange") + continue + site = pywikibot.getSite() + if pType == 'good': + comment = pywikibot.setAction( + pywikibot.translate(site, msg_good) + % (fromsite.lang, a.title())) + elif pType == 'list': + comment = pywikibot.setAction( + pywikibot.translate(site, msg_lists) + % (fromsite.lang, a.title())) + else: + comment = pywikibot.setAction( + pywikibot.translate(site, msg) + % (fromsite.lang, a.title())) + ### Moving {{Link FA|xx}} to top of interwikis ### + if template_on_top == True: + # Getting the interwiki + iw = pywikibot.getLanguageLinks(text, site) + # Removing the interwiki + text = pywikibot.removeLanguageLinks(text, site) + text += u"\r\n{{%s|%s}}\r\n" % (templatelist[0], + fromsite.lang) + # Adding the interwiki + text = pywikibot.replaceLanguageLinks(text, + iw, site) + ### Placing {{Link FA|xx}} right next to corresponding interwiki ### + else: + text=(text[:m.end()] + + (u" {{%s|%s}}" % (templatelist[0], + fromsite.lang)) + + text[m.end():]) + if not dry: + try: + atrans.put(text, comment) + except pywikibot.LockedPage: + pywikibot.output(u'Page %s is locked!' + % atrans.title()) + cc[a.title()]=atrans.title() + else: + if atrans: + text=atrans.get() + m=re_Link_FA.search(text) + if m: + # insert just before interwiki + if (not interactive or + pywikibot.input( + u'Connecting %s -> %s. Proceed? [Y/N]' + % (a.title(), atrans.title())) in ['Y','y'] + ): + m=re_this_iw.search(text) + if not m: + pywikibot.output( + u"no interwiki record, very strange") + continue + site = pywikibot.getSite() + comment = pywikibot.setAction( + pywikibot.translate(site, msg_former) + % (fromsite.lang, a.title())) + text=re.sub(re_Link_FA,'',text) + if not dry: + try: + atrans.put(text, comment) + except pywikibot.LockedPage: + pywikibot.output(u'Page %s is locked!' + % atrans.title()) + else: + pywikibot.output(u"(already done)") + cc[a.title()]=atrans.title() + except pywikibot.PageNotSaved, e: + pywikibot.output(u"Page not saved") def featuredWithInterwiki(fromsite, tosite, template_on_top, pType, quiet, - dry=False): + dry=False,query=500): if not fromsite.lang in cache: cache[fromsite.lang]={} if not tosite.lang in cache[fromsite.lang]: @@ -526,121 +641,16 @@ if nocache: cc={} - templatelist = getTemplateList(tosite.lang, pType) - findtemplate = '(' + '|'.join(templatelist) + ')' - re_Link_FA=re.compile(ur"\{\{%s\|%s\}\}" - % (findtemplate.replace(u' ', u'[ _]'), - fromsite.lang), re.IGNORECASE) - re_this_iw=re.compile(ur"\[\[%s:[^]]+\]\]" % fromsite.lang) - arts=featuredArticles(fromsite, pType) + top=0 + if len(arts)>query: + while top<len(arts): + bottom=top + top=top+query + featuredbot(arts[bottom:top],cc,tosite,template_on_top, pType, quiet,dry) + else: + featuredbot(arts,cc,tosite,template_on_top,pType,quiet,dry) - pairs=[] - for a in arts: - if a.title()<afterpage: - continue - if u"/" in a.title() and a.namespace() != 0: - pywikibot.output(u"%s is a subpage" % a.title()) - continue - if a.title() in cc: - pywikibot.output(u"(cached) %s -> %s"%(a.title(), cc[a.title()])) - continue - if a.isRedirectPage(): - a=a.getRedirectTarget() - try: - if not a.exists(): - pywikibot.output(u"source page doesn't exist: %s" % a.title()) - continue - atrans = findTranslated(a, tosite, quiet) - if pType!='former': - if atrans: - text=atrans.get() - m=re_Link_FA.search(text) - if m: - pywikibot.output(u"(already done)") - else: - # insert just before interwiki - if (not interactive or - pywikibot.input( - u'Connecting %s -> %s. Proceed? [Y/N]' - % (a.title(), atrans.title())) in ['Y','y'] - ): - m=re_this_iw.search(text) - if not m: - pywikibot.output( - u"no interwiki record, very strange") - continue - site = pywikibot.getSite() - if pType == 'good': - comment = pywikibot.setAction( - pywikibot.translate(site, msg_good) - % (fromsite.lang, a.title())) - elif pType == 'list': - comment = pywikibot.setAction( - pywikibot.translate(site, msg_lists) - % (fromsite.lang, a.title())) - else: - comment = pywikibot.setAction( - pywikibot.translate(site, msg) - % (fromsite.lang, a.title())) - ### Moving {{Link FA|xx}} to top of interwikis ### - if template_on_top == True: - # Getting the interwiki - iw = pywikibot.getLanguageLinks(text, site) - # Removing the interwiki - text = pywikibot.removeLanguageLinks(text, site) - text += u"\r\n{{%s|%s}}\r\n" % (templatelist[0], - fromsite.lang) - # Adding the interwiki - text = pywikibot.replaceLanguageLinks(text, - iw, site) - - ### Placing {{Link FA|xx}} right next to corresponding interwiki ### - else: - text=(text[:m.end()] - + (u" {{%s|%s}}" % (templatelist[0], - fromsite.lang)) - + text[m.end():]) - if not dry: - try: - atrans.put(text, comment) - except pywikibot.LockedPage: - pywikibot.output(u'Page %s is locked!' - % atrans.title()) - cc[a.title()]=atrans.title() - else: - if atrans: - text=atrans.get() - m=re_Link_FA.search(text) - if m: - # insert just before interwiki - if (not interactive or - pywikibot.input( - u'Connecting %s -> %s. Proceed? [Y/N]' - % (a.title(), atrans.title())) in ['Y','y'] - ): - m=re_this_iw.search(text) - if not m: - pywikibot.output( - u"no interwiki record, very strange") - continue - site = pywikibot.getSite() - comment = pywikibot.setAction( - pywikibot.translate(site, msg_former) - % (fromsite.lang, a.title())) - text=re.sub(re_Link_FA,'',text) - if not dry: - try: - atrans.put(text, comment) - except pywikibot.LockedPage: - pywikibot.output(u'Page %s is locked!' - % atrans.title()) - else: - pywikibot.output(u"(already done)") - cc[a.title()]=atrans.title() - except pywikibot.PageNotSaved, e: - pywikibot.output(u"Page not saved") - if __name__=="__main__": template_on_top = True featuredcount = False @@ -650,6 +660,7 @@ part = False quiet = False dry = False + query=500 for arg in pywikibot.handleArgs(): if arg == '-interactive': interactive=1 @@ -658,6 +669,11 @@ elif arg.startswith('-fromlang:'): fromlang=arg[10:].split(",") part = True + elif arg.startswith('-query:'): + try: + query=int(arg[7:]) + except: + query=500 elif arg == '-fromall': doAll = True elif arg.startswith('-after:'): @@ -743,7 +759,7 @@ break elif fromsite != pywikibot.getSite(): featuredWithInterwiki(fromsite, pywikibot.getSite(), - template_on_top, processType, quiet, dry) + template_on_top, processType, quiet, dry,query) except KeyboardInterrupt: pywikibot.output('\nQuitting program...') finally:

13 years, 7 months

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

by xqt＠svn.wikimedia.org

Revision: 8573 Author: xqt Date: 2010-09-19 12:30:58 +0000 (Sun, 19 Sep 2010) Log Message: ----------- bugfix for exception handling. Use an error class derived from BaseException since we use new-style classes for errors. Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2010-09-17 23:43:47 UTC (rev 8572) +++ trunk/pywikipedia/wikipedia.py 2010-09-19 12:30:58 UTC (rev 8573) @@ -6484,7 +6484,7 @@ print 'DEBUG allpages>>> data.keys()', data.keys() if 'warnings' in data: warning = data['warnings']['allpages']['*'] - raise str(warning) + raise RuntimeError("API query warning: %s" % warning) if 'error' in data: raise RuntimeError("API query error: %s" % data) if not 'allpages' in data['query']:

13 years, 7 months

SVN: [8572] trunk/pywikipedia/imagetransfer.py

by amir＠svn.wikimedia.org

Revision: 8572 Author: amir Date: 2010-09-17 23:43:47 +0000 (Fri, 17 Sep 2010) Log Message: ----------- adding Persian template and translates.Thanks Ali! Modified Paths: -------------- trunk/pywikipedia/imagetransfer.py Modified: trunk/pywikipedia/imagetransfer.py =================================================================== --- trunk/pywikipedia/imagetransfer.py 2010-09-17 09:20:40 UTC (rev 8571) +++ trunk/pywikipedia/imagetransfer.py 2010-09-17 23:43:47 UTC (rev 8572) @@ -36,6 +36,7 @@ copy_message = { 'ar':u"هذه الصورة تم نقلها من %s. الوصف الأصلي كان:\r\n\r\n%s", 'en':u"This image was copied from %s. The original description was:\r\n\r\n%s", + 'fa':u"تصویر از %s کپی شده‌است.توضیحات اصلی ان این بود::\r\n\r\n%s", 'de':u"Dieses Bild wurde von %s kopiert. Die dortige Beschreibung lautete:\r\n\r\n%s", 'fr':u"Cette image est copiée de %s. La description originale était:\r\n\r\n%s", 'he':u"תמונה זו הועתקה מהאתר %s. תיאור הקובץ המקורי היה:\r\n\r\n%s", @@ -56,6 +57,7 @@ 'de': u'{{NowCommons|%s}}', 'fr': u'{{Désormais sur Commons|%s}}', 'en': u'{{subst:ncd|Image:%s}}', + 'fa': u'{{موجود در انبار|%s}}', 'he': u'{{גם בוויקישיתוף|%s}}', 'hu': u'{{azonnali-commons|Kép:%s}}', 'ia': u'{{OraInCommons|Imagine:%s}}', @@ -82,6 +84,7 @@ 'de': u'Datei ist jetzt auf Wikimedia Commons verfügbar.', 'en': u'File is now available on Wikimedia Commons.', 'eo': u'Dosiero nun estas havebla en la Wikimedia-Komunejo.', + 'fa': u'پرونده اکنون در انبار است', 'he': u'הקובץ זמין כעת בוויקישיתוף.', 'hu': u'A fájl most már elérhető a Wikimedia Commonson', 'ia': u'Le file es ora disponibile in Wikimedia Commons.', @@ -117,6 +120,22 @@ u'Bild-PD-Kunst': u'PD-Art', u'Bild-PD-US': u'PD-USGov', }, + ('wikipedia:fa', 'commons:commons'): { + u'مالکیت عمومی': u'PD', + u'مالکیت عمومی-خود': u'PD-self', + u'مجوز گنو': u'GFDL', + u'مجوز گنو-خود': u'GFDL-self', + u'نگاره قدیمی': u'PD-Iran', + u'نگاره نوشتاری': u'PD-textlogo', + u'نگاره عراقی': u'PD-Iraq', + u'نگاره بریتانیا': u'PD-UK', + u'نگاره هابل': u'PD-Hubble', + u'نگاره آمریکا': u'PD-US', + u'نگاره دولت آمریکا': u'PD-USGov', + u'کک-یاد-دو': u'Cc-by-2.0', + u'کک-یاد-حفظ-دونیم': u'Cc-by-sa-2.5', + u'کک-یاد-سه': u'Cc-by-3.0', + }, ('wikipedia:fr', 'commons:commons'): { u'Domaine public': u'PD' },

13 years, 7 months

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

by xqt＠svn.wikimedia.org

Revision: 8571 Author: xqt Date: 2010-09-17 09:20:40 +0000 (Fri, 17 Sep 2010) Log Message: ----------- NoPage and BadTitle exceptions for _getVersionHistory, requested by DrTrigon Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2010-09-17 05:41:56 UTC (rev 8570) +++ trunk/pywikipedia/wikipedia.py 2010-09-17 09:20:40 UTC (rev 8571) @@ -2615,6 +2615,13 @@ result = query.GetData(params, self.site()) if 'error' in result: raise RuntimeError("%s" % result['error']) + pageInfo = result['query']['pages'].values()[0] + if result['query']['pages'].keys()[0] == "-1": + if 'missing' in pageInfo: + raise NoPage(self.site(), self.aslink(forceInterwiki=True), + "Page does not exist.") + elif 'invalid' in pageInfo: + raise BadTitle('BadTitle: %s' % self) if 'query-continue' in result and getAll: params['rvstartid'] = result['query-continue']['revisions']['rvstartid'] @@ -2624,7 +2631,7 @@ if skipFirst: skipFirst = False else: - for r in result['query']['pages'].values()[0]['revisions']: + for r in pageInfo['revisions']: c = '' if 'comment' in r: c = r['comment']

13 years, 7 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Pywikipedia-svn September 2010