Pywikipedia-svn May 2009

pywikipedia-svn@lists.wikimedia.org

8 participants
154 discussions

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

SVN: [6901] trunk/pywikipedia
by cosoleto＠svn.wikimedia.org 17 May '09

17 May '09

Revision: 6901 Author: cosoleto Date: 2009-05-17 16:44:38 +0000 (Sun, 17 May 2009) Log Message: ----------- Cosmetics: removed extra whitespaces. Modified Paths: -------------- trunk/pywikipedia/families/wikiquote_family.py trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/families/wikiquote_family.py =================================================================== --- trunk/pywikipedia/families/wikiquote_family.py 2009-05-17 16:39:50 UTC (rev 6900) +++ trunk/pywikipedia/families/wikiquote_family.py 2009-05-17 16:44:38 UTC (rev 6901) @@ -184,8 +184,8 @@ self.disambiguationTemplates = { '_default': [], 'fr': ['Homonymie'], - 'ka': [u'მრავალმნიშვნელოვანი', u'მრავმნიშ'], - 'pt': [u'Desambiguação'], + 'ka': [u'მრავალმნიშვნელოვანი', u'მრავმნიშ'], + 'pt': [u'Desambiguação'], } # attop is a list of languages that prefer to have the interwiki Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2009-05-17 16:39:50 UTC (rev 6900) +++ trunk/pywikipedia/wikipedia.py 2009-05-17 16:44:38 UTC (rev 6901) @@ -1125,7 +1125,6 @@ """ if not hasattr(self, "_isDisambig"): - if not hasattr(self._site, "_disambigtemplates"): distl = self._site.family.disambig(self._site.lang) if distl is None:

1 0

SVN: [6900] trunk/pywikipedia/families/wikiquote_family.py
by cosoleto＠svn.wikimedia.org 17 May '09

17 May '09

Revision: 6900 Author: cosoleto Date: 2009-05-17 16:39:50 +0000 (Sun, 17 May 2009) Log Message: ----------- Added disambig template name for fr.wikiquote. Modified Paths: -------------- trunk/pywikipedia/families/wikiquote_family.py Modified: trunk/pywikipedia/families/wikiquote_family.py =================================================================== --- trunk/pywikipedia/families/wikiquote_family.py 2009-05-17 16:34:13 UTC (rev 6899) +++ trunk/pywikipedia/families/wikiquote_family.py 2009-05-17 16:39:50 UTC (rev 6900) @@ -183,6 +183,7 @@ self.disambiguationTemplates = { '_default': [], + 'fr': ['Homonymie'], 'ka': [u'მრავალმნიშვნელოვანი', u'მრავმნიშ'], 'pt': [u'Desambiguação'], }

1 0

SVN: [6899] trunk/pywikipedia/family.py
by nicdumz＠svn.wikimedia.org 17 May '09

17 May '09

