Pywikipedia-svn

pywikipedia-svn@lists.wikimedia.org

5163 discussions

SVN: [6911] trunk/pywikipedia/families/wikipedia_family.py
by nicdumz＠svn.wikimedia.org 21 May '09

21 May '09

Revision: 6911 Author: nicdumz Date: 2009-05-21 14:15:28 +0000 (Thu, 21 May 2009) Log Message: ----------- Using MediaWiki:Disambiguationspage for sv & simple Modified Paths: -------------- trunk/pywikipedia/families/wikipedia_family.py Modified: trunk/pywikipedia/families/wikipedia_family.py =================================================================== --- trunk/pywikipedia/families/wikipedia_family.py 2009-05-21 14:07:49 UTC (rev 6910) +++ trunk/pywikipedia/families/wikipedia_family.py 2009-05-21 14:15:28 UTC (rev 6911) @@ -737,7 +737,7 @@ 'ru': [u'Disambig', u'Неоднозначность', u'неоднозначность', u'Многозначность', u'Фамилия'], 'scn': [u'Disambigua', u'Disambig', u'Sigla2', u'Sigla3'], - 'simple': [u'Disambig', u'Disambiguation', u'3CC',u'2CC'], + 'simple': None, 'sh': [u'Višeznačna odrednica', u'Disambig', u'Razdvojba', u'Razvrstavanje', u'VZO', u'Višeznačnost', u'Homograf', @@ -749,10 +749,7 @@ u'Višeznačna odrednica'], 'srn': [u'Dp'], 'su': [u'Disambig'], - 'sv': [u'Betydelselista', u'Disambig', u'Förgrening', u'Gaffel', - u'Efternamn', u'Gren', u'Förgreningssida', u'3LC', - u'Trebokstavsförkortning', u'TLAdisambig', u'4LA', - u'Trebokstavsförgrening'], + 'sv': None, 'sw': [u'Maana'], 'ta': [u'பக்கவழி நெறிப்படுத்தல்'], 'te': [u'అయోమయ నివృత్తి', u'వివరమైన అయోమయ నివృత్తి'],

1 0

SVN: [6910] trunk/pywikipedia/families/wikipedia_family.py
by nicdumz＠svn.wikimedia.org 21 May '09

21 May '09

Revision: 6910 Author: nicdumz Date: 2009-05-21 14:07:49 +0000 (Thu, 21 May 2009) Log Message: ----------- Using MediaWiki:Disambiguationspage for fr.wp Modified Paths: -------------- trunk/pywikipedia/families/wikipedia_family.py Modified: trunk/pywikipedia/families/wikipedia_family.py =================================================================== --- trunk/pywikipedia/families/wikipedia_family.py 2009-05-21 10:38:13 UTC (rev 6909) +++ trunk/pywikipedia/families/wikipedia_family.py 2009-05-21 14:07:49 UTC (rev 6910) @@ -679,16 +679,7 @@ 'fa': [u'ابهام‌زدایی',u'ابهام زدایی'], 'fi': [u'Täsmennyssivu', u'Disambig'], 'fo': [u'Fleiri týdningar'], - # See http://fr.wikipedia.org/wiki/MediaWiki:Disambiguationspage - 'fr': [u'Homonymie', u'Arrondissements homonymes', u'Disambig', - u'Bandeau standard pour page d\'homonymie', - u'Batailles homonymes', u'Cantons homonymes', - u'Homonymie de clubs sportifs', u'Homonymie dynastique', - u'Homonymie de comtés', u'Internationalisation', - u'Isomérie', u'Homonymie de nom romain', - u'Paronymie', u'Patronyme', u'Personnes homonymes', - u'Unités homonymes', u'Villes homonymes', u'Homonymie bateau', - u'Toponymie'], + 'fr': None, 'frp': [u'Homonimos'], 'fy': [u'Tfs', u'Neibetsjuttings'], 'ga': [u'Idirdhealú', u'Disambig'],

1 0

