pywikibot April 2008

pywikibot@lists.wikimedia.org

34 participants
213 discussions

[Pywikipedia-l] [ pywikipediabot-Patches-1947976 ] more Norwegian translations

by SourceForge.net

Patches item #1947976, was opened at 2008-04-21 16:47 Message generated for change (Comment added) made by nicdumz You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=603140&aid=1947976&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: None Group: None Status: Open Resolution: None Priority: 5 Private: No Submitted By: Christoffer (roboticuskhan) Assigned to: Nobody/Anonymous (nobody) Summary: more Norwegian translations Initial Comment: added standard no and nn translations in various scripts. ---------------------------------------------------------------------- Comment By: NicDumZ — Nicolas Dumazet (nicdumz) Date: 2008-04-21 19:55 Message: Logged In: YES user_id=1963242 Originator: NO added in r5244. Thanks !!! ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=603140&aid=1947976&group_…

15 years, 12 months

[Pywikipedia-l] SVN: [5244] trunk/pywikipedia

by nicdumz＠svn.wikimedia.org

Revision: 5244 Author: nicdumz Date: 2008-04-21 17:54:30 +0000 (Mon, 21 Apr 2008) Log Message: ----------- Adding Christoffer's no/nn translations (patch #1947976) -- Thanks ! Modified Paths: -------------- trunk/pywikipedia/fixing_redirects.py trunk/pywikipedia/image.py trunk/pywikipedia/makecat.py trunk/pywikipedia/redirect.py trunk/pywikipedia/replace.py trunk/pywikipedia/selflink.py trunk/pywikipedia/unlink.py Modified: trunk/pywikipedia/fixing_redirects.py =================================================================== --- trunk/pywikipedia/fixing_redirects.py 2008-04-20 22:34:58 UTC (rev 5243) +++ trunk/pywikipedia/fixing_redirects.py 2008-04-21 17:54:30 UTC (rev 5244) @@ -25,25 +25,27 @@ 'en': u'Bot: Fixing redirects', 'he': u'בוט: מתקן הפניות', 'ja': u'ロボットによる:リダイレクト回避', + 'nn': u'robot: retta omdirigeringar', 'no': u'Robot: Retter omdirigeringer', 'pt': u'Bot: Arrumando redirects', + 'sv': u'Bot: Rättar omdirigeringar', 'zh': u'機器人: 修復重定向', - 'sv': u'Bot: Rättar omdirigeringar', } featured_articles = { 'ar': u'ويكيبيديا:مقالات مختارة', 'de': u'Wikipedia:Exzellente_Artikel', 'en': u'Wikipedia:Featured_articles', - 'he': u'פורטל:ערכים_מומלצים', 'es': u'Wikipedia:Artículos_destacados', 'fr': u'Wikipédia:Articles_de_qualité', + 'he': u'פורטל:ערכים_מומלצים', 'it': u'Wikipedia:Articoli_in_vetrina', 'ja': u'Wikipedia:秀逸な記事', 'nl': u'Wikipedia:Etalage', + 'nn': u'Wikipedia:Gode artiklar', 'no': u'Wikipedia:Anbefalte artikler', + 'pt': u'Wikipedia:Os_melhores_artigos', 'sv': u'Wikipedia:Utvalda_artiklar', - 'pt': u'Wikipedia:Os_melhores_artigos', 'zh': u'Wikipedia:特色条目', } Modified: trunk/pywikipedia/image.py =================================================================== --- trunk/pywikipedia/image.py 2008-04-20 22:34:58 UTC (rev 5243) +++ trunk/pywikipedia/image.py 2008-04-21 17:54:30 UTC (rev 5244) @@ -51,6 +51,8 @@ 'fr': u'Bot: Remplace image %s par %s', 'he': u'בוט: מחליף את התמונה %s בתמונה %s', 'lt': u'robotas: vaizdas %s keičiamas į %s', + 'nn': u'robot: erstatta biletet %s med %s', + 'no': u'robot: erstatter bildet %s med %s', 'nl': u'Bot: afbeelding %s vervangen door %s', 'pl': u'Robot zamienia obraz %s na %s', 'pt': u'Bot: Alterando imagem %s para %s', @@ -65,6 +67,8 @@ 'he': u'בוט: מסיר את התמונה %s', 'lt': u'robotas: Šalinamas vaizdas %s', 'nl': u'Bot: afbeelding %s verwijderd', + 'no': u'robot: fjerner bildet %s', + 'nn': u'robot: fjerna biletet %s', 'pl': u'Robot usuwa obraz %s', 'pt': u'Bot: Alterando imagem %s', } Modified: trunk/pywikipedia/makecat.py =================================================================== --- trunk/pywikipedia/makecat.py 2008-04-20 22:34:58 UTC (rev 5243) +++ trunk/pywikipedia/makecat.py 2008-04-21 17:54:30 UTC (rev 5244) @@ -50,6 +50,8 @@ 'ia':u'Creation o actualisation de categoria:', 'it':u'La creazione o laggiornamento di categoria:', 'nl':u'Aanmaak of uitbreiding van categorie:', + 'nn':u'oppretting eller oppdatering av kategori:': + 'no':u'opprettelse eller oppdatering av kategori:': 'pl':u'Stworzenie lub aktualizacja kategorii:', 'pt':u'Criando ou atualizando categoria:', } Modified: trunk/pywikipedia/redirect.py =================================================================== --- trunk/pywikipedia/redirect.py 2008-04-20 22:34:58 UTC (rev 5243) +++ trunk/pywikipedia/redirect.py 2008-04-21 17:54:30 UTC (rev 5244) @@ -66,6 +66,7 @@ 'ksh':u'Bot: Dubbel Ömlëijdong fottjemaat', 'lt': u'robotas: Taisomas dvigubas peradresavimas', 'nl': u'Robot: Dubbele doorverwijzing gecorrigeerd', + 'nn': u'robot: retta dobbel omdirigering', 'no': u'bot: Retter dobbel omdirigering', 'pl': u'Robot naprawia podwójne przekierowanie', 'pt': u'Bot: Corrigido duplo redirecionamento', @@ -97,6 +98,8 @@ 'ksh':u'Bot: Dė Ömlëijdong jingk ennet Liiere', 'lt': u'robotas: Peradresavimas į niekur', 'nl': u'Robot: Doel doorverwijzing bestaat niet', + 'nn': u'robot: målet for omdirigeringa eksisterer ikkje', + 'no': u'robot: målet for omdirigeringen eksisterer ikke', 'pl': u'Robot: cel przekierowania nie istnieje', 'pt': u'Bot: Redirecionamento não existe', 'ru': u'Робот: перенаправление в никуда', Modified: trunk/pywikipedia/replace.py =================================================================== --- trunk/pywikipedia/replace.py 2008-04-20 22:34:58 UTC (rev 5243) +++ trunk/pywikipedia/replace.py 2008-04-21 17:54:30 UTC (rev 5244) @@ -149,6 +149,7 @@ 'nds':u'Bot: Text automaatsch utwesselt: %s', 'nds-nl':u'Bot: autematisch tekse vervungen %s', 'nl':u'Bot: automatisch tekst vervangen %s', + 'nn':u'robot: automatisk teksterstatting: %s', 'no':u'bot: Automatisk teksterstatning: %s', 'pl':u'Robot automatycznie zamienia tekst %s', 'pt':u'Bot: Mudança automática %s', Modified: trunk/pywikipedia/selflink.py =================================================================== --- trunk/pywikipedia/selflink.py 2008-04-20 22:34:58 UTC (rev 5243) +++ trunk/pywikipedia/selflink.py 2008-04-21 17:54:30 UTC (rev 5244) @@ -42,9 +42,11 @@ 'ar':u'روبوت: إزالة وصلات ذاتية', 'de':u'Bot: Entferne Selbstlinks', 'en':u'Robot: Removing selflinks', + 'fr':u'Bot: Enlève autoliens', 'he':u'בוט: מסיר קישורים של הדף לעצמו', - 'fr':u'Bot: Enlève autoliens', 'nl':u'Bot: links naar pagina zelf verwijderd', + 'nn':u'robot: fjerna sjølvlenkjer', + 'no':u'robot: fjerner selvlenker', 'pl':u'Robot automatycznie usuwa linki zwrotne', 'pt':u'Bot: Retirando link para o próprio artigo' } Modified: trunk/pywikipedia/unlink.py =================================================================== --- trunk/pywikipedia/unlink.py 2008-04-20 22:34:58 UTC (rev 5243) +++ trunk/pywikipedia/unlink.py 2008-04-21 17:54:30 UTC (rev 5244) @@ -34,6 +34,8 @@ 'de':u'Bot: Entlinke "%s"', 'en':u'Robot: Unlinking "%s"', 'he':u'בוט: מסיר קישורים לדף "%s"', + 'nn':u'robot: fjerna lenkje til "%s"', + 'no':u'robot: fjerner lenke til "%s"', 'pt':u'Bot: Retirando link para "%s"', }

