Pywikipedia-svn January 2013

pywikipedia-svn@lists.wikimedia.org

9 participants
168 discussions

SVN: [10891] trunk/pywikipedia/wikipedia.py
by drtrigon＠svn.wikimedia.org 12 Jan '13

12 Jan '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/10891 Revision: 10891 Author: drtrigon Date: 2013-01-12 11:43:11 +0000 (Sat, 12 Jan 2013) Log Message: ----------- bug fix; follow-up to r10875 with simplification and some PEP 8 Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2013-01-12 11:37:01 UTC (rev 10890) +++ trunk/pywikipedia/wikipedia.py 2013-01-12 11:43:11 UTC (rev 10891) @@ -8689,9 +8689,14 @@ if enabled: if not logname: logname = '%s.log' % calledModuleName() + if pywikibot.throttle.pid > 1: + logname = '%s.%s.log' % (calledModuleName(), pywikibot.throttle.pid) logfn = config.datafilepath('logs', logname) logger = logging.getLogger() # root logger + if logger.handlers: # init just once (if re-called) + logger = logging.getLogger('pywikibot') + return logger.setLevel(logging.DEBUG) # create file handler which logs even debug messages fh = logging.handlers.TimedRotatingFileHandler(logfn, @@ -8705,28 +8710,29 @@ ch = logging.StreamHandler() ch.setLevel(logging.INFO) # create formatter and add it to the handlers - formatter = logging.Formatter('%(asctime)s %(name)-20s %(levelname)-8s %(message)s') + formatter = logging.Formatter( + fmt='%(asctime)s %(name)18s: %(levelname)-8s %(message)s', + datefmt="%Y-%m-%d %H:%M:%S" + ) fh.setFormatter(formatter) #ch.setFormatter(formatter) # add the handlers to logger logger.addHandler(fh) # output to logfile #logger.addHandler(ch) # output to terminal/shell console - # patch for Issue 8117: TimedRotatingFileHandler doesn't rotate log file at startup. - # applies to python2.6 only, solution from python2.7 source: + # patch for "Issue 8117: TimedRotatingFileHandler doesn't rotate log + # file at startup." + # applies to python2.6 only, solution filched from python2.7 source: # http://hg.python.org/cpython-fullhistory/diff/a566e53f106d/Lib/logging/hand… if os.path.exists(logfn): t = os.stat(logfn).st_mtime - logger.handlers[0].rolloverAt = logger.handlers[0].computeRollover(t) + logger.handlers[0].rolloverAt=logger.handlers[0].computeRollover(t) logger = logging.getLogger('pywikibot') else: # disable the log file logger = None -if '*' in config.log or calledModuleName() in config.log: - setLogfileStatus(True) - writeToCommandLogFile() colorTagR = re.compile('\03{.*?}', re.UNICODE) @@ -8740,10 +8746,10 @@ type = plaintext.split(':') func = 'info' if len(type): - for func in ['debug', 'warning', 'error', 'critical', 'info']: - if func == type[0].strip().lower(): - break - getattr(logger, func)(plaintext.strip()) + func = type[0].strip().lower() + if func not in ['debug', 'warning', 'error', 'critical', 'info']: + func = 'info' + getattr(logger, func)(plaintext.rstrip().lstrip('\n')) output_lock = threading.Lock() input_lock = threading.Lock() @@ -9049,6 +9055,9 @@ import pywikibot pywikibot.__dict__.update(locals()) +if '*' in config.log or calledModuleName() in config.log: + setLogfileStatus(True) + if __name__ == '__main__': import doctest print 'Pywikipediabot %s' % version.getversion()

1 0

SVN: [10890] trunk/pywikipedia/version.py
by drtrigon＠svn.wikimedia.org 12 Jan '13

12 Jan '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/10890 Revision: 10890 Author: drtrigon Date: 2013-01-12 11:37:01 +0000 (Sat, 12 Jan 2013) Log Message: ----------- improvement; follow-up to r10889 in order to simplify the code Modified Paths: -------------- trunk/pywikipedia/version.py Modified: trunk/pywikipedia/version.py =================================================================== --- trunk/pywikipedia/version.py 2013-01-11 23:13:04 UTC (rev 10889) +++ trunk/pywikipedia/version.py 2013-01-12 11:37:01 UTC (rev 10890) @@ -25,7 +25,7 @@ try: rev2 = int(getversion_onlinerepo()) rev1 = int(str(data['rev']).split()[0]) - data['cmp_ver'] = 'OUTDATED' if cmp_ver(rev1, rev2)=='<' else 'ok' + data['cmp_ver'] = 'OUTDATED' if rev1 < rev2 else 'ok' except ParseError: data['cmp_ver'] = 'n/a' return '%(tag)s (r%(rev)s, %(date)s, %(cmp_ver)s)' % data

