Pywikipedia-l April 2008

pywikipedia-l@lists.wikimedia.org

34 participants
213 discussions

[ pywikipediabot-Patches-1945787 ] template.py translation for Russian (ru)
by SourceForge.net 18 Apr '08

18 Apr '08

Patches item #1945787, was opened at 2008-04-18 14:25 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=1945787&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: Solon (solon_kr) Assigned to: Nobody/Anonymous (nobody) Summary: template.py translation for Russian (ru) Initial Comment: Patch for template.py ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=603140&aid=1945787&group_…

1 0

Re: [Pywikipedia-l] Unbeep :-)
by Siebrand Mazeland 18 Apr '08

18 Apr '08

Add "ring_bell = False" to your user-config.py. Restart your bot and enjoy your silence. Cheers! Siebrand P.s. This setting is False by default in the currect version (since r4469) of the framework. Maybe it is a good idea to update, especially if you are talking to MediaWiki 1.13. > Hi folks, > > where can I switch off that terrible beep that sounds every time whne the > bot finds a page and is very happy with that? Im am much less happy. > > Bináris

1 0

Unbeep :-)
by Bináris 18 Apr '08

18 Apr '08

Hi folks, where can I switch off that terrible beep that sounds every time whne the bot finds a page and is very happy with that? Im am much less happy. Bináris

1 0

SVN: [5231] branches/rewrite/pywikibot/data/api.py
by russblau＠svn.wikimedia.org 18 Apr '08

18 Apr '08

Revision: 5231 Author: russblau Date: 2008-04-18 08:57:36 +0000 (Fri, 18 Apr 2008) Log Message: ----------- urlencode doesn't play nicely with Unicode Modified Paths: -------------- branches/rewrite/pywikibot/data/api.py Modified: branches/rewrite/pywikibot/data/api.py =================================================================== --- branches/rewrite/pywikibot/data/api.py 2008-04-17 17:54:39 UTC (rev 5230) +++ branches/rewrite/pywikibot/data/api.py 2008-04-18 08:57:36 UTC (rev 5231) @@ -142,7 +142,8 @@ raise TypeError("Query format '%s' cannot be parsed." % self.params['format']) uri = self.site.scriptpath() + "/api.php" - params = urllib.urlencode(self.params) + params = urllib.urlencode([(k, v.encode("utf8")) + for (k, v) in self.params.items()]) while True: # TODO catch http errors try:

1 0

[ pywikipediabot-Bugs-1924322 ] interwiki links on subpages in templates
by SourceForge.net 18 Apr '08

18 Apr '08

Bugs item #1924322, was opened at 2008-03-24 06:19 Message generated for change (Comment added) made by nobody You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=603138&aid=1924322&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: interwiki Group: None Status: Open Resolution: None Priority: 5 Private: No Submitted By: Nobody/Anonymous (nobody) Assigned to: Nobody/Anonymous (nobody) Summary: interwiki links on subpages in templates Initial Comment: In English and some other major wikipedias interwiki links are placed on /doc subpage (or whatever it's called) in templates. Interwiki bot should check if such a page exists and not place interwiki links on main template page but place/update links on that subpage. Otherwise, everytime a bot places interwiki on a template with this structure, the main template page needs to be cleaned and interwiki links moved to a subpage manually ---------------------------------------------------------------------- Comment By: Nobody/Anonymous (nobody) Date: 2008-04-17 13:13 Message: Logged In: NO Every like it about his problem. If there is a page with subpages in templates. The interwiki links on the subpages needs to places in inside the nowiki section. So if the last word of the page is </nowiki> the interwiki link needs to be placed before the </nowiki> tag. I'm the operator of the CarsracBot with its home on the nl.wikipedia.org And I have seen this behaviour on that articles where en:list_of_asteroides/1101-1200 is a part of. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=603138&aid=1924322&group_…

1 0

SVN: [5230] branches/rewrite/pywikibot
by russblau＠svn.wikimedia.org 17 Apr '08

17 Apr '08

