Pywikipedia-svn May 2010

pywikipedia-svn@lists.wikimedia.org

10 participants
91 discussions

SVN: [8161] trunk/pywikipedia/standardize_notes.py
by xqt＠svn.wikimedia.org 14 May '10

14 May '10

Revision: 8161 Author: xqt Date: 2010-05-14 08:37:03 +0000 (Fri, 14 May 2010) Log Message: ----------- bugfix for #3000806 introduced with r6609 Modified Paths: -------------- trunk/pywikipedia/standardize_notes.py Modified: trunk/pywikipedia/standardize_notes.py =================================================================== --- trunk/pywikipedia/standardize_notes.py 2010-05-14 07:58:30 UTC (rev 8160) +++ trunk/pywikipedia/standardize_notes.py 2010-05-14 08:37:03 UTC (rev 8161) @@ -329,7 +329,9 @@ yield wikipedia.Page(wikipedia.getSite(), pagename) class ReplaceRobot: - def __init__(self, generator, replacements, refsequence, references, refusage, exceptions = [], regex = False, acceptall = False): + def __init__(self, generator, replacements, refsequence, references, + refusage, exceptions = [], regex = False, acceptall = False, + summary = ''): self.generator = generator self.replacements = replacements self.exceptions = exceptions @@ -338,6 +340,7 @@ self.references = references self.refsequence = refsequence self.refusage = refusage + self.summary = summary def checkExceptions(self, original_text): """ @@ -998,7 +1001,7 @@ if choice in ['a', 'A']: self.acceptall = True if self.acceptall or choice in ['y', 'Y']: - pl.put(new_text) + pl.put(new_text, self.summary) def main(): # How we want to retrieve information on which pages need to be changed. @@ -1063,7 +1066,8 @@ source = 'sqldump' elif arg.startswith('-page'): if len(arg) == 5: - pagenames.append(wikipedia.input(u'Which page do you want to chage?')) + pagenames.append( + wikipedia.input(u'Which page do you want to change?')) else: pagenames.append(arg[6:]) source = 'userinput' @@ -1109,9 +1113,11 @@ exceptions = fix['exceptions'] replacements = fix['replacements'] - gen = ReplacePageGenerator(source, replacements, exceptions, regex, namespace, textfilename, sqlfilename, categoryname, pagenames) + gen = ReplacePageGenerator(source, replacements, exceptions, regex, namespace, + textfilename, sqlfilename, categoryname, pagenames) preloadingGen = pagegenerators.PreloadingGenerator(gen, pageNumber = 20) - bot = ReplaceRobot(preloadingGen, replacements, refsequence, references, refusage, exceptions, regex, acceptall, editSummary) + bot = ReplaceRobot(preloadingGen, replacements, refsequence, references, + refusage, exceptions, regex, acceptall, editSummary) bot.run()

1 0

SVN: [8160]
by xqt＠svn.wikimedia.org 14 May '10

14 May '10