15 years, 12 months

[Pywikipedia-l] [ pywikipediabot-Patches-1947976 ] more Norwegian translations

by SourceForge.net

Patches item #1947976, was opened at 2008-04-21 16:47 Message generated for change (Tracker Item Submitted) made by Item Submitter You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=603140&aid=1947976&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: None Group: None Status: Open Resolution: None Priority: 5 Private: No Submitted By: Christoffer (roboticuskhan) Assigned to: Nobody/Anonymous (nobody) Summary: more Norwegian translations Initial Comment: added standard no and nn translations in various scripts. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=603140&aid=1947976&group_…

15 years, 12 months

[Pywikipedia-l] [ pywikipediabot-Bugs-1947526 ] speedy_delete cannot quit in Windows

by SourceForge.net

Bugs item #1947526, was opened at 2008-04-21 10:56 Message generated for change (Tracker Item Submitted) made by Item Submitter You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=603138&aid=1947526&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: None Group: None Status: Open Resolution: None Priority: 5 Private: No Submitted By: Alex S.H. Lin (lin4h) Assigned to: Nobody/Anonymous (nobody) Summary: speedy_delete cannot quit in Windows Initial Comment: OS:Windows XP SP2 Python: 2.5.2c1 When I finish to use speedy_delete.py, I type q to quit program.But it still in "Quitting program." and cannot return to command console. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=603138&aid=1947526&group_…

