Pywikipedia-svn June 2012

pywikipedia-svn@lists.wikimedia.org

7 participants
171 discussions

SVN: [10302] trunk/pywikipedia/cosmetic_changes.py
by xqt＠svn.wikimedia.org 06 Jun '12

06 Jun '12

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/10302 Revision: 10302 Author: xqt Date: 2012-06-06 15:38:28 +0000 (Wed, 06 Jun 2012) Log Message: ----------- New option -async enables asynchron saving the page, request bug #3532278 update from rewrite r10301 Modified Paths: -------------- trunk/pywikipedia/cosmetic_changes.py Modified: trunk/pywikipedia/cosmetic_changes.py =================================================================== --- trunk/pywikipedia/cosmetic_changes.py 2012-06-06 15:36:59 UTC (rev 10301) +++ trunk/pywikipedia/cosmetic_changes.py 2012-06-06 15:38:28 UTC (rev 10302) @@ -11,6 +11,8 @@ -always Don't prompt you for each replacement. Warning (see below) has not to be confirmed. ATTENTION: Use this with care! +-async Put page on queue to be saved to wiki asynchronously. + -summary:XYZ Set the summary message text for the edit to XYZ, bypassing the predefined message texts with original and replacements inserted. @@ -804,12 +806,13 @@ 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', async=False): self.generator = generator self.acceptall = acceptall self.comment = comment self.done = False + self.async = async def treat(self, page): try: @@ -832,7 +835,10 @@ self.done = True return if self.acceptall or choice == 'y': - page.put(changedText, comment=self.comment) + if self.async: + page.put_async(changedText, comment=self.comment) + else: + page.put(changedText, comment=self.comment) else: pywikibot.output('No changes were necessary in %s' % page.title()) @@ -863,6 +869,7 @@ editSummary = '' answer = 'y' always = False + async = False # This factory is responsible for processing command line arguments # that are also used by other scripts and that determine on which pages # to work on. @@ -873,6 +880,8 @@ editSummary = arg[len('-summary:'):] elif arg == '-always': always = True + elif arg == '-async': + async = True elif not genFactory.handleArg(arg): pageTitle.append(arg) @@ -895,7 +904,7 @@ if answer == 'y': preloadingGen = pagegenerators.PreloadingGenerator(gen) bot = CosmeticChangesBot(preloadingGen, acceptall=always, - comment=editSummary) + comment=editSummary, async=async) bot.run() if __name__ == "__main__":

1 0

SVN: [10301] branches/rewrite/scripts/cosmetic_changes.py
by xqt＠svn.wikimedia.org 06 Jun '12

06 Jun '12

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/10301 Revision: 10301 Author: xqt Date: 2012-06-06 15:36:59 +0000 (Wed, 06 Jun 2012) Log Message: ----------- New option -async enables asynchron saving the page, request bug #3532278 Modified Paths: -------------- branches/rewrite/scripts/cosmetic_changes.py Modified: branches/rewrite/scripts/cosmetic_changes.py =================================================================== --- branches/rewrite/scripts/cosmetic_changes.py 2012-06-06 15:05:45 UTC (rev 10300) +++ branches/rewrite/scripts/cosmetic_changes.py 2012-06-06 15:36:59 UTC (rev 10301) @@ -11,6 +11,8 @@ -always Don't prompt you for each replacement. Warning (see below) has not to be confirmed. ATTENTION: Use this with care! +-async Put page on queue to be saved to wiki asynchronously. + -summary:XYZ Set the summary message text for the edit to XYZ, bypassing the predefined message texts with original and replacements inserted. @@ -655,12 +657,13 @@ 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', async=False): self.generator = generator self.acceptall = acceptall self.comment = comment self.done = False + self.async = async def treat(self, page): try: @@ -683,7 +686,8 @@ self.done = True return if self.acceptall or choice == 'y': - page.put(changedText, comment=self.comment) + page.text = changedText + page.save(comment=self.comment, async=self.async) else: pywikibot.output('No changes were necessary in %s' % page.title()) @@ -715,6 +719,7 @@ editSummary = '' answer = 'y' always = False + async = False # This factory is responsible for processing command line arguments # that are also used by other scripts and that determine on which pages # to work on. @@ -725,6 +730,8 @@ editSummary = arg[len('-summary:'):] elif arg == '-always': always = True + elif arg == '-async': + async = True elif not genFactory.handleArg(arg): pageTitle.append(arg) @@ -747,7 +754,7 @@ if answer == 'y': preloadingGen = pagegenerators.PreloadingGenerator(gen) bot = CosmeticChangesBot(preloadingGen, acceptall=always, - comment=editSummary) + comment=editSummary, async=async) bot.run() if __name__ == "__main__":

1 0

SVN: [10300] trunk/pywikipedia/families/wikibooks_family.py
by xqt＠svn.wikimedia.org 06 Jun '12