Revision: 5230 Author: russblau Date: 2008-04-17 17:54:39 +0000 (Thu, 17 Apr 2008) Log Message: ----------- Moved comm protocol classes to separate directory, simplified throttle, made other behind-the-scenes changes Modified Paths: -------------- branches/rewrite/pywikibot/__init__.py branches/rewrite/pywikibot/config.py branches/rewrite/pywikibot/data/api.py branches/rewrite/pywikibot/login.py branches/rewrite/pywikibot/page.py branches/rewrite/pywikibot/site.py branches/rewrite/pywikibot/throttle.py Added Paths: ----------- branches/rewrite/pywikibot/comms/ branches/rewrite/pywikibot/comms/__init__.py branches/rewrite/pywikibot/comms/http.py branches/rewrite/pywikibot/comms/threadedhttp.py Removed Paths: ------------- branches/rewrite/pywikibot/data/http.py branches/rewrite/pywikibot/data/threadedhttp.py Modified: branches/rewrite/pywikibot/__init__.py =================================================================== --- branches/rewrite/pywikibot/__init__.py 2008-04-17 16:43:25 UTC (rev 5229) +++ branches/rewrite/pywikibot/__init__.py 2008-04-17 17:54:39 UTC (rev 5230) @@ -9,11 +9,11 @@ # __version__ = '$Id: $' +import logging +logging.getLogger().setLevel(logging.DEBUG) from exceptions import * -from page import Page, ImagePage, Category - import config _sites = {} @@ -60,6 +60,20 @@ getSite = Site # alias for backwards-compability +from page import Page, ImagePage, Category + +##def Page(*args, **kwargs): +## from page import Page as _Page +## return _Page(*args, **kwargs) +## +##def ImagePage(*args, **kwargs): +## from page import ImagePage as _ImagePage +## return _ImagePage(*args, **kwargs) +## +##def Category(*args, **kwargs): +## from page import Category as _Category +## return _Category(*args, **kwargs) + # DEBUG def output(text): @@ -71,9 +85,6 @@ return getpass.getpass(prompt) return raw_input(prompt) -import logging -logging.getLogger().setLevel(logging.DEBUG) - def stopme(): """Drop this process from the throttle log. @@ -82,7 +93,11 @@ """ # only need one drop() call because all throttles use the same global pid - Site().get_throttle.drop() + try: + _sites[_sites.keys()[0]].throttle.drop() + logging.info("Dropped throttle(s).") + except IndexError: + pass import atexit atexit.register(stopme) Added: branches/rewrite/pywikibot/comms/__init__.py =================================================================== Added: branches/rewrite/pywikibot/comms/http.py =================================================================== --- branches/rewrite/pywikibot/comms/http.py (rev 0) +++ branches/rewrite/pywikibot/comms/http.py 2008-04-17 17:54:39 UTC (rev 5230) @@ -0,0 +1,104 @@ +# -*- coding: utf-8 -*- +""" +Basic HTTP access interface. + +This module handles communication between the bot and the HTTP threads. + +This module is responsible for + - Setting up a connection pool + - Providing a (blocking) interface for HTTP requests + - Translate site objects with query strings into urls + - Urlencoding all data + - Basic HTTP error handling +""" + +# +# (C) Pywikipedia bot team, 2007 +# +# Distributed under the terms of the MIT license. +# + +__version__ = '$Id: $' +__docformat__ = 'epytext' + +import Queue +import urllib +import urlparse +import logging +import atexit + +import config +import cookielib +import threadedhttp + + +# global variables + +useragent = 'Pywikipediabot/2.0' # This should include some global version string +numthreads = 1 +threads = [] + +connection_pool = threadedhttp.ConnectionPool() +http_queue = Queue.Queue() + +cookie_jar = threadedhttp.LockableCookieJar( + config.datafilepath("%s-%s-%s.lwp" + % (config.family, + config.mylang, + config.usernames[config.family][config.mylang]))) +try: + cookie_jar.load() +except (IOError, cookielib.LoadError): + logging.debug("Loading cookies failed.") +else: + logging.debug("Loaded cookies from file.") + + +# Build up HttpProcessors +logging.info('Starting %i threads...' % numthreads) +for i in range(numthreads): + proc = threadedhttp.HttpProcessor(http_queue, cookie_jar, connection_pool) + proc.setDaemon(True) + threads.append(proc) + proc.start() + +# Prepare flush on quit +def _flush(): + for i in threads: + http_queue.put(None) + logging.info('Waiting for threads to finish... ') + for i in threads: + i.join() + logging.debug('All threads finished.') +atexit.register(_flush) + +# export cookie_jar to global namespace +import pywikibot +pywikibot.cookie_jar = cookie_jar + +def request(site, uri, *args, **kwargs): + """Queue a request to be submitted to Site. + + All parameters not listed below are the same as + L{httplib2.Http.request}, but the uri is relative + + @param site: The Site to connect to + @return: The received data (a unicode string). + """ + baseuri = "%s://%s/" % (site.protocol(), site.hostname()) + uri = urlparse.urljoin(baseuri, uri) + + request = threadedhttp.HttpRequest(uri, *args, **kwargs) + http_queue.put(request) + request.lock.acquire() + + #do some error correcting stuff + + #if all else fails + if isinstance(request.data, Exception): + raise request.data + + if request.data[0].status != 200: + logging.warning("Http response status %s" % request.data[0].status) + + return request.data[1] Added: branches/rewrite/pywikibot/comms/threadedhttp.py =================================================================== --- branches/rewrite/pywikibot/comms/threadedhttp.py (rev 0) +++ branches/rewrite/pywikibot/comms/threadedhttp.py 2008-04-17 17:54:39 UTC (rev 5230) @@ -0,0 +1,428 @@ +# -*- coding: utf-8 -*- +""" Httplib2 threaded cookie layer + +This class extends httplib2, adding support for: + - Cookies, guarded for cross-site redirects + - Thread safe ConnectionPool and LockableCookieJar classes + - HttpProcessor thread class + - HttpRequest object + +""" + +# (C) 2007 Pywikipedia bot team, 2007 +# (C) 2006 Httplib 2 team, 2006 +# (C) 2007 Metaweb Technologies, Inc. +# +# Partially distributed under the MIT license +# Partially distributed under Metaweb Technologies, Incs license +# which is compatible with the MIT license + +__version__ = '$Id: threadedhttp.py 4984 2008-02-06 16:21:18Z russblau $' +__docformat__ = 'epytext' + +# standard python libraries +import re +import threading +import time +import logging + +import urllib +import cookielib + +# easy_install safeguarded dependencies +import pkg_resources +pkg_resources.require("httplib2") +import httplib2 + + +class ConnectionPool(object): + """A thread-safe connection pool.""" + + def __init__(self, maxnum=5): + """ + @param maxnum: Maximum number of connections per identifier. + The pool drops excessive connections added. + + """ + logging.debug("Creating connection pool.") + self.connections = {} + self.lock = threading.Lock() + self.maxnum = maxnum + + def __del__(self): + """Destructor to close all connections in the pool.""" + self.lock.acquire() + try: + logging.debug("Closing connection pool (%s connections)" + % len(self.connections)) + for key in self.connections: + for connection in self.connections[key]: + connection.close() + finally: + self.lock.release() + + def __repr__(self): + return self.connections.__repr__() + + def pop_connection(self, identifier): + """Get a connection from identifier's connection pool. + + @param identifier: The pool identifier + @return: A connection object if found, None otherwise + + """ + self.lock.acquire() + try: + if identifier in self.connections: + if len(self.connections[identifier]) > 0: + logging.debug("Retrieved connection from '%s' pool." + % identifier) + return self.connections[identifier].pop() + return None + finally: + self.lock.release() + + def push_connection(self, identifier, connection): + """Add a connection to identifier's connection pool. + + @param identifier: The pool identifier + @param connection: The connection to add to the pool + + """ + self.lock.acquire() + try: + if identifier not in self.connections: + self.connections[identifier] = [] + + if len(self.connections[identifier]) == self.maxnum: + logging.debug('closing %s connection %r' + % (identifier, connection)) + connection.close() + del connection + else: + self.connections[identifier].append(connection) + finally: + self.lock.release() + + +class LockableCookieJar(cookielib.LWPCookieJar): + """CookieJar with integrated Lock object.""" + def __init__(self, *args, **kwargs): + cookielib.LWPCookieJar.__init__(self, *args, **kwargs) + self.lock = threading.Lock() + + +class Http(httplib2.Http): + """Subclass of httplib2.Http that stores cookies. + + Overrides httplib2's internal redirect support to prevent cookies being + eaten by the wrong sites. + + """ + def __init__(self, *args, **kwargs): + """ + @param cookiejar: (optional) CookieJar to use. A new one will be + used when not supplied. + @param connection_pool: (optional) Connection pool to use. A new one + will be used when not supplied. + @param max_redirects: (optional) The maximum number of redirects to + follow. 5 is default. + + """ + try: + self.cookiejar = kwargs.pop('cookiejar') + except KeyError: + self.cookiejar = LockableCookieJar() + try: + self.connection_pool = kwargs.pop('connection_pool') + except KeyError: + self.connection_pool = ConnectionPool() + self.max_redirects = kwargs.pop('max_redirects', 5) + httplib2.Http.__init__(self, *args, **kwargs) + + def request(self, uri, method="GET", body=None, headers=None, + max_redirects=None, connection_type=None): + """Start an HTTP request. + + @param uri: The uri to retrieve + @param method: (optional) The HTTP method to use. Default is 'GET' + @param body: (optional) The request body. Default is no body. + @param headers: (optional) Additional headers to send. Defaults + include C{connection: keep-alive}, C{user-agent} and + C{content-type}. + @param max_redirects: (optional) The maximum number of redirects to + use for this request. The class instance's max_redirects is + default + @param connection_type: (optional) see L{httplib2.Http.request} + + @return: (response, content) tuple + + """ + if max_redirects is None: + max_redirects = self.max_redirects + if headers is None: + headers = {} + # Prepare headers + headers.pop('cookie', None) + req = DummyRequest(uri, headers) + self.cookiejar.lock.acquire() + try: + self.cookiejar.add_cookie_header(req) + finally: + self.cookiejar.lock.release() + headers = req.headers + + # Wikimedia squids: add connection: keep-alive to request headers + # unless overridden + headers['connection'] = headers.pop('connection', 'keep-alive') + + # determine connection pool key and fetch connection + (scheme, authority, request_uri, defrag_uri) = httplib2.urlnorm( + httplib2.iri2uri(uri)) + conn_key = scheme+":"+authority + + connection = self.connection_pool.pop_connection(conn_key) + if connection is not None: + self.connections[conn_key] = connection + + # Redirect hack: we want to regulate redirects + follow_redirects = self.follow_redirects + self.follow_redirects = False + logging.debug('%r' % ( + (uri, method, body, headers, max_redirects, connection_type),)) + try: + (response, content) = httplib2.Http.request( + self, uri, method, body, headers, + max_redirects, connection_type) + except Exception, e: # what types? + # return exception instance to be retrieved by the calling thread + return e + self.follow_redirects = follow_redirects + + # return connection to pool + self.connection_pool.push_connection(conn_key, + self.connections[conn_key]) + del self.connections[conn_key] + + # First write cookies + self.cookiejar.lock.acquire() + try: + self.cookiejar.extract_cookies(DummyResponse(response), req) + finally: + self.cookiejar.lock.release() + + # Check for possible redirects + redirectable_response = ((response.status == 303) or + (response.status in [300, 301, 302, 307] and + method in ["GET", "HEAD"])) + if self.follow_redirects and (max_redirects > 0) \ + and redirectable_response: + (response, content) = self._follow_redirect( + uri, method, body, headers, response, content, max_redirects) + + return (response, content) + + def _follow_redirect(self, uri, method, body, headers, response, + content, max_redirects): + """Internal function to follow a redirect recieved by L{request}""" + (scheme, authority, absolute_uri, defrag_uri) = httplib2.urlnorm( + httplib2.iri2uri(uri)) + if self.cache: + cachekey = defrag_uri + else: + cachekey = None + + # Pick out the location header and basically start from the beginning + # remembering first to strip the ETag header and decrement our 'depth' + if not response.has_key('location') and response.status != 300: + raise httplib2.RedirectMissingLocation( + "Redirected but the response is missing a Location: header.", + response, content) + # Fix-up relative redirects (which violate an RFC 2616 MUST) + if response.has_key('location'): + location = response['location'] + (scheme, authority, path, query, fragment) = httplib2.parse_uri( + location) + if authority == None: + response['location'] = httplib2.urlparse.urljoin(uri, location) + logging.debug('Relative redirect: changed [%s] to [%s]' + % (location, response['location'])) + if response.status == 301 and method in ["GET", "HEAD"]: + response['-x-permanent-redirect-url'] = response['location'] + if not response.has_key('content-location'): + response['content-location'] = absolute_uri + httplib2._updateCache(headers, response, content, self.cache, + cachekey) + + headers.pop('if-none-match', None) + headers.pop('if-modified-since', None) + + if response.has_key('location'): + location = response['location'] + redirect_method = ((response.status == 303) and + (method not in ["GET", "HEAD"]) + ) and "GET" or method + return self.request(location, redirect_method, body=body, + headers=headers, + max_redirects=max_redirects - 1) + else: + raise RedirectLimit( + "Redirected more times than redirection_limit allows.", + response, content) + + +class HttpRequest(object): + """Object wrapper for HTTP requests that need to block origin thread. + + Usage: + + >>> request = HttpRequest('http://www.google.com') + >>> queue.put(request) + >>> request.lock.acquire() + >>> print request.data + + C{request.lock.acquire()} will block until the data is available. + + """ + def __init__(self, *args, **kwargs): + """See C{Http.request} for parameters.""" + self.args = args + self.kwargs = kwargs + self.data = None + self.lock = threading.Semaphore(0) + + +class HttpProcessor(threading.Thread): + """Thread object to spawn multiple HTTP connection threads.""" + def __init__(self, queue, cookiejar, connection_pool): + """ + @param queue: The C{Queue.Queue} object that contains L{HttpRequest} + objects. + @param cookiejar: The C{LockableCookieJar} cookie object to share among + requests. + @param connection_pool: The C{ConnectionPool} object which contains + connections to share among requests. + + """ + threading.Thread.__init__(self) + self.queue = queue + self.http = Http(cookiejar=cookiejar, connection_pool=connection_pool) + + def run(self): + # The Queue item is expected to either an HttpRequest object + # or None (to shut down the thread) + logging.debug('Thread started, waiting for requests.') + while (True): + item = self.queue.get() + if item is None: + logging.debug('Shutting down thread.') + return + try: + item.data = self.http.request(*item.args, **item.kwargs) + finally: + if item.lock: + item.lock.release() + + +# Metaweb Technologies, Inc. License: + # ======================================================================== + # The following dummy classes are: + # ======================================================================== + # Copyright (c) 2007, Metaweb Technologies, Inc. + # All rights reserved. + # + # Redistribution and use in source and binary forms, with or without + # modification, are permitted provided that the following conditions + # are met: + # * Redistributions of source code must retain the above copyright + # notice, this list of conditions and the following disclaimer. + # * Redistributions in binary form must reproduce the above + # copyright notice, this list of conditions and the following + # disclaimer in the documentation and/or other materials provided + # with the distribution. + # + # THIS SOFTWARE IS PROVIDED BY METAWEB TECHNOLOGIES AND CONTRIBUTORS + # ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + # FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL METAWEB + # TECHNOLOGIES OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + # INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + # BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + # CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + # POSSIBILITY OF SUCH DAMAGE. + # ======================================================================== + +class DummyRequest(object): + """Simulated urllib2.Request object for httplib2 + implements only what's necessary for cookielib.CookieJar to work + """ + def __init__(self, url, headers=None): + self.url = url + self.headers = headers + self.origin_req_host = cookielib.request_host(self) + self.type, r = urllib.splittype(url) + self.host, r = urllib.splithost(r) + if self.host: + self.host = urllib.unquote(self.host) + + def get_full_url(self): + return self.url + + def get_origin_req_host(self): + # TODO to match urllib2 this should be different for redirects + return self.origin_req_host + + def get_type(self): + return self.type + + def get_host(self): + return self.host + + def get_header(self, key, default=None): + return self.headers.get(key.lower(), default) + + def has_header(self, key): + return key in self.headers + + def add_unredirected_header(self, key, val): + # TODO this header should not be sent on redirect + self.headers[key.lower()] = val + + def is_unverifiable(self): + # TODO to match urllib2, this should be set to True when the + # request is the result of a redirect + return False + +class DummyResponse(object): + """Simulated urllib2.Request object for httplib2 + implements only what's necessary for cookielib.CookieJar to work + """ + def __init__(self, response): + self.response = response + + def info(self): + return DummyMessage(self.response) + +class DummyMessage(object): + """Simulated mimetools.Message object for httplib2 + implements only what's necessary for cookielib.CookieJar to work + """ + def __init__(self, response): + self.response = response + + def getheaders(self, k): + k = k.lower() + v = self.response.get(k.lower(), None) + if k not in self.response: + return [] + #return self.response[k].split(re.compile(',\\s*')) + + # httplib2 joins multiple values for the same header + # using ','. but the netscape cookie format uses ',' + # as part of the expires= date format. so we have + # to split carefully here - header.split(',') won't do it. + HEADERVAL= re.compile(r'\s*(([^,]|(,\s*\d))+)') + return [h[0] for h in HEADERVAL.findall(self.response[k])] Modified: branches/rewrite/pywikibot/config.py =================================================================== --- branches/rewrite/pywikibot/config.py 2008-04-17 16:43:25 UTC (rev 5229) +++ branches/rewrite/pywikibot/config.py 2008-04-17 17:54:39 UTC (rev 5230) @@ -282,16 +282,16 @@ # 'minthrottle' seconds. This can be lengthened if the server is slow, # but never more than 'maxthrottle' seconds. However - if you are running # more than one bot in parallel the times are lengthened. -minthrottle = 1 +# By default, the get_throttle is turned off, and 'maxlag' is used to +# control the rate of server access. Set minthrottle to non-zero to use a +# throttle on read access. +minthrottle = 0 maxthrottle = 10 -# Slow down the robot such that it never makes a second change within +# Slow down the robot such that it never makes a second page edit within # 'put_throttle' seconds. put_throttle = 10 -# By default, the get_throttle is turned off, and 'maxlag' is used to -# control the rate of server access. Set this to non-zero to use a throttle -# on read access. -get_throttle = 0 + # Sometimes you want to know when a delay is inserted. If a delay is larger # than 'noisysleep' seconds, it is logged on the screen. noisysleep = 3.0 @@ -299,9 +299,11 @@ # Defer bot edits during periods of database server lag. For details, see # http://www.mediawiki.org/wiki/Maxlag_parameter # You can set this variable to a number of seconds, or to None (or 0) to -# disable this behavior. -# It is recommended that you do not change this parameter unless you know -# what you are doing and have a good reason for it! +# disable this behavior. Higher values are more aggressive in seeking +# access to the wiki. +# Non-Wikimedia wikis may or may not support this feature; for families +# that do not use it, it is recommended to set minthrottle (above) to +# at least 1 second. maxlag = 5 # Maximum of pages which can be retrieved by special pages. Increase this if Modified: branches/rewrite/pywikibot/data/api.py =================================================================== --- branches/rewrite/pywikibot/data/api.py 2008-04-17 16:43:25 UTC (rev 5229) +++ branches/rewrite/pywikibot/data/api.py 2008-04-17 17:54:39 UTC (rev 5230) @@ -11,7 +11,6 @@ from UserDict import DictMixin from datetime import datetime, timedelta -import http import simplejson as json import logging import re @@ -65,7 +64,7 @@ >>> r = Request(site=mysite, action="query", meta="userinfo") >>> # This is equivalent to - >>> # http://[path]/api.php?action=query&meta=userinfo&format=json + >>> # http://{path}/api.php?action=query&meta=userinfo&format=json >>> # r.data is undefined until request is submitted >>> print r.data Traceback (most recent call last): @@ -75,8 +74,9 @@ >>> r['meta'] = "userinfo|siteinfo" >>> # add a new parameter >>> r['siprop'] = "namespaces" + >>> # note that "uiprop" param gets added automatically >>> r.params - {'action': 'query', 'meta': 'userinfo|siteinfo', 'maxlag': '5', 'siprop': 'namespaces', 'format': 'json'} + {'maxlag': '5', 'format': 'json', 'meta': 'userinfo|siteinfo', 'action': 'query', 'siprop': 'namespaces', 'uiprop': 'blockinfo|hasmsg'} >>> data = r.submit() >>> type(data) <type 'dict'> @@ -137,6 +137,7 @@ @return: The data retrieved from api.php (a dict) """ + from pywikibot.comms import http if self.params['format'] != 'json': raise TypeError("Query format '%s' cannot be parsed." % self.params['format']) @@ -292,7 +293,7 @@ # FIXME: this won't handle generators with <redirlinks> subelements # correctly yet while True: - self.site.get_throttle() + self.site.throttle() self.data = self.request.submit() if not self.data or not isinstance(self.data, dict): raise StopIteration @@ -394,7 +395,7 @@ """Iterate objects for elements found in response.""" # this looks for the resultkey ''inside'' a <page> entry while True: - self.site.get_throttle() + self.site.throttle() self.data = self.request.submit() if not self.data or not isinstance(self.data, dict): raise StopIteration @@ -459,7 +460,10 @@ self.username = login_result['login']['lgusername'] return "\n".join(cookies) + def storecookiedata(self, data): + pywikibot.cookie_jar.save() + if __name__ == "__main__": from pywikibot import Site mysite = Site("en", "wikipedia") @@ -468,5 +472,5 @@ import doctest doctest.testmod() _test() + pywikibot.stopme() - Deleted: branches/rewrite/pywikibot/data/http.py =================================================================== --- branches/rewrite/pywikibot/data/http.py 2008-04-17 16:43:25 UTC (rev 5229) +++ branches/rewrite/pywikibot/data/http.py 2008-04-17 17:54:39 UTC (rev 5230) @@ -1,84 +0,0 @@ -# -*- coding: utf-8 -*- -""" -Basic HTTP access interface. - -This module handles communication between the bot and the HTTP threads. - -This module is responsible for - - Setting up a connection pool - - Providing a (blocking) interface for HTTP requests - - Translate site objects with query strings into urls - - Urlencoding all data - - Basic HTTP error handling -""" - -# -# (C) Pywikipedia bot team, 2007 -# -# Distributed under the terms of the MIT license. -# - -__version__ = '$Id: $' -__docformat__ = 'epytext' - -import Queue -import urllib -import urlparse -import logging -import atexit - -import threadedhttp - - -# global variables - -useragent = 'Pywikipediabot/2.0' # This should include some global version string -numthreads = 1 -threads = [] - -connection_pool = threadedhttp.ConnectionPool() -cookie_jar = threadedhttp.LockableCookieJar() -http_queue = Queue.Queue() - -# Build up HttpProcessors -logging.info('Starting %i threads...' % numthreads) -for i in range(numthreads): - proc = threadedhttp.HttpProcessor(http_queue, cookie_jar, connection_pool) - threads.append(proc) - proc.start() - -# Prepare flush on quit -def _flush(): - for i in threads: - http_queue.put(None) - logging.info('Waiting for threads to finish... ') - for i in threads: - i.join() -atexit.register(_flush) - -def request(site, uri, *args, **kwargs): - """Queue a request to be submitted to Site. - - All parameters not listed below are the same as - L{httplib2.Http.request}, but the uri is relative - - @param site: The Site to connect to - @return: The received data (a unicode string). - """ - baseuri = "%s://%s/" % (site.protocol(), site.hostname()) - uri = urlparse.urljoin(baseuri, uri) - - request = threadedhttp.HttpRequest(uri, *args, **kwargs) - http_queue.put(request) - request.lock.acquire() - - #do some error correcting stuff - - #if all else fails - if isinstance(request.data, Exception): - raise request.data - - if request.data[0].status != 200: - logging.warning("Http response status %s" % request.data[0].status) - - return request.data[1] Deleted: branches/rewrite/pywikibot/data/threadedhttp.py =================================================================== --- branches/rewrite/pywikibot/data/threadedhttp.py 2008-04-17 16:43:25 UTC (rev 5229) +++ branches/rewrite/pywikibot/data/threadedhttp.py 2008-04-17 17:54:39 UTC (rev 5230) @@ -1,414 +0,0 @@ -# -*- coding: utf-8 -*- -""" Httplib2 threaded cookie layer - -This class extends httplib2, adding support for: - - Cookies, guarded for cross-site redirects - - Thread safe ConnectionPool and LockableCookieJar classes - - HttpProcessor thread class - - HttpRequest object - -""" - -# (C) 2007 Pywikipedia bot team, 2007 -# (C) 2006 Httplib 2 team, 2006 -# (C) 2007 Metaweb Technologies, Inc. -# -# Partially distributed under the MIT license -# Partially distributed under Metaweb Technologies, Incs license -# which is compatible with the MIT license - -__version__ = '$Id$' -__docformat__ = 'epytext' - -# standard python libraries -import re -import threading -import time -import logging - -import urllib -import cookielib - -# easy_install safeguarded dependencies -import pkg_resources -pkg_resources.require("httplib2") -import httplib2 - - -class ConnectionPool(object): - """A thread-safe connection pool.""" - - def __init__(self, maxnum=5): - """ - @param maxnum: Maximum number of connections per identifier. - The pool drops excessive connections added. - - """ - self.connections = {} - self.lock = threading.Lock() - self.maxnum = maxnum - - def __del__(self): - """Destructor to close all connections in the pool.""" - self.lock.acquire() - try: - for key in self.connections: - for connection in self.connections[key]: - connection.close() - finally: - self.lock.release() - - def __repr__(self): - return self.connections.__repr__() - - def pop_connection(self, identifier): - """Get a connection from identifier's connection pool. - - @param identifier: The pool identifier - @return: A connection object if found, None otherwise - - """ - self.lock.acquire() - try: - if identifier in self.connections: - if len(self.connections[identifier]) > 0: - return self.connections[identifier].pop() - return None - finally: - self.lock.release() - - def push_connection(self, identifier, connection): - """Add a connection to identifier's connection pool. - - @param identifier: The pool identifier - @param connection: The connection to add to the pool - - """ - self.lock.acquire() - try: - if identifier not in self.connections: - self.connections[identifier] = [] - - if len(self.connections[identifier]) == self.maxnum: - logging.debug('closing %s connection %r' % (identifier, connection)) - connection.close() - del connection - else: - self.connections[identifier].append(connection) - finally: - self.lock.release() - -class LockableCookieJar(cookielib.CookieJar): - """CookieJar with integrated Lock object.""" - def __init__(self, *args, **kwargs): - cookielib.CookieJar.__init__(self, *args, **kwargs) - self.lock = threading.Lock() - -class Http(httplib2.Http): - """Subclass of httplib2.Http that stores cookies. - - Overrides httplib2's internal redirect support to prevent cookies being - eaten by the wrong sites. - - """ - def __init__(self, *args, **kwargs): - """ - @param cookiejar: (optional) CookieJar to use. A new one will be - used when not supplied. - @param connection_pool: (optional) Connection pool to use. A new one - will be used when not supplied. - @param max_redirects: (optional) The maximum number of redirects to - follow. 5 is default. - - """ - self.cookiejar = kwargs.pop('cookiejar', LockableCookieJar()) - self.connection_pool = kwargs.pop('connection_pool', ConnectionPool()) - self.max_redirects = kwargs.pop('max_redirects', 5) - httplib2.Http.__init__(self, *args, **kwargs) - - def request(self, uri, method="GET", body=None, headers=None, - max_redirects=None, connection_type=None): - """Start an HTTP request. - - @param uri: The uri to retrieve - @param method: (optional) The HTTP method to use. Default is 'GET' - @param body: (optional) The request body. Default is no body. - @param headers: (optional) Additional headers to send. Defaults - include C{connection: keep-alive}, C{user-agent} and - C{content-type}. - @param max_redirects: (optional) The maximum number of redirects to - use for this request. The class instance's max_redirects is - default - @param connection_type: (optional) see L{httplib2.Http.request} - - @return: (response, content) tuple - - """ - if max_redirects is None: - max_redirects = self.max_redirects - if headers is None: - headers = {} - # Prepare headers - headers.pop('cookie', None) - req = DummyRequest(uri, headers) - self.cookiejar.lock.acquire() - try: - self.cookiejar.add_cookie_header(req) - finally: - self.cookiejar.lock.release() - headers = req.headers - - # Wikimedia squids: add connection: keep-alive to request headers - # unless overridden - headers['connection'] = headers.pop('connection', 'keep-alive') - - # determine connection pool key and fetch connection - (scheme, authority, request_uri, defrag_uri) = httplib2.urlnorm( - httplib2.iri2uri(uri)) - conn_key = scheme+":"+authority - - connection = self.connection_pool.pop_connection(conn_key) - if connection is not None: - self.connections[conn_key] = connection - - # Redirect hack: we want to regulate redirects - follow_redirects = self.follow_redirects - self.follow_redirects = False - logging.debug('%r' % ( - (uri, method, body, headers, max_redirects, connection_type),)) - try: - (response, content) = httplib2.Http.request( - self, uri, method, body, headers, - max_redirects, connection_type) - except Exception, e: # what types? - # return exception instance to be retrieved by the calling thread - return e - self.follow_redirects = follow_redirects - - # return connection to pool - self.connection_pool.push_connection(conn_key, - self.connections[conn_key]) - del self.connections[conn_key] - - # First write cookies - self.cookiejar.lock.acquire() - try: - self.cookiejar.extract_cookies(DummyResponse(response), req) - finally: - self.cookiejar.lock.release() - - # Check for possible redirects - redirectable_response = ((response.status == 303) or - (response.status in [300, 301, 302, 307] and - method in ["GET", "HEAD"])) - if self.follow_redirects and (max_redirects > 0) \ - and redirectable_response: - (response, content) = self._follow_redirect( - uri, method, body, headers, response, content, max_redirects) - - return (response, content) - - def _follow_redirect(self, uri, method, body, headers, response, - content, max_redirects): - """Internal function to follow a redirect recieved by L{request}""" - (scheme, authority, absolute_uri, defrag_uri) = httplib2.urlnorm( - httplib2.iri2uri(uri)) - if self.cache: - cachekey = defrag_uri - else: - cachekey = None - - # Pick out the location header and basically start from the beginning - # remembering first to strip the ETag header and decrement our 'depth' - if not response.has_key('location') and response.status != 300: - raise httplib2.RedirectMissingLocation( - "Redirected but the response is missing a Location: header.", - response, content) - # Fix-up relative redirects (which violate an RFC 2616 MUST) - if response.has_key('location'): - location = response['location'] - (scheme, authority, path, query, fragment) = httplib2.parse_uri( - location) - if authority == None: - response['location'] = httplib2.urlparse.urljoin(uri, location) - logging.debug('Relative redirect: changed [%s] to [%s]' - % (location, response['location'])) - if response.status == 301 and method in ["GET", "HEAD"]: - response['-x-permanent-redirect-url'] = response['location'] - if not response.has_key('content-location'): - response['content-location'] = absolute_uri - httplib2._updateCache(headers, response, content, self.cache, - cachekey) - - headers.pop('if-none-match', None) - headers.pop('if-modified-since', None) - - if response.has_key('location'): - location = response['location'] - redirect_method = ((response.status == 303) and - (method not in ["GET", "HEAD"]) - ) and "GET" or method - return self.request(location, redirect_method, body=body, - headers=headers, - max_redirects=max_redirects - 1) - else: - raise RedirectLimit( - "Redirected more times than redirection_limit allows.", - response, content) - - -class HttpRequest(object): - """Object wrapper for HTTP requests that need to block origin thread. - - Usage: - - >>> request = HttpRequest('http://www.google.com') - >>> queue.put(request) - >>> request.lock.acquire() - >>> print request.data - - C{request.lock.acquire()} will block until the data is available. - - """ - def __init__(self, *args, **kwargs): - """See C{Http.request} for parameters.""" - self.args = args - self.kwargs = kwargs - self.data = None - self.lock = threading.Semaphore(0) - - -class HttpProcessor(threading.Thread): - """Thread object to spawn multiple HTTP connection threads.""" - def __init__(self, queue, cookiejar, connection_pool): - """ - @param queue: The C{Queue.Queue} object that contains L{HttpRequest} - objects. - @param cookiejar: The C{LockableCookieJar} cookie object to share among - requests. - @param connection_pool: The C{ConnectionPool} object which contains - connections to share among requests. - - """ - threading.Thread.__init__(self) - self.queue = queue - self.http = Http(cookiejar=cookiejar, connection_pool=connection_pool) - - def run(self): - # The Queue item is expected to either an HttpRequest object - # or None (to shut down the thread) - logging.debug('Thread started, waiting for requests.') - while (True): - item = self.queue.get() - if item is None: - logging.debug('Shutting down thread.') - return - try: - item.data = self.http.request(*item.args, **item.kwargs) - finally: - if item.lock: - item.lock.release() - - -# Metaweb Technologies, Inc. License: - # ======================================================================== - # The following dummy classes are: - # ======================================================================== - # Copyright (c) 2007, Metaweb Technologies, Inc. - # All rights reserved. - # - # Redistribution and use in source and binary forms, with or without - # modification, are permitted provided that the following conditions - # are met: - # * Redistributions of source code must retain the above copyright - # notice, this list of conditions and the following disclaimer. - # * Redistributions in binary form must reproduce the above - # copyright notice, this list of conditions and the following - # disclaimer in the documentation and/or other materials provided - # with the distribution. - # - # THIS SOFTWARE IS PROVIDED BY METAWEB TECHNOLOGIES AND CONTRIBUTORS - # ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - # FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL METAWEB - # TECHNOLOGIES OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - # INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - # BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - # CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - # POSSIBILITY OF SUCH DAMAGE. - # ======================================================================== - -class DummyRequest(object): - """Simulated urllib2.Request object for httplib2 - implements only what's necessary for cookielib.CookieJar to work - """ - def __init__(self, url, headers=None): - self.url = url - self.headers = headers - self.origin_req_host = cookielib.request_host(self) - self.type, r = urllib.splittype(url) - self.host, r = urllib.splithost(r) - if self.host: - self.host = urllib.unquote(self.host) - - def get_full_url(self): - return self.url - - def get_origin_req_host(self): - # TODO to match urllib2 this should be different for redirects - return self.origin_req_host - - def get_type(self): - return self.type - - def get_host(self): - return self.host - - def get_header(self, key, default=None): - return self.headers.get(key.lower(), default) - - def has_header(self, key): - return key in self.headers - - def add_unredirected_header(self, key, val): - # TODO this header should not be sent on redirect - self.headers[key.lower()] = val - - def is_unverifiable(self): - # TODO to match urllib2, this should be set to True when the - # request is the result of a redirect - return False - -class DummyResponse(object): - """Simulated urllib2.Request object for httplib2 - implements only what's necessary for cookielib.CookieJar to work - """ - def __init__(self, response): - self.response = response - - def info(self): - return DummyMessage(self.response) - -class DummyMessage(object): - """Simulated mimetools.Message object for httplib2 - implements only what's necessary for cookielib.CookieJar to work - """ - def __init__(self, response): - self.response = response - - def getheaders(self, k): - k = k.lower() - v = self.response.get(k.lower(), None) - if k not in self.response: - return [] - #return self.response[k].split(re.compile(',\\s*')) - - # httplib2 joins multiple values for the same header - # using ','. but the netscape cookie format uses ',' - # as part of the expires= date format. so we have - # to split carefully here - header.split(',') won't do it. - HEADERVAL= re.compile(r'\s*(([^,]|(,\s*\d))+)') - return [h[0] for h in HEADERVAL.findall(self.response[k])] Modified: branches/rewrite/pywikibot/login.py =================================================================== --- branches/rewrite/pywikibot/login.py 2008-04-17 16:43:25 UTC (rev 5229) +++ branches/rewrite/pywikibot/login.py 2008-04-17 17:54:39 UTC (rev 5230) @@ -26,15 +26,15 @@ -force Ignores if the user is already logged in, and tries to log in. -If not given as parameter, the script will ask for your username and password -(password entry will be hidden), log in to your home wiki using this -combination, and store the resulting cookies (containing your password hash, -so keep it secured!) in a file in the login-data subdirectory. +If not given as parameter, the script will ask for your username and +password (password entry will be hidden), log in to your home wiki using +this combination, and store the resulting cookies (containing your password +hash, so keep it secured!) in a file in the data subdirectory. -All scripts in this library will be looking for this cookie file and will use the -login information if it is present. +All scripts in this library will be looking for this cookie file and will +use the login information if it is present. -To log out, throw away the XX-login.data file that is created in the login-data +To log out, throw away the *.lwp file that is created in the data subdirectory. """ # @@ -169,7 +169,7 @@ if match: id = match.group('id') if not config.solve_captcha: - raise wikipedia.CaptchaError(id) + raise pywikibot.CaptchaError(id) url = self.site.protocol() + '://' + self.site.hostname() + self.site.captcha_image_address(id) answer = wikipedia.ui.askForCaptcha(url) return self.getCookie(remember = remember, captchaId = id, captchaAnswer = answer) @@ -255,7 +255,7 @@ for arg in wikipedia.handleArgs(): if arg.startswith("-pass"): if len(arg) == 5: - password = wikipedia.input(u'Password for all accounts:', password = True) + password = pywikibot.input(u'Password for all accounts:', password = True) else: password = arg[6:] elif arg == "-sysop": @@ -274,9 +274,9 @@ namedict = config.usernames for familyName in namedict.iterkeys(): for lang in namedict[familyName].iterkeys(): - site = wikipedia.getSite(code=lang, fam=familyName) + site = pywikibot.getSite(code=lang, fam=familyName) if not forceLogin and site.loggedInAs(sysop = sysop) != None: - wikipedia.output(u'Already logged in on %s' % site) + pywikibot.output(u'Already logged in on %s' % site) else: loginMan = LoginManager(password, sysop = sysop, site = site) loginMan.login() @@ -288,4 +288,4 @@ try: main() finally: - wikipedia.stopme() + pywikibot.stopme() Modified: branches/rewrite/pywikibot/page.py =================================================================== --- branches/rewrite/pywikibot/page.py 2008-04-17 16:43:25 UTC (rev 5229) +++ branches/rewrite/pywikibot/page.py 2008-04-17 17:54:39 UTC (rev 5230) @@ -93,10 +93,10 @@ # copy all of source's attributes to this object self.__dict__ = source.__dict__ elif isinstance(source, Link): - self._site = link.site - self._section = link.section - self._ns = link.namespace - self._title = link.title + self._site = source.site + self._section = source.section + self._ns = source.namespace + self._title = source.title # reassemble the canonical title from components if self._ns: self._title = "%s:%s" % (self.site().namespace(self._ns), Modified: branches/rewrite/pywikibot/site.py =================================================================== --- branches/rewrite/pywikibot/site.py 2008-04-17 16:43:25 UTC (rev 5229) +++ branches/rewrite/pywikibot/site.py 2008-04-17 17:54:39 UTC (rev 5230) @@ -103,15 +103,8 @@ self._pagemutex = threading.Lock() self._locked_pages = [] - pt_min = min(config.minthrottle, config.put_throttle) - self.put_throttle = Throttle(self, pt_min, config.maxthrottle, - verbosedelay=True) - self.put_throttle.setDelay(config.put_throttle) + self.throttle = Throttle(self, multiplydelay=True, verbosedelay=True) - gt_min = min(config.minthrottle, config.get_throttle) - self.get_throttle = Throttle(self, gt_min, config.maxthrottle) - self.get_throttle.setDelay(config.get_throttle) - def family(self): """Return the associated Family object.""" return self._family @@ -409,7 +402,7 @@ - blockinfo: present if user is blocked (dict) """ - if not hasattr(self, "_userinfo"): + if not hasattr(self, "_userinfo") or "rights" not in self._userinfo: uirequest = api.Request( site=self, action="query", Modified: branches/rewrite/pywikibot/throttle.py =================================================================== --- branches/rewrite/pywikibot/throttle.py 2008-04-17 16:43:25 UTC (rev 5229) +++ branches/rewrite/pywikibot/throttle.py 2008-04-17 17:54:39 UTC (rev 5230) @@ -27,22 +27,24 @@ Calling this object blocks the calling thread until at least 'delay' seconds have passed since the previous call. - Each Site initiates two Throttle objects: get_throttle to control - the rate of read access, and put_throttle to control the rate of write - access. These are available as the Site.get_throttle and Site.put_throttle - objects. + Each Site initiates one Throttle object (site.throttle) to control the + rate of access. """ def __init__(self, site, mindelay=config.minthrottle, maxdelay=config.maxthrottle, + writedelay=config.put_throttle, multiplydelay=True, verbosedelay=False): self.lock = threading.RLock() self.mysite = str(site) + self.logfn = config.datafilepath('throttle.log') self.mindelay = mindelay self.maxdelay = maxdelay - self.now = 0 + self.writedelay = writedelay + self.last_read = 0 + self.last_write = 0 self.next_multiplicity = 1.0 - self.checkdelay = 240 # Check logfile again after this many seconds + self.checkdelay = 120 # Check logfile again after this many seconds self.dropdelay = 360 # Ignore processes that have not made # a check in this many seconds self.releasepid = 1800 # Free the process id after this many seconds @@ -51,11 +53,8 @@ self.verbosedelay = verbosedelay if multiplydelay: self.checkMultiplicity() - self.setDelay(mindelay) + self.setDelays() - def logfn(self): - return config.datafilepath('throttle.log') - def checkMultiplicity(self): global pid self.lock.acquire() @@ -65,7 +64,7 @@ my_pid = 1 count = 1 try: - f = open(self.logfn(), 'r') + f = open(self.logfn, 'r') except IOError: if not pid: pass @@ -101,7 +100,7 @@ processes.append({'pid': my_pid, 'time': self.checktime, 'site': self.mysite}) - f = open(self.logfn(), 'w') + f = open(self.logfn, 'w') processes.sort(key=lambda p:(p['pid'], p['site'])) for p in processes: f.write("%(pid)s %(time)s %(site)s\n" % p) @@ -114,20 +113,24 @@ finally: self.lock.release() - def setDelay(self, delay=config.minthrottle, absolute=False): - """Set the nominal delay in seconds.""" + def setDelays(self, delay=None, absolute=False): + """Set the nominal delays in seconds. Defaults to config values.""" self.lock.acquire() try: + if delay is None: + delay = self.mindelay if absolute: self.maxdelay = delay self.mindelay = delay self.delay = delay + self.writedelay = min(max(self.mindelay, self.writedelay), + self.maxdelay) # Start the delay count now, not at the next check - self.now = time.time() + self.last_read = self.last_write = time.time() finally: self.lock.release() - def getDelay(self): + def getDelay(self, write=False): """Return the actual delay, accounting for multiple processes. This value is the maximum wait between reads/writes, not taking @@ -135,7 +138,10 @@ """ global pid - thisdelay = self.delay + if write: + thisdelay = self.writedelay + else: + thisdelay = self.delay if pid: # If set, we're checking for multiple processes if time.time() > self.checktime + self.checkdelay: self.checkMultiplicity() @@ -146,13 +152,16 @@ thisdelay *= self.process_multiplicity return thisdelay - def waittime(self): + def waittime(self, write=False): """Return waiting time in seconds if a query would be made right now""" # Take the previous requestsize in account calculating the desired # delay this time - thisdelay = self.getDelay() + thisdelay = self.getDelay(write=write) now = time.time() - ago = now - self.now + if write: + ago = now - self.last_write + else: + ago = now - self.last_read if ago < thisdelay: delta = thisdelay - ago return delta @@ -164,7 +173,7 @@ self.checktime = 0 processes = [] try: - f = open(self.logfn(), 'r') + f = open(self.logfn, 'r') except IOError: return else: @@ -183,13 +192,13 @@ processes.append({'pid': this_pid, 'time': ptime, 'site': this_site}) - f = open(self.logfn(), 'w') + f = open(self.logfn, 'w') processes.sort(key=lambda p:p['pid']) for p in processes: f.write("%(pid)s %(time)s %(site)s\n" % p) f.close() - def __call__(self, requestsize=1): + def __call__(self, requestsize=1, write=False): """ Block the calling program if the throttle time has not expired. @@ -198,7 +207,7 @@ """ self.lock.acquire() try: - waittime = self.waittime() + waittime = self.waittime(write=write) # Calculate the multiplicity of the next delay based on how # big the request is that is being posted now. # We want to add "one delay" for each factor of two in the @@ -213,7 +222,10 @@ time.localtime())) ) time.sleep(waittime) - self.now = time.time() + if write: + self.last_write = time.time() + else: + self.last_read = time.time() finally: self.lock.release()