Revision: 8160 Author: xqt Date: 2010-05-14 07:58:30 +0000 (Fri, 14 May 2010) Log Message: ----------- Fixes a capitalization issue which broke category bots in the Hungarian Wikipedia (bugfix #2997587 by tgr) Thanks Modified Paths: -------------- branches/rewrite/pywikibot/families/wikipedia_family.py trunk/pywikipedia/families/wikipedia_family.py Modified: branches/rewrite/pywikibot/families/wikipedia_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikipedia_family.py 2010-05-14 07:30:18 UTC (rev 8159) +++ branches/rewrite/pywikibot/families/wikipedia_family.py 2010-05-14 07:58:30 UTC (rev 8160) @@ -67,9 +67,9 @@ 'fr': (u'Redirection de catégorie',), 'hi': (u'श्रेणीअनुप्रेषित', u'Categoryredirect',), - 'hu': (u'kat-redir', - u'katredir', - u'kat-redirekt',), + 'hu': (u'Kat-redir', + u'Katredir', + u'Kat-redirekt',), 'id': (u'Alih kategori', u'Alihkategori',), # 'it' has removed its template Modified: trunk/pywikipedia/families/wikipedia_family.py =================================================================== --- trunk/pywikipedia/families/wikipedia_family.py 2010-05-14 07:30:18 UTC (rev 8159) +++ trunk/pywikipedia/families/wikipedia_family.py 2010-05-14 07:58:30 UTC (rev 8160) @@ -626,9 +626,9 @@ 'fr': (u'Redirection de catégorie',), 'hi': (u'श्रेणीअनुप्रेषित', u'Categoryredirect',), - 'hu': (u'kat-redir', - u'katredir', - u'kat-redirekt',), + 'hu': (u'Kat-redir', + u'Katredir', + u'Kat-redirekt',), 'id': (u'Alih kategori', u'Alihkategori',), # 'it' has removed its template

1 0

SVN: [8159]
by xqt＠svn.wikimedia.org 14 May '10

14 May '10

Revision: 8159 Author: xqt Date: 2010-05-14 07:30:18 +0000 (Fri, 14 May 2010) Log Message: ----------- new Portail namespace on wikisource:fr; update family files Modified Paths: -------------- branches/rewrite/pywikibot/families/wikibooks_family.py branches/rewrite/pywikibot/families/wikipedia_family.py branches/rewrite/pywikibot/families/wikiquote_family.py branches/rewrite/pywikibot/families/wikisource_family.py branches/rewrite/pywikibot/families/wiktionary_family.py trunk/pywikipedia/families/wikibooks_family.py trunk/pywikipedia/families/wikipedia_family.py trunk/pywikipedia/families/wikiquote_family.py trunk/pywikipedia/families/wikisource_family.py trunk/pywikipedia/families/wiktionary_family.py Modified: branches/rewrite/pywikibot/families/wikibooks_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikibooks_family.py 2010-05-12 15:29:13 UTC (rev 8158) +++ branches/rewrite/pywikibot/families/wikibooks_family.py 2010-05-14 07:30:18 UTC (rev 8159) @@ -11,9 +11,9 @@ self.name = 'wikibooks' self.languages_by_size = [ - 'en', 'de', 'fr', 'ja', 'pt', 'hu', 'es', 'nl', 'pl', 'it', 'he', - 'sq', 'fi', 'vi', 'ru', 'cs', 'hr', 'ca', 'zh', 'sv', 'da', 'th', - 'tr', 'mk', 'sr', 'tl', 'fa', 'ar', 'id', 'ko', 'gl', 'is', 'no', + 'en', 'de', 'fr', 'ja', 'pt', 'hu', 'nl', 'es', 'pl', 'it', 'he', + 'sq', 'fi', 'ru', 'vi', 'cs', 'hr', 'ca', 'zh', 'sv', 'da', 'tr', + 'th', 'mk', 'sr', 'tl', 'fa', 'ko', 'ar', 'id', 'gl', 'is', 'no', 'ta', 'ka', 'eo', 'lt', 'bg', 'ro', 'sk', 'el', 'la', 'si', 'ia', 'ang', 'cv', 'sl', 'et', 'mr', 'uk', 'ur', 'ml', 'az', 'oc', 'ms', 'eu', 'hi', 'fy', 'ie', 'tg', 'bn', 'hy', 'af', 'pa', 'te', 'bs', Modified: branches/rewrite/pywikibot/families/wikipedia_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikipedia_family.py 2010-05-12 15:29:13 UTC (rev 8158) +++ branches/rewrite/pywikibot/families/wikipedia_family.py 2010-05-14 07:30:18 UTC (rev 8159) @@ -14,29 +14,29 @@ 'en', 'de', 'fr', 'pl', 'it', 'ja', 'nl', 'es', 'pt', 'ru', 'sv', 'zh', 'no', 'ca', 'fi', 'uk', 'cs', 'hu', 'tr', 'ro', 'ko', 'eo', 'da', 'ar', 'id', 'vi', 'vo', 'sr', 'sk', 'lt', 'he', 'bg', 'fa', - 'sl', 'hr', 'et', 'new', 'ms', 'simple', 'th', 'gl', 'nn', 'eu', - 'hi', 'ht', 'el', 'war', 'te', 'ceb', 'mk', 'la', 'ka', 'az', 'br', + 'sl', 'hr', 'et', 'new', 'ms', 'simple', 'th', 'gl', 'war', 'nn', + 'eu', 'hi', 'ht', 'el', 'te', 'ceb', 'mk', 'la', 'ka', 'az', 'br', 'sh', 'lb', 'bs', 'is', 'mr', 'jv', 'lv', 'cy', 'tl', 'sq', 'pms', - 'bpy', 'be-x-old', 'ta', 'bn', 'oc', 'an', 'be', 'io', 'sw', 'nds', - 'fy', 'scn', 'qu', 'af', 'su', 'gu', 'zh-yue', 'ast', 'ur', 'lmo', - 'nap', 'ku', 'bat-smg', 'ml', 'wa', 'cv', 'ksh', 'ga', 'tg', 'hy', - 'roa-tara', 'vec', 'kn', 'yo', 'gd', 'yi', 'uz', 'pam', 'os', - 'zh-min-nan', 'mi', 'kk', 'sah', 'als', 'tt', 'nah', 'li', 'glk', - 'roa-rup', 'hsb', 'co', 'arz', 'gan', 'ia', 'bcl', 'mn', 'fiu-vro', + 'bpy', 'be-x-old', 'ta', 'oc', 'bn', 'an', 'be', 'io', 'sw', 'nds', + 'fy', 'scn', 'af', 'qu', 'gu', 'su', 'zh-yue', 'lmo', 'ast', 'ur', + 'nap', 'ku', 'ml', 'bat-smg', 'roa-rup', 'wa', 'cv', 'ksh', 'ga', + 'tg', 'hy', 'roa-tara', 'vec', 'kn', 'yo', 'gd', 'yi', 'uz', 'pam', + 'os', 'zh-min-nan', 'mi', 'kk', 'tt', 'sah', 'als', 'nah', 'li', + 'glk', 'hsb', 'arz', 'co', 'gan', 'ia', 'bcl', 'mn', 'fiu-vro', 'pnb', 'nds-nl', 'vls', 'fo', 'tk', 'sa', 'ne', 'am', 'dv', 'nrm', - 'pag', 'bar', 'rm', 'gv', 'map-bms', 'my', 'sco', 'diq', 'wuu', - 'se', 'fur', 'si', 'lij', 'ug', 'mt', 'nov', 'bh', 'mzn', 'csb', - 'ilo', 'zh-classical', 'pi', 'km', 'lad', 'mg', 'sc', 'frp', 'ang', - 'kw', 'hif', 'ckb', 'bo', 'pdc', 'haw', 'szl', 'pa', 'ps', 'ie', - 'hak', 'kv', 'crh', 'to', 'stq', 'myv', 'ace', 'gn', 'ln', 'nv', - 'krc', 'mhr', 'cbk-zam', 'ky', 'ext', 'jbo', 'arc', 'wo', 'ty', - 'xal', 'eml', 'kab', 'tpi', 'so', 'zea', 'pap', 'srn', 'ay', 'ba', - 'ig', 'or', 'dsb', 'kg', 'udm', 'lo', 'rmy', 'kl', 'cu', 'mwl', - 'ab', 'kaa', 'ce', 'sm', 'av', 'ks', 'tet', 'got', 'pcd', 'sd', - 'mdf', 'na', 'bm', 'pnt', 'iu', 'pih', 'as', 'fj', 'cdo', 'ee', - 'bug', 'chr', 'om', 'zu', 'bi', 'ti', 'za', 'ss', 'ts', 've', 'ha', - 'dz', 'sg', 'ch', 'cr', 'xh', 'ak', 'lbe', 'tn', 'ki', 'ik', 'bxr', - 'rw', 'st', 'tw', 'ny', 'sn', 'chy', 'ff', 'lg', 'tum', 'rn', + 'bar', 'pag', 'rm', 'gv', 'map-bms', 'my', 'sco', 'diq', 'wuu', + 'se', 'si', 'fur', 'lij', 'ug', 'bh', 'mt', 'nov', 'mzn', 'csb', + 'ilo', 'zh-classical', 'pi', 'lad', 'km', 'mg', 'sc', 'ang', 'frp', + 'kw', 'hif', 'ckb', 'bo', 'pdc', 'haw', 'szl', 'pa', 'ps', 'hak', + 'ie', 'kv', 'crh', 'to', 'stq', 'myv', 'ace', 'cbk-zam', 'gn', 'ln', + 'nv', 'krc', 'mhr', 'ky', 'ext', 'jbo', 'arc', 'xal', 'wo', 'ty', + 'eml', 'kab', 'tpi', 'so', 'pap', 'zea', 'srn', 'ay', 'fj', 'ba', + 'ig', 'or', 'dsb', 'kg', 'udm', 'lo', 'kl', 'rmy', 'cu', 'ce', + 'mwl', 'ab', 'kaa', 'sm', 'av', 'ks', 'tet', 'got', 'pcd', 'sd', + 'mdf', 'na', 'bm', 'pnt', 'iu', 'pih', 'as', 'cdo', 'ee', 'bug', + 'chr', 'om', 'zu', 'bi', 'ti', 'za', 'ss', 'ts', 've', 'ha', 'sg', + 'dz', 'ch', 'cr', 'xh', 'ak', 'lbe', 'tn', 'ki', 'ik', 'bxr', 'rw', + 'st', 'tw', 'ny', 'sn', 'chy', 'ff', 'lg', 'tum', 'rn', ] for lang in self.languages_by_size: Modified: branches/rewrite/pywikibot/families/wikiquote_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikiquote_family.py 2010-05-12 15:29:13 UTC (rev 8158) +++ branches/rewrite/pywikibot/families/wikiquote_family.py 2010-05-14 07:30:18 UTC (rev 8159) @@ -13,7 +13,7 @@ self.languages_by_size = [ 'en', 'it', 'pl', 'de', 'pt', 'ru', 'sk', 'es', 'bg', 'bs', 'sl', 'tr', 'fr', 'he', 'cs', 'lt', 'zh', 'el', 'hu', 'fa', 'uk', 'eo', - 'sv', 'id', 'nl', 'no', 'ja', 'fi', 'hy', 'nn', 'et', 'ca', 'ar', + 'id', 'sv', 'nl', 'no', 'ja', 'fi', 'hy', 'nn', 'et', 'ca', 'ar', 'ka', 'ko', 'ku', 'hr', 'gl', 'sr', 'ro', 'cy', 'ml', 'li', 'is', 'th', 'te', 'af', 'da', 'az', 'eu', 'sq', 'vi', 'la', 'br', 'hi', 'be', 'ast', 'uz', 'ta', 'ang', 'mr', 'zh-min-nan', 'gu', 'lb', Modified: branches/rewrite/pywikibot/families/wikisource_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikisource_family.py 2010-05-12 15:29:13 UTC (rev 8158) +++ branches/rewrite/pywikibot/families/wikisource_family.py 2010-05-14 07:30:18 UTC (rev 8159) @@ -13,7 +13,7 @@ self.languages_by_size = [ 'en', 'zh', 'ru', 'pt', 'fr', 'de', 'es', 'it', 'he', 'ar', 'hu', 'fa', 'pl', 'th', 'cs', 'ro', 'hr', 'te', 'fi', 'tr', 'nl', 'sv', - 'sl', 'uk', 'ko', 'vi', 'sr', 'ja', 'el', 'la', 'bn', 'li', 'yi', + 'sl', 'uk', 'ko', 'vi', 'sr', 'ja', 'bn', 'el', 'la', 'li', 'yi', 'ml', 'az', 'is', 'bs', 'hy', 'ca', 'id', 'mk', 'no', 'da', 'ta', 'et', 'bg', 'lt', 'gl', 'kn', 'cy', 'sk', 'zh-min-nan', 'fo', ] Modified: branches/rewrite/pywikibot/families/wiktionary_family.py =================================================================== --- branches/rewrite/pywikibot/families/wiktionary_family.py 2010-05-12 15:29:13 UTC (rev 8158) +++ branches/rewrite/pywikibot/families/wiktionary_family.py 2010-05-14 07:30:18 UTC (rev 8159) @@ -15,14 +15,14 @@ 'hu', 'el', 'no', 'ta', 'de', 'it', 'sv', 'ko', 'nl', 'kn', 'lo', 'ml', 'ja', 'ku', 'ar', 'es', 'ro', 'et', 'id', 'te', 'gl', 'bg', 'uk', 'ca', 'li', 'vo', 'fa', 'is', 'scn', 'sr', 'af', 'cs', 'th', - 'simple', 'sw', 'fy', 'oc', 'br', 'he', 'hr', 'sl', 'hy', 'sq', + 'simple', 'fy', 'sw', 'oc', 'br', 'he', 'hr', 'sl', 'hy', 'sq', 'tt', 'la', 'zh-min-nan', 'da', 'wa', 'ne', 'tk', 'ast', 'ur', - 'hsb', 'kk', 'ky', 'eo', 'lv', 'wo', 'ang', 'my', 'mg', 'ka', 'hi', + 'hsb', 'kk', 'ky', 'eo', 'lv', 'wo', 'mg', 'my', 'ang', 'ka', 'hi', 'co', 'ga', 'gn', 'az', 'ia', 'eu', 'sk', 'csb', 'ms', 'st', 'tl', - 'mr', 'cy', 'nds', 'kl', 'sd', 'ug', 'be', 'ti', 'mk', 'ps', 'sh', + 'mr', 'cy', 'nds', 'kl', 'be', 'sd', 'ug', 'ti', 'mk', 'sh', 'ps', 'an', 'bn', 'gu', 'km', 'ss', 'ts', 'qu', 'bs', 'fo', 'am', 'rw', 'chr', 'su', 'om', 'mn', 'nah', 'ie', 'yi', 'iu', 'mt', 'kw', 'gv', - 'gd', 'tg', 'si', 'nn', 'zu', 'dv', 'pa', 'tpi', 'sg', 'jv', + 'gd', 'tg', 'si', 'nn', 'zu', 'dv', 'tpi', 'pa', 'sg', 'jv', 'roa-rup', 'uz', 'mi', 'ik', 'so', 'ha', 'ay', 'lb', 'sa', 'na', 'jbo', 'tn', 'sm', 'ks', 'fj', 'ln', 'za', 'dz', 'als', ] Modified: trunk/pywikipedia/families/wikibooks_family.py =================================================================== --- trunk/pywikipedia/families/wikibooks_family.py 2010-05-12 15:29:13 UTC (rev 8158) +++ trunk/pywikipedia/families/wikibooks_family.py 2010-05-14 07:30:18 UTC (rev 8159) @@ -11,9 +11,9 @@ self.name = 'wikibooks' self.languages_by_size = [ - 'en', 'de', 'fr', 'ja', 'pt', 'hu', 'es', 'nl', 'pl', 'it', 'he', - 'sq', 'fi', 'vi', 'ru', 'cs', 'hr', 'ca', 'zh', 'sv', 'da', 'th', - 'tr', 'mk', 'sr', 'tl', 'fa', 'ar', 'id', 'ko', 'gl', 'is', 'no', + 'en', 'de', 'fr', 'ja', 'pt', 'hu', 'nl', 'es', 'pl', 'it', 'he', + 'sq', 'fi', 'ru', 'vi', 'cs', 'hr', 'ca', 'zh', 'sv', 'da', 'tr', + 'th', 'mk', 'sr', 'tl', 'fa', 'ko', 'ar', 'id', 'gl', 'is', 'no', 'ta', 'ka', 'eo', 'lt', 'bg', 'ro', 'sk', 'el', 'la', 'si', 'ia', 'ang', 'cv', 'sl', 'et', 'mr', 'uk', 'ur', 'ml', 'az', 'oc', 'ms', 'eu', 'hi', 'fy', 'ie', 'tg', 'bn', 'hy', 'af', 'pa', 'te', 'bs', Modified: trunk/pywikipedia/families/wikipedia_family.py =================================================================== --- trunk/pywikipedia/families/wikipedia_family.py 2010-05-12 15:29:13 UTC (rev 8158) +++ trunk/pywikipedia/families/wikipedia_family.py 2010-05-14 07:30:18 UTC (rev 8159) @@ -14,29 +14,29 @@ 'en', 'de', 'fr', 'pl', 'it', 'ja', 'nl', 'es', 'pt', 'ru', 'sv', 'zh', 'no', 'ca', 'fi', 'uk', 'cs', 'hu', 'tr', 'ro', 'ko', 'eo', 'da', 'ar', 'id', 'vi', 'vo', 'sr', 'sk', 'lt', 'he', 'bg', 'fa', - 'sl', 'hr', 'et', 'new', 'ms', 'simple', 'th', 'gl', 'nn', 'eu', - 'hi', 'ht', 'el', 'war', 'te', 'ceb', 'mk', 'la', 'ka', 'az', 'br', + 'sl', 'hr', 'et', 'new', 'ms', 'simple', 'th', 'gl', 'war', 'nn', + 'eu', 'hi', 'ht', 'el', 'te', 'ceb', 'mk', 'la', 'ka', 'az', 'br', 'sh', 'lb', 'bs', 'is', 'mr', 'jv', 'lv', 'cy', 'tl', 'sq', 'pms', - 'bpy', 'be-x-old', 'ta', 'bn', 'oc', 'an', 'be', 'io', 'sw', 'nds', - 'fy', 'scn', 'qu', 'af', 'su', 'gu', 'zh-yue', 'ast', 'ur', 'lmo', - 'nap', 'ku', 'bat-smg', 'ml', 'wa', 'cv', 'ksh', 'ga', 'tg', 'hy', - 'roa-tara', 'vec', 'kn', 'yo', 'gd', 'yi', 'uz', 'pam', 'os', - 'zh-min-nan', 'mi', 'kk', 'sah', 'als', 'tt', 'nah', 'li', 'glk', - 'roa-rup', 'hsb', 'co', 'arz', 'gan', 'ia', 'bcl', 'mn', 'fiu-vro', + 'bpy', 'be-x-old', 'ta', 'oc', 'bn', 'an', 'be', 'io', 'sw', 'nds', + 'fy', 'scn', 'af', 'qu', 'gu', 'su', 'zh-yue', 'lmo', 'ast', 'ur', + 'nap', 'ku', 'ml', 'bat-smg', 'roa-rup', 'wa', 'cv', 'ksh', 'ga', + 'tg', 'hy', 'roa-tara', 'vec', 'kn', 'yo', 'gd', 'yi', 'uz', 'pam', + 'os', 'zh-min-nan', 'mi', 'kk', 'tt', 'sah', 'als', 'nah', 'li', + 'glk', 'hsb', 'arz', 'co', 'gan', 'ia', 'bcl', 'mn', 'fiu-vro', 'pnb', 'nds-nl', 'vls', 'fo', 'tk', 'sa', 'ne', 'am', 'dv', 'nrm', - 'pag', 'bar', 'rm', 'gv', 'map-bms', 'my', 'sco', 'diq', 'wuu', - 'se', 'fur', 'si', 'lij', 'ug', 'mt', 'nov', 'bh', 'mzn', 'csb', - 'ilo', 'zh-classical', 'pi', 'km', 'lad', 'mg', 'sc', 'frp', 'ang', - 'kw', 'hif', 'ckb', 'bo', 'pdc', 'haw', 'szl', 'pa', 'ps', 'ie', - 'hak', 'kv', 'crh', 'to', 'stq', 'myv', 'ace', 'gn', 'ln', 'nv', - 'krc', 'mhr', 'cbk-zam', 'ky', 'ext', 'jbo', 'arc', 'wo', 'ty', - 'xal', 'eml', 'kab', 'tpi', 'so', 'zea', 'pap', 'srn', 'ay', 'ba', - 'ig', 'or', 'dsb', 'kg', 'udm', 'lo', 'rmy', 'kl', 'cu', 'mwl', - 'ab', 'kaa', 'ce', 'sm', 'av', 'ks', 'tet', 'got', 'pcd', 'sd', - 'mdf', 'na', 'bm', 'pnt', 'iu', 'pih', 'as', 'fj', 'cdo', 'ee', - 'bug', 'chr', 'om', 'zu', 'bi', 'ti', 'za', 'ss', 'ts', 've', 'ha', - 'dz', 'sg', 'ch', 'cr', 'xh', 'ak', 'lbe', 'tn', 'ki', 'ik', 'bxr', - 'rw', 'st', 'tw', 'ny', 'sn', 'chy', 'ff', 'lg', 'tum', 'rn', + 'bar', 'pag', 'rm', 'gv', 'map-bms', 'my', 'sco', 'diq', 'wuu', + 'se', 'si', 'fur', 'lij', 'ug', 'bh', 'mt', 'nov', 'mzn', 'csb', + 'ilo', 'zh-classical', 'pi', 'lad', 'km', 'mg', 'sc', 'ang', 'frp', + 'kw', 'hif', 'ckb', 'bo', 'pdc', 'haw', 'szl', 'pa', 'ps', 'hak', + 'ie', 'kv', 'crh', 'to', 'stq', 'myv', 'ace', 'cbk-zam', 'gn', 'ln', + 'nv', 'krc', 'mhr', 'ky', 'ext', 'jbo', 'arc', 'xal', 'wo', 'ty', + 'eml', 'kab', 'tpi', 'so', 'pap', 'zea', 'srn', 'ay', 'fj', 'ba', + 'ig', 'or', 'dsb', 'kg', 'udm', 'lo', 'kl', 'rmy', 'cu', 'ce', + 'mwl', 'ab', 'kaa', 'sm', 'av', 'ks', 'tet', 'got', 'pcd', 'sd', + 'mdf', 'na', 'bm', 'pnt', 'iu', 'pih', 'as', 'cdo', 'ee', 'bug', + 'chr', 'om', 'zu', 'bi', 'ti', 'za', 'ss', 'ts', 've', 'ha', 'sg', + 'dz', 'ch', 'cr', 'xh', 'ak', 'lbe', 'tn', 'ki', 'ik', 'bxr', 'rw', + 'st', 'tw', 'ny', 'sn', 'chy', 'ff', 'lg', 'tum', 'rn', ] if family.config.SSL_connection: Modified: trunk/pywikipedia/families/wikiquote_family.py =================================================================== --- trunk/pywikipedia/families/wikiquote_family.py 2010-05-12 15:29:13 UTC (rev 8158) +++ trunk/pywikipedia/families/wikiquote_family.py 2010-05-14 07:30:18 UTC (rev 8159) @@ -13,7 +13,7 @@ self.languages_by_size = [ 'en', 'it', 'pl', 'de', 'pt', 'ru', 'sk', 'es', 'bg', 'bs', 'sl', 'tr', 'fr', 'he', 'cs', 'lt', 'zh', 'el', 'hu', 'fa', 'uk', 'eo', - 'sv', 'id', 'nl', 'no', 'ja', 'fi', 'hy', 'nn', 'et', 'ca', 'ar', + 'id', 'sv', 'nl', 'no', 'ja', 'fi', 'hy', 'nn', 'et', 'ca', 'ar', 'ka', 'ko', 'ku', 'hr', 'gl', 'sr', 'ro', 'cy', 'ml', 'li', 'is', 'th', 'te', 'af', 'da', 'az', 'eu', 'sq', 'vi', 'la', 'br', 'hi', 'be', 'ast', 'uz', 'ta', 'ang', 'mr', 'zh-min-nan', 'gu', 'lb', Modified: trunk/pywikipedia/families/wikisource_family.py =================================================================== --- trunk/pywikipedia/families/wikisource_family.py 2010-05-12 15:29:13 UTC (rev 8158) +++ trunk/pywikipedia/families/wikisource_family.py 2010-05-14 07:30:18 UTC (rev 8159) @@ -13,7 +13,7 @@ self.languages_by_size = [ 'en', 'zh', 'ru', 'pt', 'fr', 'de', 'es', 'it', 'he', 'ar', 'hu', 'fa', 'pl', 'th', 'cs', 'ro', 'hr', 'te', 'fi', 'tr', 'nl', 'sv', - 'sl', 'uk', 'ko', 'vi', 'sr', 'ja', 'el', 'la', 'bn', 'li', 'yi', + 'sl', 'uk', 'ko', 'vi', 'sr', 'ja', 'bn', 'el', 'la', 'li', 'yi', 'ml', 'az', 'is', 'bs', 'hy', 'ca', 'id', 'mk', 'no', 'da', 'ta', 'et', 'bg', 'lt', 'gl', 'kn', 'cy', 'sk', 'zh-min-nan', 'fo', ] @@ -278,6 +278,7 @@ 'ar': u'فهرس', 'en': u'Index', 'et': u'Autor', + 'fr': u'Portail', 'he': u'ביאור', 'hu': u'Index', 'hy': u'Ինդեքս', @@ -296,6 +297,7 @@ 'ar': u'نقاش الفهرس', 'en': u'Index talk', 'et': u'Autori arutelu', + 'fr': u'Discussion Portail', 'he': u'שיחת ביאור', 'hu': u'Index vita', 'hy': u'Ինդեքսի քննարկում', Modified: trunk/pywikipedia/families/wiktionary_family.py =================================================================== --- trunk/pywikipedia/families/wiktionary_family.py 2010-05-12 15:29:13 UTC (rev 8158) +++ trunk/pywikipedia/families/wiktionary_family.py 2010-05-14 07:30:18 UTC (rev 8159) @@ -15,14 +15,14 @@ 'hu', 'el', 'no', 'ta', 'de', 'it', 'sv', 'ko', 'nl', 'kn', 'lo', 'ml', 'ja', 'ku', 'ar', 'es', 'ro', 'et', 'id', 'te', 'gl', 'bg', 'uk', 'ca', 'li', 'vo', 'fa', 'is', 'scn', 'sr', 'af', 'cs', 'th', - 'simple', 'sw', 'fy', 'oc', 'br', 'he', 'hr', 'sl', 'hy', 'sq', + 'simple', 'fy', 'sw', 'oc', 'br', 'he', 'hr', 'sl', 'hy', 'sq', 'tt', 'la', 'zh-min-nan', 'da', 'wa', 'ne', 'tk', 'ast', 'ur', - 'hsb', 'kk', 'ky', 'eo', 'lv', 'wo', 'ang', 'my', 'mg', 'ka', 'hi', + 'hsb', 'kk', 'ky', 'eo', 'lv', 'wo', 'mg', 'my', 'ang', 'ka', 'hi', 'co', 'ga', 'gn', 'az', 'ia', 'eu', 'sk', 'csb', 'ms', 'st', 'tl', - 'mr', 'cy', 'nds', 'kl', 'sd', 'ug', 'be', 'ti', 'mk', 'ps', 'sh', + 'mr', 'cy', 'nds', 'kl', 'be', 'sd', 'ug', 'ti', 'mk', 'sh', 'ps', 'an', 'bn', 'gu', 'km', 'ss', 'ts', 'qu', 'bs', 'fo', 'am', 'rw', 'chr', 'su', 'om', 'mn', 'nah', 'ie', 'yi', 'iu', 'mt', 'kw', 'gv', - 'gd', 'tg', 'si', 'nn', 'zu', 'dv', 'pa', 'tpi', 'sg', 'jv', + 'gd', 'tg', 'si', 'nn', 'zu', 'dv', 'tpi', 'pa', 'sg', 'jv', 'roa-rup', 'uz', 'mi', 'ik', 'so', 'ha', 'ay', 'lb', 'sa', 'na', 'jbo', 'tn', 'sm', 'ks', 'fj', 'ln', 'za', 'dz', 'als', ]

1 0

SVN: [8158] trunk/pywikipedia/wikipedia.py
by shizhao＠svn.wikimedia.org 12 May '10

12 May '10

Revision: 8158 Author: shizhao Date: 2010-05-12 15:29:13 +0000 (Wed, 12 May 2010) Log Message: ----------- new add protection(). Return list of dicts of this page protection level. Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2010-05-12 08:50:38 UTC (rev 8157) +++ trunk/pywikipedia/wikipedia.py 2010-05-12 15:29:13 UTC (rev 8158) @@ -241,6 +241,7 @@ getReferences : List of pages linking to the page canBeEdited (*) : True if page is unprotected or user has edit privileges + protection(*) : This page protection level botMayEdit (*) : True if bot is allowed to edit page put(newtext) : Saves the page put_async(newtext) : Queues the page to be saved asynchronously @@ -2115,6 +2116,25 @@ # page is locked and we don't have a sysop account. return False + def protection(self): + """Return list of dicts of this page protection level. like: + [{u'expiry': u'2010-05-26T14:41:51Z', u'type': u'edit', u'level': u'autoconfirmed'}, {u'expiry': u'2010-05-26T14:41:51Z', u'type': u'move', u'level': u'sysop'}] + + if the page non protection, return [] + """ + + params = { + 'action': 'query', + 'prop' : 'info', + 'inprop': 'protection', + 'titles' : self.title(), + } + + datas = query.GetData(params, self.site()) + data=datas['query']['pages'].values()[0]['protection'] + return data + + def toggleTalkPage(self): """Return the other member of the article-talk page pair for this Page.

1 0

SVN: [8157] trunk/pywikipedia/wikipedia.py
by xqt＠svn.wikimedia.org 12 May '10

12 May '10

Revision: 8157 Author: xqt Date: 2010-05-12 08:50:38 +0000 (Wed, 12 May 2010) Log Message: ----------- add language codes to bots output in error messages (#2994661) Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2010-05-11 20:13:00 UTC (rev 8156) +++ trunk/pywikipedia/wikipedia.py 2010-05-12 08:50:38 UTC (rev 8157) @@ -7505,20 +7505,19 @@ # if callback is provided, it is responsible for exception handling continue if isinstance(error, SpamfilterError): - output(u"Saving page [[%s]] prevented by spam filter: %s" - % (page.title(), error.url)) + output(u"Saving page %s prevented by spam filter: %s" + % (page.aslink(True), error.url)) elif isinstance(error, PageNotSaved): - output(u"Saving page [[%s]] failed: %s" - % (page.title(), error)) + output(u"Saving page %s failed: %s" % (page.aslink(True), error)) elif isinstance(error, LockedPage): - output(u"Page [[%s]] is locked; not saved." % page.title()) + output(u"Page %s is locked; not saved." % page.aslink(True)) elif isinstance(error, NoUsername): - output(u"Page [[%s]] not saved; sysop privileges required." - % page.title()) + output(u"Page %s not saved; sysop privileges required." + % page.aslink(True)) elif error is not None: tb = traceback.format_exception(*sys.exc_info()) - output(u"Saving page [[%s]] failed:\n%s" - % (page.title(), "".join(tb))) + output(u"Saving page %s failed:\n%s" + % (page.aslink(True), "".join(tb))) _putthread = threading.Thread(target=async_put) # identification for debugging purposes

1 0

SVN: [8156] branches/rewrite/pywikibot/login.py
by russblau＠svn.wikimedia.org 12 May '10

12 May '10

Revision: 8156 Author: russblau Date: 2010-05-11 20:13:00 +0000 (Tue, 11 May 2010) Log Message: ----------- Fixing bugs identified on mailing list by Morten Wang. Modified Paths: -------------- branches/rewrite/pywikibot/login.py Modified: branches/rewrite/pywikibot/login.py =================================================================== --- branches/rewrite/pywikibot/login.py 2010-05-11 14:26:15 UTC (rev 8155) +++ branches/rewrite/pywikibot/login.py 2010-05-11 20:13:00 UTC (rev 8156) @@ -48,10 +48,10 @@ import logging import pywikibot -from pywikibot import config +from pywikibot import config, deprecate_arg from pywikibot.exceptions import NoSuchSite, NoUsername -logger = "wiki.login" +_logger = "wiki.login" # On some wikis you are only allowed to run a bot if there is a link to @@ -70,6 +70,8 @@ class LoginManager: + @deprecate_arg("username", "user") + @deprecate_arg("verbose", None) def __init__(self, password=None, sysop=False, site=None, user=None): if site is not None: self.site = site @@ -255,20 +257,22 @@ for lang in namedict[familyName]: try: site = pywikibot.getSite(code=lang, fam=familyName) - if not forceLogin and (site.logged_in(sysop) and site.user()) != None: - pywikibot.output(u'Already logged in on %s' % site) + if site.logged_in(sysop) \ + and site.user() == site.username(sysop): + pywikibot.output(u"Login successful on %(site)s." % locals()) else: - loginMan = LoginManager(password, sysop=sysop, - site=site) - loginMan.login() + pywikibot.output(u"Not logged in on %(site)s." % locals()) except NoSuchSite: pywikibot.output( lang + u'.' + familyName + u' is not a valid site, please remove it from your config') else: - loginMan = pywikibot.data.api.LoginManager(password, sysop=sysop) - loginMan.login() + site = pywikibot.Site(sysop=sysop) + if site.logged_in(sysop) and site.user() == site.username(sysop): + pywikibot.output(u"Login successful on %(site)s." % locals()) + else: + pywikibot.output(u"Not logged in on %(site)s." % locals()) if __name__ == "__main__": try:

1 0

SVN: [8155] trunk/pywikipedia/checkimages.py
by filnik＠svn.wikimedia.org 11 May '10

11 May '10

Revision: 8155 Author: filnik Date: 2010-05-11 14:26:15 +0000 (Tue, 11 May 2010) Log Message: ----------- Bugfix due to the change of timestamp Modified Paths: -------------- trunk/pywikipedia/checkimages.py Modified: trunk/pywikipedia/checkimages.py =================================================================== --- trunk/pywikipedia/checkimages.py 2010-05-10 17:50:47 UTC (rev 8154) +++ trunk/pywikipedia/checkimages.py 2010-05-11 14:26:15 UTC (rev 8155) @@ -1329,12 +1329,16 @@ if normal: imageData = image image = imageData[0] - timestamp = imageData[1] + #20100511133318L --- 15:33, 11 mag 2010 e 18 sec + b = str(imageData[1]) # use b as variable to make smaller the timestamp-formula used below.. + # fixing the timestamp to the format that we normally use.. + timestamp = "%s-%s-%sT%s:%s:%sZ" % (b[0:4], b[4:6], b[6:8], b[8:10], b[10:12], b[12:14]) else: + #http://pytz.sourceforge.net/ <- maybe useful? + # '2008-06-18T08:04:29Z' timestamp = image.getLatestUploader()[1] - #http://pytz.sourceforge.net/ <- maybe useful? - # '2008-06-18T08:04:29Z' img_time = datetime.datetime.strptime(timestamp, u"%Y-%m-%dT%H:%M:%SZ") #not relative to localtime + now = datetime.datetime.strptime(str(datetime.datetime.utcnow()).split('.')[0], "%Y-%m-%d %H:%M:%S") #timezones are UTC # + seconds to be sure that now > img_time while now < img_time:

1 0

SVN: [8154] branches/rewrite/generate_user_files.py
by russblau＠svn.wikimedia.org 11 May '10

11 May '10

Revision: 8154 Author: russblau Date: 2010-05-10 17:50:47 +0000 (Mon, 10 May 2010) Log Message: ----------- Fix bug identified on mailing list 2010-05-05 by Morten Wang Modified Paths: -------------- branches/rewrite/generate_user_files.py Modified: branches/rewrite/generate_user_files.py =================================================================== --- branches/rewrite/generate_user_files.py 2010-05-10 06:52:26 UTC (rev 8153) +++ branches/rewrite/generate_user_files.py 2010-05-10 17:50:47 UTC (rev 8154) @@ -48,6 +48,8 @@ base_dir = get_base_dir() console_encoding = sys.stdout.encoding +# the directory in which generate_user_files.py is located +pywikibot_dir = sys.path[0] if console_encoding is None or sys.platform == 'cygwin': console_encoding = "iso-8859-1" @@ -128,7 +130,9 @@ _fnc = os.path.join(base_dir, "user-config.py") if not file_exists(_fnc): known_families = re.findall(r'(.+)_family.py\b', - '\n'.join(os.listdir(os.path.join(base_dir, "families")))) + '\n'.join(os.listdir( + os.path.join( + pywikibot_dir, "pywikibot", "families")))) fam = listchoice(known_families, "Select family of sites we are working on", default='wikipedia')

1 0

SVN: [8153]
by xqt＠svn.wikimedia.org 10 May '10

10 May '10

Revision: 8153 Author: xqt Date: 2010-05-10 06:52:26 +0000 (Mon, 10 May 2010) Log Message: ----------- language codes to bots output in error messages for better log analysis (request 2996465) Modified Paths: -------------- branches/rewrite/scripts/interwiki.py trunk/pywikipedia/interwiki.py Modified: branches/rewrite/scripts/interwiki.py =================================================================== --- branches/rewrite/scripts/interwiki.py 2010-05-10 06:25:59 UTC (rev 8152) +++ branches/rewrite/scripts/interwiki.py 2010-05-10 06:52:26 UTC (rev 8153) @@ -62,6 +62,12 @@ -quiet: Use this option to get less output + -async: Put page on queue to be saved to wiki asynchronously. This + enables loading pages during saving throtteling and gives a + better performance. + NOTE: For post-processing it always assumes that saving the + the pages was sucessful. + Additionaly, these arguments can be used to restrict the bot to certain pages: -namespace:n Number or name of namespace to process. The parameter can be @@ -330,6 +336,8 @@ return seq2 import pywikibot +import config2 as config +import catlib from pywikibot import pagegenerators, catlib, config2 as config import titletranslate, interwiki_graph import webbrowser @@ -612,6 +620,7 @@ minlinks = 0 quiet = False restoreAll = False + async = False def readOptions(self, arg): """ Read all commandline parameters for the global container """ @@ -706,6 +715,8 @@ self.nobackonly = True elif arg == '-quiet': self.quiet = True + elif arg == '-async': + self.async = True elif arg.startswith('-lack:'): remainder = arg[6:].split(':') self.lacklanguage = remainder[0] @@ -1783,8 +1794,8 @@ oldtext = page.get() template = (page.namespace() == 10) newtext = pywikibot.replaceLanguageLinks(oldtext, new, - site = page.site(), - template = template) + site = page.site(), + template = template) # This is for now. Later there should be different funktions for each kind if not botMayEdit(page): if template: @@ -1844,11 +1855,17 @@ if not globalvar.quiet: pywikibot.output(u"NOTE: Updating live wiki...") timeout=60 - while 1: + while True: try: - status, reason, data = page.put(newtext, comment = mcomment) + if globalvar.async: + page.put_async(newtext, comment = mcomment) + status = 302 + else: + status, reason, data = page.put(newtext, comment = mcomment) except pywikibot.LockedPage: - pywikibot.output(u'Page %s is locked. Skipping.' % (page,)) + pywikibot.output(u'Page %s is locked. Skipping.' + % page.title(asLink=True, + forceInterwiki=True)) raise SaveError(u'Locked') except pywikibot.EditConflict: pywikibot.output(u'ERROR putting page: An edit conflict occurred. Giving up.') @@ -2236,253 +2253,181 @@ hintStrings = ['%s:%s' % (hintedPage.site().language(), hintedPage.title()) for hintedPage in pagelist] bot.add(page, hints = hintStrings) -#=========== +def main(): + singlePageTitle = [] + start = None + # Which namespaces should be processed? + # default to [] which means all namespaces will be processed + namespaces = [] + number = None + until = None + warnfile = None + # a normal PageGenerator (which doesn't give hints, only Pages) + hintlessPageGen = None + optContinue = False + optRestore = False + restoredFiles = [] + File2Restore = [] + dumpFileName = '' + append = True + newPages = None + # 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. + genFactory = pagegenerators.GeneratorFactory() -globalvar=Global() + for arg in pywikibot.handleArgs(): + if globalvar.readOptions(arg): + continue + if arg.startswith('-xml'): + if len(arg) == 4: + xmlFilename = pywikibot.input(u'Please enter the XML dump\'s filename:') + else: + xmlFilename = arg[5:] + hintlessPageGen = XmlDumpLmoLinkPageGenerator(xmlFilename) + elif arg.startswith('-warnfile:'): + warnfile = arg[10:] + elif arg.startswith('-years'): + # Look if user gave a specific year at which to start + # Must be a natural number or negative integer. + if len(arg) > 7 and (arg[7:].isdigit() or (arg[7] == "-" and arg[8:].isdigit())): + startyear = int(arg[7:]) + else: + startyear = 1 + # avoid problems where year pages link to centuries etc. + globalvar.followredirect = False + hintlessPageGen = pagegenerators.YearPageGenerator(startyear) + elif arg.startswith('-days'): + if len(arg) > 6 and arg[5] == ':' and arg[6:].isdigit(): + # Looks as if the user gave a specific month at which to start + # Must be a natural number. + startMonth = int(arg[6:]) + else: + startMonth = 1 + hintlessPageGen = pagegenerators.DayPageGenerator(startMonth) + elif arg.startswith('-new'): + if len(arg) > 5 and arg[4] == ':' and arg[5:].isdigit(): + # Looks as if the user gave a specific number of pages + newPages = int(arg[5:]) + else: + newPages = 100 + elif arg.startswith('-restore'): + globalvar.restoreAll = arg[9:].lower() == 'all' + optRestore = not globalvar.restoreAll + elif arg == '-continue': + optContinue = True + elif arg.startswith('-namespace:'): + try: + namespaces.append(int(arg[11:])) + except ValueError: + namespaces.append(arg[11:]) + # deprecated for consistency with other scripts + elif arg.startswith('-number:'): + number = int(arg[8:]) + elif arg.startswith('-until:'): + until = arg[7:] + else: + if not genFactory.handleArg(arg): + singlePageTitle.append(arg) -if __name__ == "__main__": + # ensure that we don't try to change main page try: site = pywikibot.getSite() - singlePageTitle = [] - hints = [] - start = None - # Which namespaces should be processed? - # default to [] which means all namespaces will be processed - namespaces = [] - number = None - until = None - warnfile = None - # a normal PageGenerator (which doesn't give hints, only Pages) - hintlessPageGen = None - optContinue = False - optRestore = False - newPages = None - # 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. - genFactory = pagegenerators.GeneratorFactory() + mainpagename = site.mediawiki_message('mainpage') + globalvar.skip.add(pywikibot.Page(site, mainpagename)) + except pywikibot.Error: + pywikibot.output(u'Missing main page name') - for arg in pywikibot.handleArgs(): - if arg.startswith('-xml'): - if len(arg) == 4: - xmlFilename = pywikibot.input(u'Please enter the XML dump\'s filename:') - else: - xmlFilename = arg[5:] - hintlessPageGen = XmlDumpLmoLinkPageGenerator(xmlFilename) - elif arg == '-noauto': - globalvar.auto = False - elif arg.startswith('-hint:'): - hints.append(arg[6:]) - elif arg.startswith('-hintfile'): - hintfilename = arg[10:] - if (hintfilename is None) or (hintfilename == ''): - hintfilename = pywikibot.input(u'Please enter the hint filename:') - f = codecs.open(hintfilename, 'r', config.textfile_encoding) - R = re.compile(ur'\[\[(.+?)(?:\]\]|\|)') # hint or title ends either before | or before ]] - for pageTitle in R.findall(f.read()): - hints.append(pageTitle) - f.close() - elif arg == '-force': - globalvar.force = True - elif arg == '-same': - globalvar.same = True - elif arg == '-wiktionary': - globalvar.same = 'wiktionary' - elif arg == '-untranslated': - globalvar.untranslated = True - elif arg == '-untranslatedonly': - globalvar.untranslated = True - globalvar.untranslatedonly = True - elif arg == '-askhints': - globalvar.untranslated = True - globalvar.untranslatedonly = False - globalvar.askhints = True - elif arg == '-noauto': - pass - elif arg == '-hintnobracket': - globalvar.hintnobracket = True - elif arg.startswith('-warnfile:'): - warnfile = arg[10:] - elif arg == '-confirm': - globalvar.confirm = True - elif arg == '-select': - globalvar.select = True - elif arg == '-autonomous' or arg == '-auto': - globalvar.autonomous = True - elif arg == '-noredirect': - globalvar.followredirect = False - elif arg == '-initialredirect': - globalvar.initialredirect = True - elif arg == '-localonly': - globalvar.localonly = True - elif arg == '-limittwo': - globalvar.limittwo = True - globalvar.strictlimittwo = True - elif arg.startswith('-whenneeded'): - globalvar.limittwo = True - globalvar.strictlimittwo = False - try: - globalvar.needlimit = int(arg[12:]) - except KeyError: - pass - except ValueError: - pass - elif arg.startswith('-years'): - # Look if user gave a specific year at which to start - # Must be a natural number or negative integer. - if len(arg) > 7 and (arg[7:].isdigit() or (arg[7] == "-" and arg[8:].isdigit())): - startyear = int(arg[7:]) - else: - startyear = 1 - # avoid problems where year pages link to centuries etc. - globalvar.followredirect = False - hintlessPageGen = pagegenerators.YearPageGenerator(startyear) - elif arg.startswith('-days'): - if len(arg) > 6 and arg[5] == ':' and arg[6:].isdigit(): - # Looks as if the user gave a specific month at which to start - # Must be a natural number. - startMonth = int(arg[6:]) - else: - startMonth = 1 - hintlessPageGen = pagegenerators.DayPageGenerator(startMonth) - elif arg.startswith('-new'): - if len(arg) > 5 and arg[4] == ':' and arg[5:].isdigit(): - # Looks as if the user gave a specific number of pages - newPages = int(arg[5:]) - else: - newPages = 100 - elif arg.startswith('-skipfile:'): - skipfile = arg[10:] - skipPageGen = pagegenerators.TextfilePageGenerator(skipfile) - for page in skipPageGen: - globalvar.skip.add(page) - del skipPageGen - elif arg == '-skipauto': - globalvar.skipauto = True - elif arg == '-restore': - optRestore = True - elif arg == '-continue': - optContinue = True - elif arg.startswith('-namespace:'): - try: - namespaces.append(int(arg[11:])) - except ValueError: - namespaces.append(arg[11:]) - # deprecated for consistency with other scripts - elif arg.startswith('-number:'): - number = int(arg[8:]) - elif arg.startswith('-until:'): - until = arg[7:] - elif arg.startswith('-neverlink:'): - globalvar.neverlink += arg[11:].split(",") - elif arg.startswith('-ignore:'): - globalvar.ignore += [pywikibot.Page(None,p) for p in arg[8:].split(",")] - elif arg.startswith('-ignorefile:'): - ignorefile = arg[12:] - ignorePageGen = pagegenerators.TextfilePageGenerator(ignorefile) - for page in ignorePageGen: - globalvar.ignore.append(page) - del ignorePageGen - elif arg == '-showpage': - globalvar.showtextlink += globalvar.showtextlinkadd - elif arg == '-graph': - # override configuration - config.interwiki_graph = True - elif arg == '-bracket': - globalvar.parenthesesonly = True - elif arg == '-localright': - globalvar.followinterwiki = False - elif arg == '-hintsareright': - globalvar.hintsareright = True - elif arg.startswith('-array:'): - globalvar.minsubjects = int(arg[7:]) - elif arg.startswith('-query:'): - globalvar.maxquerysize = int(arg[7:]) - elif arg == '-back': - globalvar.nobackonly = True - else: - if not genFactory.handleArg(arg): - singlePageTitle.append(arg) + if newPages is not None: + if len(namespaces) == 0: + ns = 0 + elif len(namespaces) == 1: + ns = namespaces[0] + if ns != 'all': + if isinstance(ns, unicode) or isinstance(ns, str): + index = site.getNamespaceIndex(ns) + if index is None: + raise ValueError(u'Unknown namespace: %s' % ns) + ns = index + namespaces = [] + else: + ns = 'all' + hintlessPageGen = pagegenerators.NewpagesPageGenerator(newPages, namespace=ns) - # ensure that we don't try to change main page + elif optRestore or optContinue or globalvar.restoreAll: + site = pywikibot.getSite() + dumpFileName = pywikibot.config.datafilepath( + 'data', + 'interwiki-dumps', + u'%s-%s.pickle' + % (site.family.name, site.lang)) try: - mainpagename = site.mediawiki_message('mainpage') - globalvar.skip.add(pywikibot.Page(site, mainpagename)) - except pywikibot.Error: - pywikibot.output(u'Missing main page name') + f = open(dumpFileName, 'r') + dumpedTitles = pickle.load(f) + f.close() + except (EOFError, IOError): + dumpedTitles = [] + pages = [pywikibot.Page(site, title) for title in dumpedTitles] - if newPages is not None: - if len(namespaces) == 0: - ns = 0 - elif len(namespaces) == 1: - ns = namespaces[0] - if ns != 'all': - if isinstance(ns, unicode) or isinstance(ns, str): - index = site.getNamespaceIndex(ns) - if index is None: - raise ValueError(u'Unknown namespace: %s' % ns) - ns = index - namespaces = [] + hintlessPageGen = iter(pages) + if optContinue: + if pages: + last = pages[-1] + nextPage = last.title(withNamespace=False) + '!' + namespace = last.namespace() else: - ns = 'all' - hintlessPageGen = pagegenerators.NewpagesPageGenerator(newPages, namespace=ns) + pywikibot.output(u"Dump file is empty?! Starting at the beginning.") + nextPage = "!" + namespace = 0 + hintlessPageGen = pagegenerators.CombinedPageGenerator([hintlessPageGen, pagegenerators.AllpagesPageGenerator(nextPage, namespace, includeredirects = False)]) - elif optRestore or optContinue: - site = pywikibot.getSite() - dumpFileName = pywikibot.config.datafilepath( - 'data', - 'interwiki-dumps', - u'%s-%s.pickle' - % (site.family.name, site.lang)) - try: - f = open(dumpFileName, 'r') - dumpedTitles = pickle.load(f) - f.close() - except (EOFError, IOError): - dumpedTitles = [] - pages = [pywikibot.Page(site, title) for title in dumpedTitles] + bot = InterwikiBot() - hintlessPageGen = iter(pages) - if optContinue: - if pages: - last = pages[-1] - nextPage = last.title(withNamespace=False) + '!' - namespace = last.namespace() - else: - pywikibot.output(u"Dump file is empty?! Starting at the beginning.") - nextPage = "!" - namespace = 0 - hintlessPageGen = pagegenerators.CombinedPageGenerator([hintlessPageGen, pagegenerators.AllpagesPageGenerator(nextPage, namespace, includeredirects = False)]) + if not hintlessPageGen: + hintlessPageGen = genFactory.getCombinedGenerator() + if hintlessPageGen: + if len(namespaces) > 0: + hintlessPageGen = pagegenerators.NamespaceFilterPageGenerator(hintlessPageGen, namespaces) + # we'll use iter() to create make a next() function available. + bot.setPageGenerator(iter(hintlessPageGen), number = number, until=until) + elif warnfile: + # TODO: filter namespaces if -namespace parameter was used + readWarnfile(warnfile, bot) + else: + singlePageTitle = ' '.join(singlePageTitle) + if not singlePageTitle: + singlePageTitle = pywikibot.input(u'Which page to check:') + singlePage = pywikibot.Page(pywikibot.getSite(), singlePageTitle) + bot.add(singlePage, hints = globalvar.hints) - bot = InterwikiBot() + try: + append = not (optRestore or optContinue or globalvar.restoreAll) + bot.run() + except KeyboardInterrupt: + dumpFileName = bot.dump(append) + except: + dumpFileName = bot.dump(append) + raise + finally: + if globalvar.contentsondisk: + StoredPage.SPdeleteStore() + if dumpFileName: + try: + restoredFiles.remove(dumpFileName) + except ValueError: + pass + for dumpFileName in restoredFiles: + try: + os.remove(dumpFileName) + pywikibot.output(u'Dumpfile %s deleted' % dumpFileName.split('\\')[-1]) + except WindowsError: + pass - if not hintlessPageGen: - hintlessPageGen = genFactory.getCombinedGenerator() - if hintlessPageGen: - if len(namespaces) > 0: - hintlessPageGen = pagegenerators.NamespaceFilterPageGenerator(hintlessPageGen, namespaces) - # we'll use iter() to create make a next() function available. - bot.setPageGenerator(iter(hintlessPageGen), number = number, until=until) - elif warnfile: - # TODO: filter namespaces if -namespace parameter was used - readWarnfile(warnfile, bot) - else: - singlePageTitle = ' '.join(singlePageTitle) - if not singlePageTitle: - singlePageTitle = pywikibot.input(u'Which page to check:') - singlePage = pywikibot.Page(pywikibot.getSite(), singlePageTitle) - bot.add(singlePage, hints = hints) +#=========== +globalvar=Global() - try: - bot.run() - except KeyboardInterrupt: - bot.dump() - except: - bot.dump() - raise - finally: - if globalvar.contentsondisk: - StoredPage.SPdeleteStore() - +if __name__ == "__main__": + try: + main() finally: pywikibot.stopme() Modified: trunk/pywikipedia/interwiki.py =================================================================== --- trunk/pywikipedia/interwiki.py 2010-05-10 06:25:59 UTC (rev 8152) +++ trunk/pywikipedia/interwiki.py 2010-05-10 06:52:26 UTC (rev 8153) @@ -335,7 +335,8 @@ return seq2 import wikipedia as pywikibot -import config, catlib +import config +import catlib import pagegenerators import titletranslate, interwiki_graph import webbrowser @@ -1836,7 +1837,8 @@ else: status, reason, data = page.put(newtext, comment = mcomment) except pywikibot.LockedPage: - pywikibot.output(u'Page %s is locked. Skipping.' % (page.title(),)) + pywikibot.output(u'Page %s is locked. Skipping.' + % page.aslink(True)) raise SaveError except pywikibot.EditConflict: pywikibot.output(u'ERROR putting page: An edit conflict occurred. Giving up.')

1 0

SVN: [8152] trunk/pywikipedia/featured.py
by xqt＠svn.wikimedia.org 10 May '10

10 May '10

Revision: 8152 Author: xqt Date: 2010-05-10 06:25:59 +0000 (Mon, 10 May 2010) Log Message: ----------- featured template for en-wiki (bugfix #2999163 by manuel) Modified Paths: -------------- trunk/pywikipedia/featured.py Modified: trunk/pywikipedia/featured.py =================================================================== --- trunk/pywikipedia/featured.py 2010-05-07 08:26:12 UTC (rev 8151) +++ trunk/pywikipedia/featured.py 2010-05-10 06:25:59 UTC (rev 8152) @@ -148,6 +148,7 @@ 'ca': [u'Enllaç AD', 'Destacat'], 'cy': ['Cyswllt erthygl ddethol', 'Dolen ED'], 'eo': ['LigoElstara'], + 'en': ['Link FA', 'FA link'], 'es': ['Destacado'], 'eu': ['NA lotura'], 'fr': ['Lien AdQ'],

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Pywikipedia-svn May 2010