15 years, 12 months

[Pywikipedia-l] SVN: [5243] trunk/pywikipedia

by nicdumz＠svn.wikimedia.org

Revision: 5243 Author: nicdumz Date: 2008-04-20 22:34:58 +0000 (Sun, 20 Apr 2008) Log Message: ----------- * Correcting a wrong output in redirect.py * Correcting the behavior of Page when given "w:page" as a title, when working on meta or commons : the default language overthere is english, but we defaulted to self.site().lang, i.e. "meta" or "commons", which was wrong and was raising "wikipedia.NoSuchSite: Language meta does not exist in family wikipedia" Modified Paths: -------------- trunk/pywikipedia/redirect.py trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/redirect.py =================================================================== --- trunk/pywikipedia/redirect.py 2008-04-20 11:38:33 UTC (rev 5242) +++ trunk/pywikipedia/redirect.py 2008-04-20 22:34:58 UTC (rev 5243) @@ -326,8 +326,10 @@ wikipedia.output( u'Redirect target is also a redirect! Won\'t delete anything.') else: + #we successfully get the target page, meaning that + #it exists and is not a redirect: no reason to touch it. wikipedia.output( - u'Redirect target does not exist! Won\'t delete anything.') + u'Redirect target does exist! Won\'t delete anything.') # idle for 1 minute wikipedia.output(u'') wikipedia.put_throttle() Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2008-04-20 11:38:33 UTC (rev 5242) +++ trunk/pywikipedia/wikipedia.py 2008-04-20 22:34:58 UTC (rev 5243) @@ -391,7 +391,12 @@ # This page is from a different family if verbose: output(u"Target link '%s' has different family '%s'" % (title, lowerNs)) - otherlang = self.site().lang + if self.site().family.name in ['commons', 'meta']: + #When the source wiki is commons or meta, + #w:page redirects you to w:en:page + otherlang = 'en' + else: + otherlang = self.site().lang familyName = self.site().family.get_known_families(site = self.site())[lowerNs] if familyName in ['commons', 'meta']: otherlang = familyName