1 0

SVN: [10889] trunk/pywikipedia/version.py
by drtrigon＠svn.wikimedia.org 12 Jan '13

12 Jan '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/10889 Revision: 10889 Author: drtrigon Date: 2013-01-11 23:13:04 +0000 (Fri, 11 Jan 2013) Log Message: ----------- bug fix; AttributeError: 'int' object has no attribute 'split' Modified Paths: -------------- trunk/pywikipedia/version.py Modified: trunk/pywikipedia/version.py =================================================================== --- trunk/pywikipedia/version.py 2013-01-11 22:29:36 UTC (rev 10888) +++ trunk/pywikipedia/version.py 2013-01-11 23:13:04 UTC (rev 10889) @@ -24,7 +24,7 @@ data = getversiondict() try: rev2 = int(getversion_onlinerepo()) - rev1 = int(data['rev'].split()[0]) + rev1 = int(str(data['rev']).split()[0]) data['cmp_ver'] = 'OUTDATED' if cmp_ver(rev1, rev2)=='<' else 'ok' except ParseError: data['cmp_ver'] = 'n/a'

1 0

SVN: [10888] trunk/pywikipedia/subster.py
by drtrigon＠svn.wikimedia.org 11 Jan '13

11 Jan '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/10888 Revision: 10888 Author: drtrigon Date: 2013-01-11 22:29:36 +0000 (Fri, 11 Jan 2013) Log Message: ----------- bug fix; pretty printer did not work (make dict first) bug fix; bot edit comment listed a lot more tags than actually updated (all after first change) Modified Paths: -------------- trunk/pywikipedia/subster.py Modified: trunk/pywikipedia/subster.py =================================================================== --- trunk/pywikipedia/subster.py 2013-01-11 22:18:43 UTC (rev 10887) +++ trunk/pywikipedia/subster.py 2013-01-11 22:29:36 UTC (rev 10888) @@ -291,7 +291,6 @@ """ substed_tags = [] # DRTRIGON-73 - prev_content = content # 0.2.) check for 'simple' mode and get additional params if param['simple']: @@ -337,7 +336,7 @@ if (param['url'][8:] == u'cache/state_bots'): # filename hard-coded d = shelve.open(pywikibot.config.datafilepath('cache', 'state_bots')) - external_buffer = pprint.pformat(d) + external_buffer = pprint.pformat(ast.literal_eval(pprint.pformat(d))) d.close() else: external_buffer = u'n/a' @@ -403,6 +402,7 @@ logging.getLogger('subster').debug( external_data ) # 5.) subst content + prev_content = content var_regex = self.get_var_regex(value) content = var_regex.sub((self._var_regex_str%{'var':value,'cont':external_data}), content, int(param['count'])) if (content != prev_content): @@ -418,6 +418,8 @@ pywikibot.output(u'BeautifulSoup tags found by regex: %i' % len(BS_tags)) + prev_content = content + BS = BeautifulSoup.BeautifulSoup(external_buffer) for item in BS_tags: external_data = eval('BS.%s' % item[1])

1 0

SVN: [10887] trunk/pywikipedia/version.py
by drtrigon＠svn.wikimedia.org 11 Jan '13

11 Jan '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/10887 Revision: 10887 Author: drtrigon Date: 2013-01-11 22:18:43 +0000 (Fri, 11 Jan 2013) Log Message: ----------- follow-up; to r10880 in order to "print a message if the release is old" as requested Modified Paths: -------------- trunk/pywikipedia/version.py Modified: trunk/pywikipedia/version.py =================================================================== --- trunk/pywikipedia/version.py 2013-01-11 21:35:15 UTC (rev 10886) +++ trunk/pywikipedia/version.py 2013-01-11 22:18:43 UTC (rev 10887) @@ -21,7 +21,14 @@ """ Parsing went wrong """ def getversion(): - return '%(tag)s (r%(rev)s, %(date)s)' % getversiondict() + data = getversiondict() + try: + rev2 = int(getversion_onlinerepo()) + rev1 = int(data['rev'].split()[0]) + data['cmp_ver'] = 'OUTDATED' if cmp_ver(rev1, rev2)=='<' else 'ok' + except ParseError: + data['cmp_ver'] = 'n/a' + return '%(tag)s (r%(rev)s, %(date)s, %(cmp_ver)s)' % data def getversiondict(): global cache @@ -104,6 +111,10 @@ raise ParseError return rev +## Simple version comparison +# +cmp_ver = lambda a, b, tol=1: {-1: '<', 0: '~', 1: '>'}[cmp((a-b)//tol, 0)] + if __name__ == '__main__': print 'Pywikipedia %s' % getversion() print 'Python %s' % sys.version

1 0