SVN: [6909] trunk/pywikipedia/watchlist.py
by alexsh＠svn.wikimedia.org 21 May '09

21 May '09

Revision: 6909 Author: alexsh Date: 2009-05-21 10:38:13 +0000 (Thu, 21 May 2009) Log Message: ----------- Add -new for load all wikis where setting in user-config.py Modified Paths: -------------- trunk/pywikipedia/watchlist.py Modified: trunk/pywikipedia/watchlist.py =================================================================== --- trunk/pywikipedia/watchlist.py 2009-05-21 10:05:32 UTC (rev 6908) +++ trunk/pywikipedia/watchlist.py 2009-05-21 10:38:13 UTC (rev 6909) @@ -12,6 +12,7 @@ Command line options: -all - Reloads watchlists for all wikis where a watchlist is already present + -new - Load watchlists for all wikis where accounts is setting in user-config.py """ # (C) Daniel Herding, 2005 @@ -78,27 +79,44 @@ pickle.dump(watchlist, f) f.close() -def refresh_all(): - import dircache, time - filenames = dircache.listdir(wikipedia.config.datafilepath('watchlists')) - watchlist_filenameR = re.compile('watchlist-([a-z\-:]+).dat') - for filename in filenames: - match = watchlist_filenameR.match(filename) - if match: - arr = match.group(1).split('-') - family = arr[0] - lang = '-'.join(arr[1:]) - site = wikipedia.getSite(code = lang, fam = family) - refresh(site) +def refresh_all(new = False): + if new: + import config + wikipedia.output('Downloading All watchlists for your accounts in user-config.py'); + for family in config.usernames: + for lang in config.usernames[family]: + site = wikipedia.getSite(code=lang, fam = family) + refresh(site) + for family in config.sysopnames: + for lang in config.sysopnames[family]: + site = wikipedia.getSite(code=lang, fam = family) + refresh(site) + else: + import dircache, time + filenames = dircache.listdir(wikipedia.config.datafilepath('watchlists')) + watchlist_filenameR = re.compile('watchlist-([a-z\-:]+).dat') + for filename in filenames: + match = watchlist_filenameR.match(filename) + if match: + arr = match.group(1).split('-') + family = arr[0] + lang = '-'.join(arr[1:]) + site = wikipedia.getSite(code = lang, fam = family) + refresh(site) + def main(): all = False + new = False for arg in wikipedia.handleArgs(): - if arg == '-all': + if arg == '-all' or arg == '-update': all = True - + elif arg == '-new': + new = True if all: refresh_all() + elif new: + refresh_all(new) else: refresh(wikipedia.getSite())

1 0

SVN: [6908] trunk/pywikipedia/families/wikipedia_family.py
by nicdumz＠svn.wikimedia.org 21 May '09

21 May '09

Revision: 6908 Author: nicdumz Date: 2009-05-21 10:05:32 +0000 (Thu, 21 May 2009) Log Message: ----------- Adding ca: disambig Modified Paths: -------------- trunk/pywikipedia/families/wikipedia_family.py Modified: trunk/pywikipedia/families/wikipedia_family.py =================================================================== --- trunk/pywikipedia/families/wikipedia_family.py 2009-05-20 12:44:07 UTC (rev 6907) +++ trunk/pywikipedia/families/wikipedia_family.py 2009-05-21 10:05:32 UTC (rev 6908) @@ -658,7 +658,7 @@ 'br': [u'Hvlstumm', u'Digejañ', u'Digejañ anvioù-badez'], 'bs': [u'Čvor'], 'ca': [u'Desambiguació', u'Disambig', u'Desambigua', - u'acrònim'], + u'acrònim', u'onomàstica'], 'ceb': [u'Giklaro'], 'cdo': [u'Gì-ngiê'], 'cs': [u'Rozcestník', u'Rozcestník - 2 znaky', u'Rozcestník - Příjmení',

1 0

SVN: [6907] trunk/pywikipedia/family.py
by cosoleto＠svn.wikimedia.org 20 May '09

20 May '09

Revision: 6907 Author: cosoleto Date: 2009-05-20 12:44:07 +0000 (Wed, 20 May 2009) Log Message: ----------- Added missing redirect translation for kv language. Reported by xqt in bug #2794362. Modified Paths: -------------- trunk/pywikipedia/family.py Modified: trunk/pywikipedia/family.py =================================================================== --- trunk/pywikipedia/family.py 2009-05-19 14:27:13 UTC (rev 6906) +++ trunk/pywikipedia/family.py 2009-05-20 12:44:07 UTC (rev 6907) @@ -3329,6 +3329,7 @@ u'\u1794\u17d2\u178a\u17bc\u179a\u1785\u17c6\u178e\u1784\u1787\u17be\u1784'], 'ko': [u'넘겨주기'], 'ksh': [u'ömleidung'], + 'kv': [u'перенаправление'], 'li': [u'doorverwijzing'], 'lt': [u'peradresavimas'], 'mk': [u'пренасочување', u'види'],

1 0

SVN: [6906] trunk/pywikipedia/family.py
by russblau＠svn.wikimedia.org 19 May '09

19 May '09

Revision: 6906 Author: russblau Date: 2009-05-19 14:27:13 +0000 (Tue, 19 May 2009) Log Message: ----------- add comments to assist in future maintenance Modified Paths: -------------- trunk/pywikipedia/family.py Modified: trunk/pywikipedia/family.py =================================================================== --- trunk/pywikipedia/family.py 2009-05-19 10:49:38 UTC (rev 6905) +++ trunk/pywikipedia/family.py 2009-05-19 14:27:13 UTC (rev 6906) @@ -3269,7 +3269,12 @@ def category_namespaces(self, code): return self.namespace(code, 14, all = True) - # Redirect code can be translated. + # Localised magic words for language code 'xyz' can be found in + # the MediaWiki source code in the file + # /mediawiki/trunk/phase3/languages/messages/MessagesXyz.php + # in the 'magicwords' array + + # Localised redirect codes # Note that redirect codes are case-insensitive, so it is enough # to enter the code in lowercase here. @@ -3313,6 +3318,8 @@ 'hy': [u'վերահղում'], 'id': [u'alih'], 'is': [u'tilvísun'], +# 'it': magic words "RINVIA" and "RINVIO" appear in the MediaWiki +# source code, BUT DO NOT WORK 'ja': [u'転送', u'リダイレクト'], 'jv': [u'alih'], 'ka': [u'გადამისამართება'], @@ -3337,6 +3344,8 @@ 'nl': [u'doorverwijzing'], 'nn': [u'omdiriger'], 'oc': [u'redireccion'], +# 'os': magic word u"рарвыст" appears in the MediaWiki source code, +# BUT DOES NOT WORK 'os': [u"перенаправление", u"перенапр"], 'pdc': [u'weiterleitung'], 'pl': [u'redirect', u'patrz', u'tam', u'przekieruj'],

1 0

SVN: [6905] trunk/pywikipedia/articlenos.py
by cosoleto＠svn.wikimedia.org 19 May '09

19 May '09

Revision: 6905 Author: cosoleto Date: 2009-05-19 10:49:38 +0000 (Tue, 19 May 2009) Log Message: ----------- Fixed some indentation errors. Modified Paths: -------------- trunk/pywikipedia/articlenos.py Modified: trunk/pywikipedia/articlenos.py =================================================================== --- trunk/pywikipedia/articlenos.py 2009-05-18 00:40:33 UTC (rev 6904) +++ trunk/pywikipedia/articlenos.py 2009-05-19 10:49:38 UTC (rev 6905) @@ -21,8 +21,8 @@ def __init__(self, site, channel, nickname, server, port=6667): SingleServerIRCBot.__init__(self, [(server, port)], nickname, nickname) self.channel = channel - self.site = site - self.other_ns = re.compile(u'14\[\[07(' + u'|'.join(site.namespaces()) + u')') + self.site = site + self.other_ns = re.compile(u'14\[\[07(' + u'|'.join(site.namespaces()) + u')') self.api_url = self.site.api_address() self.api_url += 'action=query&meta=siteinfo&siprop=statistics&format=xml' self.api_found = re.compile(r'articles="(.*?)"') @@ -35,7 +35,7 @@ c.join(self.channel) def on_privmsg(self, c, e): - pass + pass def on_pubmsg(self, c, e): match = self.re_edit.match(e.arguments()[0]) @@ -59,19 +59,19 @@ return except wikipedia.IsRedirectPage: return - print entry[0], name + print entry[0], name def on_dccmsg(self, c, e): - pass + pass def on_dccchat(self, c, e): - pass + pass def do_command(self, e, cmd): - pass + pass def on_quit(self, e, cmd): - pass + pass def main(): site = wikipedia.getSite()

1 0

SVN: [6904] trunk/pywikipedia/wikipedia.py
by russblau＠svn.wikimedia.org 17 May '09

17 May '09

Revision: 6904 Author: russblau Date: 2009-05-18 00:40:33 +0000 (Mon, 18 May 2009) Log Message: ----------- .capitalize() is not desirable: >>> print "Foo Bar".capitalize() Foo bar Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2009-05-17 21:20:34 UTC (rev 6903) +++ trunk/pywikipedia/wikipedia.py 2009-05-18 00:40:33 UTC (rev 6904) @@ -1141,7 +1141,7 @@ else: # Normalize template capitalization self._site._disambigtemplates = set( - t.capitalize() for t in distl + t[:1].upper() + t[1:] for t in distl ) disambigInPage = self._site._disambigtemplates.intersection(self.templates()) self._isDisambig = len(disambigInPage) > 0

1 0

SVN: [6903] branches/rewrite/pywikibot/site.py
by russblau＠svn.wikimedia.org 17 May '09

17 May '09

Revision: 6903 Author: russblau Date: 2009-05-17 21:20:34 +0000 (Sun, 17 May 2009) Log Message: ----------- Prevent infinite recursion in login process Modified Paths: -------------- branches/rewrite/pywikibot/site.py Modified: branches/rewrite/pywikibot/site.py =================================================================== --- branches/rewrite/pywikibot/site.py 2009-05-17 21:17:10 UTC (rev 6902) +++ branches/rewrite/pywikibot/site.py 2009-05-17 21:20:34 UTC (rev 6903) @@ -651,6 +651,7 @@ def login(self, sysop=False): """Log the user in if not already logged in.""" # check whether a login cookie already exists for this user + self._loginstatus = -2 if not hasattr(self, "_userinfo"): self.getuserinfo() if self.logged_in(sysop):

1 0

SVN: [6902] branches/rewrite/pywikibot
by russblau＠svn.wikimedia.org 17 May '09

17 May '09

Revision: 6902 Author: russblau Date: 2009-05-17 21:17:10 +0000 (Sun, 17 May 2009) Log Message: ----------- Fixing login problems; the root issue is that when you use secure.wikimedia.org to login, the API sets cookies that can only be used on secure.wikimedia.org, so we now have to use SSL for all API queries. Modified Paths: -------------- branches/rewrite/pywikibot/config2.py branches/rewrite/pywikibot/data/api.py branches/rewrite/pywikibot/login.py branches/rewrite/pywikibot/site.py Modified: branches/rewrite/pywikibot/config2.py =================================================================== --- branches/rewrite/pywikibot/config2.py 2009-05-17 16:44:38 UTC (rev 6901) +++ branches/rewrite/pywikibot/config2.py 2009-05-17 21:17:10 UTC (rev 6902) @@ -71,7 +71,7 @@ # Security Connection for Wikimedia Projects # use_SSL_onlogin = True # if available, use SSL when logging in -use_SSL_always = False # if available, use SSL for all API queries +use_SSL_always = True # if available, use SSL for all API queries # Available security projects available_ssl_project = [ Modified: branches/rewrite/pywikibot/data/api.py =================================================================== --- branches/rewrite/pywikibot/data/api.py 2009-05-17 16:44:38 UTC (rev 6901) +++ branches/rewrite/pywikibot/data/api.py 2009-05-17 21:17:10 UTC (rev 6902) @@ -185,6 +185,8 @@ from pywikibot.comms import http params = self.http_params() + if self.site._loginstatus == -3: + self.site.login(False) while True: action = self.params.get("action", "") write = action in ( @@ -248,14 +250,14 @@ status = self.site._loginstatus # save previous login status if ( ("error" in result and result["error"]["code"].endswith("limit")) - or (status != -1 + or (status >= 0 and self.site._userinfo['name'] != self.site._username[status])): # user is no longer logged in (session expired?) # reset userinfo, then make user log in again del self.site._userinfo self.site._loginstatus = -1 - if status == -1: + if status < 0: status = 0 # default to non-sysop login self.site.login(status) # retry the previous query @@ -672,6 +674,7 @@ lgname=self.username, lgpassword=self.password ) + self.site._loginstatus = -2 login_result = login_request.submit() if u"login" not in login_result: raise RuntimeError("API login response does not have 'login' key.") @@ -692,6 +695,7 @@ raise APIError(code=login_result["login"]["result"], info="") def storecookiedata(self, data): + # ignore data; cookies are set by threadedhttp module pywikibot.cookie_jar.save() Modified: branches/rewrite/pywikibot/login.py =================================================================== --- branches/rewrite/pywikibot/login.py 2009-05-17 16:44:38 UTC (rev 6901) +++ branches/rewrite/pywikibot/login.py 2009-05-17 21:17:10 UTC (rev 6902) @@ -142,9 +142,9 @@ The argument data is the raw data, as returned by getCookie(). """ - filename = config.datafilepath('%s-%s-%s-login.data' - % (self.site.family.name, self.site.code, - self.username)) + # THIS IS OVERRIDDEN IN data/api.py + filename = config.datafilepath('pywikibot.lwp') + logger.debug(u"Storing cookies to %s" % filename) f = open(filename, 'w') f.write(data) f.close() Modified: branches/rewrite/pywikibot/site.py =================================================================== --- branches/rewrite/pywikibot/site.py 2009-05-17 16:44:38 UTC (rev 6901) +++ branches/rewrite/pywikibot/site.py 2009-05-17 21:17:10 UTC (rev 6902) @@ -123,10 +123,6 @@ if not hasattr(self, "_throttle"): self._throttle = Throttle(self, multiplydelay=True, verbosedelay=True) - try: - self.login(False) - except pywikibot.NoUsername: - pass return self._throttle @property @@ -617,11 +613,12 @@ self.sitelock = threading.Lock() self._msgcache = {} self.nocapitalize = self.code in self.family.nocapitalize - # _loginstatus: -2 means login not yet attempted, + # _loginstatus: -3 means login not yet attempted, + # -2 means login attempt in progress, # -1 means not logged in (anon user), # 0 means logged in as user, # 1 means logged in as sysop - self._loginstatus = -2 + self._loginstatus = -3 return # ANYTHING BELOW THIS POINT IS NOT YET IMPLEMENTED IN __init__() @@ -656,19 +653,16 @@ # check whether a login cookie already exists for this user if not hasattr(self, "_userinfo"): self.getuserinfo() -## if self._userinfo['name'] == self._username[sysop]: -## self._loginstatus = sysop -## return if self.logged_in(sysop): return loginMan = api.LoginManager(site=self, sysop=sysop, user=self._username[sysop]) if loginMan.login(retry = True): self._username[sysop] = loginMan.username - self._loginstatus = sysop if hasattr(self, "_userinfo"): del self._userinfo self.getuserinfo() + self._loginstatus = sysop else: self._loginstatus = -1 # failure if not hasattr(self, "_siteinfo"):

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Pywikipedia-svn