15 years, 12 months

[Pywikipedia-l] SVN: [5242] branches/rewrite/pywikibot/README-conversion.txt

by nicdumz＠svn.wikimedia.org

Revision: 5242 Author: nicdumz Date: 2008-04-20 11:38:33 +0000 (Sun, 20 Apr 2008) Log Message: ----------- Some documentation, to save time to potential hands ;) Modified Paths: -------------- branches/rewrite/pywikibot/README-conversion.txt Modified: branches/rewrite/pywikibot/README-conversion.txt =================================================================== --- branches/rewrite/pywikibot/README-conversion.txt 2008-04-20 10:01:57 UTC (rev 5241) +++ branches/rewrite/pywikibot/README-conversion.txt 2008-04-20 11:38:33 UTC (rev 5242) @@ -11,6 +11,19 @@ example, wikipedia.Page can be replaced by pywikibot.Page throughout any bot. +With pywikipedia scripts were importing "wikipedia" or "pagegenerators" +librairies; pywikibot is now written as a standard module. +(To use it, just import "pywikibot", assuming that pywikibot/ is in sys.path) + +== Python librairies == + +You will need, to run pywikibot, httplib2 and setuptools +* httplib2 : http://code.google.com/p/httplib2/ +* setuptools : http://pypi.python.org/pypi/setuptools/ + +If you run into errors involving httplib2.urlnorm, update httplib2 to +0.4.0 (Ubuntu package python-httlib2 for example, is outdated) + == Page objects == The constructor syntax for Pages has been modified; existing calls in the

16 years

[Pywikipedia-l] SVN: [5241] branches/rewrite/pywikibot

by nicdumz＠svn.wikimedia.org

Revision: 5241 Author: nicdumz Date: 2008-04-20 10:01:57 +0000 (Sun, 20 Apr 2008) Log Message: ----------- * Some verbosity when setuptools is not installed * Correcting calls to wait() / .retry_wait in Request Modified Paths: -------------- branches/rewrite/pywikibot/comms/threadedhttp.py branches/rewrite/pywikibot/data/api.py Modified: branches/rewrite/pywikibot/comms/threadedhttp.py =================================================================== --- branches/rewrite/pywikibot/comms/threadedhttp.py 2008-04-19 19:56:10 UTC (rev 5240) +++ branches/rewrite/pywikibot/comms/threadedhttp.py 2008-04-20 10:01:57 UTC (rev 5241) @@ -28,9 +28,14 @@ import urllib import cookielib +import sys # easy_install safeguarded dependencies -import pkg_resources +try: + import pkg_resources +except ImportError: + print "Error : You need the python module setuptools to use this module" + sys.exit(1) pkg_resources.require("httplib2") import httplib2 Modified: branches/rewrite/pywikibot/data/api.py =================================================================== --- branches/rewrite/pywikibot/data/api.py 2008-04-19 19:56:10 UTC (rev 5240) +++ branches/rewrite/pywikibot/data/api.py 2008-04-20 10:01:57 UTC (rev 5241) @@ -177,7 +177,7 @@ "Non-JSON response received from server %s; the server may be down." % self.site) print rawdata - self.wait(max_retries, retry_wait) + self.wait() continue if not result: result = {} @@ -221,7 +221,7 @@ self.max_retries -= 1 if self.max_retries < 0: raise TimeoutError("Maximum retries attempted without success.") - logging.warn("Waiting %s seconds before retrying." % wait) + logging.warn("Waiting %s seconds before retrying." % self.retry_wait) time.sleep(self.retry_wait) # double the next wait, but do not exceed 120 seconds self.retry_wait = min(120, self.retry_wait * 2)