SVN: [10886] trunk/pywikipedia/generate_family_file.py
by valhallasw＠svn.wikimedia.org 11 Jan '13

11 Jan '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/10886 Revision: 10886 Author: valhallasw Date: 2013-01-11 21:35:15 +0000 (Fri, 11 Jan 2013) Log Message: ----------- New monkey-patching to make generate_family_file work again... Modified Paths: -------------- trunk/pywikipedia/generate_family_file.py Modified: trunk/pywikipedia/generate_family_file.py =================================================================== --- trunk/pywikipedia/generate_family_file.py 2013-01-11 12:01:12 UTC (rev 10885) +++ trunk/pywikipedia/generate_family_file.py 2013-01-11 21:35:15 UTC (rev 10886) @@ -40,11 +40,12 @@ import wikipediatools wikipediatools.get_base_dir = lambda: '.' -# Monkey-patch os.path.exists to prevent config.py from loading user_config.py -import os.path -os.path.exists = lambda x: False +# Set some config settings +import config +config.mylang = 'en' -# Now we can load family.py +# Now we can boot the framework +import wikipedia import family class FamilyFileGenerator(object):

1 0

SVN: [10885] branches/rewrite/pywikibot/families/wikipedia_family.py
by xqt＠svn.wikimedia.org 11 Jan '13

11 Jan '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/10885 Revision: 10885 Author: xqt Date: 2013-01-11 12:01:12 +0000 (Fri, 11 Jan 2013) Log Message: ----------- use several disambig templates from MediaWiki:Disambiguationspage, update from trunk r10884 Modified Paths: -------------- branches/rewrite/pywikibot/families/wikipedia_family.py Modified: branches/rewrite/pywikibot/families/wikipedia_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikipedia_family.py 2013-01-11 11:58:49 UTC (rev 10884) +++ branches/rewrite/pywikibot/families/wikipedia_family.py 2013-01-11 12:01:12 UTC (rev 10885) @@ -130,10 +130,8 @@ # first char must be in uppercase '_default': [u'Disambig'], # for default MediaWiki message only 'cdo': [u'Gì-ngiê', u'Disambig'], - 'fo': [u'Fleiri týdningar'], 'frp': [u'Homonimos', u'Disambig'], 'fur': [u'Disambiguazion', u'Disambig'], - 'fy': [u'Tfs', u'Neibetsjuttings'], 'gd': [u'Soilleireachadh'], 'haw': [u'Huaʻōlelo puana like'], 'hr': [u'Preusmjerenje u razdvojbu', u'Razdvojba', u'Razdvojba1', @@ -152,11 +150,9 @@ u'Tobokstavsforkortelse', u'Trebokstavsforkortelse', u'Flertydig', u'Pekerside'], 'nov': [u'Desambig'], - 'nrm': [u'Page dé frouque'], 'qu': [u"Sut'ichana qillqa", u'Disambig', u'SJM'], 'rmy': [u'Dudalipen'], 'sk': [u'Disambig', u'Rozlišovacia stránka', u'Disambiguation'], - 'srn': [u'Dp'], 'tg': [u'Ибҳомзудоӣ', u'Disambig', u'Рафъи ибҳом', u'Disambiguation'], 'tr': [u'Anlam ayrım', u'Disambig', u'Anlam ayrımı', @@ -165,7 +161,6 @@ u'kısaltmalar (anlam ayrımı)', u'Coğrafya (anlam ayrımı)', u'Yerleşim yerleri (anlam ayrımı)', u'Sayılar (anlam ayrımı)', u"ABD'deki iller (anlam ayrımı)"], - 'vls': [u'Db', u'Dp', u'Dpintro'], 'wo': [u'Bokktekki'], 'yi': [u'באדייטען'], 'zea': [u'Dp', u'Deurverwiespagina'],

1 0

SVN: [10884] trunk/pywikipedia/families/wikipedia_family.py
by xqt＠svn.wikimedia.org 11 Jan '13