06 Jun '12

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/10300 Revision: 10300 Author: xqt Date: 2012-06-06 15:05:45 +0000 (Wed, 06 Jun 2012) Log Message: ----------- km-wikibooks is eigther still open or re-opened, update language_by_size (bug #3532357), update from rewrite r10299 Modified Paths: -------------- trunk/pywikipedia/families/wikibooks_family.py Modified: trunk/pywikipedia/families/wikibooks_family.py =================================================================== --- trunk/pywikipedia/families/wikibooks_family.py 2012-06-06 15:03:59 UTC (rev 10299) +++ trunk/pywikipedia/families/wikibooks_family.py 2012-06-06 15:05:45 UTC (rev 10300) @@ -16,9 +16,9 @@ 'da', 'th', 'gl', 'ta', 'no', 'ko', 'fa', 'sr', 'ar', 'tl', 'mk', 'is', 'tt', 'lt', 'ka', 'az', 'eo', 'ro', 'bg', 'uk', 'hy', 'sl', 'sk', 'el', 'si', 'li', 'la', 'ang', 'ia', 'cv', 'et', 'ur', 'mr', - 'bn', 'ms', 'hi', 'oc', 'ml', 'kk', 'eu', 'fy', 'ie', 'ne', 'te', - 'af', 'tg', 'sa', 'pa', 'bs', 'ky', 'mg', 'cy', 'be', 'zh-min-nan', - 'ast', 'ku', 'tk', 'uz', 'su', 'vo', 'mn', 'my', + 'bn', 'ms', 'hi', 'oc', 'ml', 'kk', 'eu', 'fy', 'ie', 'ne', 'km', + 'te', 'af', 'tg', 'sa', 'pa', 'bs', 'ky', 'mg', 'cy', 'be', + 'zh-min-nan', 'ast', 'ku', 'tk', 'uz', 'su', 'vo', 'mn', 'my', ] self.langs = dict([(lang, '%s.wikibooks.org' % lang) for lang in self.languages_by_size])

1 0

SVN: [10299] branches/rewrite/pywikibot/families/wikibooks_family.py
by xqt＠svn.wikimedia.org 06 Jun '12

06 Jun '12

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/10299 Revision: 10299 Author: xqt Date: 2012-06-06 15:03:59 +0000 (Wed, 06 Jun 2012) Log Message: ----------- km-wikibooks is eigther still open or re-opened, update language_by_size (bug #3532357) Modified Paths: -------------- branches/rewrite/pywikibot/families/wikibooks_family.py Modified: branches/rewrite/pywikibot/families/wikibooks_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikibooks_family.py 2012-06-05 12:45:26 UTC (rev 10298) +++ branches/rewrite/pywikibot/families/wikibooks_family.py 2012-06-06 15:03:59 UTC (rev 10299) @@ -16,9 +16,9 @@ 'da', 'th', 'gl', 'ta', 'no', 'ko', 'fa', 'sr', 'ar', 'tl', 'mk', 'is', 'tt', 'lt', 'ka', 'az', 'eo', 'ro', 'bg', 'uk', 'hy', 'sl', 'sk', 'el', 'si', 'li', 'la', 'ang', 'ia', 'cv', 'et', 'ur', 'mr', - 'bn', 'ms', 'hi', 'oc', 'ml', 'kk', 'eu', 'fy', 'ie', 'ne', 'te', - 'af', 'tg', 'sa', 'pa', 'bs', 'ky', 'mg', 'cy', 'be', 'zh-min-nan', - 'ast', 'ku', 'tk', 'uz', 'su', 'vo', 'mn', 'my', + 'bn', 'ms', 'hi', 'oc', 'ml', 'kk', 'eu', 'fy', 'ie', 'ne', 'km', + 'te', 'af', 'tg', 'sa', 'pa', 'bs', 'ky', 'mg', 'cy', 'be', + 'zh-min-nan', 'ast', 'ku', 'tk', 'uz', 'su', 'vo', 'mn', 'my', ] self.langs = dict([(lang, '%s.wikibooks.org' % lang) for lang in self.languages_by_size])

1 0

SVN: [10298] branches/rewrite/scripts/cosmetic_changes.py
by xqt＠svn.wikimedia.org 05 Jun '12

05 Jun '12

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/10298 Revision: 10298 Author: xqt Date: 2012-06-05 12:45:26 +0000 (Tue, 05 Jun 2012) Log Message: ----------- partially revert of r10291 since category default sortkey is fixed in r10297 Modified Paths: -------------- branches/rewrite/scripts/cosmetic_changes.py Modified: branches/rewrite/scripts/cosmetic_changes.py =================================================================== --- branches/rewrite/scripts/cosmetic_changes.py 2012-06-05 12:41:01 UTC (rev 10297) +++ branches/rewrite/scripts/cosmetic_changes.py 2012-06-05 12:45:26 UTC (rev 10298) @@ -32,7 +32,7 @@ all of them, but be careful if you do. """ # -# (C) xqt, 2009-2011 +# (C) xqt, 2009-2012 # (C) Pywikipedia bot team, 2006-2012 # # Distributed under the terms of the MIT license. @@ -141,7 +141,7 @@ if self.site.sitename()== u'commons:commons' and self.namespace == 6: text = self.commonsfiledesc(text) text = self.fixSelfInterwiki(text) -## text = self.standardizePageFooter(text) # removes pipe links on categories + text = self.standardizePageFooter(text) text = self.fixSyntaxSave(text) ## text = self.cleanUpLinks(text) #module object has no attribute url2unicode text = self.cleanUpSectionHeaders(text)

1 0

SVN: [10297] branches/rewrite/pywikibot/page.py
by xqt＠svn.wikimedia.org 05 Jun '12

05 Jun '12

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/10297 Revision: 10297 Author: xqt Date: 2012-06-05 12:41:01 +0000 (Tue, 05 Jun 2012) Log Message: ----------- enable default sort key for Category.aslink(), bugfix for r5088 Modified Paths: -------------- branches/rewrite/pywikibot/page.py Modified: branches/rewrite/pywikibot/page.py =================================================================== --- branches/rewrite/pywikibot/page.py 2012-06-04 17:02:54 UTC (rev 10296) +++ branches/rewrite/pywikibot/page.py 2012-06-05 12:41:01 UTC (rev 10297) @@ -1573,7 +1573,7 @@ @deprecate_arg("forceInterwiki", None) @deprecate_arg("textlink", None) @deprecate_arg("noInterwiki", None) - def aslink(self, sortKey=u''): + def aslink(self, sortKey=None): """Return a link to place a page in this Category. Use this only to generate a "true" category link, not for interwikis @@ -1584,9 +1584,10 @@ @type sortKey: (optional) unicode """ - if sortKey: + key = sortKey or self.sortKey + if key: titleWithSortKey = '%s|%s' % (self.title(withSection=False), - self.sortKey) + key) else: titleWithSortKey = self.title(withSection=False) return '[[%s]]' % titleWithSortKey

1 0

SVN: [10296] branches/rewrite
by xqt＠svn.wikimedia.org 04 Jun '12

04 Jun '12

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/10296 Revision: 10296 Author: xqt Date: 2012-06-04 17:02:54 +0000 (Mon, 04 Jun 2012) Log Message: ----------- split editarticle to library and script part Modified Paths: -------------- branches/rewrite/scripts/blockpageschecker.py branches/rewrite/scripts/editarticle.py branches/rewrite/scripts/replace.py branches/rewrite/scripts/solve_disambiguation.py branches/rewrite/scripts/upload.py Added Paths: ----------- branches/rewrite/pywikibot/editor.py Copied: branches/rewrite/pywikibot/editor.py (from rev 10289, branches/rewrite/scripts/editarticle.py) =================================================================== --- branches/rewrite/pywikibot/editor.py (rev 0) +++ branches/rewrite/pywikibot/editor.py 2012-06-04 17:02:54 UTC (rev 10296) @@ -0,0 +1,111 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +""" +Text editor class for your favourite editor. +""" + +# +# (C) Gerrit Holl 2004 +# (C) Pywikipedia team, 2004-2012 +# +__version__ = "$Id$" +# +# Distributed under the terms of the MIT license. +# + +__metaclass__ = type +import sys +import os +import tempfile +import pywikibot +from pywikibot import config2 as config + + +class TextEditor(object): + def __init__(self): + pass + + def command(self, tempFilename, text, jumpIndex = None): + command = config.editor + if jumpIndex: + # Some editors make it possible to mark occurences of substrings, + # or to jump to the line of the first occurence. + # TODO: Find a better solution than hardcoding these, e.g. a config + # option. + line = text[:jumpIndex].count('\n') + column = jumpIndex - (text[:jumpIndex].rfind('\n') + 1) + else: + line = column = 0 + # Linux editors. We use startswith() because some users might use + # parameters. + if config.editor.startswith('kate'): + command += " -l %i -c %i" % (line + 1, column + 1) + elif config.editor.startswith('gedit'): + command += " +%i" % (line + 1) # seems not to support columns + elif config.editor.startswith('emacs'): + command += " +%i" % (line + 1) # seems not to support columns + elif config.editor.startswith('jedit'): + command += " +line:%i" % (line + 1) # seems not to support columns + elif config.editor.startswith('vim'): + command += " +%i" % (line + 1) # seems not to support columns + elif config.editor.startswith('nano'): + command += " +%i,%i" % (line + 1, column + 1) + # Windows editors + elif config.editor.lower().endswith('notepad++.exe'): + command += " -n%i" % (line + 1) # seems not to support columns + + command += ' %s' % tempFilename + #print command + return command + + def convertLinebreaks(self, text): + if sys.platform=='win32': + return text.replace('\r\n', '\n') + # TODO: Mac OS handling + return text + + def restoreLinebreaks(self, text): + if text is None: + return None + if sys.platform=='win32': + return text.replace('\n', '\r\n') + # TODO: Mac OS handling + return text + + def edit(self, text, jumpIndex = None, highlight = None): + """ + Calls the editor and thus allows the user to change the text. + Returns the modified text. Halts the thread's operation until the editor + is closed. + + Returns None if the user didn't save the text file in his text editor. + + Parameters: + * text - a Unicode string + * jumpIndex - an integer: position at which to put the caret + * highlight - a substring; each occurence will be highlighted + """ + text = self.convertLinebreaks(text) + if config.editor: + tempFilename = '%s.%s' % (tempfile.mktemp(), + config.editor_filename_extension) + tempFile = open(tempFilename, 'w') + tempFile.write(text.encode(config.editor_encoding)) + tempFile.close() + creationDate = os.stat(tempFilename).st_mtime + command = self.command(tempFilename, text, jumpIndex) + os.system(command) + lastChangeDate = os.stat(tempFilename).st_mtime + if lastChangeDate == creationDate: + # Nothing changed + return None + else: + newcontent = open(tempFilename).read().decode( + config.editor_encoding) + os.unlink(tempFilename) + return self.restoreLinebreaks(newcontent) + else: + return self.restoreLinebreaks( + pywikibot.editText(text, jumpIndex=jumpIndex, + highlight=highlight)) + Modified: branches/rewrite/scripts/blockpageschecker.py =================================================================== --- branches/rewrite/scripts/blockpageschecker.py 2012-06-04 16:43:06 UTC (rev 10295) +++ branches/rewrite/scripts/blockpageschecker.py 2012-06-04 17:02:54 UTC (rev 10296) @@ -198,7 +198,7 @@ if quest == 'b': webbrowser.open(url) elif quest == 'g': - import editarticle + from pywikibot import editor as editarticle editor = editarticle.TextEditor() text = editor.edit(page.get()) Modified: branches/rewrite/scripts/editarticle.py =================================================================== --- branches/rewrite/scripts/editarticle.py 2012-06-04 16:43:06 UTC (rev 10295) +++ branches/rewrite/scripts/editarticle.py 2012-06-04 17:02:54 UTC (rev 10296) @@ -6,7 +6,7 @@ # # (C) Gerrit Holl 2004 -# (C) Pywikipedia team, 2004-2011 +# (C) Pywikipedia team, 2004-2012 # __version__ = "$Id$" # @@ -22,104 +22,16 @@ # - ... __metaclass__ = type -import sys import os import string import optparse import tempfile import pywikibot -from pywikibot import config, i18n +from pywikibot import i18n +from pywikibot.editor import TextEditor -class TextEditor: - def __init__(self): - pass - - def command(self, tempFilename, text, jumpIndex = None): - command = config.editor - if jumpIndex: - # Some editors make it possible to mark occurences of substrings, - # or to jump to the line of the first occurence. - # TODO: Find a better solution than hardcoding these, e.g. a config - # option. - line = text[:jumpIndex].count('\n') - column = jumpIndex - (text[:jumpIndex].rfind('\n') + 1) - else: - line = column = 0 - # Linux editors. We use startswith() because some users might use - # parameters. - if config.editor.startswith('kate'): - command += " -l %i -c %i" % (line + 1, column + 1) - elif config.editor.startswith('gedit'): - command += " +%i" % (line + 1) # seems not to support columns - elif config.editor.startswith('emacs'): - command += " +%i" % (line + 1) # seems not to support columns - elif config.editor.startswith('jedit'): - command += " +line:%i" % (line + 1) # seems not to support columns - elif config.editor.startswith('vim'): - command += " +%i" % (line + 1) # seems not to support columns - elif config.editor.startswith('nano'): - command += " +%i,%i" % (line + 1, column + 1) - # Windows editors - elif config.editor.lower().endswith('notepad++.exe'): - command += " -n%i" % (line + 1) # seems not to support columns - - command += ' %s' % tempFilename - #print command - return command - - def convertLinebreaks(self, text): - if sys.platform=='win32': - return text.replace('\r\n', '\n') - # TODO: Mac OS handling - return text - - def restoreLinebreaks(self, text): - if text is None: - return None - if sys.platform=='win32': - return text.replace('\n', '\r\n') - # TODO: Mac OS handling - return text - - def edit(self, text, jumpIndex = None, highlight = None): - """ - Calls the editor and thus allows the user to change the text. - Returns the modified text. Halts the thread's operation until the editor - is closed. - - Returns None if the user didn't save the text file in his text editor. - - Parameters: - * text - a Unicode string - * jumpIndex - an integer: position at which to put the caret - * highlight - a substring; each occurence will be highlighted - """ - text = self.convertLinebreaks(text) - if config.editor: - tempFilename = '%s.%s' % (tempfile.mktemp(), - config.editor_filename_extension) - tempFile = open(tempFilename, 'w') - tempFile.write(text.encode(config.editor_encoding)) - tempFile.close() - creationDate = os.stat(tempFilename).st_mtime - command = self.command(tempFilename, text, jumpIndex) - os.system(command) - lastChangeDate = os.stat(tempFilename).st_mtime - if lastChangeDate == creationDate: - # Nothing changed - return None - else: - newcontent = open(tempFilename).read().decode( - config.editor_encoding) - os.unlink(tempFilename) - return self.restoreLinebreaks(newcontent) - else: - return self.restoreLinebreaks( - pywikibot.editText(text, jumpIndex=jumpIndex, - highlight=highlight)) - class ArticleEditor: # join lines if line starts with this ones joinchars = string.letters + '[]' + string.digits Modified: branches/rewrite/scripts/replace.py =================================================================== --- branches/rewrite/scripts/replace.py 2012-06-04 16:43:06 UTC (rev 10295) +++ branches/rewrite/scripts/replace.py 2012-06-04 17:02:54 UTC (rev 10296) @@ -125,7 +125,7 @@ import sys, re, time import pywikibot from pywikibot import pagegenerators -from scripts import editarticle +from pywikibot import editor as editarticle from pywikibot import catlib, config from pywikibot import i18n import webbrowser Modified: branches/rewrite/scripts/solve_disambiguation.py =================================================================== --- branches/rewrite/scripts/solve_disambiguation.py 2012-06-04 16:43:06 UTC (rev 10295) +++ branches/rewrite/scripts/solve_disambiguation.py 2012-06-04 17:02:54 UTC (rev 10296) @@ -86,7 +86,7 @@ # Application specific imports import pywikibot -from scripts import editarticle +from pywikibot import editor as editarticle from pywikibot import pagegenerators from pywikibot import config from pywikibot import i18n Modified: branches/rewrite/scripts/upload.py =================================================================== --- branches/rewrite/scripts/upload.py 2012-06-04 16:43:06 UTC (rev 10295) +++ branches/rewrite/scripts/upload.py 2012-06-04 17:02:54 UTC (rev 10296) @@ -174,7 +174,7 @@ u'Do you want to change this description?', ['Yes', 'No'], ['y', 'N'], 'n') if choice == 'y': - import editarticle + from pywikibot import editor as editarticle editor = editarticle.TextEditor() newDescription = editor.edit(self.description) # if user saved / didn't press Cancel

1 0

SVN: [10295] trunk/pywikipedia/cosmetic_changes.py
by xqt＠svn.wikimedia.org 04 Jun '12

04 Jun '12

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/10295 Revision: 10295 Author: xqt Date: 2012-06-04 16:43:06 +0000 (Mon, 04 Jun 2012) Log Message: ----------- re-order imports Modified Paths: -------------- trunk/pywikipedia/cosmetic_changes.py Modified: trunk/pywikipedia/cosmetic_changes.py =================================================================== --- trunk/pywikipedia/cosmetic_changes.py 2012-06-04 14:13:15 UTC (rev 10294) +++ trunk/pywikipedia/cosmetic_changes.py 2012-06-04 16:43:06 UTC (rev 10295) @@ -57,12 +57,11 @@ # __version__ = '$Id$' # +import sys, re import wikipedia as pywikibot import isbn import pagegenerators from pywikibot import i18n -import sys -import re warning = """ ATTENTION: You can run this script as a stand-alone for testing purposes.

1 0

SVN: [10294] branches/rewrite
by xqt＠svn.wikimedia.org 04 Jun '12

04 Jun '12

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/10294 Revision: 10294 Author: xqt Date: 2012-06-04 14:13:15 +0000 (Mon, 04 Jun 2012) Log Message: ----------- fixes.py is a replace config file, not a user script Modified Paths: -------------- branches/rewrite/scripts/replace.py Added Paths: ----------- branches/rewrite/pywikibot/fixes.py Removed Paths: ------------- branches/rewrite/scripts/fixes.py Copied: branches/rewrite/pywikibot/fixes.py (from rev 10289, branches/rewrite/scripts/fixes.py) =================================================================== --- branches/rewrite/pywikibot/fixes.py (rev 0) +++ branches/rewrite/pywikibot/fixes.py 2012-06-04 14:13:15 UTC (rev 10294) @@ -0,0 +1,665 @@ +# -*- coding: utf-8 -*- +""" +File containing all standard fixes + +""" + +# +# (C) Pywikipedia team, 2008-2010 +# +__version__ = '$Id$' +# +# Distributed under the terms of the MIT license. +# + +help = u""" + * HTML - Convert HTML tags to wiki syntax, and + fix XHTML. + * isbn - Fix badly formatted ISBNs. + * syntax - Try to fix bad wiki markup. Do not run + this in automatic mode, as the bot may + make mistakes. + * syntax-safe - Like syntax, but less risky, so you can + run this in automatic mode. + * case-de - fix upper/lower case errors in German + * grammar-de - fix grammar and typography in German + * vonbis - Ersetze Binde-/Gedankenstrich durch "bis" + in German + * music - Links auf Begriffsklärungen in German + * datum - specific date formats in German + * correct-ar - Corrections for Arabic Wikipedia and any + Arabic wiki. + * yu-tld - the yu top-level domain will soon be + disabled, see + * fckeditor - Try to convert FCKeditor HTML tags to wiki + syntax. + http://lists.wikimedia.org/pipermail/wikibots-l/2009-February/000290.html + +""" + +fixes = { + # These replacements will convert HTML to wiki syntax where possible, and + # make remaining tags XHTML compliant. + 'HTML': { + 'regex': True, + 'msg': { + 'ar':u'روبوت: تحويل/تصليح HTML', + 'be':u'Бот: карэкцыя HTML', + 'cs':u'převod/oprava HTML', + 'en':u'Robot: Converting/fixing HTML', + 'eo':u'Bot: koredtado de HTMLa teksto', + 'fa':u'ربات:تبدیل/تصحیح کدهای اچ‌تی‌ام‌ال', + 'de':u'Bot: konvertiere/korrigiere HTML', + 'fr':u'Robot: convertit/fixe HTML', + 'he':u'בוט: ממיר/מתקן HTML', + 'ja':u'ロボットによる: HTML転換', + 'ksh':u'Bot: vun HTML en Wikikood wandelle', + 'ia':u'Robot: conversion/reparation de HTML', + 'lt':u'robotas: konvertuojamas/taisomas HTML', + 'nl':u'Bot: conversie/reparatie HTML', + 'pl':u'Robot konwertuje/naprawia HTML', + 'pt':u'Bot: Corrigindo HTML', + 'ru':u'Бот: коррекция HTML', + 'sr':u'Бот: Поправка HTML-а', + 'sv':u'Bot: Konverterar/korrigerar HTML', + 'uk':u'Бот: корекцiя HTML', + 'zh':u'機器人: 轉換HTML', + }, + 'replacements': [ + # Everything case-insensitive (?i) + # Keep in mind that MediaWiki automatically converts <br> to <br /> + # when rendering pages, so you might comment the next two lines out + # to save some time/edits. + #(r'(?i)<br>', r'<br />'), + # linebreak with attributes + #(r'(?i)<br ([^>/]+?)>', r'<br \1 />'), + (r'(?i)<b>(.*?)</b>', r"'''\1'''"), + (r'(?i)<strong>(.*?)</strong>', r"'''\1'''"), + (r'(?i)<i>(.*?)</i>', r"''\1''"), + (r'(?i)<em>(.*?)</em>', r"''\1''"), + # horizontal line without attributes in a single line + (r'(?i)([\r\n])<hr[ /]*>([\r\n])', r'\1----\2'), + # horizontal line without attributes with more text in the same line + #(r'(?i) +<hr[ /]*> +', r'\r\n----\r\n'), + # horizontal line with attributes; can't be done with wiki syntax + # so we only make it XHTML compliant + (r'(?i)<hr ([^>/]+?)>', r'<hr \1 />'), + # a header where only spaces are in the same line + (r'(?i)([\r\n]) *<h1> *([^<]+?) *</h1> *([\r\n])', r"\1= \2 =\3"), + (r'(?i)([\r\n]) *<h2> *([^<]+?) *</h2> *([\r\n])', r"\1== \2 ==\3"), + (r'(?i)([\r\n]) *<h3> *([^<]+?) *</h3> *([\r\n])', r"\1=== \2 ===\3"), + (r'(?i)([\r\n]) *<h4> *([^<]+?) *</h4> *([\r\n])', r"\1==== \2 ====\3"), + (r'(?i)([\r\n]) *<h5> *([^<]+?) *</h5> *([\r\n])', r"\1===== \2 =====\3"), + (r'(?i)([\r\n]) *<h6> *([^<]+?) *</h6> *([\r\n])', r"\1====== \2 ======\3"), + # TODO: maybe we can make the bot replace <p> tags with \r\n's. + ], + 'exceptions': { + 'inside-tags': [ + 'nowiki', + 'comment', + 'math', + 'pre' + ], + } + }, + + # Grammar fixes for German language + # Do NOT run this automatically! + 'grammar-de': { + 'regex': True, + 'msg': { + 'de':u'Bot: korrigiere Grammatik', + }, + 'replacements': [ + #(u'([Ss]owohl) ([^,\.]+?), als auch', r'\1 \2 als auch'), + #(u'([Ww]eder) ([^,\.]+?), noch', r'\1 \2 noch'), + # + # Vorsicht bei Substantiven, z. B. 3-Jähriger! + (u'(\d+)(minütig|stündig|tägig|wöchig|jährig|minütlich|stündlich|täglich|wöchentlich|jährlich|fach|mal|malig|köpfig|teilig|gliedrig|geteilt|elementig|dimensional|bändig|eckig|farbig|stimmig)', r'\1-\2'), + # zusammengesetztes Wort, Bindestrich wird durchgeschleift + (u'(?<!\w)(\d+|\d+[\.,]\d+)(\$|€|DM|£|¥|mg|g|kg|ml|cl|l|t|ms|min|µm|mm|cm|dm|m|km|ha|°C|kB|MB|GB|TB|W|kW|MW|GW|PS|Nm|eV|kcal|mA|mV|kV|Ω|Hz|kHz|MHz|GHz|mol|Pa|Bq|Sv|mSv)([²³]?-[\w\[])', r'\1-\2\3'), + # Größenangabe ohne Leerzeichen vor Einheit + # weggelassen wegen vieler falsch Positiver: s, A, V, C, S, J, % + (u'(?<!\w)(\d+|\d+[\.,]\d+)(\$|€|DM|£|¥|mg|g|kg|ml|cl|l|t|ms|min|µm|mm|cm|dm|m|km|ha|°C|kB|MB|GB|TB|W|kW|MW|GW|PS|Nm|eV|kcal|mA|mV|kV|Ω|Hz|kHz|MHz|GHz|mol|Pa|Bq|Sv|mSv)(?=\W|²|³|$)', r'\1 \2'), + # Temperaturangabe mit falsch gesetztem Leerzeichen + (u'(?<!\w)(\d+|\d+[\.,]\d+)° C(?=\W|²|³|$)', ur'\1 °C'), + # Kein Leerzeichen nach Komma + (u'([a-zäöüß](\]\])?,)((\[\[)?[a-zäöüA-ZÄÖÜ])', r'\1 \3'), + # Leerzeichen und Komma vertauscht + (u'([a-zäöüß](\]\])?) ,((\[\[)?[a-zäöüA-ZÄÖÜ])', r'\1, \3'), + # Plenks (d. h. Leerzeichen auch vor dem Komma/Punkt/Ausrufezeichen/Fragezeichen) + # Achtung bei Französisch: http://de.wikipedia.org/wiki/Plenk#Sonderfall_Franz.C3.B6sisch + # Leerzeichen vor Doppelpunkt/Semikolon kann korrekt sein, nach irgendeiner Norm für Zitationen. + (u'([a-zäöüß](\]\])?) ([,\.!\?]) ((\[\[)?[a-zäöüA-ZÄÖÜ])', r'\1\3 \4'), + #(u'([a-z]\.)([A-Z])', r'\1 \2'), + ], + 'exceptions': { + 'inside-tags': [ + 'nowiki', + 'comment', + 'math', + 'pre', # because of code examples + 'source', # because of code examples + 'startspace', # because of code examples + 'hyperlink', # e.g. commas in URLs + 'gallery', # because of filenames + 'timeline', + ], + 'text-contains': [ + r'sic!', + r'20min.ch', # Schweizer News-Seite + ], + 'inside': [ + r'<code>.*</code>', # because of code examples + r'{{[Zz]itat\|.*?}}', + ur'{{§\|.*?}}', # Gesetzesparagraph + ur'§ ?\d+[a-z]', # Gesetzesparagraph + r'Ju 52/1m', # Flugzeugbezeichnung + r'Ju 52/3m', # Flugzeugbezeichnung + r'AH-1W', # Hubschrauberbezeichnung + r'ZPG-3W', # Luftschiffbezeichnung + r'8mm', # Filmtitel + r'802.11g', # WLAN-Standard + r'DOS/4GW', # Software + r'ntfs-3g', # Dateisystem-Treiber + r'/\w(,\w)*/', # Laut-Aufzählung in der Linguistik + r'[xyz](,[xyz])+', # Variablen in der Mathematik (unklar, ob Leerzeichen hier Pflicht sind) + r'(?m)^;(.*?)$', # Definitionslisten, dort gibt es oft absichtlich Leerzeichen vor Doppelpunkten + r'\d+h( | )\d+m', # Schreibweise für Zeiten, vor allem in Film-Infoboxen. Nicht korrekt, aber dafür schön kurz. + r'(?i)\[\[(Bild|Image|Media):.+?\|', # Dateinamen auslassen + r'{{bgc\|.*?}}', # Hintergrundfarbe + r'<sup>\d+m</sup>', # bei chemischen Formeln + r'$[A-Z][A-Za-z]*(,[A-Z][A-Za-z]*(<sup>.*?</sup>|<sub>.*?</sub>|))+$' # chemische Formel, z. B. AuPb(Pb,Sb,Bi)Te. Hier sollen keine Leerzeichen hinter die Kommata. + ], + 'title': [ + r'Arsen', # chemische Formel + ], + } + }, + + # Do NOT run this automatically! + # Recommendation: First run syntax-safe automatically, afterwards + # run syntax manually, carefully checking that you're not breaking + # anything. + 'syntax': { + 'regex': True, + 'msg': { + 'ar':u'بوت: تصليح تهيئة الويكي', + 'be':u'Бот: Карэкцыя вiкi-сiнтаксiсу', + 'cs':u'Oprava wikisyntaxe', + 'de':u'Bot: Korrigiere Wiki-Syntax', + 'en':u'Robot: Fixing wiki syntax', + 'eo':u'Bot: Korektado de vikia sintakso', + 'fa':u'ربات:تصحیح قالب ویکی‌نویسی', + 'fr':u'Bot: Corrige wiki-syntaxe', + 'he':u'בוט: מתקן תחביר ויקי', + 'ia':u'Robot: Reparation de syntaxe wiki', + 'ja':u'ロボットによる: wiki構文修正', + 'lt':u'robotas: Taisoma wiki sintaksė', + 'nl':u'Bot: reparatie wikisyntaxis', + 'pl':u'Robot poprawia wiki-składnię', + 'pt':u'Bot: Corrigindo sintaxe wiki', + 'ru':u'Бот: Коррекция вики синтаксиса', + 'sr':u'Бот: Поправка вики синтаксе', + 'uk':u'Бот: Корекцiя вiкi-синтаксису', + 'zh':u'機器人: 修正wiki語法', + }, + 'replacements': [ + # external link in double brackets + (r'\[\[(?P<url>https?://[^\]]+?)\]\]', r'[\g<url>]'), + # external link starting with double bracket + (r'\[\[(?P<url>https?://.+?)\]', r'[\g<url>]'), + # external link with forgotten closing bracket + #(r'\[(?P<url>https?://[^\]\s]+)\r\n', r'[\g<url>]\r\n'), + # external link ending with double bracket. + # do not change weblinks that contain wiki links inside + # inside the description + (r'\[(?P<url>https?://[^\[\]]+?)\]\](?!\])', r'[\g<url>]'), + # external link and description separated by a dash. + # ATTENTION: while this is a mistake in most cases, there are some + # valid URLs that contain dashes! + (r'\[(?P<url>https?://[^\|\]\s]+?) *\| *(?P<label>[^\|\]]+?)\]', r'[\g<url> \g<label>]'), + # wiki link closed by single bracket. + # ATTENTION: There are some false positives, for example + # Brainfuck code examples or MS-DOS parameter instructions. + # There are also sometimes better ways to fix it than + # just putting an additional ] after the link. + (r'\[\[([^\[\]]+?)\](?!\])', r'[[\1]]'), + # wiki link opened by single bracket. + # ATTENTION: same as above. + (r'(?<!\[)\[([^\[\]]+?)\]\](?!\])', r'[[\1]]'), + # template closed by single bracket + # ATTENTION: There are some false positives, especially in + # mathematical context or program code. + (r'{{([^{}]+?)}(?!})', r'{{\1}}'), + ], + 'exceptions': { + 'inside-tags': [ + 'nowiki', + 'comment', + 'math', + 'pre', + 'source', # because of code examples + 'startspace', # because of code examples + ], + 'text-contains': [ + r'http://.*?object=tx\|', # regular dash in URL + r'http://.*?allmusic\.com', # regular dash in URL + r'http://.*?allmovie\.com', # regular dash in URL + r'http://physics.nist.gov/', # regular dash in URL + r'http://www.forum-seniorenarbeit.de/', # regular dash in URL + r'http://kuenstlerdatenbank.ifa.de/', # regular dash in URL + r'&object=med', # regular dash in URL + r'\[CDATA\[' # lots of brackets + ], + } + }, + + # The same as syntax, but restricted to replacements that should + # be safe to run automatically. + 'syntax-safe': { + 'regex': True, + 'msg': { + 'ar':u'بوت: تصليح تهيئة الويكي', + 'be':u'Бот: Карэкцыя вiкi-сiнтаксiсу', + 'cs':u'Oprava wikisyntaxe', + 'de':u'Bot: Korrigiere Wiki-Syntax', + 'en':u'Robot: Fixing wiki syntax', + 'eo':u'Bot: Korektado de vikia sintakso', + 'fa':u'ربات:تصحیح قالب ویکی‌نویسی', + 'fr':u'Bot: Corrige wiki-syntaxe', + 'he':u'בוט: מתקן תחביר ויקי', + 'ia':u'Robot: Reparation de syntaxe wiki', + 'ja':u'ロボットによる: wiki構文修正', + 'lt':u'robotas: Taisoma wiki sintaksė', + 'nl':u'Bot: reparatie wikisyntaxis', + 'pl':u'Robot poprawia wiki-składnię', + 'pt':u'Bot: Corrigindo sintaxe wiki', + 'ru':u'Бот: Коррекция вики синтаксиса', + 'sr':u'Бот: Поправка вики синтаксе', + 'uk':u'Бот: Корекцiя вiкi-синтаксису', + 'zh':u'機器人: 修正wiki語法', + }, + 'replacements': [ + # external link in double brackets + (r'\[\[(?P<url>https?://[^\]]+?)\]\]', r'[\g<url>]'), + # external link starting with double bracket + (r'\[\[(?P<url>https?://.+?)\]', r'[\g<url>]'), + # external link with forgotten closing bracket + #(r'\[(?P<url>https?://[^\]\s]+)\r\n', r'[\g<url>]\r\n'), + # external link and description separated by a dash, with + # whitespace in front of the dash, so that it is clear that + # the dash is not a legitimate part of the URL. + (r'\[(?P<url>https?://[^\|\] \r\n]+?) +\| *(?P<label>[^\|\]]+?)\]', r'[\g<url> \g<label>]'), + # dash in external link, where the correct end of the URL can + # be detected from the file extension. It is very unlikely that + # this will cause mistakes. + (r'\[(?P<url>https?://[^\|\] ]+?(\.pdf|\.html|\.htm|\.php|\.asp|\.aspx|\.jsp)) *\| *(?P<label>[^\|\]]+?)\]', r'[\g<url> \g<label>]'), + ], + 'exceptions': { + 'inside-tags': [ + 'nowiki', + 'comment', + 'math', + 'pre', + 'source', # because of code examples + 'startspace', # because of code examples + ], + } + }, + + 'case-de': { # German upper / lower case issues + 'regex': True, + 'msg': { + 'de':u'Bot: Korrigiere Groß-/Kleinschreibung', + }, + 'replacements': [ + (r'\batlantische(r|n|) Ozean', r'Atlantische\1 Ozean'), + (r'\bdeutsche(r|n|) Bundestag\b', r'Deutsche\1 Bundestag'), + (r'\bdeutschen Bundestags\b', r'Deutschen Bundestags'), # Aufpassen, z. B. 'deutsche Bundestagswahl' + (r'\bdeutsche(r|n|) Reich\b', r'Deutsche\1 Reich'), + (r'\bdeutschen Reichs\b', r'Deutschen Reichs'), # Aufpassen, z. B. 'deutsche Reichsgrenzen' + (r'\bdritte(n|) Welt(?!krieg)', r'Dritte\1 Welt'), + (r'\bdreißigjährige(r|n|) Krieg', r'Dreißigjährige\1 Krieg'), + (r'\beuropäische(n|) Gemeinschaft', r'Europäische\1 Gemeinschaft'), + (r'\beuropäische(n|) Kommission', r'Europäische\1 Kommission'), + (r'\beuropäische(n|) Parlament', r'Europäische\1 Parlament'), + (r'\beuropäische(n|) Union', r'Europäische\1 Union'), + (r'\berste(r|n|) Weltkrieg', r'Erste\1 Weltkrieg'), + (r'\bkalte(r|n|) Krieg', r'Kalte\1 Krieg'), + (r'\bpazifische(r|n|) Ozean', r'Pazifische\1 Ozean'), + (r'Tag der deutschen Einheit', r'Tag der Deutschen Einheit'), + (r'\bzweite(r|n|) Weltkrieg', r'Zweite\1 Weltkrieg'), + ], + 'exceptions': { + 'inside-tags': [ + 'nowiki', + 'comment', + 'math', + 'pre', + ], + 'text-contains': [ + r'sic!', + ], + } + }, + + 'vonbis': { + 'regex': True, + 'msg': { + 'de':u'Bot: Ersetze Binde-/Gedankenstrich durch "bis"', + }, + 'replacements': [ + # Bindestrich, Gedankenstrich, Geviertstrich + (u'(von \d{3,4}) *(-|–|–|—|—) *(\d{3,4})', r'\1 bis \3'), + ], + }, + + # some disambiguation stuff for de: + # python replace.py -fix:music -subcat:Album + 'music': { + 'regex': False, + 'msg': { + 'de':u'Bot: korrigiere Links auf Begriffsklärungen', + }, + 'replacements': [ + (u'[[CD]]', u'[[Audio-CD|CD]]'), + (u'[[LP]]', u'[[Langspielplatte|LP]]'), + (u'[[EP]]', u'[[Extended Play|EP]]'), + (u'[[MC]]', u'[[Musikkassette|MC]]'), + (u'[[Single]]', u'[[Single (Musik)|Single]]'), + ], + 'exceptions': { + 'inside-tags': [ + 'hyperlink', + ] + } + }, + + # format of dates of birth and death, for de: + # python replace.py -fix:datum -ref:Vorlage:Personendaten + 'datum': { + 'regex': True, + 'msg': { + 'de': u'Bot: Korrigiere Datumsformat', + }, + 'replacements': [ + # space after birth sign w/ year + #(u'\(\*(\d{3,4})', u'(* \\1'), + ## space after death sign w/ year + #(u'†(\d{3,4})', u'† \\1'), + #(u'&dagger;(\d{3,4})', u'† \\1'), + ## space after birth sign w/ linked date + #(u'\(\*\[\[(\d)', u'(* [[\\1'), + ## space after death sign w/ linked date + #(u'†\[\[(\d)', u'† [[\\1'), + #(u'&dagger;\[\[(\d)', u'† [[\\1'), + (u'\[\[(\d+\. (?:Januar|Februar|März|April|Mai|Juni|Juli|August|September|Oktober|November|Dezember)) (\d{1,4})\]\]', u'[[\\1]] [[\\2]]'), + # Keine führende Null beim Datum (ersteinmal nur bei denen, bei denen auch ein Leerzeichen fehlt) + (u'0(\d+)\.(Januar|Februar|März|April|Mai|Juni|Juli|August|September|Oktober|November|Dezember)', r'\1. \2'), + # Kein Leerzeichen zwischen Tag und Monat + (u'(\d+)\.(Januar|Februar|März|April|Mai|Juni|Juli|August|September|Oktober|November|Dezember)', r'\1. \2'), + # Kein Punkt vorm Jahr + (u'(\d+)\. (Januar|Februar|März|April|Mai|Juni|Juli|August|September|Oktober|November|Dezember)\.(\d{1,4})', r'\1. \2 \3'), + ], + 'exceptions': { + 'inside': [ + r'\[\[20. Juli 1944\]\]', # Hitler-Attentat + r'\[\[17. Juni 1953\]\]', # Ost-Berliner Volksaufstand + r'\[\[1. April 2000\]\]', # Film + r'\[\[11. September 2001\]\]', # Anschläge in den USA + r'\[\[7. Juli 2005\]\]', # Terroranschläge in Spanien + ], + } + }, + + 'isbn': { + 'regex': True, + 'msg': 'isbn-formatting', # use i18n translations + 'replacements': [ + # colon + (r'ISBN: (\d+)', r'ISBN \1'), + # superfluous word "number" + (r'ISBN( number| no\.?| No\.?|-Nummer|-Nr\.):? (\d+)', r'ISBN \2'), + # Space, minus, dot, hypen, en dash, em dash, etc. instead of + # hyphen-minus as separator, or spaces between digits and separators. + # Note that these regular expressions also match valid ISBNs, but + # these won't be changed. + (ur'ISBN (978|979) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d)(?!\d)', r'ISBN \1-\2-\3-\4-\5'), # ISBN-13 + (ur'ISBN (\d+) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d|X|x)(?!\d)', r'ISBN \1-\2-\3-\4'), # ISBN-10 + # missing space before ISBN-10 or before ISBN-13, + # or non-breaking space. + (r'ISBN(| | )((\d(-?)){12}\d|(\d(-?)){9}[\dXx])', r'ISBN \2'), + ], + 'exceptions': { + 'inside-tags': [ + 'comment', + 'hyperlink', + ], + 'inside': [ + r'ISBN (\d(-?)){12}\d', # matches valid ISBN-13s + r'ISBN (\d(-?)){9}[\dXx]', # matches valid ISBN-10s + ], + } + }, + + #Corrections for Arabic Wikipedia and any Arabic wiki. + #python replace.py -fix:correct-ar -start:! -always + + 'correct-ar': { + 'regex': True, + 'msg': { + 'ar':u'تدقيق إملائي', + }, + 'replacements': [ + #(u' ,', u' ،'), #FIXME: Do not replace comma in non-Arabic text, interwiki, image links or <math> syntax. + (ur'\bإمرأة\b', u'امرأة'), + (ur'\bالى\b', ur'إلى'), + (ur'\bإسم\b', u'اسم'), + (ur'\bالأن\b', u'الآن'), + (ur'\bالة\b', u'آلة'), + (ur'\bفى\b', u'في'), + (ur'\bإبن\b', u'ابن'), + (ur'\bإبنة\b', u'ابنة'), + (ur'\bإقتصاد\b', u'اقتصاد'), + (ur'\bإجتماع\b', u'اجتماع'), + (ur'\bانجيل\b', u'إنجيل'), + (ur'\bاجماع\b', u'إجماع'), + (ur'\bاكتوبر\b', u'أكتوبر'), + (ur'\bإستخراج\b', u'استخراج'), + (ur'\bإستعمال\b', u'استعمال'), + (ur'\bإستبدال\b', u'استبدال'), + (ur'\bإشتراك\b', u'اشتراك'), + (ur'\bإستعادة\b', u'استعادة'), + (ur'\bإستقلال\b', u'استقلال'), + (ur'\bإنتقال\b', u'انتقال'), + (ur'\bإتحاد\b', u'اتحاد'), + (ur'\bاملاء\b', u'إملاء'), + (ur'\bإستخدام\b', u'استخدام'), + (ur'\bأحدى\b', u'إحدى'), + (ur'\bلاكن\b', u'لكن'), + (ur'\bإثنان\b', u'اثنان'), + (ur'\bإحتياط\b', u'احتياط'), + (ur'\bإقتباس\b', u'اقتباس'), + (ur'\bادارة\b', u'إدارة'), + (ur'\bابناء\b', u'أبناء'), + (ur'\bالانصار\b', u'الأنصار'), + (ur'\bاشارة\b', u'إشارة'), + (ur'\bإقرأ\b', u'اقرأ'), + (ur'\bإمتياز\b', u'امتياز'), + (ur'\bارق\b', u'أرق'), + (ur'\bاللة\b', u'الله'), + (ur'\bإختبار\b', u'اختبار'), + (ur'==[ ]?روابط خارجية[ ]?==', u'== وصلات خارجية =='), + (ur'\bارسال\b', u'إرسال'), + (ur'\bإتصالات\b', u'اتصالات'), + (ur'\bابو\b', u'أبو'), + (ur'\bابا\b', u'أبا'), + (ur'\bاخو\b', u'أخو'), + (ur'\bاخا\b', u'أخا'), + (ur'\bاخي\b', u'أخي'), + (ur'\bاحد\b', u'أحد'), + (ur'\bاربعاء\b', u'أربعاء'), + (ur'\bاول\b', u'أول'), + (ur'\b(ال|)اهم\b', ur'\1أهم'), + (ur'\b(ال|)اثقل\b', ur'\1أثقل'), + (ur'\b(ال|)امجد\b', ur'\1أمجد'), + (ur'\b(ال|)اوسط\b', ur'\1أوسط'), + (ur'\b(ال|)اشقر\b', ur'\1أشقر'), + (ur'\b(ال|)انور\b', ur'\1أنور'), + (ur'\b(ال|)اصعب\b', ur'\1أصعب'), + (ur'\b(ال|)اسهل\b', ur'\1أسهل'), + (ur'\b(ال|)اجمل\b', ur'\1أجمل'), + (ur'\b(ال|)اقبح\b', ur'\1أقبح'), + (ur'\b(ال|)اطول\b', ur'\1أطول'), + (ur'\b(ال|)اقصر\b', ur'\1أقصر'), + (ur'\b(ال|)اسمن\b', ur'\1أسمن'), + (ur'\b(ال|)اذكى\b', ur'\1أذكى'), + (ur'\b(ال|)اكثر\b', ur'\1أكثر'), + (ur'\b(ال|)افضل\b', ur'\1أفضل'), + (ur'\b(ال|)اكبر\b', ur'\1أكبر'), + (ur'\b(ال|)اشهر\b', ur'\1أشهر'), + (ur'\b(ال|)ابطأ\b', ur'\1أبطأ'), + (ur'\b(ال|)اماني\b', ur'\1أماني'), + (ur'\b(ال|)احلام\b', ur'\1أحلام'), + (ur'\b(ال|)اسماء\b', ur'\1أسماء'), + (ur'\b(ال|)اسامة\b', ur'\1أسامة'), + (ur'\bابراهيم\b', u'إبراهيم'), + (ur'\bاسماعيل\b', u'إسماعيل'), + (ur'\bايوب\b', u'أيوب'), + (ur'\bايمن\b', u'أيمن'), + (ur'\bاوزبكستان\b', u'أوزبكستان'), + (ur'\bاذربيجان\b', u'أذربيجان'), + (ur'\bافغانستان\b', u'أفغانستان'), + (ur'\bانجلترا\b', u'إنجلترا'), + (ur'\bايطاليا\b', u'إيطاليا'), + (ur'\bاوربا\b', u'أوروبا'), + (ur'\bأوربا\b', u'أوروبا'), + (ur'\bاوغندة\b', u'أوغندة'), + (ur'\b(ال|)ا(لماني|فريقي|سترالي)(ا|ة|تان|ان|ين|ي|ون|و|ات|)\b', ur'\1أ\2\3'), + (ur'\b(ال|)ا(وروب|مريك)(ا|ي|ية|يتان|يان|يين|يي|يون|يو|يات|)\b', ur'\1أ\2\3'), + (ur'\b(ال|)ا(ردن|رجنتين|وغند|سبان|وكران|فغان)(ي|ية|يتان|يان|يين|يي|يون|يو|يات|)\b', ur'\1أ\2\3'), + (ur'\b(ال|)ا(سرائيل|يران|مارات|نكليز|نجليز)(ي|ية|يتان|يان|يين|يي|يون|يو|يات|)\b', ur'\1إ\2\3'), + (ur'\b(ال|)(ا|أ)(رثوذكس|رثوذوكس)(ي|ية|يتان|يان|يين|يي|يون|يو|يات|)\b', ur'\1أرثوذكس\4'), + (ur'\bإست(عمل|خدم|مر|مد|مال|عاض|قام|حال|جاب|قال|زاد|عان|طال)(ت|ا|وا|)\b', ur'است\1\2'), + (ur'\bإست(حال|قال|طال|زاد|عان|قام|راح|جاب|عاض|مال)ة\b', ur'است\1ة'), + ], + 'exceptions': { + 'inside-tags': [ + 'interwiki', + 'math', + 'ref', + ], + } + }, + 'specialpages': { + 'regex': False, + 'msg': { + 'en': u'Robot: Fixing special page capitalisation', + 'fa':u'ربات: تصحیح بزرگی و کوچکی حروف صفحه‌های ویژه', + }, + 'replacements': [ + (u'Special:Allpages', u'Special:AllPages'), + (u'Special:Blockip', u'Special:BlockIP'), + (u'Special:Blankpage', u'Special:BlankPage'), + (u'Special:Filepath', u'Special:FilePath'), + (u'Special:Globalusers', u'Special:GlobalUsers'), + (u'Special:Imagelist', u'Special:ImageList'), + (u'Special:Ipblocklist', u'Special:IPBlockList'), + (u'Special:Listgrouprights', u'Special:ListGroupRights'), + (u'Special:Listusers', u'Special:ListUsers'), + (u'Special:Newimages', u'Special:NewImages'), + (u'Special:Prefixindex', u'Special:PrefixIndex'), + (u'Special:Protectedpages', u'Special:ProtectedPages'), + (u'Special:Recentchanges', u'Special:RecentChanges'), + (u'Special:Specialpages', u'Special:SpecialPages'), + (u'Special:Unlockdb', u'Special:UnlockDB'), + (u'Special:Userlogin', u'Special:UserLogin'), + (u'Special:Userlogout', u'Special:UserLogout'), + (u'Special:Whatlinkshere', u'Special:WhatLinksHere'), + ], + }, + # yu top-level domain will soon be disabled, + # see http://lists.wikimedia.org/pipermail/wikibots-l/2009-February/000290.html + # The following are domains that are often-used. + 'yu-tld': { + 'regex': False, + 'nocase': True, + 'msg': { + 'de': u'Bot: Ersetze Links auf .yu-Domains', + 'en': u'Robot: Replacing links to .yu domains', + 'fa': u'ربات: جایگزینی پیوندها به دامنه‌ها با پسوند yu', + 'fr': u'Robot: Correction des liens pointant vers le domaine .yu, qui expire en 2009', + 'ksh': u'Bot: de ahle .yu-Domains loufe us, dröm ußjetuusch', + }, + 'replacements': [ + (u'www.budva.cg.yu', u'www.budva.rs'), + (u'spc.org.yu', u'spc.rs'), + (u'www.oks.org.yu', u'www.oks.org.rs'), + (u'www.kikinda.org.yu', u'www.kikinda.rs'), + (u'www.ds.org.yu', u'www.ds.org.rs'), + (u'www.nbs.yu', u'www.nbs.rs'), + (u'www.serbia.sr.gov.yu', u'www.srbija.gov.rs'), + (u'eunet.yu', u'eunet.rs'), + (u'www.zastava-arms.co.yu', u'www.zastava-arms.co.rs'), + (u'www.airportnis.co.yu', u'www.airportnis.rs'), + # (u'www.danas.co.yu', u'www.danas.rs'), # Archive links don't seem to work + (u'www.belex.co.yu', u'www.belex.rs'), + (u'beograd.org.yu', u'beograd.rs'), + (u'www.vlada.cg.yu', u'www.vlada.me'), + (u'webrzs.statserb.sr.gov.yu', u'webrzs.stat.gov.rs'), + (u'www.statserb.sr.gov.yu', u'webrzs.stat.gov.rs'), + (u'www.rastko.org.yu', u'www.rastko.org.rs'), + (u'www.reprezentacija.co.yu', u'www.reprezentacija.rs'), + (u'www.blic.co.yu', u'www.blic.co.rs'), + (u'www.beograd.org.yu', u'www.beograd.org.rs'), + (u'arhiva.glas-javnosti.co.yu', u'arhiva.glas-javnosti.rs'), + (u'www.srpsko-nasledje.co.yu', u'www.srpsko-nasledje.co.rs'), + (u'www.dnevnik.co.yu', u'www.dnevnik.rs'), + (u'www.srbija.sr.gov.yu', u'www.srbija.gov.rs'), + (u'www.kurir-info.co.yu/Arhiva', u'arhiva.kurir-info.rs/Arhiva'), + (u'www.kurir-info.co.yu/arhiva', u'arhiva.kurir-info.rs/arhiva'), + (u'www.kurir-info.co.yu', u'www.kurir-info.rs'), + (u'arhiva.kurir-info.co.yu', u'arhiva.kurir-info.rs'), + (u'www.prvaliga.co.yu', u'www.prvaliga.rs'), + (u'www.mitropolija.cg.yu', u'www.mitropolija.me'), + (u'www.spc.yu/sr', u'www.spc.rs/sr'), + (u'www.sk.co.yu', u'www.sk.co.rs'), + (u'www.ekoforum.org.yu', u'www.ekoforum.org'), + (u'www.svevlad.org.yu', u'www.svevlad.org.rs'), + (u'www.posta.co.yu', u'www.posta.rs'), + (u'www.glas-javnosti.co.yu', u'www.glas-javnosti.rs'), + (u'www.fscg.cg.yu', u'www.fscg.co.me'), + (u'ww1.rts.co.yu/euro', u'ww1.rts.co.rs/euro'), + (u'www.rtv.co.yu', u'www.rtv.rs'), + (u'www.politika.co.yu', u'www.politika.rs'), + (u'www.mfa.gov.yu', u'www.mfa.gov.rs'), + (u'www.drzavnauprava.sr.gov.yu', u'www.drzavnauprava.gov.rs'), + ], + }, + # These replacements will convert HTML tag from FCK-editor to wiki syntax. + # + 'fckeditor': { + 'regex': True, + 'msg': { + 'en': u'Robot: Fixing rich-editor html', + 'fa': u'ربات: تصحیح اچ‌تی‌ام‌ال ویرایشگر پیشرفته', + }, + 'replacements': [ + # replace <br> with a new line + (r'(?i)<br>', r'\n'), + # replace   with a space + (r'(?i) ', r' '), + ], + }, +} + +# +# Load the user fixes file. + +from pywikibot import config + +try: + execfile(config.datafilepath("user-fixes.py")) +except IOError: + pass Deleted: branches/rewrite/scripts/fixes.py =================================================================== --- branches/rewrite/scripts/fixes.py 2012-06-04 14:02:21 UTC (rev 10293) +++ branches/rewrite/scripts/fixes.py 2012-06-04 14:13:15 UTC (rev 10294) @@ -1,665 +0,0 @@ -# -*- coding: utf-8 -*- -""" -File containing all standard fixes - -""" - -# -# (C) Pywikipedia team, 2008-2010 -# -__version__ = '$Id$' -# -# Distributed under the terms of the MIT license. -# - -help = u""" - * HTML - Convert HTML tags to wiki syntax, and - fix XHTML. - * isbn - Fix badly formatted ISBNs. - * syntax - Try to fix bad wiki markup. Do not run - this in automatic mode, as the bot may - make mistakes. - * syntax-safe - Like syntax, but less risky, so you can - run this in automatic mode. - * case-de - fix upper/lower case errors in German - * grammar-de - fix grammar and typography in German - * vonbis - Ersetze Binde-/Gedankenstrich durch "bis" - in German - * music - Links auf Begriffsklärungen in German - * datum - specific date formats in German - * correct-ar - Corrections for Arabic Wikipedia and any - Arabic wiki. - * yu-tld - the yu top-level domain will soon be - disabled, see - * fckeditor - Try to convert FCKeditor HTML tags to wiki - syntax. - http://lists.wikimedia.org/pipermail/wikibots-l/2009-February/000290.html - -""" - -fixes = { - # These replacements will convert HTML to wiki syntax where possible, and - # make remaining tags XHTML compliant. - 'HTML': { - 'regex': True, - 'msg': { - 'ar':u'روبوت: تحويل/تصليح HTML', - 'be':u'Бот: карэкцыя HTML', - 'cs':u'převod/oprava HTML', - 'en':u'Robot: Converting/fixing HTML', - 'eo':u'Bot: koredtado de HTMLa teksto', - 'fa':u'ربات:تبدیل/تصحیح کدهای اچ‌تی‌ام‌ال', - 'de':u'Bot: konvertiere/korrigiere HTML', - 'fr':u'Robot: convertit/fixe HTML', - 'he':u'בוט: ממיר/מתקן HTML', - 'ja':u'ロボットによる: HTML転換', - 'ksh':u'Bot: vun HTML en Wikikood wandelle', - 'ia':u'Robot: conversion/reparation de HTML', - 'lt':u'robotas: konvertuojamas/taisomas HTML', - 'nl':u'Bot: conversie/reparatie HTML', - 'pl':u'Robot konwertuje/naprawia HTML', - 'pt':u'Bot: Corrigindo HTML', - 'ru':u'Бот: коррекция HTML', - 'sr':u'Бот: Поправка HTML-а', - 'sv':u'Bot: Konverterar/korrigerar HTML', - 'uk':u'Бот: корекцiя HTML', - 'zh':u'機器人: 轉換HTML', - }, - 'replacements': [ - # Everything case-insensitive (?i) - # Keep in mind that MediaWiki automatically converts <br> to <br /> - # when rendering pages, so you might comment the next two lines out - # to save some time/edits. - #(r'(?i)<br>', r'<br />'), - # linebreak with attributes - #(r'(?i)<br ([^>/]+?)>', r'<br \1 />'), - (r'(?i)<b>(.*?)</b>', r"'''\1'''"), - (r'(?i)<strong>(.*?)</strong>', r"'''\1'''"), - (r'(?i)<i>(.*?)</i>', r"''\1''"), - (r'(?i)<em>(.*?)</em>', r"''\1''"), - # horizontal line without attributes in a single line - (r'(?i)([\r\n])<hr[ /]*>([\r\n])', r'\1----\2'), - # horizontal line without attributes with more text in the same line - #(r'(?i) +<hr[ /]*> +', r'\r\n----\r\n'), - # horizontal line with attributes; can't be done with wiki syntax - # so we only make it XHTML compliant - (r'(?i)<hr ([^>/]+?)>', r'<hr \1 />'), - # a header where only spaces are in the same line - (r'(?i)([\r\n]) *<h1> *([^<]+?) *</h1> *([\r\n])', r"\1= \2 =\3"), - (r'(?i)([\r\n]) *<h2> *([^<]+?) *</h2> *([\r\n])', r"\1== \2 ==\3"), - (r'(?i)([\r\n]) *<h3> *([^<]+?) *</h3> *([\r\n])', r"\1=== \2 ===\3"), - (r'(?i)([\r\n]) *<h4> *([^<]+?) *</h4> *([\r\n])', r"\1==== \2 ====\3"), - (r'(?i)([\r\n]) *<h5> *([^<]+?) *</h5> *([\r\n])', r"\1===== \2 =====\3"), - (r'(?i)([\r\n]) *<h6> *([^<]+?) *</h6> *([\r\n])', r"\1====== \2 ======\3"), - # TODO: maybe we can make the bot replace <p> tags with \r\n's. - ], - 'exceptions': { - 'inside-tags': [ - 'nowiki', - 'comment', - 'math', - 'pre' - ], - } - }, - - # Grammar fixes for German language - # Do NOT run this automatically! - 'grammar-de': { - 'regex': True, - 'msg': { - 'de':u'Bot: korrigiere Grammatik', - }, - 'replacements': [ - #(u'([Ss]owohl) ([^,\.]+?), als auch', r'\1 \2 als auch'), - #(u'([Ww]eder) ([^,\.]+?), noch', r'\1 \2 noch'), - # - # Vorsicht bei Substantiven, z. B. 3-Jähriger! - (u'(\d+)(minütig|stündig|tägig|wöchig|jährig|minütlich|stündlich|täglich|wöchentlich|jährlich|fach|mal|malig|köpfig|teilig|gliedrig|geteilt|elementig|dimensional|bändig|eckig|farbig|stimmig)', r'\1-\2'), - # zusammengesetztes Wort, Bindestrich wird durchgeschleift - (u'(?<!\w)(\d+|\d+[\.,]\d+)(\$|€|DM|£|¥|mg|g|kg|ml|cl|l|t|ms|min|µm|mm|cm|dm|m|km|ha|°C|kB|MB|GB|TB|W|kW|MW|GW|PS|Nm|eV|kcal|mA|mV|kV|Ω|Hz|kHz|MHz|GHz|mol|Pa|Bq|Sv|mSv)([²³]?-[\w\[])', r'\1-\2\3'), - # Größenangabe ohne Leerzeichen vor Einheit - # weggelassen wegen vieler falsch Positiver: s, A, V, C, S, J, % - (u'(?<!\w)(\d+|\d+[\.,]\d+)(\$|€|DM|£|¥|mg|g|kg|ml|cl|l|t|ms|min|µm|mm|cm|dm|m|km|ha|°C|kB|MB|GB|TB|W|kW|MW|GW|PS|Nm|eV|kcal|mA|mV|kV|Ω|Hz|kHz|MHz|GHz|mol|Pa|Bq|Sv|mSv)(?=\W|²|³|$)', r'\1 \2'), - # Temperaturangabe mit falsch gesetztem Leerzeichen - (u'(?<!\w)(\d+|\d+[\.,]\d+)° C(?=\W|²|³|$)', ur'\1 °C'), - # Kein Leerzeichen nach Komma - (u'([a-zäöüß](\]\])?,)((\[\[)?[a-zäöüA-ZÄÖÜ])', r'\1 \3'), - # Leerzeichen und Komma vertauscht - (u'([a-zäöüß](\]\])?) ,((\[\[)?[a-zäöüA-ZÄÖÜ])', r'\1, \3'), - # Plenks (d. h. Leerzeichen auch vor dem Komma/Punkt/Ausrufezeichen/Fragezeichen) - # Achtung bei Französisch: http://de.wikipedia.org/wiki/Plenk#Sonderfall_Franz.C3.B6sisch - # Leerzeichen vor Doppelpunkt/Semikolon kann korrekt sein, nach irgendeiner Norm für Zitationen. - (u'([a-zäöüß](\]\])?) ([,\.!\?]) ((\[\[)?[a-zäöüA-ZÄÖÜ])', r'\1\3 \4'), - #(u'([a-z]\.)([A-Z])', r'\1 \2'), - ], - 'exceptions': { - 'inside-tags': [ - 'nowiki', - 'comment', - 'math', - 'pre', # because of code examples - 'source', # because of code examples - 'startspace', # because of code examples - 'hyperlink', # e.g. commas in URLs - 'gallery', # because of filenames - 'timeline', - ], - 'text-contains': [ - r'sic!', - r'20min.ch', # Schweizer News-Seite - ], - 'inside': [ - r'<code>.*</code>', # because of code examples - r'{{[Zz]itat\|.*?}}', - ur'{{§\|.*?}}', # Gesetzesparagraph - ur'§ ?\d+[a-z]', # Gesetzesparagraph - r'Ju 52/1m', # Flugzeugbezeichnung - r'Ju 52/3m', # Flugzeugbezeichnung - r'AH-1W', # Hubschrauberbezeichnung - r'ZPG-3W', # Luftschiffbezeichnung - r'8mm', # Filmtitel - r'802.11g', # WLAN-Standard - r'DOS/4GW', # Software - r'ntfs-3g', # Dateisystem-Treiber - r'/\w(,\w)*/', # Laut-Aufzählung in der Linguistik - r'[xyz](,[xyz])+', # Variablen in der Mathematik (unklar, ob Leerzeichen hier Pflicht sind) - r'(?m)^;(.*?)$', # Definitionslisten, dort gibt es oft absichtlich Leerzeichen vor Doppelpunkten - r'\d+h( | )\d+m', # Schreibweise für Zeiten, vor allem in Film-Infoboxen. Nicht korrekt, aber dafür schön kurz. - r'(?i)\[\[(Bild|Image|Media):.+?\|', # Dateinamen auslassen - r'{{bgc\|.*?}}', # Hintergrundfarbe - r'<sup>\d+m</sup>', # bei chemischen Formeln - r'$[A-Z][A-Za-z]*(,[A-Z][A-Za-z]*(<sup>.*?</sup>|<sub>.*?</sub>|))+$' # chemische Formel, z. B. AuPb(Pb,Sb,Bi)Te. Hier sollen keine Leerzeichen hinter die Kommata. - ], - 'title': [ - r'Arsen', # chemische Formel - ], - } - }, - - # Do NOT run this automatically! - # Recommendation: First run syntax-safe automatically, afterwards - # run syntax manually, carefully checking that you're not breaking - # anything. - 'syntax': { - 'regex': True, - 'msg': { - 'ar':u'بوت: تصليح تهيئة الويكي', - 'be':u'Бот: Карэкцыя вiкi-сiнтаксiсу', - 'cs':u'Oprava wikisyntaxe', - 'de':u'Bot: Korrigiere Wiki-Syntax', - 'en':u'Robot: Fixing wiki syntax', - 'eo':u'Bot: Korektado de vikia sintakso', - 'fa':u'ربات:تصحیح قالب ویکی‌نویسی', - 'fr':u'Bot: Corrige wiki-syntaxe', - 'he':u'בוט: מתקן תחביר ויקי', - 'ia':u'Robot: Reparation de syntaxe wiki', - 'ja':u'ロボットによる: wiki構文修正', - 'lt':u'robotas: Taisoma wiki sintaksė', - 'nl':u'Bot: reparatie wikisyntaxis', - 'pl':u'Robot poprawia wiki-składnię', - 'pt':u'Bot: Corrigindo sintaxe wiki', - 'ru':u'Бот: Коррекция вики синтаксиса', - 'sr':u'Бот: Поправка вики синтаксе', - 'uk':u'Бот: Корекцiя вiкi-синтаксису', - 'zh':u'機器人: 修正wiki語法', - }, - 'replacements': [ - # external link in double brackets - (r'\[\[(?P<url>https?://[^\]]+?)\]\]', r'[\g<url>]'), - # external link starting with double bracket - (r'\[\[(?P<url>https?://.+?)\]', r'[\g<url>]'), - # external link with forgotten closing bracket - #(r'\[(?P<url>https?://[^\]\s]+)\r\n', r'[\g<url>]\r\n'), - # external link ending with double bracket. - # do not change weblinks that contain wiki links inside - # inside the description - (r'\[(?P<url>https?://[^\[\]]+?)\]\](?!\])', r'[\g<url>]'), - # external link and description separated by a dash. - # ATTENTION: while this is a mistake in most cases, there are some - # valid URLs that contain dashes! - (r'\[(?P<url>https?://[^\|\]\s]+?) *\| *(?P<label>[^\|\]]+?)\]', r'[\g<url> \g<label>]'), - # wiki link closed by single bracket. - # ATTENTION: There are some false positives, for example - # Brainfuck code examples or MS-DOS parameter instructions. - # There are also sometimes better ways to fix it than - # just putting an additional ] after the link. - (r'\[\[([^\[\]]+?)\](?!\])', r'[[\1]]'), - # wiki link opened by single bracket. - # ATTENTION: same as above. - (r'(?<!\[)\[([^\[\]]+?)\]\](?!\])', r'[[\1]]'), - # template closed by single bracket - # ATTENTION: There are some false positives, especially in - # mathematical context or program code. - (r'{{([^{}]+?)}(?!})', r'{{\1}}'), - ], - 'exceptions': { - 'inside-tags': [ - 'nowiki', - 'comment', - 'math', - 'pre', - 'source', # because of code examples - 'startspace', # because of code examples - ], - 'text-contains': [ - r'http://.*?object=tx\|', # regular dash in URL - r'http://.*?allmusic\.com', # regular dash in URL - r'http://.*?allmovie\.com', # regular dash in URL - r'http://physics.nist.gov/', # regular dash in URL - r'http://www.forum-seniorenarbeit.de/', # regular dash in URL - r'http://kuenstlerdatenbank.ifa.de/', # regular dash in URL - r'&object=med', # regular dash in URL - r'\[CDATA\[' # lots of brackets - ], - } - }, - - # The same as syntax, but restricted to replacements that should - # be safe to run automatically. - 'syntax-safe': { - 'regex': True, - 'msg': { - 'ar':u'بوت: تصليح تهيئة الويكي', - 'be':u'Бот: Карэкцыя вiкi-сiнтаксiсу', - 'cs':u'Oprava wikisyntaxe', - 'de':u'Bot: Korrigiere Wiki-Syntax', - 'en':u'Robot: Fixing wiki syntax', - 'eo':u'Bot: Korektado de vikia sintakso', - 'fa':u'ربات:تصحیح قالب ویکی‌نویسی', - 'fr':u'Bot: Corrige wiki-syntaxe', - 'he':u'בוט: מתקן תחביר ויקי', - 'ia':u'Robot: Reparation de syntaxe wiki', - 'ja':u'ロボットによる: wiki構文修正', - 'lt':u'robotas: Taisoma wiki sintaksė', - 'nl':u'Bot: reparatie wikisyntaxis', - 'pl':u'Robot poprawia wiki-składnię', - 'pt':u'Bot: Corrigindo sintaxe wiki', - 'ru':u'Бот: Коррекция вики синтаксиса', - 'sr':u'Бот: Поправка вики синтаксе', - 'uk':u'Бот: Корекцiя вiкi-синтаксису', - 'zh':u'機器人: 修正wiki語法', - }, - 'replacements': [ - # external link in double brackets - (r'\[\[(?P<url>https?://[^\]]+?)\]\]', r'[\g<url>]'), - # external link starting with double bracket - (r'\[\[(?P<url>https?://.+?)\]', r'[\g<url>]'), - # external link with forgotten closing bracket - #(r'\[(?P<url>https?://[^\]\s]+)\r\n', r'[\g<url>]\r\n'), - # external link and description separated by a dash, with - # whitespace in front of the dash, so that it is clear that - # the dash is not a legitimate part of the URL. - (r'\[(?P<url>https?://[^\|\] \r\n]+?) +\| *(?P<label>[^\|\]]+?)\]', r'[\g<url> \g<label>]'), - # dash in external link, where the correct end of the URL can - # be detected from the file extension. It is very unlikely that - # this will cause mistakes. - (r'\[(?P<url>https?://[^\|\] ]+?(\.pdf|\.html|\.htm|\.php|\.asp|\.aspx|\.jsp)) *\| *(?P<label>[^\|\]]+?)\]', r'[\g<url> \g<label>]'), - ], - 'exceptions': { - 'inside-tags': [ - 'nowiki', - 'comment', - 'math', - 'pre', - 'source', # because of code examples - 'startspace', # because of code examples - ], - } - }, - - 'case-de': { # German upper / lower case issues - 'regex': True, - 'msg': { - 'de':u'Bot: Korrigiere Groß-/Kleinschreibung', - }, - 'replacements': [ - (r'\batlantische(r|n|) Ozean', r'Atlantische\1 Ozean'), - (r'\bdeutsche(r|n|) Bundestag\b', r'Deutsche\1 Bundestag'), - (r'\bdeutschen Bundestags\b', r'Deutschen Bundestags'), # Aufpassen, z. B. 'deutsche Bundestagswahl' - (r'\bdeutsche(r|n|) Reich\b', r'Deutsche\1 Reich'), - (r'\bdeutschen Reichs\b', r'Deutschen Reichs'), # Aufpassen, z. B. 'deutsche Reichsgrenzen' - (r'\bdritte(n|) Welt(?!krieg)', r'Dritte\1 Welt'), - (r'\bdreißigjährige(r|n|) Krieg', r'Dreißigjährige\1 Krieg'), - (r'\beuropäische(n|) Gemeinschaft', r'Europäische\1 Gemeinschaft'), - (r'\beuropäische(n|) Kommission', r'Europäische\1 Kommission'), - (r'\beuropäische(n|) Parlament', r'Europäische\1 Parlament'), - (r'\beuropäische(n|) Union', r'Europäische\1 Union'), - (r'\berste(r|n|) Weltkrieg', r'Erste\1 Weltkrieg'), - (r'\bkalte(r|n|) Krieg', r'Kalte\1 Krieg'), - (r'\bpazifische(r|n|) Ozean', r'Pazifische\1 Ozean'), - (r'Tag der deutschen Einheit', r'Tag der Deutschen Einheit'), - (r'\bzweite(r|n|) Weltkrieg', r'Zweite\1 Weltkrieg'), - ], - 'exceptions': { - 'inside-tags': [ - 'nowiki', - 'comment', - 'math', - 'pre', - ], - 'text-contains': [ - r'sic!', - ], - } - }, - - 'vonbis': { - 'regex': True, - 'msg': { - 'de':u'Bot: Ersetze Binde-/Gedankenstrich durch "bis"', - }, - 'replacements': [ - # Bindestrich, Gedankenstrich, Geviertstrich - (u'(von \d{3,4}) *(-|–|–|—|—) *(\d{3,4})', r'\1 bis \3'), - ], - }, - - # some disambiguation stuff for de: - # python replace.py -fix:music -subcat:Album - 'music': { - 'regex': False, - 'msg': { - 'de':u'Bot: korrigiere Links auf Begriffsklärungen', - }, - 'replacements': [ - (u'[[CD]]', u'[[Audio-CD|CD]]'), - (u'[[LP]]', u'[[Langspielplatte|LP]]'), - (u'[[EP]]', u'[[Extended Play|EP]]'), - (u'[[MC]]', u'[[Musikkassette|MC]]'), - (u'[[Single]]', u'[[Single (Musik)|Single]]'), - ], - 'exceptions': { - 'inside-tags': [ - 'hyperlink', - ] - } - }, - - # format of dates of birth and death, for de: - # python replace.py -fix:datum -ref:Vorlage:Personendaten - 'datum': { - 'regex': True, - 'msg': { - 'de': u'Bot: Korrigiere Datumsformat', - }, - 'replacements': [ - # space after birth sign w/ year - #(u'\(\*(\d{3,4})', u'(* \\1'), - ## space after death sign w/ year - #(u'†(\d{3,4})', u'† \\1'), - #(u'&dagger;(\d{3,4})', u'† \\1'), - ## space after birth sign w/ linked date - #(u'\(\*\[\[(\d)', u'(* [[\\1'), - ## space after death sign w/ linked date - #(u'†\[\[(\d)', u'† [[\\1'), - #(u'&dagger;\[\[(\d)', u'† [[\\1'), - (u'\[\[(\d+\. (?:Januar|Februar|März|April|Mai|Juni|Juli|August|September|Oktober|November|Dezember)) (\d{1,4})\]\]', u'[[\\1]] [[\\2]]'), - # Keine führende Null beim Datum (ersteinmal nur bei denen, bei denen auch ein Leerzeichen fehlt) - (u'0(\d+)\.(Januar|Februar|März|April|Mai|Juni|Juli|August|September|Oktober|November|Dezember)', r'\1. \2'), - # Kein Leerzeichen zwischen Tag und Monat - (u'(\d+)\.(Januar|Februar|März|April|Mai|Juni|Juli|August|September|Oktober|November|Dezember)', r'\1. \2'), - # Kein Punkt vorm Jahr - (u'(\d+)\. (Januar|Februar|März|April|Mai|Juni|Juli|August|September|Oktober|November|Dezember)\.(\d{1,4})', r'\1. \2 \3'), - ], - 'exceptions': { - 'inside': [ - r'\[\[20. Juli 1944\]\]', # Hitler-Attentat - r'\[\[17. Juni 1953\]\]', # Ost-Berliner Volksaufstand - r'\[\[1. April 2000\]\]', # Film - r'\[\[11. September 2001\]\]', # Anschläge in den USA - r'\[\[7. Juli 2005\]\]', # Terroranschläge in Spanien - ], - } - }, - - 'isbn': { - 'regex': True, - 'msg': 'isbn-formatting', # use i18n translations - 'replacements': [ - # colon - (r'ISBN: (\d+)', r'ISBN \1'), - # superfluous word "number" - (r'ISBN( number| no\.?| No\.?|-Nummer|-Nr\.):? (\d+)', r'ISBN \2'), - # Space, minus, dot, hypen, en dash, em dash, etc. instead of - # hyphen-minus as separator, or spaces between digits and separators. - # Note that these regular expressions also match valid ISBNs, but - # these won't be changed. - (ur'ISBN (978|979) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d)(?!\d)', r'ISBN \1-\2-\3-\4-\5'), # ISBN-13 - (ur'ISBN (\d+) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d|X|x)(?!\d)', r'ISBN \1-\2-\3-\4'), # ISBN-10 - # missing space before ISBN-10 or before ISBN-13, - # or non-breaking space. - (r'ISBN(| | )((\d(-?)){12}\d|(\d(-?)){9}[\dXx])', r'ISBN \2'), - ], - 'exceptions': { - 'inside-tags': [ - 'comment', - 'hyperlink', - ], - 'inside': [ - r'ISBN (\d(-?)){12}\d', # matches valid ISBN-13s - r'ISBN (\d(-?)){9}[\dXx]', # matches valid ISBN-10s - ], - } - }, - - #Corrections for Arabic Wikipedia and any Arabic wiki. - #python replace.py -fix:correct-ar -start:! -always - - 'correct-ar': { - 'regex': True, - 'msg': { - 'ar':u'تدقيق إملائي', - }, - 'replacements': [ - #(u' ,', u' ،'), #FIXME: Do not replace comma in non-Arabic text, interwiki, image links or <math> syntax. - (ur'\bإمرأة\b', u'امرأة'), - (ur'\bالى\b', ur'إلى'), - (ur'\bإسم\b', u'اسم'), - (ur'\bالأن\b', u'الآن'), - (ur'\bالة\b', u'آلة'), - (ur'\bفى\b', u'في'), - (ur'\bإبن\b', u'ابن'), - (ur'\bإبنة\b', u'ابنة'), - (ur'\bإقتصاد\b', u'اقتصاد'), - (ur'\bإجتماع\b', u'اجتماع'), - (ur'\bانجيل\b', u'إنجيل'), - (ur'\bاجماع\b', u'إجماع'), - (ur'\bاكتوبر\b', u'أكتوبر'), - (ur'\bإستخراج\b', u'استخراج'), - (ur'\bإستعمال\b', u'استعمال'), - (ur'\bإستبدال\b', u'استبدال'), - (ur'\bإشتراك\b', u'اشتراك'), - (ur'\bإستعادة\b', u'استعادة'), - (ur'\bإستقلال\b', u'استقلال'), - (ur'\bإنتقال\b', u'انتقال'), - (ur'\bإتحاد\b', u'اتحاد'), - (ur'\bاملاء\b', u'إملاء'), - (ur'\bإستخدام\b', u'استخدام'), - (ur'\bأحدى\b', u'إحدى'), - (ur'\bلاكن\b', u'لكن'), - (ur'\bإثنان\b', u'اثنان'), - (ur'\bإحتياط\b', u'احتياط'), - (ur'\bإقتباس\b', u'اقتباس'), - (ur'\bادارة\b', u'إدارة'), - (ur'\bابناء\b', u'أبناء'), - (ur'\bالانصار\b', u'الأنصار'), - (ur'\bاشارة\b', u'إشارة'), - (ur'\bإقرأ\b', u'اقرأ'), - (ur'\bإمتياز\b', u'امتياز'), - (ur'\bارق\b', u'أرق'), - (ur'\bاللة\b', u'الله'), - (ur'\bإختبار\b', u'اختبار'), - (ur'==[ ]?روابط خارجية[ ]?==', u'== وصلات خارجية =='), - (ur'\bارسال\b', u'إرسال'), - (ur'\bإتصالات\b', u'اتصالات'), - (ur'\bابو\b', u'أبو'), - (ur'\bابا\b', u'أبا'), - (ur'\bاخو\b', u'أخو'), - (ur'\bاخا\b', u'أخا'), - (ur'\bاخي\b', u'أخي'), - (ur'\bاحد\b', u'أحد'), - (ur'\bاربعاء\b', u'أربعاء'), - (ur'\bاول\b', u'أول'), - (ur'\b(ال|)اهم\b', ur'\1أهم'), - (ur'\b(ال|)اثقل\b', ur'\1أثقل'), - (ur'\b(ال|)امجد\b', ur'\1أمجد'), - (ur'\b(ال|)اوسط\b', ur'\1أوسط'), - (ur'\b(ال|)اشقر\b', ur'\1أشقر'), - (ur'\b(ال|)انور\b', ur'\1أنور'), - (ur'\b(ال|)اصعب\b', ur'\1أصعب'), - (ur'\b(ال|)اسهل\b', ur'\1أسهل'), - (ur'\b(ال|)اجمل\b', ur'\1أجمل'), - (ur'\b(ال|)اقبح\b', ur'\1أقبح'), - (ur'\b(ال|)اطول\b', ur'\1أطول'), - (ur'\b(ال|)اقصر\b', ur'\1أقصر'), - (ur'\b(ال|)اسمن\b', ur'\1أسمن'), - (ur'\b(ال|)اذكى\b', ur'\1أذكى'), - (ur'\b(ال|)اكثر\b', ur'\1أكثر'), - (ur'\b(ال|)افضل\b', ur'\1أفضل'), - (ur'\b(ال|)اكبر\b', ur'\1أكبر'), - (ur'\b(ال|)اشهر\b', ur'\1أشهر'), - (ur'\b(ال|)ابطأ\b', ur'\1أبطأ'), - (ur'\b(ال|)اماني\b', ur'\1أماني'), - (ur'\b(ال|)احلام\b', ur'\1أحلام'), - (ur'\b(ال|)اسماء\b', ur'\1أسماء'), - (ur'\b(ال|)اسامة\b', ur'\1أسامة'), - (ur'\bابراهيم\b', u'إبراهيم'), - (ur'\bاسماعيل\b', u'إسماعيل'), - (ur'\bايوب\b', u'أيوب'), - (ur'\bايمن\b', u'أيمن'), - (ur'\bاوزبكستان\b', u'أوزبكستان'), - (ur'\bاذربيجان\b', u'أذربيجان'), - (ur'\bافغانستان\b', u'أفغانستان'), - (ur'\bانجلترا\b', u'إنجلترا'), - (ur'\bايطاليا\b', u'إيطاليا'), - (ur'\bاوربا\b', u'أوروبا'), - (ur'\bأوربا\b', u'أوروبا'), - (ur'\bاوغندة\b', u'أوغندة'), - (ur'\b(ال|)ا(لماني|فريقي|سترالي)(ا|ة|تان|ان|ين|ي|ون|و|ات|)\b', ur'\1أ\2\3'), - (ur'\b(ال|)ا(وروب|مريك)(ا|ي|ية|يتان|يان|يين|يي|يون|يو|يات|)\b', ur'\1أ\2\3'), - (ur'\b(ال|)ا(ردن|رجنتين|وغند|سبان|وكران|فغان)(ي|ية|يتان|يان|يين|يي|يون|يو|يات|)\b', ur'\1أ\2\3'), - (ur'\b(ال|)ا(سرائيل|يران|مارات|نكليز|نجليز)(ي|ية|يتان|يان|يين|يي|يون|يو|يات|)\b', ur'\1إ\2\3'), - (ur'\b(ال|)(ا|أ)(رثوذكس|رثوذوكس)(ي|ية|يتان|يان|يين|يي|يون|يو|يات|)\b', ur'\1أرثوذكس\4'), - (ur'\bإست(عمل|خدم|مر|مد|مال|عاض|قام|حال|جاب|قال|زاد|عان|طال)(ت|ا|وا|)\b', ur'است\1\2'), - (ur'\bإست(حال|قال|طال|زاد|عان|قام|راح|جاب|عاض|مال)ة\b', ur'است\1ة'), - ], - 'exceptions': { - 'inside-tags': [ - 'interwiki', - 'math', - 'ref', - ], - } - }, - 'specialpages': { - 'regex': False, - 'msg': { - 'en': u'Robot: Fixing special page capitalisation', - 'fa':u'ربات: تصحیح بزرگی و کوچکی حروف صفحه‌های ویژه', - }, - 'replacements': [ - (u'Special:Allpages', u'Special:AllPages'), - (u'Special:Blockip', u'Special:BlockIP'), - (u'Special:Blankpage', u'Special:BlankPage'), - (u'Special:Filepath', u'Special:FilePath'), - (u'Special:Globalusers', u'Special:GlobalUsers'), - (u'Special:Imagelist', u'Special:ImageList'), - (u'Special:Ipblocklist', u'Special:IPBlockList'), - (u'Special:Listgrouprights', u'Special:ListGroupRights'), - (u'Special:Listusers', u'Special:ListUsers'), - (u'Special:Newimages', u'Special:NewImages'), - (u'Special:Prefixindex', u'Special:PrefixIndex'), - (u'Special:Protectedpages', u'Special:ProtectedPages'), - (u'Special:Recentchanges', u'Special:RecentChanges'), - (u'Special:Specialpages', u'Special:SpecialPages'), - (u'Special:Unlockdb', u'Special:UnlockDB'), - (u'Special:Userlogin', u'Special:UserLogin'), - (u'Special:Userlogout', u'Special:UserLogout'), - (u'Special:Whatlinkshere', u'Special:WhatLinksHere'), - ], - }, - # yu top-level domain will soon be disabled, - # see http://lists.wikimedia.org/pipermail/wikibots-l/2009-February/000290.html - # The following are domains that are often-used. - 'yu-tld': { - 'regex': False, - 'nocase': True, - 'msg': { - 'de': u'Bot: Ersetze Links auf .yu-Domains', - 'en': u'Robot: Replacing links to .yu domains', - 'fa': u'ربات: جایگزینی پیوندها به دامنه‌ها با پسوند yu', - 'fr': u'Robot: Correction des liens pointant vers le domaine .yu, qui expire en 2009', - 'ksh': u'Bot: de ahle .yu-Domains loufe us, dröm ußjetuusch', - }, - 'replacements': [ - (u'www.budva.cg.yu', u'www.budva.rs'), - (u'spc.org.yu', u'spc.rs'), - (u'www.oks.org.yu', u'www.oks.org.rs'), - (u'www.kikinda.org.yu', u'www.kikinda.rs'), - (u'www.ds.org.yu', u'www.ds.org.rs'), - (u'www.nbs.yu', u'www.nbs.rs'), - (u'www.serbia.sr.gov.yu', u'www.srbija.gov.rs'), - (u'eunet.yu', u'eunet.rs'), - (u'www.zastava-arms.co.yu', u'www.zastava-arms.co.rs'), - (u'www.airportnis.co.yu', u'www.airportnis.rs'), - # (u'www.danas.co.yu', u'www.danas.rs'), # Archive links don't seem to work - (u'www.belex.co.yu', u'www.belex.rs'), - (u'beograd.org.yu', u'beograd.rs'), - (u'www.vlada.cg.yu', u'www.vlada.me'), - (u'webrzs.statserb.sr.gov.yu', u'webrzs.stat.gov.rs'), - (u'www.statserb.sr.gov.yu', u'webrzs.stat.gov.rs'), - (u'www.rastko.org.yu', u'www.rastko.org.rs'), - (u'www.reprezentacija.co.yu', u'www.reprezentacija.rs'), - (u'www.blic.co.yu', u'www.blic.co.rs'), - (u'www.beograd.org.yu', u'www.beograd.org.rs'), - (u'arhiva.glas-javnosti.co.yu', u'arhiva.glas-javnosti.rs'), - (u'www.srpsko-nasledje.co.yu', u'www.srpsko-nasledje.co.rs'), - (u'www.dnevnik.co.yu', u'www.dnevnik.rs'), - (u'www.srbija.sr.gov.yu', u'www.srbija.gov.rs'), - (u'www.kurir-info.co.yu/Arhiva', u'arhiva.kurir-info.rs/Arhiva'), - (u'www.kurir-info.co.yu/arhiva', u'arhiva.kurir-info.rs/arhiva'), - (u'www.kurir-info.co.yu', u'www.kurir-info.rs'), - (u'arhiva.kurir-info.co.yu', u'arhiva.kurir-info.rs'), - (u'www.prvaliga.co.yu', u'www.prvaliga.rs'), - (u'www.mitropolija.cg.yu', u'www.mitropolija.me'), - (u'www.spc.yu/sr', u'www.spc.rs/sr'), - (u'www.sk.co.yu', u'www.sk.co.rs'), - (u'www.ekoforum.org.yu', u'www.ekoforum.org'), - (u'www.svevlad.org.yu', u'www.svevlad.org.rs'), - (u'www.posta.co.yu', u'www.posta.rs'), - (u'www.glas-javnosti.co.yu', u'www.glas-javnosti.rs'), - (u'www.fscg.cg.yu', u'www.fscg.co.me'), - (u'ww1.rts.co.yu/euro', u'ww1.rts.co.rs/euro'), - (u'www.rtv.co.yu', u'www.rtv.rs'), - (u'www.politika.co.yu', u'www.politika.rs'), - (u'www.mfa.gov.yu', u'www.mfa.gov.rs'), - (u'www.drzavnauprava.sr.gov.yu', u'www.drzavnauprava.gov.rs'), - ], - }, - # These replacements will convert HTML tag from FCK-editor to wiki syntax. - # - 'fckeditor': { - 'regex': True, - 'msg': { - 'en': u'Robot: Fixing rich-editor html', - 'fa': u'ربات: تصحیح اچ‌تی‌ام‌ال ویرایشگر پیشرفته', - }, - 'replacements': [ - # replace <br> with a new line - (r'(?i)<br>', r'\n'), - # replace   with a space - (r'(?i) ', r' '), - ], - }, -} - -# -# Load the user fixes file. - -from pywikibot import config - -try: - execfile(config.datafilepath("user-fixes.py")) -except IOError: - pass Modified: branches/rewrite/scripts/replace.py =================================================================== --- branches/rewrite/scripts/replace.py 2012-06-04 14:02:21 UTC (rev 10293) +++ branches/rewrite/scripts/replace.py 2012-06-04 14:13:15 UTC (rev 10294) @@ -131,7 +131,7 @@ import webbrowser # Imports predefined replacements tasks from fixes.py -import scripts.fixes as fixes +from pywikibot import fixes # This is required for the text that is shown when you run this script # with the parameter -help.

1 0

SVN: [10293] branches/rewrite/pywikibot
by xqt＠svn.wikimedia.org 04 Jun '12

04 Jun '12

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/10293 Revision: 10293 Author: xqt Date: 2012-06-04 14:02:21 +0000 (Mon, 04 Jun 2012) Log Message: ----------- strip trailing whitespaces Modified Paths: -------------- branches/rewrite/pywikibot/family.py branches/rewrite/pywikibot/site.py Modified: branches/rewrite/pywikibot/family.py =================================================================== --- branches/rewrite/pywikibot/family.py 2012-06-04 13:41:38 UTC (rev 10292) +++ branches/rewrite/pywikibot/family.py 2012-06-04 14:02:21 UTC (rev 10293) @@ -25,7 +25,7 @@ # http://meta.wikimedia.org/wiki/Interwiki_sorting_order # The sorting order by language name from meta - # MediaWiki:Interwiki_config-sorting_order-native-languagename + # MediaWiki:Interwiki_config-sorting_order-native-languagename self.alphabetic = [ 'ace', 'kbd', 'af', 'ak', 'als', 'am', 'ang', 'ab', 'ar', 'an', 'arc', 'roa-rup', 'frp', 'as', 'ast', 'gn', 'av', 'ay', 'az', 'bm', @@ -60,7 +60,7 @@ ] # The revised sorting order by first word from meta - # MediaWiki:Interwiki_config-sorting_order-native-languagename-firstword + # MediaWiki:Interwiki_config-sorting_order-native-languagename-firstword self.alphabetic_revised = [ 'ace', 'kbd', 'af', 'ak', 'als', 'am', 'ang', 'ab', 'ar', 'an', 'arc', 'roa-rup', 'frp', 'as', 'ast', 'gn', 'av', 'ay', 'az', 'bjn', Modified: branches/rewrite/pywikibot/site.py =================================================================== --- branches/rewrite/pywikibot/site.py 2012-06-04 13:41:38 UTC (rev 10292) +++ branches/rewrite/pywikibot/site.py 2012-06-04 14:02:21 UTC (rev 10293) @@ -680,16 +680,16 @@ """ if not hasattr(self, "_userinfo"): return False - + if sysop and 'sysop' not in self.userinfo['groups']: return False - + if not self.userinfo['name']: return False - + if self.userinfo['name'] != self._username[sysop]: pywikibot.warning("Logged in as %s instead of %s" % (self.userinfo['name'], self._username[sysop])) - + return True @deprecated("Site.user()") @@ -2885,7 +2885,7 @@ """ # TODO: update docstring - + # N.B. API still provides no way to access Special:Newpages content # directly, so we get new pages indirectly through 'recentchanges' @@ -2913,7 +2913,7 @@ N.B. the API does not provide direct access to Special:Newimages, so this is derived from the "upload" log events instead. - + """ #TODO: update docstring for event in logevents(self, logtype="upload", user=user, @@ -3028,7 +3028,7 @@ gqppage="Uncategorizedpages", step=step, total=total) return upgen - + @deprecate_arg("number", None) @deprecate_arg("repeat", None) def uncategorizedtemplates(self, number=None, repeat=True,

1 0

← Newer
1
...
11
12
13
14
15
16
17
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Pywikipedia-svn June 2012