16 years

[Pywikipedia-l] SVN: [5240] trunk/pywikipedia/fixing_redirects.py

by nicdumz＠svn.wikimedia.org

Revision: 5240 Author: nicdumz Date: 2008-04-19 19:56:10 +0000 (Sat, 19 Apr 2008) Log Message: ----------- adding no: translations for fixing_redirects.py by ZorroIII ... Thanks ! Modified Paths: -------------- trunk/pywikipedia/fixing_redirects.py Modified: trunk/pywikipedia/fixing_redirects.py =================================================================== --- trunk/pywikipedia/fixing_redirects.py 2008-04-19 19:46:02 UTC (rev 5239) +++ trunk/pywikipedia/fixing_redirects.py 2008-04-19 19:56:10 UTC (rev 5240) @@ -25,6 +25,7 @@ 'en': u'Bot: Fixing redirects', 'he': u'בוט: מתקן הפניות', 'ja': u'ロボットによる:リダイレクト回避', + 'no': u'Robot: Retter omdirigeringer', 'pt': u'Bot: Arrumando redirects', 'zh': u'機器人: 修復重定向', 'sv': u'Bot: Rättar omdirigeringar', @@ -40,6 +41,7 @@ 'it': u'Wikipedia:Articoli_in_vetrina', 'ja': u'Wikipedia:秀逸な記事', 'nl': u'Wikipedia:Etalage', + 'no': u'Wikipedia:Anbefalte artikler', 'sv': u'Wikipedia:Utvalda_artiklar', 'pt': u'Wikipedia:Os_melhores_artigos', 'zh': u'Wikipedia:特色条目',

16 years

[Pywikipedia-l] SVN: [5239] trunk/pywikipedia/commonsdelinker

by btongminh＠svn.wikimedia.org