11 Jan '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/10884 Revision: 10884 Author: xqt Date: 2013-01-11 11:58:49 +0000 (Fri, 11 Jan 2013) Log Message: ----------- use several disambig templates from MediaWiki:Disambiguationspage Modified Paths: -------------- trunk/pywikipedia/families/wikipedia_family.py Modified: trunk/pywikipedia/families/wikipedia_family.py =================================================================== --- trunk/pywikipedia/families/wikipedia_family.py 2013-01-11 08:31:46 UTC (rev 10883) +++ trunk/pywikipedia/families/wikipedia_family.py 2013-01-11 11:58:49 UTC (rev 10884) @@ -1093,10 +1093,8 @@ # first char must be in uppercase '_default': [u'Disambig'], # for default MediaWiki message only 'cdo': [u'Gì-ngiê', u'Disambig'], - 'fo': [u'Fleiri týdningar'], 'frp': [u'Homonimos', u'Disambig'], 'fur': [u'Disambiguazion', u'Disambig'], - 'fy': [u'Tfs', u'Neibetsjuttings'], 'gd': [u'Soilleireachadh'], 'haw': [u'Huaʻōlelo puana like'], 'hr': [u'Preusmjerenje u razdvojbu', u'Razdvojba', u'Razdvojba1', @@ -1115,11 +1113,9 @@ u'Tobokstavsforkortelse', u'Trebokstavsforkortelse', u'Flertydig', u'Pekerside'], 'nov': [u'Desambig'], - 'nrm': [u'Page dé frouque'], 'qu': [u"Sut'ichana qillqa", u'Disambig', u'SJM'], 'rmy': [u'Dudalipen'], 'sk': [u'Disambig', u'Rozlišovacia stránka', u'Disambiguation'], - 'srn': [u'Dp'], 'tg': [u'Ибҳомзудоӣ', u'Disambig', u'Рафъи ибҳом', u'Disambiguation'], 'tr': [u'Anlam ayrım', u'Disambig', u'Anlam ayrımı', @@ -1128,7 +1124,6 @@ u'kısaltmalar (anlam ayrımı)', u'Coğrafya (anlam ayrımı)', u'Yerleşim yerleri (anlam ayrımı)', u'Sayılar (anlam ayrımı)', u"ABD'deki iller (anlam ayrımı)"], - 'vls': [u'Db', u'Dp', u'Dpintro'], 'wo': [u'Bokktekki'], 'yi': [u'באדייטען'], 'zea': [u'Dp', u'Deurverwiespagina'],

1 0

SVN: [10883] branches/rewrite/scripts/clean_sandbox.py
by xqt＠svn.wikimedia.org 11 Jan '13

11 Jan '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/10883 Revision: 10883 Author: xqt Date: 2013-01-11 08:31:46 +0000 (Fri, 11 Jan 2013) Log Message: ----------- L10N for bar-wiki, update from trunk r10882 Modified Paths: -------------- branches/rewrite/scripts/clean_sandbox.py Modified: branches/rewrite/scripts/clean_sandbox.py =================================================================== --- branches/rewrite/scripts/clean_sandbox.py 2013-01-11 08:29:42 UTC (rev 10882) +++ branches/rewrite/scripts/clean_sandbox.py 2013-01-11 08:31:46 UTC (rev 10883) @@ -31,7 +31,7 @@ # (C) Wikipedian, 2006-2007 # (C) Andre Engels, 2007 # (C) Siebrand Mazeland, 2007 -# (C) xqt, 2009-2012 +# (C) xqt, 2009-2013 # (C) Dr. Trigon, 2012 # # Distributed under the terms of the MIT license. @@ -85,7 +85,7 @@ 'als':u'Project:Sandchaschte', 'ar': u'Project:ملعب', 'az': u'Vikipediya:Qaralama dəftəri', - 'bar':u'Project:Spielwiese', + 'bar':u'Project:Spuiwiesn', 'cs': u'Project:Pískoviště', 'da': u'Project:Sandkassen', 'de': u'Project:Spielwiese',

1 0

SVN: [10882] trunk/pywikipedia/clean_sandbox.py
by xqt＠svn.wikimedia.org 11 Jan '13

11 Jan '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/10882 Revision: 10882 Author: xqt Date: 2013-01-11 08:29:42 +0000 (Fri, 11 Jan 2013) Log Message: ----------- L10N for bar-wiki Modified Paths: -------------- trunk/pywikipedia/clean_sandbox.py Modified: trunk/pywikipedia/clean_sandbox.py =================================================================== --- trunk/pywikipedia/clean_sandbox.py 2013-01-11 07:07:54 UTC (rev 10881) +++ trunk/pywikipedia/clean_sandbox.py 2013-01-11 08:29:42 UTC (rev 10882) @@ -31,7 +31,7 @@ # (C) Wikipedian, 2006-2007 # (C) Andre Engels, 2007 # (C) Siebrand Mazeland, 2007 -# (C) xqt, 2009 +# (C) xqt, 2009-2013 # (C) Dr. Trigon, 2011-2012 # # DrTrigonBot: http://de.wikipedia.org/wiki/Benutzer:DrTrigonBot @@ -87,7 +87,7 @@ 'als':u'Project:Sandchaschte', 'ar': u'Project:ملعب', 'az': u'Vikipediya:Qaralama dəftəri', - 'bar':u'Project:Spielwiese', + 'bar':u'Project:Spuiwiesn', 'cs': u'Project:Pískoviště', 'da': u'Project:Sandkassen', 'de': u'Project:Spielwiese',

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Pywikipedia-svn January 2013