1 0

SVN: [5229] trunk/pywikipedia/archive
by mfarag＠svn.wikimedia.org 17 Apr '08

17 Apr '08

Revision: 5229 Author: mfarag Date: 2008-04-17 16:43:25 +0000 (Thu, 17 Apr 2008) Log Message: ----------- yet more Modified Paths: -------------- trunk/pywikipedia/archive/brackethttp.py trunk/pywikipedia/archive/copy_table.py Modified: trunk/pywikipedia/archive/brackethttp.py =================================================================== --- trunk/pywikipedia/archive/brackethttp.py 2008-04-17 15:59:50 UTC (rev 5228) +++ trunk/pywikipedia/archive/brackethttp.py 2008-04-17 16:43:25 UTC (rev 5229) @@ -12,7 +12,8 @@ import re, sys import wikipedia -myComment = {'en':u'Bot: URL fixed', +myComment = {'ar':u'بوت: URL تم إصلاحها', + 'en':u'Bot: URL fixed', 'he':u'בוט: תוקנה כתובת URL', 'pt':u'Bot: URL corrigido', 'zh':u'機器人: 網址已修復', Modified: trunk/pywikipedia/archive/copy_table.py =================================================================== --- trunk/pywikipedia/archive/copy_table.py 2008-04-17 15:59:50 UTC (rev 5228) +++ trunk/pywikipedia/archive/copy_table.py 2008-04-17 16:43:25 UTC (rev 5229) @@ -41,6 +41,7 @@ # Summary message msg={ + "ar":u"روبوت: نسخ الجدول من ", "en":u"robot: copying table from ", "de":u"Bot: Kopiere Tabelle von ", "he":u"רובוט: מעתיק טבלה מתוך ",

1 0

SVN: [5228] trunk/pywikipedia
by mfarag＠svn.wikimedia.org 17 Apr '08

17 Apr '08

Revision: 5228 Author: mfarag Date: 2008-04-17 15:59:50 +0000 (Thu, 17 Apr 2008) Log Message: ----------- Add/Update Arabic Modified Paths: -------------- trunk/pywikipedia/add_text.py trunk/pywikipedia/capitalize_redirects.py trunk/pywikipedia/catall.py trunk/pywikipedia/catlib.py trunk/pywikipedia/checkimages.py trunk/pywikipedia/commons_link.py trunk/pywikipedia/editarticle.py trunk/pywikipedia/featured.py trunk/pywikipedia/fixes.py trunk/pywikipedia/image.py trunk/pywikipedia/isbn.py trunk/pywikipedia/makecat.py trunk/pywikipedia/movepages.py trunk/pywikipedia/pagefromfile.py trunk/pywikipedia/redirect.py trunk/pywikipedia/spamremove.py trunk/pywikipedia/speedy_delete.py trunk/pywikipedia/spellcheck.py trunk/pywikipedia/standardize_interwiki.py trunk/pywikipedia/standardize_notes.py trunk/pywikipedia/table2wiki.py trunk/pywikipedia/template.py trunk/pywikipedia/unlink.py trunk/pywikipedia/unusedfiles.py Modified: trunk/pywikipedia/add_text.py =================================================================== --- trunk/pywikipedia/add_text.py 2008-04-17 09:37:15 UTC (rev 5227) +++ trunk/pywikipedia/add_text.py 2008-04-17 15:59:50 UTC (rev 5228) @@ -53,6 +53,7 @@ } msg = { + 'ar': u'بوت: إضافة %s', 'en': u'Bot: Adding %s', 'he': u'בוט: מוסיף %s', 'it': u'Bot: Aggiungo %s', Modified: trunk/pywikipedia/capitalize_redirects.py =================================================================== --- trunk/pywikipedia/capitalize_redirects.py 2008-04-17 09:37:15 UTC (rev 5227) +++ trunk/pywikipedia/capitalize_redirects.py 2008-04-17 15:59:50 UTC (rev 5228) @@ -40,6 +40,7 @@ import wikipedia, pagegenerators, catlib msg = { + 'ar': u'روبوت: إنشاء تحويلة إلى [[%s]]', 'en': u'Robot: Create redirect to [[%s]]', 'fr': u'robot: créez redirect à [[%s]]', 'he': u'בוט: יוצר הפניה לדף [[%s]]', Modified: trunk/pywikipedia/catall.py =================================================================== --- trunk/pywikipedia/catall.py 2008-04-17 09:37:15 UTC (rev 5227) +++ trunk/pywikipedia/catall.py 2008-04-17 15:59:50 UTC (rev 5228) @@ -23,6 +23,7 @@ wikipedia.put_throttle.setDelay(10) msg={ + 'ar':u'بوت: تغيير التصنيفات', 'en':u'Bot: Changing categories', 'he':u'Bot: משנה קטגוריות', 'fr':u'Bot: Change categories', Modified: trunk/pywikipedia/catlib.py =================================================================== --- trunk/pywikipedia/catlib.py 2008-04-17 09:37:15 UTC (rev 5227) +++ trunk/pywikipedia/catlib.py 2008-04-17 15:59:50 UTC (rev 5228) @@ -23,6 +23,7 @@ from sets import Set as set msg_created_for_renaming = { + 'ar':u'روبوت: نقل من %s. المؤلفون: %s', 'de':u'Bot: Verschoben von %s. Autoren: %s', 'en':u'Robot: Moved from %s. Authors: %s', 'fr':u'Robot : déplacé depuis %s. Auteurs: %s', Modified: trunk/pywikipedia/checkimages.py =================================================================== --- trunk/pywikipedia/checkimages.py 2008-04-17 09:37:15 UTC (rev 5227) +++ trunk/pywikipedia/checkimages.py 2008-04-17 15:59:50 UTC (rev 5228) @@ -108,6 +108,7 @@ # Summary for when the will add the no source comm = { 'commons':u'Bot: Marking newly uploaded untagged file', + 'ar' :u'بوت: التعليم على ملف مرفوع حديثا غير موسوم', 'en' :u'Bot: Marking newly uploaded untagged file', 'hu' :u'Robot: Frissen feltöltött licencsablon nélküli fájl megjelölése', 'it' :u"Bot: Aggiungo unverified", @@ -129,6 +130,7 @@ # Summary that the bot use when it notify the problem with the image's license comm2 = { 'commons':"Bot: Requesting source information." , + 'ar' :"بوت: طلب معلومات المصدر." , 'en' :"Bot: Requesting source information." , 'it' :"Bot: Notifico l'unverified", 'ja' :u"ロボットによる:出典とライセンス明記のお願い", @@ -164,6 +166,7 @@ # Text that will be add if the bot find a unknown extension. delete_immediately_notification = { 'commons':u'The [[:Image:%s]] file seems to have a wrong extension, please check. ~~~~', + 'ar' :u'الملف [[:Image:%s]] يبدو أن امتداده خاطيء, من فضلك تحقق. ~~~~', 'en' :u'The [[:Image:%s]] file seems to have a wrong extension, please check. ~~~~', 'it' :u'{{subst:Utente:Filbot/Ext|%s}}', 'hu' :u'A [[:Kép:%s]] fájlnak rossz a kiterjesztése, kérlek ellenőrízd. ~~~~', @@ -173,6 +176,7 @@ # Summary of the delate immediately. (f.e: Adding {{db-meta|The file has .%s as extension.}}) del_comm = { 'commons':u'Bot: Adding %s', + 'ar' :u'بوت: إضافة %s', 'en' :u'Bot: Adding %s', 'it' :u'Bot: Aggiungo %s', 'ja' :u'ロボットによる: 追加 %s', @@ -185,6 +189,7 @@ # will add if the image hasn't the license. nothing_head = { 'commons':u"",# Nothing, the template has already the header inside. + 'ar' :u"\n== صورة بدون ترخيص ==\n", 'en' :u"\n== Image without license ==\n", 'ja' :u'', 'it' :u"\n\n== Immagine senza licenza ==\n", @@ -261,6 +266,7 @@ # The summary of the report comm10 = { 'commons':u'Bot: Updating the log', + 'ar':u'بوت: تحديث السجل', 'en':u'Bot: Updating the log', 'it':u'Bot: Aggiorno il log', 'ja': u'ロボットによる:更新', Modified: trunk/pywikipedia/commons_link.py =================================================================== --- trunk/pywikipedia/commons_link.py 2008-04-17 09:37:15 UTC (rev 5227) +++ trunk/pywikipedia/commons_link.py 2008-04-17 15:59:50 UTC (rev 5228) @@ -37,12 +37,14 @@ import re comment1 = { + 'ar':u'روبوت: تضمين قالب كومنز', 'en':u'Robot: Include commons template', 'he':u'בוט: מוסיף תבנית Commons', 'ja':u'ロボットによる: テンプレcommons追加', 'zh':u'機器人: 增加commons模板', } comment2 = { + 'ar':u'روبوت: تضمين قالب تصنيف كومنز', 'en':u'Robot: Include commonscat template', 'he':u'בוט: מוסיף תבנית Commonscat', 'ja':u'ロボットによる: テンプレcommonscat追加', Modified: trunk/pywikipedia/editarticle.py =================================================================== --- trunk/pywikipedia/editarticle.py 2008-04-17 09:37:15 UTC (rev 5227) +++ trunk/pywikipedia/editarticle.py 2008-04-17 15:59:50 UTC (rev 5228) @@ -26,6 +26,7 @@ import config msg = { + 'ar': u'تعديل يدوي: %s', 'de': u'Manuelle Bearbeitung: %s', 'en': u'Manual edit: %s', 'he': u'עריכה ידנית: %s', Modified: trunk/pywikipedia/featured.py =================================================================== --- trunk/pywikipedia/featured.py 2008-04-17 09:37:15 UTC (rev 5227) +++ trunk/pywikipedia/featured.py 2008-04-17 15:59:50 UTC (rev 5228) @@ -52,7 +52,7 @@ return links msg = { - 'ar': u'بوت: وصلة مقالة مختارة ل [[%s:%s]]', + 'ar': u'بوت: وصلة مقالة مختارة ل[[%s:%s]]', 'bs': u'Bot: Interwiki za izabrane članke za [[%s:%s]]', 'en': u'Bot: Featured article link for [[%s:%s]]', 'cs': u'Bot: Nejlepší článek: [[%s:%s]]', @@ -80,7 +80,7 @@ template = { 'af': ['Link FA'], - 'ar': [u'وصلة مقالة مختارة'], + 'ar': [u'وصلة مقالة مختارة', 'Link FA'], 'bg': ['Link FA'], 'br': ['Liamm PuB'], 'bs': ['Link FA'], @@ -124,7 +124,7 @@ 'af': (BACK, u"Sjabloon:Voorbladartikel"), 'am': (CAT, u"Category:Wikipedia:Featured_article"), 'ast': (BACK, u"Plantilla:Destacaos"), - 'ar': (BACK, u"قالب:مقالة مختارة"), + 'ar': (CAT, u"تصنيف:مقالات مختارة"), # az: Vikipediya:Fəal məzmun #'be': (BACK, u"Шаблён:Выбраны артыкул"), 'bg': (BACK, u"Шаблон:Избрана статия"), Modified: trunk/pywikipedia/fixes.py =================================================================== --- trunk/pywikipedia/fixes.py 2008-04-17 09:37:15 UTC (rev 5227) +++ trunk/pywikipedia/fixes.py 2008-04-17 15:59:50 UTC (rev 5228) @@ -21,6 +21,7 @@ 'HTML': { 'regex': True, 'msg': { + 'ar':u'روبوت: تحويل/تصليح HTML', 'en':u'Robot: converting/fixing HTML', 'de':u'Bot: konvertiere/korrigiere HTML', 'fr':u'Robot: convertit/fixe HTML', @@ -153,6 +154,7 @@ 'syntax': { 'regex': True, 'msg': { + 'ar':u'بوت: تصليح تهيئة الويكي', 'de':u'Bot: Korrigiere Wiki-Syntax', 'en':u'Bot: Fixing wiki syntax', 'fr':u'Bot: Corrige wiki-syntaxe', @@ -222,6 +224,7 @@ 'syntax-safe': { 'regex': True, 'msg': { + 'ar':u'بوت: تصليح تهيئة الويكي', 'de':u'Bot: Korrigiere Wiki-Syntax', 'en':u'Bot: Fixing wiki syntax', 'fr':u'Bot: Corrige wiki-syntaxe', @@ -371,6 +374,7 @@ 'isbn': { 'regex': True, 'msg': { + 'ar': u'روبوت: تصليح صيغة ISBN', 'de': u'Bot: Korrigiere ISBN-Format', 'en': u'Robot: Fixing ISBN format', 'es': u'Arreglando formato ISBN', Modified: trunk/pywikipedia/image.py =================================================================== --- trunk/pywikipedia/image.py 2008-04-17 09:37:15 UTC (rev 5227) +++ trunk/pywikipedia/image.py 2008-04-17 15:59:50 UTC (rev 5228) @@ -45,6 +45,7 @@ """ # Summary messages for replacing images msg_replace={ + 'ar': u'روبوت - استبدال الصورة %s مع %s', 'de': u'Bot: Ersetze Bild %s durch %s', 'en': u'Robot - Replacing image %s with %s', 'fr': u'Bot: Remplace image %s par %s', @@ -57,6 +58,7 @@ # Summary messages for removing images msg_remove={ + 'ar': u'روبوت - إزالة الصورة %s', 'de': u'Bot: Entferne Bild %s', 'en': u'Robot - Removing image %s', 'fr': u'Bot: Enleve image %s', Modified: trunk/pywikipedia/isbn.py =================================================================== --- trunk/pywikipedia/isbn.py 2008-04-17 09:37:15 UTC (rev 5227) +++ trunk/pywikipedia/isbn.py 2008-04-17 15:59:50 UTC (rev 5228) @@ -47,6 +47,7 @@ # Summary messages in different languages msg = { + 'ar': u'روبوت: تهيئة ISBN', 'de': 'Bot: Formatiere ISBN', 'en': 'Robot: Formatting ISBN', 'he': u'בוט: מעצב ISBN', Modified: trunk/pywikipedia/makecat.py =================================================================== --- trunk/pywikipedia/makecat.py 2008-04-17 09:37:15 UTC (rev 5227) +++ trunk/pywikipedia/makecat.py 2008-04-17 15:59:50 UTC (rev 5228) @@ -42,6 +42,7 @@ import wikipedia, date, catlib msg={ + 'ar':u'إنشاء أو تحديث التصنيف:', 'en':u'Creation or update of category:', 'es':u'Creación o actualiza de la categoría:', 'fr':u'Création ou mise à jour de categorie:', Modified: trunk/pywikipedia/movepages.py =================================================================== --- trunk/pywikipedia/movepages.py 2008-04-17 09:37:15 UTC (rev 5227) +++ trunk/pywikipedia/movepages.py 2008-04-17 15:59:50 UTC (rev 5228) @@ -45,7 +45,7 @@ } summary={ - 'ar': u'نقل الصفحة بواسطة البوت', + 'ar': u'روبوت: نقل الصفحة', 'en': u'Robot: moved page', 'de': u'Bot: Seite verschoben', 'el': u'Μετακίνηση σελίδων με bot', Modified: trunk/pywikipedia/pagefromfile.py =================================================================== --- trunk/pywikipedia/pagefromfile.py 2008-04-17 09:37:15 UTC (rev 5227) +++ trunk/pywikipedia/pagefromfile.py 2008-04-17 15:59:50 UTC (rev 5228) @@ -53,6 +53,7 @@ """ msg = { + 'ar': u'استيراد تلقائي للمقالات', 'de': u'Automatischer Import von Artikeln', 'en': u'Automated import of articles', 'fr': u'Import automatique', @@ -70,6 +71,7 @@ # The following messages are added to topic when the page already exists msg_top = { + 'ar': u'كتابة على الأعلى', 'de': u'ergänze am Anfang', 'en': u'append on top', 'he': u'הוספה בראש הדף', @@ -85,6 +87,7 @@ } msg_bottom = { + 'ar': u'كتابة على الأسفل', 'de': u'ergänze am Ende', 'en': u'append on bottom', 'he': u'הוספה בתחתית הדף', @@ -100,6 +103,7 @@ } msg_force = { + 'ar': u'تمت الكتابة على النص الموجود', 'de': u'bestehender Text überschrieben', 'en': u'existing text overwritten', 'he': u'הטקסט הישן נמחק', Modified: trunk/pywikipedia/redirect.py =================================================================== --- trunk/pywikipedia/redirect.py 2008-04-17 09:37:15 UTC (rev 5227) +++ trunk/pywikipedia/redirect.py 2008-04-17 15:59:50 UTC (rev 5228) @@ -83,6 +83,7 @@ # Reason for deleting broken redirects reason_broken={ + 'ar': u'روبوت: هدف التحويلة غير موجود', 'en': u'Robot: Redirect target doesn\'t exist', 'de': u'Bot: Weiterleitungsziel existiert nicht', 'es': u'Robot: La página a la que redirige no existe', Modified: trunk/pywikipedia/spamremove.py =================================================================== --- trunk/pywikipedia/spamremove.py 2008-04-17 09:37:15 UTC (rev 5227) +++ trunk/pywikipedia/spamremove.py 2008-04-17 15:59:50 UTC (rev 5228) @@ -32,6 +32,7 @@ automatic = False namespaces = [] msg = { + 'ar': u'إزالة الوصلات إلى موقع سبام %s', 'de': u'Entferne in Spam-Blacklist eingetragenen Weblink auf %s', 'en': u'Removing links to spamming site %s', 'he': u'מסיר קישורים לאתר ספאם %s', Modified: trunk/pywikipedia/speedy_delete.py =================================================================== --- trunk/pywikipedia/speedy_delete.py 2008-04-17 09:37:15 UTC (rev 5227) +++ trunk/pywikipedia/speedy_delete.py 2008-04-17 15:59:50 UTC (rev 5228) @@ -46,7 +46,7 @@ csd_cat={ 'als': u'Kategorie:Wikipedia:Schnelllöschen', - 'ar': u'تصنيف:صفحات حذف سريع', + 'ar': u'تصنيف:صفحات للحذف السريع', 'be': u'Катэгорыя:Вікіпэдыя:Кандыдатуры на выдаленьне', 'cs': u'Kategorie:Stránky ke smazání', 'de': u'Kategorie:Wikipedia:Schnelllöschen', @@ -132,6 +132,7 @@ # Default reason for deleting a talk page. talk_deletion_msg={ + 'ar':u'صفحة نقاش يتيمة', 'de':u'Verwaiste Diskussionsseite', 'en':u'Orphaned talk page', 'he':u'דף שיחה של ערך שנמחק', Modified: trunk/pywikipedia/spellcheck.py =================================================================== --- trunk/pywikipedia/spellcheck.py 2008-04-17 09:37:15 UTC (rev 5227) +++ trunk/pywikipedia/spellcheck.py 2008-04-17 15:59:50 UTC (rev 5228) @@ -61,6 +61,7 @@ import string, codecs msg={ + 'ar':u'تدقيق إملائي بمساعدة البوت', 'en':u'Bot-aided spell checker', 'es':u'Bot asistido de correción ortográfica', 'fr':u'Correction orthographique par robot', Modified: trunk/pywikipedia/standardize_interwiki.py =================================================================== --- trunk/pywikipedia/standardize_interwiki.py 2008-04-17 09:37:15 UTC (rev 5227) +++ trunk/pywikipedia/standardize_interwiki.py 2008-04-17 15:59:50 UTC (rev 5228) @@ -22,6 +22,7 @@ # The summary that the Bot will use. comment = { + 'ar':u'روبوت: توحيد قياسي للإنترويكي', 'de':u'Bot: Interwikilinks standardisieren', 'en':u'Robot: interwiki standardization', 'fr':u'Bot : Standardisation des interwikis', Modified: trunk/pywikipedia/standardize_notes.py =================================================================== --- trunk/pywikipedia/standardize_notes.py 2008-04-17 09:37:15 UTC (rev 5227) +++ trunk/pywikipedia/standardize_notes.py 2008-04-17 15:59:50 UTC (rev 5228) @@ -62,6 +62,7 @@ # Summary messages in different languages msg = { + 'ar':u'روبوت: معالجة مراجع تلقائية %s', 'de':u'Bot: Automatisierte Textersetzung %s', 'en':u'Robot: Automated reference processing %s', 'es':u'Robot: Reemplazo automático de texto %s', Modified: trunk/pywikipedia/table2wiki.py =================================================================== --- trunk/pywikipedia/table2wiki.py 2008-04-17 09:37:15 UTC (rev 5227) +++ trunk/pywikipedia/table2wiki.py 2008-04-17 15:59:50 UTC (rev 5228) @@ -61,7 +61,8 @@ '&params;': pagegenerators.parameterHelp, } -msg_no_warnings = {'de':u'Bot: Tabellensyntax konvertiert', +msg_no_warnings = {'ar':u'بوت بواسطة مستخدم: تحديث تهيئة الجدول', + 'de':u'Bot: Tabellensyntax konvertiert', 'en':u'User-controlled Bot: table syntax updated', 'es':u'Bot controlado: actualizada sintaxis de tabla', 'fr':u'Bot: wikification syntaxe tableaux', @@ -75,7 +76,8 @@ 'pt':u'Bot: Sintaxe da tabela HTML para Wiki atualizada', } -msg_one_warning = {'de':u'Bot: Tabellensyntax konvertiert - %d Warnung!', +msg_one_warning = {'ar':u'بوت بواسطة مستخدم: تحديث تهيئة الجدول - %d تحذير!', + 'de':u'Bot: Tabellensyntax konvertiert - %d Warnung!', 'en':u'User-controlled Bot: table syntax updated - %d warning!', 'es':u'Bot controlado: actualizada sintaxis de tabla - %d aviso!', 'fr':u'Bot: wikification syntaxe tableaux - %d avertissements !', @@ -84,12 +86,13 @@ 'kk':u'Басқарылмалы бот: Кесте пішімі түзетілді - %d құлақтандыру!', 'lt':u'kontroliuojamas robotas: atnaujinta lentelės sintaksė - %d įspėjimas!', 'nl':u'Tabel gewijzigd van HTML- naar Wikisyntax - %d waarschuwing!', - 'no':u'bot: Konverterer tabellsyntaks – %d advarsel!', + 'no':u'bot: Konverterer tabellsyntaks – %d advarsel!', 'pl':u'Kontrolowany przez użytkownika robot poprawia składnię tabeli - %d ostrzeżenie!', 'pt':u'Bot: Sintaxe da tabela HTML para Wiki atualizada - %d aviso', } -msg_multiple_warnings = {'de':u'Bot: Tabellensyntax konvertiert - %d Warnungen!', +msg_multiple_warnings = {'ar':u'بوت بواسطة مستخدم: تحديث تهيئة الجدول - %d تحذير!', + 'de':u'Bot: Tabellensyntax konvertiert - %d Warnungen!', 'en':u'User-controlled Bot: table syntax updated - %d warnings!', 'es':u'Bot controlado: actualizada sintaxis de tabla - %d avisos!', 'fr':u'Bot: wikification syntaxe tableaux - %d avertissements !', Modified: trunk/pywikipedia/template.py =================================================================== --- trunk/pywikipedia/template.py 2008-04-17 09:37:15 UTC (rev 5227) +++ trunk/pywikipedia/template.py 2008-04-17 15:59:50 UTC (rev 5228) @@ -147,6 +147,7 @@ """ # Summary messages for replacing templates msg_change={ + 'ar':u'روبوت: تغيير القالب: %s', 'en':u'Robot: Changing template: %s', 'de':u'Bot: Ändere Vorlage: %s', 'fr':u'Robot: Change modèle: %s', @@ -167,6 +168,7 @@ #Needs more translations! msgs_change={ + 'ar':u'روبوت: تغيير القوالب: %s', 'en':u'Robot: Changing templates: %s', 'de':u'Bot: Ändere Vorlagen: %s', 'fr':u'Bot: Modifie modèles %s', @@ -184,6 +186,7 @@ # Summary messages for removing templates msg_remove={ + 'ar':u'روبوت: إزالة القالب: %s', 'en':u'Robot: Removing template: %s', 'de':u'Bot: Entferne Vorlage: %s', 'fr':u'Robot: Enlève le modèle: %s', @@ -204,6 +207,7 @@ #Needs more translations! msgs_remove={ + 'ar':u'روبوت: إزالة القوالب: %s', 'en':u'Robot: Removing templates: %s', 'de':u'Bot: Entferne Vorlagen: %s', 'he':u'בוט: מסיר תבניות: %s', @@ -222,6 +226,7 @@ # Summary messages for substituting templates #Needs more translations! msg_subst={ + 'ar':u'روبوت: نسخ القالب: %s', 'en':u'Robot: Substituting template: %s', 'de':u'Bot: Umgehe Vorlage: %s', 'fr':u'Bot: Remplace modèle : %s', @@ -238,6 +243,7 @@ #Needs more translations! msgs_subst={ + 'ar':u'روبوت: نسخ القوالب: %s', 'en':u'Robot: Substituting templates: %s', 'de':u'Bot: Umgehe Vorlagen: %s', 'fr':u'Bot: Remplace modèles : %s', Modified: trunk/pywikipedia/unlink.py =================================================================== --- trunk/pywikipedia/unlink.py 2008-04-17 09:37:15 UTC (rev 5227) +++ trunk/pywikipedia/unlink.py 2008-04-17 15:59:50 UTC (rev 5228) @@ -30,6 +30,7 @@ # Summary messages in different languages msg = { + 'ar':u'روبوت: إزالة وصلات "%s"', 'de':u'Bot: Entlinke "%s"', 'en':u'Robot: Unlinking "%s"', 'he':u'בוט: מסיר קישורים לדף "%s"', Modified: trunk/pywikipedia/unusedfiles.py =================================================================== --- trunk/pywikipedia/unusedfiles.py 2008-04-17 09:37:15 UTC (rev 5227) +++ trunk/pywikipedia/unusedfiles.py 2008-04-17 15:59:50 UTC (rev 5228) @@ -29,6 +29,7 @@ #**********************# comment = { + 'ar': u'صور للاستبعاد', 'en': u'images for elimination', 'he': u'תמונות להסרה', 'it': u'Bot: segnalo immagine orfana da eliminare',

1 0

SVN: [5227] trunk/pywikipedia
by mfarag＠svn.wikimedia.org 17 Apr '08

17 Apr '08

Revision: 5227 Author: mfarag Date: 2008-04-17 09:37:15 +0000 (Thu, 17 Apr 2008) Log Message: ----------- and more Modified Paths: -------------- trunk/pywikipedia/basic.py trunk/pywikipedia/date.py Modified: trunk/pywikipedia/basic.py =================================================================== --- trunk/pywikipedia/basic.py 2008-04-17 09:24:10 UTC (rev 5226) +++ trunk/pywikipedia/basic.py 2008-04-17 09:37:15 UTC (rev 5227) @@ -29,6 +29,7 @@ # Edit summary message that should be used. # NOTE: Put a good description here, and add translations, if possible! msg = { + 'ar': u'روبوت: تغيير ...', 'de': u'Bot: Ändere ...', 'en': u'Robot: changing ...', 'pt': u'Bot: alterando...', Modified: trunk/pywikipedia/date.py =================================================================== --- trunk/pywikipedia/date.py 2008-04-17 09:24:10 UTC (rev 5226) +++ trunk/pywikipedia/date.py 2008-04-17 09:37:15 UTC (rev 5227) @@ -415,7 +415,7 @@ 'als': lambda v: slh( v, [u"Januar", u"Februar", u"März", u"April", u"Mai", u"Juni", u"Juli", u"August", u"September", u"Oktober", u"November", u"Dezember"] ), 'an' : lambda v: slh( v, [u"chinero", u"frebero", u"marzo", u"abril", u"mayo", u"chunio", u"chulio", u"agosto", u"setiembre", u"otubre", u"nobiembre", u"abiento"] ), 'ang': lambda v: slh( v, [u"Æfterra Gēola", u"Solmōnaþ", u"Hrēþmōnaþ", u"Ēastermōnaþ", u"Þrimilcemōnaþ", u"Sēremōnaþ", u"Mǣdmōnaþ", u"Wēodmōnaþ", u"Hāligmōnaþ", u"Winterfylleþ", u"Blōtmōnaþ", u"Gēolmōnaþ"] ), - 'ar' : lambda v: slh( v, [u"يناير", u"فبراير", u"مارس", u"إبريل", u"مايو", u"يونيو", u"يوليو", u"أغسطس", u"سبتمبر", u"أكتوبر", u"نوفمبر", u"ديسمبر"] ), + 'ar' : lambda v: slh( v, [u"يناير", u"فبراير", u"مارس", u"أبريل", u"مايو", u"يونيو", u"يوليو", u"أغسطس", u"سبتمبر", u"أكتوبر", u"نوفمبر", u"ديسمبر"] ), 'ast': lambda v: slh( v, [u"xineru", u"febreru", u"marzu", u"abril", u"mayu", u"xunu", u"xunetu", u"agostu", u"setiembre", u"ochobre", u"payares", u"avientu"] ), 'be' : lambda v: slh( v, [u"студзень", u"люты", u"сакавік", u"красавік", u"травень", u"чэрвень", u"ліпень", u"жнівень", u"верасень", u"кастрычнік", u"лістапад", u"сьнежань"] ), 'bg' : lambda v: slh( v, [u"януари", u"февруари", u"март", u"април", u"май", u"юни", u"юли", u"август", u"септември", u"октомври", u"ноември", u"декември"] ), @@ -1281,7 +1281,7 @@ addFmt ('an', False, [ u"%d de chinero", u"%d de frebero", u"%d de marzo", u"%d d'abril", u"%d de mayo", u"%d de chunio", u"%d de chulio", u"%d d'agosto", u"%d de setiembre", u"%d d'otubre", u"%d de nobiembre", u"%d d'abiento" ]) #addFmt ('ang',False, [ u"%d Æfterra Gēola", u"%d Solmōnaþ", u"%d Hréþmónaþ", u"%d Éastermónaþ", u"%d Þrimilcemónaþ", u"%d Séremónaþ", u"%d Mǽdmónaþ", u"%d Wéodmónaþ", u"%d Háligmónaþ", u"%d Winterfylleþ", u"%d Blótmónaþ", u"%d Gēolmōnaþ" ]) addFmt2('ang',False, u"%%d %s", True ) -addFmt ('ar', False, [ u"%d يناير", u"%d فبراير", u"%d مارس", u"%d إبريل", u"%d مايو", u"%d يونيو", u"%d يوليو", u"%d أغسطس", u"%d سبتمبر", u"%d اكتوبر", u"%d نوفمبر", u"%d ديسمبر" ]) +addFmt ('ar', False, [ u"%d يناير", u"%d فبراير", u"%d مارس", u"%d أبريل", u"%d مايو", u"%d يونيو", u"%d يوليو", u"%d أغسطس", u"%d سبتمبر", u"%d أكتوبر", u"%d نوفمبر", u"%d ديسمبر" ]) addFmt ('ast',False, [ u"%d de xineru", u"%d de febreru", u"%d de marzu", u"%d d'abril", u"%d de mayu", u"%d de xunu", u"%d de xunetu", u"%d d'agostu", u"%d de setiembre", u"%d d'ochobre", u"%d de payares", u"%d d'avientu" ]) addFmt ('be', False, [ u"%d студзеня", u"%d лютага", u"%d сакавіка", u"%d красавіка", u"%d траўня", u"%d чэрвеня", u"%d ліпеня", u"%d жніўня", u"%d верасьня", u"%d кастрычніка", u"%d лістапада", u"%d сьнежня" ]) addFmt2('bg', False, u"%%d %s", False )

1 0

SVN: [5226] trunk/pywikipedia
by mfarag＠svn.wikimedia.org 17 Apr '08

17 Apr '08

Revision: 5226 Author: mfarag Date: 2008-04-17 09:24:10 +0000 (Thu, 17 Apr 2008) Log Message: ----------- Add/Update Arabic (ar) translation Modified Paths: -------------- trunk/pywikipedia/commonscat.py trunk/pywikipedia/cosmetic_changes.py trunk/pywikipedia/delete.py trunk/pywikipedia/disambredir.py trunk/pywikipedia/fixing_redirects.py trunk/pywikipedia/imagetransfer.py trunk/pywikipedia/misspelling.py trunk/pywikipedia/movepages.py trunk/pywikipedia/noreferences.py trunk/pywikipedia/nowcommons.py trunk/pywikipedia/selflink.py trunk/pywikipedia/solve_disambiguation.py trunk/pywikipedia/weblinkchecker.py Modified: trunk/pywikipedia/commonscat.py =================================================================== --- trunk/pywikipedia/commonscat.py 2008-04-16 13:38:04 UTC (rev 5225) +++ trunk/pywikipedia/commonscat.py 2008-04-17 09:24:10 UTC (rev 5226) @@ -37,6 +37,7 @@ commonscatTemplates = { 'af' : u'CommonsKategorie', + 'ar' : u'تصنيف كومنز', 'als' : u'Commonscat', 'az' : u'CommonsKat', 'bg' : u'Commonscat', Modified: trunk/pywikipedia/cosmetic_changes.py =================================================================== --- trunk/pywikipedia/cosmetic_changes.py 2008-04-16 13:38:04 UTC (rev 5225) +++ trunk/pywikipedia/cosmetic_changes.py 2008-04-17 09:24:10 UTC (rev 5226) @@ -41,6 +41,7 @@ # Summary message when using this module as a stand-alone script msg_standalone = { + 'ar': u'روبوت: تغييرات طفيفة', 'de': u'Bot: Kosmetische Änderungen', 'en': u'Robot: Cosmetic changes', 'es': u'Robot: Cambios triviales', @@ -61,6 +62,7 @@ # Summary message that will be appended to the normal message when # cosmetic changes are made on the fly msg_append = { + 'ar': u'; تغييرات طفيفة', 'de': u'; kosmetische Änderungen', 'en': u'; cosmetic changes', 'es': u'; cambios triviales', Modified: trunk/pywikipedia/delete.py =================================================================== --- trunk/pywikipedia/delete.py 2008-04-16 13:38:04 UTC (rev 5225) +++ trunk/pywikipedia/delete.py 2008-04-17 09:24:10 UTC (rev 5226) @@ -34,6 +34,7 @@ # Summary messages for deleting from a category. msg_simple_delete = { + 'ar': u'بوت: حذف قائمة من الملفات.', 'en': u'Bot: Deleting a list of files.', 'he': u'בוט: מוחק רשימת דפים מתוך קובץ.', 'nl': u'Bot: verwijdert een lijst met pagina\'s.', @@ -42,6 +43,7 @@ 'sv': u'Bot: Tar bort fillista.', } msg_delete_category = { + 'ar': u'روبوت - حذف كل الصفحات من التصنيف %s', 'de': u'Bot: Lösche alle Seiten in Kategorie %s', 'en': u'Robot - Deleting all pages from category %s', 'he': u'בוט: מוחק את כל הדפים מהקטגוריה %s.', @@ -53,6 +55,7 @@ 'sv': u'Bot: Tar bort alla sidor i kategori %s', } msg_delete_links = { + 'ar': u'روبوت - حذف كل الصفحات الموصولة من %s', 'de': u'Bot: Lösche alle Seiten in %s verlinkten Seiten', 'en': u'Robot - Deleting all pages linked from %s', 'fr': u'Bot: Supprime toutes pages liées depuis %s', @@ -64,6 +67,7 @@ 'sv': u'Bot: Tar bort alla sidor länkade från %s', } msg_delete_ref = { + 'ar': u'روبوت - حذف كل الصفحات الراجعة من %s', 'de': u'Bot: Lösche alle auf %s linkenden Seiten', 'en': u'Robot - Deleting all pages referring from %s', 'fr': u'Bot: Supprime toutes pages référant à %s', @@ -74,6 +78,7 @@ 'pt': u'Bot: Apagando todas as páginas afluentes a %s', } msg_delete_images = { + 'ar': u'روبوت -حذف كل الصور في الصفحة %s', 'en': u'Robot - Deleting all images on page %s', 'he': u'בוט: מוחק את כל התמונות בדף %s.', 'nl': u'Bot: verwijdert alle media op pagina %s', Modified: trunk/pywikipedia/disambredir.py =================================================================== --- trunk/pywikipedia/disambredir.py 2008-04-16 13:38:04 UTC (rev 5225) +++ trunk/pywikipedia/disambredir.py 2008-04-17 09:24:10 UTC (rev 5226) @@ -17,6 +17,7 @@ import catlib msg = { + 'ar': u'تغيير التحويلات في صفحة توضيح', 'en': u'Changing redirects on a disambiguation page', 'he': u'משנה קישורים להפניות בדף פירושונים', 'ja': u'ロボットによる: 曖昧さ回避ページのリダイレクト修正', Modified: trunk/pywikipedia/fixing_redirects.py =================================================================== --- trunk/pywikipedia/fixing_redirects.py 2008-04-16 13:38:04 UTC (rev 5225) +++ trunk/pywikipedia/fixing_redirects.py 2008-04-17 09:24:10 UTC (rev 5226) @@ -21,6 +21,7 @@ import re, sys msg = { + 'ar': u'بوت: إصلاح التحويلات', 'en': u'Bot: Fixing redirects', 'he': u'בוט: מתקן הפניות', 'ja': u'ロボットによる:リダイレクト回避', @@ -30,6 +31,7 @@ } featured_articles = { + 'ar': u'ويكيبيديا:مقالات مختارة', 'de': u'Wikipedia:Exzellente_Artikel', 'en': u'Wikipedia:Featured_articles', 'he': u'פורטל:ערכים_מומלצים', Modified: trunk/pywikipedia/imagetransfer.py =================================================================== --- trunk/pywikipedia/imagetransfer.py 2008-04-16 13:38:04 UTC (rev 5225) +++ trunk/pywikipedia/imagetransfer.py 2008-04-17 09:24:10 UTC (rev 5226) @@ -33,6 +33,7 @@ import wikipedia, upload, config, pagegenerators copy_message = { + 'ar':u"هذه الصورة تم نقلها من %s. الوصف الأصلي كان:\r\n\r\n%s", 'en':u"This image was copied from %s. The original description was:\r\n\r\n%s", 'de':u"Dieses Bild wurde von %s kopiert. Die dortige Beschreibung lautete:\r\n\r\n%s", 'fr':u"Cette image est copiée de %s. La description originale était:\r\n\r\n%s", @@ -48,6 +49,7 @@ } nowCommonsTemplate = { + 'ar': u'{{subst:الآن_كومنز|Image:%s}}', 'de': u'{{NowCommons|%s}}', 'fr': u'{{Désormais sur Commons|%s}}', 'en': u'{{subst:ncd|Image:%s}}', @@ -70,6 +72,7 @@ #} nowCommonsMessage = { + 'ar': u'الملف الآن متوفر في ويكيميديا كومنز.', 'de': u'Datei ist jetzt auf Wikimedia Commons verfügbar.', 'en': u'File is now available on Wikimedia Commons.', 'he': u'הקובץ זמין כעת בוויקישיתוף.', Modified: trunk/pywikipedia/misspelling.py =================================================================== --- trunk/pywikipedia/misspelling.py 2008-04-16 13:38:04 UTC (rev 5225) +++ trunk/pywikipedia/misspelling.py 2008-04-17 09:24:10 UTC (rev 5226) @@ -44,6 +44,7 @@ } msg = { + 'ar': u'روبوت: إصلاح وصلة خاطئة إلى %s', 'de': u'Bot: korrigiere Link auf Falschschreibung: %s', 'en': u'Robot: Fixing misspelled link to %s', 'he': u'בוט: מתקן קישור עם שגיאה לדף %s', Modified: trunk/pywikipedia/movepages.py =================================================================== --- trunk/pywikipedia/movepages.py 2008-04-16 13:38:04 UTC (rev 5225) +++ trunk/pywikipedia/movepages.py 2008-04-17 09:24:10 UTC (rev 5226) @@ -59,6 +59,7 @@ } deletesummary={ + 'ar': u'روبوت: حذف التحويلة بعد نقل الصفحة', 'de': u'Bot: Lösche nach Seitenverschiebung nicht benötigte Umleitung', 'en': u'Robot: Deleting redirect after page has been moved', 'he': u'בוט: מוחק הפניה לאחר שהדף הועבר', @@ -66,7 +67,6 @@ 'pt': u'Bot: Página apagada depois de movida', 'ru': u'Робот: удаление перенаправления после переименования страницы', # These are too unspecific: - #'ar': u'حذف الصفحة بواسطة البوت', #'el': u'Διαγραφή σελίδων με bot', #'fr': u'Page supprimée par bot', #'nl': u'Pagina verwijderd door robot', Modified: trunk/pywikipedia/noreferences.py =================================================================== --- trunk/pywikipedia/noreferences.py 2008-04-16 13:38:04 UTC (rev 5225) +++ trunk/pywikipedia/noreferences.py 2008-04-17 09:24:10 UTC (rev 5226) @@ -47,6 +47,7 @@ # Summary messages in different languages msg = { + 'ar':u'روبوت: إضافة وسم <references /> مفقود', 'de':u'Bot: Trage fehlendes <references /> nach', 'en':u'Robot: Adding missing <references /> tag', 'he':u'בוט: מוסיף תגית <references /> חסרה', @@ -64,6 +65,11 @@ # Otherwise, it would try to put it in front of the "External links" section, # or if that fails, the "See also" section, etc. placeBeforeSections = { + 'ar': [ # no explicit policy on where to put the references + u'وصلات خارجية', + u'انظر أيضا', + u'ملاحظات' + ], 'de': [ # no explicit policy on where to put the references u'Literatur', u'Weblinks', @@ -102,6 +108,10 @@ # The first title should be the preferred one: It's the one that # will be used when a new section has to be created. referencesSections = { + 'ar': [ # not sure about which ones are preferred. + u'مراجع', + u'ملاحظات', + ], 'de': [ u'Einzelnachweise', # The "Einzelnachweise" title is disputed, some people prefer the other variants u'Quellen', @@ -154,6 +164,7 @@ # on your wiki, you don't have to enter anything here. referencesTemplates = { 'wikipedia': { + 'ar': [u'Reflist',u'ثبت المراجع',u'قائمة المراجع'], 'en': [u'Reflist',u'Refs',u'FootnotesSmall',u'Reference', u'Ref-list',u'Reference list',u'References-small',u'Reflink', u'Footnotes',u'FootnotesSmall'], Modified: trunk/pywikipedia/nowcommons.py =================================================================== --- trunk/pywikipedia/nowcommons.py 2008-04-16 13:38:04 UTC (rev 5225) +++ trunk/pywikipedia/nowcommons.py 2008-04-17 09:24:10 UTC (rev 5226) @@ -44,6 +44,10 @@ '_default': [ u'NowCommons' ], + 'ar': [ + u'الآن كومنز', + u'الآن كومونز', + ], 'de': [ u'NowCommons', u'NC', Modified: trunk/pywikipedia/selflink.py =================================================================== --- trunk/pywikipedia/selflink.py 2008-04-16 13:38:04 UTC (rev 5225) +++ trunk/pywikipedia/selflink.py 2008-04-17 09:24:10 UTC (rev 5226) @@ -39,6 +39,7 @@ # NOTE: Predefined replacement tasks might use their own dictionary, see 'fixes' # in fixes.py. msg = { + 'ar':u'روبوت: إزالة وصلات ذاتية', 'de':u'Bot: Entferne Selbstlinks', 'en':u'Robot: Removing selflinks', 'he':u'בוט: מסיר קישורים של הדף לעצמו', Modified: trunk/pywikipedia/solve_disambiguation.py =================================================================== --- trunk/pywikipedia/solve_disambiguation.py 2008-04-16 13:38:04 UTC (rev 5225) +++ trunk/pywikipedia/solve_disambiguation.py 2008-04-17 09:24:10 UTC (rev 5226) @@ -76,6 +76,7 @@ # Summary message when working on disambiguation pages msg = { + 'ar': u'توضيح بمساعدة روبوت: %s - غير الوصلة أو الوصلات إلى %s', 'cs': u'Odstranění linku na rozcestník [[%s]] s použitím robota - Změněn(y) odkaz(y) na %s', 'en': u'Robot-assisted disambiguation: %s - Changed link(s) to %s', 'da': u'Retter flertydigt link til: %s - Ændrede link(s) til %s', @@ -98,6 +99,7 @@ # Summary message when working on disambiguation pages and the link is removed msg_unlink = { + 'ar': u'توضيح بمساعدة روبوت: %s - أزال الوصلة أو الوصلات.', 'cs': u'Odstranění linku na rozcestník [[%s]] s použitím robota - Odstraněn(y) odkaz(y)', 'en': u'Robot-assisted disambiguation: %s - Removed link(s).', 'da': u'Retter flertydigt link til: %s - Fjernede link(s)', @@ -120,6 +122,7 @@ # Summary message when working on redirects msg_redir = { + 'ar': u'توضيح بمساعدة روبوت: %s - غير الوصلة أو الوصلات إلى %s', 'cs': u'Robot opravil přesměrování na %s - Změněn(y) odkaz(y) na %s', 'en': u'Robot-assisted disambiguation: %s - Changed link(s) to %s', 'da': u'Retter flertydigt link til: %s - Ændrede link(s) til %s', @@ -142,6 +145,7 @@ # Summary message when working on redirects and the link is removed msg_redir_unlink = { + 'ar': u'توضيح بمساعدة روبوت: %s - أزال الوصلة أو الوصلات', 'cs': u'Robot opravil přesměrování na %s - Odstraněn(y) odkaz(y)', 'en': u'Robot-assisted disambiguation: %s - Removed link(s)', 'da': u'Retter flertydigt link til: %s - Fjernede link(s)', @@ -164,6 +168,7 @@ # disambiguation page name format for "primary topic" disambiguations # (Begriffsklärungen nach Modell 2) primary_topic_format = { + 'ar': u'%s_(توضيح)', 'cs': u'%s_(rozcestník)', 'de': u'%s_(Begriffsklärung)', 'en': u'%s_(disambiguation)', @@ -189,6 +194,9 @@ ignore_title = { 'wikipedia': { + 'ar': [ + u'تصنيف:صفحات توضيح', + ], 'cs': [ u'Wikipedie:Chybějící interwiki/.+', u'Wikipedie:Rozcestníky', Modified: trunk/pywikipedia/weblinkchecker.py =================================================================== --- trunk/pywikipedia/weblinkchecker.py 2008-04-16 13:38:04 UTC (rev 5225) +++ trunk/pywikipedia/weblinkchecker.py 2008-04-17 09:24:10 UTC (rev 5226) @@ -103,6 +103,7 @@ } talk_report_msg = { + 'ar': u'روبوت: الإبلاغ عن وصلات خارجية غير متوفرة', 'de': u'Bot: Berichte nicht verfügbaren Weblink', 'en': u'robot: Reporting unavailable external link', 'fr': u'Bot: Rapporte lien externe inaccessible', @@ -122,6 +123,7 @@ # The second %s will be replaced by a hint to the Internet Archive, # in case the page has been archived there. talk_report = { + 'ar': u'== وصلة ميتة ==\n\nخلال عدة عمليات أوتوماتيكية من البوت الوصلة الخارجية التالية كانت غير متوفرة. من فضلك تحقق من أن الوصلة لا تعمل وأزلها أو أصلحها في هذه الحالة!\n\n%s\n%s--~~~~', 'de': u'== Toter Weblink ==\n\nBei mehreren automatisierten Botläufen wurde der folgende Weblink als nicht verfügbar erkannt. Bitte überprüfe, ob der Link tatsächlich unerreichbar ist, und korrigiere oder entferne ihn in diesem Fall!\n\n%s\n%s--~~~~', 'en': u'== Dead link ==\n\nDuring several automated bot runs the following external link was found to be unavailable. Please check if the link is in fact down and fix or remove it in that case!\n\n%s\n%s--~~~~', 'fr': u'== Lien mort ==\n\nPendant plusieurs patrouilles par bot, le lien suivant a été inaccessible. Veuillez vérifier si le lien est effectivement mort et si oui corrigez ou retirez-le.\n\n%s\n%s--~~~~', @@ -138,6 +140,7 @@ } talk_report_archive = { + 'ar': u'\nصفحة الويب تم حفظها بواسطة أرشيف الإنترنت. من فضلك ضع في الاعتبار الوصل لنسخة مؤرشفة مناسبة: [%s]. ', 'de': u'Die Webseite wurde vom Internet Archive gespeichert. Bitte verlinke gegebenenfalls eine geeignete archivierte Version: [%s]. ', 'en': u'\nThe web page has been saved by the Internet Archive. Please consider linking to an appropriate archived version: [%s]. ', 'fr': u"\nLa page a été sauvegardée dans l'''Internet Archive''. Il serait peut-être utile de faire pointer le lien vers une des versions archivées : [%s]. ",

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

Pywikipedia-l April 2008