Revision: 5239 Author: btongminh Date: 2008-04-19 19:46:02 +0000 (Sat, 19 Apr 2008) Log Message: ----------- Fix some minor bugs. Starve threads when we can't feed them. Modified Paths: -------------- trunk/pywikipedia/commonsdelinker/checkusage.py trunk/pywikipedia/commonsdelinker/delinker.py trunk/pywikipedia/commonsdelinker/threadpool.py Modified: trunk/pywikipedia/commonsdelinker/checkusage.py =================================================================== --- trunk/pywikipedia/commonsdelinker/checkusage.py 2008-04-19 17:40:05 UTC (rev 5238) +++ trunk/pywikipedia/commonsdelinker/checkusage.py 2008-04-19 19:46:02 UTC (rev 5239) @@ -233,8 +233,8 @@ if no_db: return self.mysql_host_prefix = mysql_host_prefix - if 'host' in mysql_kwargs: del mysql_kwargs['host'] - self.mysql_kwargs = mysql_kwargs + self.mysql_kwargs = mysql_kwargs.copy() # To be safe + if 'host' in self.mysql_kwargs: del self.mysql_kwargs['host'] self.use_autoconn = use_autoconn self.mysql_retry_timeout = mysql_retry_timeout self.mysql_max_retries = mysql_max_retries @@ -292,7 +292,7 @@ **self.mysql_kwargs) else: database = MySQLdb.connect(use_unicode = False, - host = host, **mysql_kwargs) + host = host, **self.mysql_kwargs) cursor = database.cursor() self.connections.append((database, cursor)) return database, cursor @@ -380,5 +380,5 @@ except: pass if self.http: - self.conn.close() + self.http.close() \ No newline at end of file Modified: trunk/pywikipedia/commonsdelinker/delinker.py =================================================================== --- trunk/pywikipedia/commonsdelinker/delinker.py 2008-04-19 17:40:05 UTC (rev 5238) +++ trunk/pywikipedia/commonsdelinker/delinker.py 2008-04-19 19:46:02 UTC (rev 5239) @@ -18,7 +18,7 @@ # # (C) Kyle/Orgullomoore, 2006-2007 # (C) Siebrand Mazeland, 2006-2007 -# (C) Bryan Tong Minh, 2007 +# (C) Bryan Tong Minh, 2007-2008 # # Distributed under the terms of the MIT license. # @@ -40,6 +40,7 @@ import sys, os, threading, time import traceback import re, cgitb +import threading import threadpool import checkusage @@ -48,9 +49,10 @@ import config def wait_callback(object): - output(u'Connection has been lost in %s. Attempting reconnection.' % repr(object), False) + output(u'%s Connection has been lost in %s. Attempting reconnection.' % (threading.currentThread(), repr(object)), False) if hasattr(object, 'error'): output(u'Error was %s: %s' % tuple(object.error)) + def universal_unicode(s): if type(s) is str: return s.decode('utf-8', 'ignore') @@ -432,6 +434,7 @@ pass class CheckUsage(threadpool.Thread): + timeout = 30 def __init__(self, pool, CommonsDelinker): threadpool.Thread.__init__(self, pool) self.CommonsDelinker = CommonsDelinker @@ -443,6 +446,7 @@ threadpool.Thread.run(self) def connect(self): + output(u'%s Connecting to databases' % self) config = self.CommonsDelinker.config if config['global']: # Note: global use requires MySQL @@ -516,6 +520,19 @@ traceback.print_exc(file = sys.stderr) self.exit() self.CommonsDelinker.thread_died() + + def starve(self): + self.pool.jobLock.acquire() + try: + if self.pool[id(self)].isSet(): return False + + output(u'%s Starving' % self) + self.CheckUsage.close() + del self.pool[id(self)] + self.pool.threads.remove(self) + return True + finally: + self.pool.jobLock.release() class Logger(threadpool.Thread): def __init__(self, pool, CommonsDelinker): @@ -529,6 +546,7 @@ threadpool.Thread.run(self) def connect(self): + output(u'%s Connecting to log database' % self) self.database = connect_database() self.cursor = self.database.cursor() @@ -597,16 +615,12 @@ self.site.forceLogin() # Initialize workers - self.CheckUsages = threadpool.ThreadPool(CheckUsage) - [self.CheckUsages.add_thread(self) for i in xrange(self.config['checkusage_instances'])] - - self.Delinkers = threadpool.ThreadPool(Delinker) - [self.Delinkers.add_thread(self) for i in xrange(self.config['delinker_instances'])] - - self.Loggers = threadpool.ThreadPool(Logger) + self.CheckUsages = threadpool.ThreadPool(CheckUsage, self.config['checkusage_instances'], self) + self.Delinkers = threadpool.ThreadPool(Delinker, self.config['delinker_instances'], self) if self.config.get('enable_logging', True): - [self.Loggers.add_thread(self) for i in xrange(self.config['logger_instances'])] + self.Loggers = threadpool.ThreadPool(Logger, self.config['logger_instances'], self) else: + self.Loggers = threadpool.ThreadPool(Logger, 1, self) self.Loggers.add_thread(self) self.http = checkusage.HTTP(self.site.hostname()) Modified: trunk/pywikipedia/commonsdelinker/threadpool.py =================================================================== --- trunk/pywikipedia/commonsdelinker/threadpool.py 2008-04-19 17:40:05 UTC (rev 5238) +++ trunk/pywikipedia/commonsdelinker/threadpool.py 2008-04-19 19:46:02 UTC (rev 5239) @@ -18,7 +18,7 @@ may cause thread unsafety! """ # -# (C) Bryan Tong Minh, 2007 +# (C) Bryan Tong Minh, 2007-2008 # # Distributed under the terms of the MIT license. # @@ -29,23 +29,28 @@ class ThreadPool(dict): pools = [] - def __init__(self, worker): + def __init__(self, worker, max_threads, *args, **kwargs): dict.__init__(self) - + self.jobLock = threading.Lock() self.jobQueue = [] self.worker = worker self.threads = [] - + + self.max_threads = max_threads + self.args = args + self.kwargs = kwargs + self.pools.append(self) - + def append(self, job): self.jobLock.acquire() + counter = 0 try: self.jobQueue.append(job) + # The amount of workers needed to be unlocked unlock_workers = len(self.jobQueue) - - counter = 0 + for event in self.itervalues(): if not event.isSet(): event.set() @@ -54,16 +59,19 @@ break finally: self.jobLock.release() - - def add_thread(self, *args, **kwargs): + if counter == 0 and len(self.threads) < self.max_threads: + self.add_thread() + self.start() + + def add_thread(self): self.jobLock.acquire() try: - thread = self.worker(self, *args, **kwargs) + thread = self.worker(self, *self.args, **self.kwargs) self.threads.append(thread) self[id(thread)] = threading.Event() finally: self.jobLock.release() - + def start(self): for thread in self.threads: if not thread.isAlive(): @@ -77,13 +85,14 @@ self[id(thread)].set() finally: self.jobLock.release() - + class Thread(threading.Thread): + timeout = None def __init__(self, pool): threading.Thread.__init__(self) self.pool = pool self.quit = False - + def run(self): while True: # No try..finally: lock.release() here: @@ -100,30 +109,37 @@ if not self.pool.jobQueue: # In case no job is available, wait for the pool - # to call and do not start a busy while loop. + # to call and do not start a busy while loop. event = self.pool[id(self)] self.pool.jobLock.release() event.clear() - event.wait() + event.wait(self.timeout) + if not event.isSet() and self.timeout != None: + if self.starve(): return continue job = self.pool.jobQueue.pop(0) self.pool.jobLock.release() self.do(job) - + def exit(self): self.pool.jobLock.acquire() try: self.quit = True self.pool[id(self)].set() + del self.pool[id(self)] + self.pool.threads.remove(self) finally: self.pool.jobLock.release() - + + def starve(self): + pass + def catch_signals(): import signal signal.signal(signal.SIGINT, sig_handler) signal.signal(signal.SIGTERM, sig_handler) - + def sig_handler(signalnum, stack): import signal for pool in ThreadPool.pools: @@ -138,28 +154,28 @@ # Maybe not a good idea, will also kill child processes import signal os.kill(0, signal.SIGTERM) - + if __name__ == '__main__': import time # Test cases - + class Worker(Thread): def do(self, args): print 'Working', self time.sleep(10) print 'Done', self - + pool = ThreadPool(Worker) print 'Spawning 5 threads' [pool.add_thread() for i in xrange(5)] pool.start() - + print 'Doing 25 jobs' for i in xrange(25): print 'Job', i pool.append(i) time.sleep(i % 6) - + for thread in pool.threads: thread.exit()

16 years

[Pywikipedia-l] [ pywikipediabot-Patches-1946758 ] Adding nn and no translations in category.py

by SourceForge.net

Patches item #1946758, was opened at 2008-04-19 19:32 Message generated for change (Comment added) made by nicdumz You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=603140&aid=1946758&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: None Group: None Status: Open Resolution: None Priority: 5 Private: No Submitted By: Christoffer (roboticuskhan) Assigned to: Nobody/Anonymous (nobody) Summary: Adding nn and no translations in category.py Initial Comment: Added various translations; see the attached file for the additions. ---------------------------------------------------------------------- Comment By: NicDumZ — Nicolas Dumazet (nicdumz) Date: 2008-04-19 19:40 Message: Logged In: YES user_id=1963242 Originator: NO Applied in r5238. Thanks ! ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=603140&aid=1946758&group_…

16 years

← Newer
1
...
5
6
7
8
9
10
11
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

pywikibot April 2008