Revision: 6899 Author: nicdumz Date: 2009-05-17 16:34:13 +0000 (Sun, 17 May 2009) Log Message: ----------- Removing broken redirects (#2792974) Modified Paths: -------------- trunk/pywikipedia/family.py Modified: trunk/pywikipedia/family.py =================================================================== --- trunk/pywikipedia/family.py 2009-05-17 16:21:48 UTC (rev 6898) +++ trunk/pywikipedia/family.py 2009-05-17 16:34:13 UTC (rev 6899) @@ -3313,7 +3313,6 @@ 'hy': [u'վերահղում'], 'id': [u'alih'], 'is': [u'tilvísun'], - 'it': [u'rinvia', u'rinvio'], 'ja': [u'転送', u'リダイレクト'], 'jv': [u'alih'], 'ka': [u'გადამისამართება'], @@ -3338,7 +3337,7 @@ 'nl': [u'doorverwijzing'], 'nn': [u'omdiriger'], 'oc': [u'redireccion'], - 'os': [u"рарвыст", u"перенаправление", u"перенаправление", u"перенапр"], + 'os': [u"перенаправление", u"перенапр"], 'pdc': [u'weiterleitung'], 'pl': [u'redirect', u'patrz', u'tam', u'przekieruj'], 'pt-br': [u"redirecionamento"],

1 0

SVN: [6898] trunk/pywikipedia/family.py
by nicdumz＠svn.wikimedia.org 17 May '09

17 May '09

Revision: 6898 Author: nicdumz Date: 2009-05-17 16:21:48 +0000 (Sun, 17 May 2009) Log Message: ----------- Updating da: File names (#2792938) Modified Paths: -------------- trunk/pywikipedia/family.py Modified: trunk/pywikipedia/family.py =================================================================== --- trunk/pywikipedia/family.py 2009-05-17 16:18:45 UTC (rev 6897) +++ trunk/pywikipedia/family.py 2009-05-17 16:21:48 UTC (rev 6898) @@ -921,7 +921,7 @@ 'cu': [u'Дѣ́ло', u'Ви́дъ'], 'cv': u'Ӳкерчĕк', 'cy': u'Delwedd', - 'da': u'Fil', + 'da': [u'Fil', u'Billede'], 'de': [u'Datei', u'Bild'], 'dsb': [u'Dataja', u'Wobraz'], 'dv': u'ފައިލް', @@ -1099,7 +1099,7 @@ 'cu': [u'Дѣ́ла бєсѣ́да', u'Ви́да бєсѣ́да'], 'cv': u'Ӳкерчĕке сӳтсе явмалли', 'cy': u'Sgwrs Delwedd', - 'da': u'Fildiskussion', + 'da': [u'Fildiskussion', u'Billeddiskussion'], 'de': [u'Datei Diskussion', u'Bild Diskussion'], 'dsb': [u'Diskusija wó dataji', u'Diskusija wó wobrazu'], 'dv': u'ފައިލް ޚިޔާލު',

1 0

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

17 May '09

Revision: 6897 Author: nicdumz Date: 2009-05-17 16:18:45 +0000 (Sun, 17 May 2009) Log Message: ----------- Adding a cs disambig (#2792828) Modified Paths: -------------- trunk/pywikipedia/families/wikipedia_family.py Modified: trunk/pywikipedia/families/wikipedia_family.py =================================================================== --- trunk/pywikipedia/families/wikipedia_family.py 2009-05-17 16:15:15 UTC (rev 6896) +++ trunk/pywikipedia/families/wikipedia_family.py 2009-05-17 16:18:45 UTC (rev 6897) @@ -663,7 +663,8 @@ 'cdo': [u'Gì-ngiê'], 'cs': [u'Rozcestník', u'Rozcestník - 2 znaky', u'Rozcestník - Příjmení', u'Rozcestník - místopisné jméno', u'Disambig', u'Rozcestník - příjmení', - u'Rozcestník - sakrální stavba', u'Rozcestník - kostel'], + u'Rozcestník - sakrální stavba', u'Rozcestník - kostel', + u'Rozcestník - 3 znaky'], 'cu': [u'Мъногосъмыслиѥ', u'Disambig'], 'cy': [u'Anamrwysedd', u'Disambig', u'Gwahaniaethu'], 'da': [u'Flertydig'],

1 0

SVN: [6896] trunk/pywikipedia/watchlist.py
by nicdumz＠svn.wikimedia.org 17 May '09

17 May '09

Revision: 6896 Author: nicdumz Date: 2009-05-17 16:15:15 +0000 (Sun, 17 May 2009) Log Message: ----------- Use unicode for output Modified Paths: -------------- trunk/pywikipedia/watchlist.py Modified: trunk/pywikipedia/watchlist.py =================================================================== --- trunk/pywikipedia/watchlist.py 2009-05-17 16:06:52 UTC (rev 6895) +++ trunk/pywikipedia/watchlist.py 2009-05-17 16:15:15 UTC (rev 6896) @@ -41,7 +41,7 @@ file_age = time.time() - os.path.getmtime(fn) # if it's older than 1 month, reload it if file_age > 30 * 24 * 60 * 60: - wikipedia.output('Copy of watchlist is one month old, reloading') + wikipedia.output(u'Copy of watchlist is one month old, reloading') refresh(site) except OSError: # no saved watchlist exists yet, retrieve one @@ -60,11 +60,11 @@ def refresh(site): # get watchlist special page's URL path = site.watchlist_address() - wikipedia.output('Retrieving watchlist for %s' % repr(site)) + wikipedia.output(u'Retrieving watchlist for %s' % repr(site)) #wikipedia.put_throttle() # It actually is a get, but a heavy one. watchlistHTML = site.getUrl(path) - wikipedia.output('Parsing watchlist') + wikipedia.output(u'Parsing watchlist') watchlist = [] for itemR in [re.compile(r'<li><input type="checkbox" name="id\[\]" value="(.+?)" />'), re.compile(r'<li><input name="titles\[\]" type="checkbox" value="(.+?)" />')]: for m in itemR.finditer(watchlistHTML):

1 0

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

17 May '09

Revision: 6895 Author: cosoleto Date: 2009-05-17 16:06:52 +0000 (Sun, 17 May 2009) Log Message: ----------- Use capitalize() instead of 'string[0] + string [1:]', fixes issue reported in bug #2792996 and patch #2792959. Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2009-05-17 16:02:32 UTC (rev 6894) +++ trunk/pywikipedia/wikipedia.py 2009-05-17 16:06:52 UTC (rev 6895) @@ -1142,8 +1142,7 @@ else: # Normalize template capitalization self._site._disambigtemplates = set( - t[0].upper() + t[1:] - for t in distl + t.capitalize() for t in distl ) disambigInPage = self._site._disambigtemplates.intersection(self.templates()) self._isDisambig = len(disambigInPage) > 0

1 0

← Newer
1
2
3
4
5
6
7
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Pywikipedia-svn May 2009