Pywikipedia-svn October 2009

pywikipedia-svn@lists.wikimedia.org

10 participants
237 discussions

SVN: [7526] trunk/pywikipedia/families/uncyclopedia_family.py

by alexsh＠svn.wikimedia.org

Revision: 7526 Author: alexsh Date: 2009-10-23 01:55:45 +0000 (Fri, 23 Oct 2009) Log Message: ----------- uncyclopedia ns update Modified Paths: -------------- trunk/pywikipedia/families/uncyclopedia_family.py Modified: trunk/pywikipedia/families/uncyclopedia_family.py =================================================================== --- trunk/pywikipedia/families/uncyclopedia_family.py 2009-10-23 01:55:05 UTC (rev 7525) +++ trunk/pywikipedia/families/uncyclopedia_family.py 2009-10-23 01:55:45 UTC (rev 7526) @@ -103,7 +103,7 @@ 'ga': u'Meán', 'he': u'מדיה', 'hr': u'Mediji', - 'hu': u'Media', + 'hu': u'Média', 'ja': u'メディア', 'ka': u'მედია', 'km': u'មេឌា', @@ -212,7 +212,7 @@ 'el': u'Συζήτηση', 'eo': u'Diskuto', 'es': u'Discusión', - 'et': u'EbaUudised', + 'et': u'Arutelu', 'fa': u'بحث', 'fi': u'Keskustelu', 'fr': u'Discussion', @@ -287,7 +287,7 @@ 'ga': u'Úsáideoir', 'he': u'משתמש', 'hr': u'Suradnik', - 'hu': u'User', + 'hu': u'Szerkesztő', 'id': u'Pengguna', 'it': u'Utente', 'ja': u'利用者', @@ -350,7 +350,7 @@ 'ga': u'Plé úsáideora', 'he': u'שיחת משתמש', 'hr': u'Razgovor sa suradnikom', - 'hu': u'User talk', + 'hu': u'Szerkesztővita', 'id': u'Pembicaraan Pengguna', 'info': u'User talk', 'it': u'Discussioni utente', @@ -463,7 +463,7 @@ 'bn': u'আনসাইক্লোপিডিয়া আলোচনা', 'bs': u'Razgovor s Neciklopedija', 'ca': u'Valenciclopèdia Discussió', - 'common': u'Project talk', + 'common': u'UnCommons talk', 'cs': u'Necyklopedie diskuse', 'cy': u'Sgwrs Celwyddoniadur', 'da': u'Spademanns Leksikon-diskussion', @@ -479,9 +479,9 @@ 'got': u'Unsaiklopedia talk', 'he': u'שיחת איןציקלופדיה', 'hr': u'Razgovor Neciklopedija', - 'hu': u'Unciklopédia vita', + 'hu': u'Unciklopédia-vita', 'id': u'Pembicaraan Tolololpedia', - 'info': u'Project talk', + 'info': u'Uncyclopaedia talk', 'it': u'Discussioni Nonciclopedia', 'ja': u'Uncyclopedia‐ノート', 'jv': u'Dhiskusi Ndhablek', @@ -546,9 +546,9 @@ 'ga': u'Íomhá', 'he': u'קובץ', 'hr': u'Datoteka', - 'hu': u'Kép', + 'hu': u'Fájl', 'id': u'Berkas', - 'info': u'Video', + 'info': u'File', 'ja': u'ファイル', 'jv': u'Gambar', 'ka': u'ფაილი', @@ -560,7 +560,7 @@ 'lo': u'ຮູບ', 'lt': u'Vaizdas', 'lv': u'Attēls', - 'meta': u'Image', + 'meta': u'File', 'mg': u'Sary', 'mk': u'Податотека', 'mo': u'Fişier', @@ -577,7 +577,7 @@ 'sl': u'Slika', 'sr': u'Слика', 'su': u'Gambar', - 'sv': u'Bild', + 'sv': u'Fil', 'th': u'ไฟล์', 'tl': u'Talaksan', 'tr': u'Dosya', @@ -610,9 +610,9 @@ 'ga': u'Plé íomhá', 'he': u'שיחת קובץ', 'hr': u'Razgovor o datoteci', - 'hu': u'Kep vita', + 'hu': u'Fájlvita', 'id': u'Pembicaraan Berkas', - 'info': u'Video talk', + 'info': u'File talk', 'it': u'Discussioni file', 'ja': u'ファイル‐ノート', 'jv': u'Dhiskusi Gambar', @@ -625,7 +625,7 @@ 'lo': u'ສົນທະນາກ່ຽວກັບຮູບ', 'lt': u'Vaizdo aptarimas', 'lv': u'Attēla diskusija', - 'meta': u'Image talk', + 'meta': u'File talk', 'mg': u'Dinika amin\'ny sary', 'mk': u'Разговор за податотека', 'mo': u'Discuţie Fişier', @@ -642,7 +642,7 @@ 'sl': u'Pogovor o sliki', 'sr': u'Разговор о слици', 'su': u'Obrolan gambar', - 'sv': u'Bilddiskussion', + 'sv': u'Fildiskussion', 'th': u'คุยเรื่องไฟล์', 'tl': u'Usapang talaksan', 'tr': u'Dosya tartışma', @@ -698,6 +698,7 @@ 'ga': u'Plé MediaWiki', 'he': u'שיחת מדיה ויקי', 'hr': u'MediaWiki razgovor', + 'hu': u'MediaWiki-vita', 'id': u'Pembicaraan MediaWiki', 'it': u'Discussioni MediaWiki', 'ja': u'MediaWiki‐ノート', @@ -727,7 +728,7 @@ 'sl': u'Pogovor o MediaWiki', 'sr': u'Разговор о МедијаВикију', 'su': u'Obrolan MédiaWiki', - 'sv': u'MediaWiki diskussion', + 'sv': u'MediaWiki-diskussion', 'th': u'คุยเรื่องมีเดียวิกิ', 'tl': u'Usapang MediaWiki', 'tr': u'MedyaViki tartışma', @@ -759,6 +760,7 @@ 'ga': u'Teimpléad', 'he': u'תבנית', 'hr': u'Predložak', + 'hu': u'Sablon', 'id': u'Templat', 'jv': u'Cithakan', 'ka': u'თარგი', @@ -818,6 +820,7 @@ 'ga': u'Plé teimpléid', 'he': u'שיחת תבנית', 'hr': u'Razgovor o predlošku', + 'hu': u'Sablonvita', 'id': u'Pembicaraan Templat', 'it': u'Discussioni template', 'ja': u'Template‐ノート', @@ -938,7 +941,7 @@ 'ga': u'Plé cabhrach', 'he': u'שיחת מדריך', 'hr': u'Razgovor o pomoći', - 'hu': u'Segítség vita', + 'hu': u'Segítségvita', 'id': u'Pembicaraan Bantuan', 'it': u'Discussioni aiuto', 'ja': u'Help‐ノート', @@ -1061,7 +1064,7 @@ 'ga': u'Plé catagóire', 'he': u'שיחת קטגוריה', 'hr': u'Razgovor o kategoriji', - 'hu': u'Kategória vita', + 'hu': u'Kategóriavita', 'id': u'Pembicaraan Kategori', 'it': u'Discussioni categoria', 'ja': u'Category‐ノート', @@ -1103,7 +1106,8 @@ self.namespaces[16] = { '_default': u'', - 'fi': u'Foorum', + 'et': u'Foorum', + 'fi': u'Foorumi', 'got': u'Forum', 'info': u'Game', 'meta': u'UnSource', @@ -1248,7 +1252,7 @@ self.namespaces[29] = { '_default': u'', - 'fi': u'Hihitys hikipelistä', + 'fi': u'Hihitys Hikipelistä', 'nl': u'Overleg Ongerijmd', 'th': u'คุยเรื่องบอร์ด', 'zh-hk': u'詞意分道討論', @@ -1499,6 +1503,9 @@ 'es': u'Incijuegos', 'he': u'איןטקסט', 'it': u'Giochi', + 'ja': u'UnBooks', + 'nn': u'Ikkeratur', + 'no': u'Ikkeratur', 'zh': u'伪基音乐', } @@ -1507,6 +1514,9 @@ 'es': u'Incijuegos Discusión', 'he': u'שיחת איןטקסט', 'it': u'Giochi', + 'ja': u'UnBooks talk', + 'nn': u'Ikkeratur-Diskusjon', + 'no': u'Ikkeratur-Diskusjon', 'zh': u'伪基音乐 talk', }

14 years, 7 months

SVN: [7525] trunk/pywikipedia/welcome.py

by alexsh＠svn.wikimedia.org

Revision: 7525 Author: alexsh Date: 2009-10-23 01:55:05 +0000 (Fri, 23 Oct 2009) Log Message: ----------- clear logbook parameter Modified Paths: -------------- trunk/pywikipedia/welcome.py Modified: trunk/pywikipedia/welcome.py =================================================================== --- trunk/pywikipedia/welcome.py 2009-10-21 21:10:29 UTC (rev 7524) +++ trunk/pywikipedia/welcome.py 2009-10-23 01:55:05 UTC (rev 7525) @@ -203,25 +203,17 @@ logbook = { 'commons': {'_default': u'Project:Welcome log', }, 'wikipedia': { + '_default': None, 'ar': u'Project:سجل الترحيب', - 'da': None, # no welcome log on da.wiki - 'de': None, # no welcome log on de.wiki - 'en': u'Project:Welcome log', 'fa': u'Project:سیاهه خوشامد', 'fr': u'Wikipedia:Prise de décision/Accueil automatique des nouveaux par un robot/log', 'ga': u'Project:Log fáilte', - 'he': None, # no welcome log on he.wiki - 'id': None, # no welcome log on id.wiki 'it': u'Project:Benvenuto Bot/Log', 'ja': u'利用者:Alexbot/Welcomebotログ', - 'ka': None, # no welcome log on ka.wiki 'nl': u'Project:Logboek welkom', 'no': u'Project:Velkomstlogg', - 'pt': None, # no welcome log on pt.wiki - 'ru': None, # no welcome log on ru.wiki 'sq': u'Project:Tung log', 'sr': u'Project:Добродошлице', - 'vo': None, # no welcome log on vo.wiki 'zh': u'User:Welcomebot/欢迎日志', } } @@ -628,6 +620,9 @@ text = u'' logg = wikipedia.translate(self.site, logbook) + if not logg: + return None + target = logg + '/' + time.strftime('%Y/%m/%d', time.localtime(time.time())) if self.site.lang == 'it': target = logg + '/' + time.strftime('%d/%m/%Y', time.localtime(time.time()))

14 years, 7 months

SVN: [7524] trunk/pywikipedia/featured.py

by purodha＠svn.wikimedia.org

Revision: 7524 Author: purodha Date: 2009-10-21 21:10:29 +0000 (Wed, 21 Oct 2009) Log Message: ----------- Grammatical corrections in help text. Modified Paths: -------------- trunk/pywikipedia/featured.py Modified: trunk/pywikipedia/featured.py =================================================================== --- trunk/pywikipedia/featured.py 2009-10-21 04:40:19 UTC (rev 7523) +++ trunk/pywikipedia/featured.py 2009-10-21 21:10:29 UTC (rev 7524) @@ -3,7 +3,7 @@ """ This script understands various command-line arguments: --interactive: ask before changing page +-interactive: ask before changing each page -nocache doesn't include /cache/featured file to remember if the article already was verified. @@ -15,18 +15,19 @@ -after:zzzz process pages after and including page zzzz --top using -top if you want moving all {{Link FA|lang}} to top of - interwiki. DEFAULT: placing {{Link FA|lang}} right next to - corresponding interwiki. --count Only counts how many featured articles of an languages - (using "-fromlang" argument) or all wikipedias - (using "-fromall" argument). (merge /archive/featuredcount.py) - like: featured.py -fromlang:en,he -count - (give counts how many featured articles of en and he wp) +-top use -top if you want to move all {{Link FA|lang}} to the top of + interwiki links. Default is placing {{Link FA|lang}} right next to + the corresponding interwiki link. +-count Only counts how many featured articles of the language(s) + (given with the "-fromlang" argument) or all wikis + (when using the "-fromall" argument) exist. + (merge /archive/featuredcount.py) + Example: featured.py -fromlang:en,he -count + counts how many featured articles exist in the en and he wikipedias. --good use this script for good articles instead od featured articles +-good use this script for good articles instead od featured articles. -usage: featured.py [-interactive] [-nocache] [-top] [-after:zzzz] [-fromlang:xx,yy,zz|-fromall] +usage: featured.py [-interactive] [-nocache] [-top] [-after:zzzz] [-fromlang:xx,yy--zz|-fromall] """ __version__ = '$Id$'

14 years, 7 months

SVN: [7523] branches/rewrite/pywikibot/config2.py

by alexsh＠svn.wikimedia.org

Revision: 7523 Author: alexsh Date: 2009-10-21 04:40:19 +0000 (Wed, 21 Oct 2009) Log Message: ----------- add platform modules to detect windows version Modified Paths: -------------- branches/rewrite/pywikibot/config2.py Modified: branches/rewrite/pywikibot/config2.py =================================================================== --- branches/rewrite/pywikibot/config2.py 2009-10-21 02:31:09 UTC (rev 7522) +++ branches/rewrite/pywikibot/config2.py 2009-10-21 04:40:19 UTC (rev 7523) @@ -9,6 +9,7 @@ import os, re import sys as __sys +import platform # IMPORTANT: # Do not change any of the variables in this file. Instead, make @@ -119,7 +120,11 @@ is_windows = __sys.platform == 'win32' home = os.path.expanduser("~") if is_windows: - base_dir = os.path.join(home, "Application Data", NAME) + _win_version = int(platform.version()[0]) + if _win_version == 5: + base_dir = os.path.join(home, "Application Data", NAME) + elif _win_version == 6: + base_dir = os.path.join(home, "AppData\\Roaming", NAME) else: base_dir = os.path.join(home, "."+NAME) if not os.path.isdir(base_dir):

14 years, 7 months

SVN: [7522] trunk/pywikipedia

by alexsh＠svn.wikimedia.org

Revision: 7522 Author: alexsh Date: 2009-10-21 02:31:09 +0000 (Wed, 21 Oct 2009) Log Message: ----------- revert...not compatible for python 2.5 Orz Modified Paths: -------------- trunk/pywikipedia/interwiki.py trunk/pywikipedia/login.py trunk/pywikipedia/query.py trunk/pywikipedia/upload.py trunk/pywikipedia/userlib.py trunk/pywikipedia/weblinkchecker.py trunk/pywikipedia/wikipedia.py Property Changed: ---------------- trunk/pywikipedia/commons_category_redirect.py trunk/pywikipedia/maintenance/cleanident Property changes on: trunk/pywikipedia/commons_category_redirect.py ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: trunk/pywikipedia/interwiki.py =================================================================== --- trunk/pywikipedia/interwiki.py 2009-10-21 02:12:58 UTC (rev 7521) +++ trunk/pywikipedia/interwiki.py 2009-10-21 02:31:09 UTC (rev 7522) @@ -1596,7 +1596,7 @@ timeout=60 while 1: try: - status, data = page.put(newtext, comment = mcomment) + status, reason, data = page.put(newtext, comment = mcomment) except wikipedia.LockedPage: wikipedia.output(u'Page %s is locked. Skipping.' % (page.title(),)) raise SaveError @@ -1628,7 +1628,7 @@ if str(status) == '302': return True else: - wikipedia.output(u'%s' % status) + wikipedia.output(u'%s %s' % (status, reason)) return False elif answer == 'g': raise GiveUpOnPage Modified: trunk/pywikipedia/login.py =================================================================== --- trunk/pywikipedia/login.py 2009-10-21 02:12:58 UTC (rev 7521) +++ trunk/pywikipedia/login.py 2009-10-21 02:31:09 UTC (rev 7522) @@ -182,7 +182,7 @@ fakepredata['wpPassword'] = fakepredata['lgpassword'] = u'XXXXX' wikipedia.output(u"self.site.postData(%s, %s)" % (address, self.site.urlEncode(fakepredata))) fakeresponsemsg = re.sub(r"(session|Token)=..........", r"session=XXXXXXXXXX", response.msg.__str__()) - wikipedia.output(u"%s\n%s" % (response.code, fakeresponsemsg)) + wikipedia.output(u"%s/%s\n%s" % (response.status, response.reason, fakeresponsemsg)) wikipedia.output(u"%s" % data) Reat=re.compile(': (.*?);') L = [] Property changes on: trunk/pywikipedia/maintenance/cleanident ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: trunk/pywikipedia/query.py =================================================================== --- trunk/pywikipedia/query.py 2009-10-21 02:12:58 UTC (rev 7521) +++ trunk/pywikipedia/query.py 2009-10-21 02:31:09 UTC (rev 7522) @@ -115,6 +115,11 @@ (('file', params['filename'].encode(site.encoding()), cont),), site.cookies(sysop=sysop) ) + elif site.hostname() in wikipedia.config.authenticate.keys(): + params["Content-type"] = "application/x-www-form-urlencoded" + params["User-agent"] = useragent + res = urllib2.urlopen(urllib2.Request(site.protocol() + '://' + site.hostname() + address, site.urlEncode(params))) + jsontext = res.read() elif params['action'] in postAC: res, jsontext = site.postForm(path, params, sysop, site.cookies(sysop = sysop) ) else: Modified: trunk/pywikipedia/upload.py =================================================================== --- trunk/pywikipedia/upload.py 2009-10-21 02:12:58 UTC (rev 7521) +++ trunk/pywikipedia/upload.py 2009-10-21 02:31:09 UTC (rev 7522) @@ -347,14 +347,14 @@ # ATTENTION: if you changed your Wikimedia Commons account not to show # an English interface, this detection will fail! success_msg = self.targetSite.mediawiki_message('successfulupload') - if success_msg in returned_html or response.code == 302: + if success_msg in returned_html or response.status == 302: wikipedia.output(u"Upload successful.") # The following is not a good idea, because the server also gives a 200 when # something went wrong. - #if response.code in [200, 302]: + #if response.status in [200, 302]: # wikipedia.output(u"Upload successful.") - elif response.code == 301: + elif response.status == 301: wikipedia.output(u"Following redirect...") address = response.getheader('Location') wikipedia.output(u"Changed upload address to %s. Please update %s.py" % (address, self.targetSite.family.__module__)) @@ -368,7 +368,7 @@ except: pass wikipedia.output(u'%s\n\n' % returned_html) - wikipedia.output(u'%i' % response.code) + wikipedia.output(u'%i %s' % (response.status, response.reason)) if self.targetSite.mediawiki_message('uploadwarning') in returned_html: answer = wikipedia.inputChoice(u"You have recevied an upload warning message. Ignore?", ['Yes', 'No'], ['y', 'N'], 'N') Modified: trunk/pywikipedia/userlib.py =================================================================== --- trunk/pywikipedia/userlib.py 2009-10-21 02:12:58 UTC (rev 7521) +++ trunk/pywikipedia/userlib.py 2009-10-21 02:31:09 UTC (rev 7522) @@ -554,7 +554,7 @@ address = self.site().unblock_address() response, data = self.site().postForm(address, predata, sysop = True) - if response.code != 302: + if response.status != 302: if self.site().mediawiki_message('ipb_cant_unblock').replace('$1',blockID) in data: raise AlreadyUnblockedError raise UnblockError, data Modified: trunk/pywikipedia/weblinkchecker.py =================================================================== --- trunk/pywikipedia/weblinkchecker.py 2009-10-21 02:12:58 UTC (rev 7521) +++ trunk/pywikipedia/weblinkchecker.py 2009-10-21 02:31:09 UTC (rev 7522) @@ -394,7 +394,7 @@ return self.resolveRedirect(useHEAD = False) else: raise - if response.code >= 300 and response.code <= 399: + if response.status >= 300 and response.status <= 399: #print response.getheaders() redirTarget = response.getheader('Location') if redirTarget: @@ -493,10 +493,10 @@ # read the server's encoding, in case we need it later self.readEncodingFromResponse(response) # site down if the server status is between 400 and 499 - alive = response.code not in range(400, 500) - if response.code in self.HTTPignore: + alive = response.status not in range(400, 500) + if response.status in self.HTTPignore: alive = False - return alive, '%s' % response.code + return alive, '%s %s' % (response.status, response.reason) class LinkCheckThread(threading.Thread): ''' Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2009-10-21 02:12:58 UTC (rev 7521) +++ trunk/pywikipedia/wikipedia.py 2009-10-21 02:31:09 UTC (rev 7522) @@ -123,7 +123,7 @@ __version__ = '$Id$' import os, sys -import socket, urllib, urllib2 +import httplib, socket, urllib, urllib2 import traceback import time, threading, Queue import math @@ -1647,6 +1647,8 @@ response, data = query.GetData(params, self.site(), sysop=sysop, back_response = True) if query.IsString(data): raise KeyError + except httplib.BadStatusLine, line: + raise PageNotSaved('Bad status line: %s' % line.line) except ServerError: output(u''.join(traceback.format_exception(*sys.exc_info()))) retry_attempt += 1 @@ -1671,7 +1673,7 @@ # Check blocks self.site().checkBlocks(sysop = sysop) # A second text area means that an edit conflict has occured. - if response.code == 500: + if response.status == 500: output(u"Server error encountered; will retry in %i minute%s." % (retry_delay, retry_delay != 1 and "s" or "")) time.sleep(60 * retry_delay) @@ -1696,8 +1698,8 @@ #for debug only #------------------------ if verbose: - output("error occured, code:%s\ninfo:%s\nstatus:%s" % ( - data['error']['code'], data['error']['info'], response.code)) + output("error occured, code:%s\ninfo:%s\nstatus:%s\nresponse:%s" % ( + data['error']['code'], data['error']['info'], response.status, response.reason)) faked = params if 'text' in faked: del faked['text'] @@ -1706,7 +1708,7 @@ #------------------------ errorCode = data['error']['code'] #cannot handle longpageerror and PageNoSave yet - if errorCode == 'maxlag' or response.code == 503: + if errorCode == 'maxlag' or response.status == 503: # server lag; wait for the lag time and retry m = re.search('Waiting for (.+?): (.+?) seconds lagged', data['error']['info']) timelag = int(m.group(2)) @@ -1791,13 +1793,13 @@ # if the page update is successed, we need to return code 302 for cheat script who # using status code # - return 302, data['edit'] + return 302, response.reason, data['edit'] solve = self.site().solveCaptcha(data) if solve: return self._putPage(text, comment, watchArticle, minorEdit, newPage, token, newToken, sysop, captcha=solve) - return response.code, data + return response.status, response.reason, data def _putPageOld(self, text, comment=None, watchArticle=False, minorEdit=True, @@ -1884,7 +1886,7 @@ return None try: response, data = self.site().postForm(address, predata, sysop) - if response.code == 503: + if response.status == 503: if 'x-database-lag' in response.msg.keys(): # server lag; Mediawiki recommends waiting 5 seconds # and retrying @@ -1896,7 +1898,9 @@ wait = min(wait*2, 300) continue # Squid error 503 - raise ServerError(response.code) + raise ServerError(response.status) + except httplib.BadStatusLine, line: + raise PageNotSaved('Bad status line: %s' % line.line) except ServerError: output(u''.join(traceback.format_exception(*sys.exc_info()))) retry_attempt += 1 @@ -1988,7 +1992,7 @@ # to "Wikipedia has a problem", but I'm not sure. Maybe we could # just check for HTTP Status 500 (Internal Server Error)? if ("<title>Wikimedia Error</title>" in data or "has a problem</title>" in data) \ - or response.code == 500: + or response.status == 500: output(u"Server error encountered; will retry in %i minute%s." % (retry_delay, retry_delay != 1 and "s" or "")) time.sleep(60 * retry_delay) @@ -2049,7 +2053,7 @@ # Something went wrong, and we don't know what. Show the # HTML code that hopefully includes some error message. output(u"ERROR: Unexpected response from wiki server.") - output(u" %s" % response.code) + output(u" %s (%s) " % (response.status, response.reason)) output(data) # Unexpected responses should raise an error and not pass, # be it silently or loudly. This should raise an error @@ -2058,7 +2062,7 @@ # We are on the preview page, so the page was not saved raise PageNotSaved - return response.code, data + return response.status, response.reason, data def canBeEdited(self): """Return bool indicating whether this page can be edited. @@ -3281,7 +3285,7 @@ else: response, data = self.site().postForm(address, predata, sysop=True) - if response.code == 302 and not data: + if response.status == 302 and not data: output(u'Changed protection level of page %s.' % self.aslink()) return True else: @@ -3289,7 +3293,7 @@ self.site().checkBlocks(sysop = True) output(u'Failed to change protection level of page %s:' % self.aslink()) - output(u"HTTP response code %s" % response.code) + output(u"HTTP response code %s" % response.status) output(data) return False @@ -3687,7 +3691,7 @@ while True: try: data = self.getData() - except (socket.error, ServerError): + except (socket.error, httplib.BadStatusLine, ServerError): # Print the traceback of the caught exception output(u''.join(traceback.format_exception(*sys.exc_info()))) output(u'DBG> got network error in _GetAll.run. ' \ @@ -5134,6 +5138,14 @@ if not language[0].upper() + language[1:] in self.namespaces(): self._validlanguages.append(language) + #if persistent_http is None: + # persistent_http = config.persistent_http + #self.persistent_http = persistent_http and self.protocol() in ('http', 'https') + #if persistent_http: + # if self.protocol() == 'http': + # self.conn = httplib.HTTPConnection(self.hostname()) + # elif self.protocol() == 'https': + # self.conn = httplib.HTTPSConnection(self.hostname()) self.persistent_http = False def _userIndex(self, sysop = False): @@ -5377,94 +5389,75 @@ """ # TODO: add the authenticate stuff here - if self.hostname() in config.authenticate.keys(): - uo = authenticateURLopener + + #if False: #self.persistent_http: + # conn = self.conn + #else: + if config.proxy['host']: + conn = httplib.HTTPConnection(config.proxy['host']) + proxyPutAddr = '%s://%s%s' % (self.protocol(), self.hostname(), address) + conn.putrequest('POST', proxyPutAddr) + if type(config.proxy['auth']) == tuple: + import base64 + authcode = base64.b64encode("%s:%s" % (config.proxy['auth'][0], config.proxy['auth'][1]) ) + conn.putheader('Proxy-Authorization', "Basic %s" % authcode ) + else: - if config.proxy['host'] and type(config.proxy['auth']) == tuple: - proxyHandle = {'http':'http://%s:%s@%s' % (config.proxy['auth'][0], config.proxy['auth'][1], config.proxy['host'] )} - elif config.proxy['host']: - proxyHandle = {'http':'http://%s' % config.proxy['host'] } - else: - proxyHandle = None + if self.protocol() == 'http': + conn = httplib.HTTPConnection(self.hostname()) + elif self.protocol() == 'https': + conn = httplib.HTTPSConnection(self.hostname()) - uo = MyURLopener(proxies = proxyHandle) - uo.addheader('Cookie', cookies) - if compress: - uo.addheader('Accept-encoding', 'gzip') + conn.putrequest('POST', address) + + # Encode all of this into a HTTP request + # otherwise, it will crash, as other protocols are not supported + if address[-1] == "?": address = address[:-1] - url = '%s://%s%s' % (self.protocol(), self.hostname(), address) + if self.hostname() in config.authenticate.keys(): + import base64 + authcode = base64.b64encode("%s:%s" % (config.authenticate[self.hostname()][0], config.authenticate[self.hostname()][1]) ) + conn.putheader("Authorization", "Basic %s" % authcode ) + + conn.putheader('Content-Length', str(len(data))) + conn.putheader('Content-type', contentType) + conn.putheader('User-agent', useragent) + if cookies: + conn.putheader('Cookie', cookies) + #if False: #self.persistent_http: + # conn.putheader('Connection', 'Keep-Alive') + if compress: + conn.putheader('Accept-encoding', 'gzip') + conn.endheaders() + conn.send(data) - # Try to retrieve the page until it was successfully loaded (just in - # case the server is down or overloaded). - # Wait for retry_idle_time minutes (growing!) between retries. - retry_idle_time = 1 - while True: - try: - if self.hostname() in config.authenticate.keys(): - request = urllib2.Request(url, data) - request.add_header('User-agent', useragent) - opener = urllib2.build_opener() - f = opener.open(request) - else: - f = uo.open(url, data) + # Prepare the return values + # Note that this can raise network exceptions which are not + # caught here. + try: + response = conn.getresponse() + except httplib.BadStatusLine: + # Blub. + conn.close() + conn.connect() + return self.postData(address, data, contentType, sysop, compress, cookies) - # read & info can raise socket.error - text = f.read() - headers = f.info() - break - except KeyboardInterrupt: - raise - except Exception, e: - if retry: - # We assume that the server is down. Wait some time, then try again. - output(u"%s" % e) - output(u"WARNING: Could not open '%s'. Maybe the server or" % url) - output(u"your connection is down. Retrying in %i minutes..." % retry_idle_time) - time.sleep(retry_idle_time * 60) - # Next time wait longer, but not longer than half an hour - retry_idle_time *= 2 - if retry_idle_time > 30: - retry_idle_time = 30 - else: - raise + data = response.read() - contentType = headers.get('content-type', '') - contentEncoding = headers.get('content-encoding', '') + if compress and response.getheader('Content-Encoding') == 'gzip': + data = decompress_gzip(data) - # Ensure that all sent data is received - if int(headers.get('content-length', '0')) != len(text) and 'content-length' in headers: - output(u'Warning! len(text) does not match content-length: %s != %s' % \ - (len(text), headers.get('content-length'))) - return self.postData(path, address, data, contentType, sysop, compress, cookie) + data = data.decode(self.encoding()) + response.close() - if compress and contentEncoding == 'gzip': - text = decompress_gzip(text) + if True: #not self.persistent_http: + conn.close() - R = re.compile('charset=([^\'\";]+)') - m = R.search(contentType) - if m: - charset = m.group(1) - else: - if verbose: - output(u"WARNING: No character set found.") - # UTF-8 as default - charset = 'utf-8' - # Check if this is the charset we expected - self.checkCharset(charset) - # Convert HTML to Unicode - try: - text = unicode(text, charset, errors = 'strict') - except UnicodeDecodeError, e: - print e - output(u'ERROR: Invalid characters found on %s://%s%s, replaced by \\ufffd.' % (self.protocol(), self.hostname(), path)) - # We use error='replace' in case of bad encoding. - text = unicode(text, charset, errors = 'replace') - # If a wiki page, get user data - self._getUserDataOld(text, sysop = sysop) + self._getUserDataOld(data, sysop = sysop) - return f, text + return response, data def getUrl(self, path, retry = None, sysop = False, data = None, compress = True, no_hostname = False, cookie_only=False, back_response=False): @@ -5531,8 +5524,10 @@ if retry: # We assume that the server is down. Wait some time, then try again. output(u"%s" % e) - output(u"WARNING: Could not open '%s'. Maybe the server or" % url) - output("your connection is down. Retrying in %i minutes..." % retry_idle_time) + output(u"""\ +WARNING: Could not open '%s'. Maybe the server or +your connection is down. Retrying in %i minutes...""" + % (url, retry_idle_time)) time.sleep(retry_idle_time * 60) # Next time wait longer, but not longer than half an hour retry_idle_time *= 2 @@ -5550,6 +5545,9 @@ if int(headers.get('content-length', '0')) != len(text) and 'content-length' in headers: output(u'Warning! len(text) does not match content-length: %s != %s' % \ (len(text), headers.get('content-length'))) + #if False: #self.persistent_http + # self.conn.close() + # self.conn.connect() return self.getUrl(path, retry, sysop, data, compress, no_hostname, cookie_only, back_response) if compress and contentEncoding == 'gzip':

14 years, 7 months

SVN: [7521] trunk/pywikipedia

by alexsh＠svn.wikimedia.org

Revision: 7521 Author: alexsh Date: 2009-10-21 02:12:58 +0000 (Wed, 21 Oct 2009) Log Message: ----------- wp.py:Site().postData():change httplib to MyURLopener, disable all response.reason, response.status->response.code, remove all httplib.BadStatusLine Modified Paths: -------------- trunk/pywikipedia/interwiki.py trunk/pywikipedia/login.py trunk/pywikipedia/query.py trunk/pywikipedia/upload.py trunk/pywikipedia/userlib.py trunk/pywikipedia/weblinkchecker.py trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/interwiki.py =================================================================== --- trunk/pywikipedia/interwiki.py 2009-10-20 23:28:49 UTC (rev 7520) +++ trunk/pywikipedia/interwiki.py 2009-10-21 02:12:58 UTC (rev 7521) @@ -1596,7 +1596,7 @@ timeout=60 while 1: try: - status, reason, data = page.put(newtext, comment = mcomment) + status, data = page.put(newtext, comment = mcomment) except wikipedia.LockedPage: wikipedia.output(u'Page %s is locked. Skipping.' % (page.title(),)) raise SaveError @@ -1628,7 +1628,7 @@ if str(status) == '302': return True else: - wikipedia.output(u'%s %s' % (status, reason)) + wikipedia.output(u'%s' % status) return False elif answer == 'g': raise GiveUpOnPage Modified: trunk/pywikipedia/login.py =================================================================== --- trunk/pywikipedia/login.py 2009-10-20 23:28:49 UTC (rev 7520) +++ trunk/pywikipedia/login.py 2009-10-21 02:12:58 UTC (rev 7521) @@ -182,7 +182,7 @@ fakepredata['wpPassword'] = fakepredata['lgpassword'] = u'XXXXX' wikipedia.output(u"self.site.postData(%s, %s)" % (address, self.site.urlEncode(fakepredata))) fakeresponsemsg = re.sub(r"(session|Token)=..........", r"session=XXXXXXXXXX", response.msg.__str__()) - wikipedia.output(u"%s/%s\n%s" % (response.status, response.reason, fakeresponsemsg)) + wikipedia.output(u"%s\n%s" % (response.code, fakeresponsemsg)) wikipedia.output(u"%s" % data) Reat=re.compile(': (.*?);') L = [] Modified: trunk/pywikipedia/query.py =================================================================== --- trunk/pywikipedia/query.py 2009-10-20 23:28:49 UTC (rev 7520) +++ trunk/pywikipedia/query.py 2009-10-21 02:12:58 UTC (rev 7521) @@ -115,11 +115,6 @@ (('file', params['filename'].encode(site.encoding()), cont),), site.cookies(sysop=sysop) ) - elif site.hostname() in wikipedia.config.authenticate.keys(): - params["Content-type"] = "application/x-www-form-urlencoded" - params["User-agent"] = useragent - res = urllib2.urlopen(urllib2.Request(site.protocol() + '://' + site.hostname() + address, site.urlEncode(params))) - jsontext = res.read() elif params['action'] in postAC: res, jsontext = site.postForm(path, params, sysop, site.cookies(sysop = sysop) ) else: Modified: trunk/pywikipedia/upload.py =================================================================== --- trunk/pywikipedia/upload.py 2009-10-20 23:28:49 UTC (rev 7520) +++ trunk/pywikipedia/upload.py 2009-10-21 02:12:58 UTC (rev 7521) @@ -347,14 +347,14 @@ # ATTENTION: if you changed your Wikimedia Commons account not to show # an English interface, this detection will fail! success_msg = self.targetSite.mediawiki_message('successfulupload') - if success_msg in returned_html or response.status == 302: + if success_msg in returned_html or response.code == 302: wikipedia.output(u"Upload successful.") # The following is not a good idea, because the server also gives a 200 when # something went wrong. - #if response.status in [200, 302]: + #if response.code in [200, 302]: # wikipedia.output(u"Upload successful.") - elif response.status == 301: + elif response.code == 301: wikipedia.output(u"Following redirect...") address = response.getheader('Location') wikipedia.output(u"Changed upload address to %s. Please update %s.py" % (address, self.targetSite.family.__module__)) @@ -368,7 +368,7 @@ except: pass wikipedia.output(u'%s\n\n' % returned_html) - wikipedia.output(u'%i %s' % (response.status, response.reason)) + wikipedia.output(u'%i' % response.code) if self.targetSite.mediawiki_message('uploadwarning') in returned_html: answer = wikipedia.inputChoice(u"You have recevied an upload warning message. Ignore?", ['Yes', 'No'], ['y', 'N'], 'N') Modified: trunk/pywikipedia/userlib.py =================================================================== --- trunk/pywikipedia/userlib.py 2009-10-20 23:28:49 UTC (rev 7520) +++ trunk/pywikipedia/userlib.py 2009-10-21 02:12:58 UTC (rev 7521) @@ -554,7 +554,7 @@ address = self.site().unblock_address() response, data = self.site().postForm(address, predata, sysop = True) - if response.status != 302: + if response.code != 302: if self.site().mediawiki_message('ipb_cant_unblock').replace('$1',blockID) in data: raise AlreadyUnblockedError raise UnblockError, data Modified: trunk/pywikipedia/weblinkchecker.py =================================================================== --- trunk/pywikipedia/weblinkchecker.py 2009-10-20 23:28:49 UTC (rev 7520) +++ trunk/pywikipedia/weblinkchecker.py 2009-10-21 02:12:58 UTC (rev 7521) @@ -394,7 +394,7 @@ return self.resolveRedirect(useHEAD = False) else: raise - if response.status >= 300 and response.status <= 399: + if response.code >= 300 and response.code <= 399: #print response.getheaders() redirTarget = response.getheader('Location') if redirTarget: @@ -493,10 +493,10 @@ # read the server's encoding, in case we need it later self.readEncodingFromResponse(response) # site down if the server status is between 400 and 499 - alive = response.status not in range(400, 500) - if response.status in self.HTTPignore: + alive = response.code not in range(400, 500) + if response.code in self.HTTPignore: alive = False - return alive, '%s %s' % (response.status, response.reason) + return alive, '%s' % response.code class LinkCheckThread(threading.Thread): ''' Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2009-10-20 23:28:49 UTC (rev 7520) +++ trunk/pywikipedia/wikipedia.py 2009-10-21 02:12:58 UTC (rev 7521) @@ -123,7 +123,7 @@ __version__ = '$Id$' import os, sys -import httplib, socket, urllib, urllib2 +import socket, urllib, urllib2 import traceback import time, threading, Queue import math @@ -1647,8 +1647,6 @@ response, data = query.GetData(params, self.site(), sysop=sysop, back_response = True) if query.IsString(data): raise KeyError - except httplib.BadStatusLine, line: - raise PageNotSaved('Bad status line: %s' % line.line) except ServerError: output(u''.join(traceback.format_exception(*sys.exc_info()))) retry_attempt += 1 @@ -1673,7 +1671,7 @@ # Check blocks self.site().checkBlocks(sysop = sysop) # A second text area means that an edit conflict has occured. - if response.status == 500: + if response.code == 500: output(u"Server error encountered; will retry in %i minute%s." % (retry_delay, retry_delay != 1 and "s" or "")) time.sleep(60 * retry_delay) @@ -1698,8 +1696,8 @@ #for debug only #------------------------ if verbose: - output("error occured, code:%s\ninfo:%s\nstatus:%s\nresponse:%s" % ( - data['error']['code'], data['error']['info'], response.status, response.reason)) + output("error occured, code:%s\ninfo:%s\nstatus:%s" % ( + data['error']['code'], data['error']['info'], response.code)) faked = params if 'text' in faked: del faked['text'] @@ -1708,7 +1706,7 @@ #------------------------ errorCode = data['error']['code'] #cannot handle longpageerror and PageNoSave yet - if errorCode == 'maxlag' or response.status == 503: + if errorCode == 'maxlag' or response.code == 503: # server lag; wait for the lag time and retry m = re.search('Waiting for (.+?): (.+?) seconds lagged', data['error']['info']) timelag = int(m.group(2)) @@ -1793,13 +1791,13 @@ # if the page update is successed, we need to return code 302 for cheat script who # using status code # - return 302, response.reason, data['edit'] + return 302, data['edit'] solve = self.site().solveCaptcha(data) if solve: return self._putPage(text, comment, watchArticle, minorEdit, newPage, token, newToken, sysop, captcha=solve) - return response.status, response.reason, data + return response.code, data def _putPageOld(self, text, comment=None, watchArticle=False, minorEdit=True, @@ -1886,7 +1884,7 @@ return None try: response, data = self.site().postForm(address, predata, sysop) - if response.status == 503: + if response.code == 503: if 'x-database-lag' in response.msg.keys(): # server lag; Mediawiki recommends waiting 5 seconds # and retrying @@ -1898,9 +1896,7 @@ wait = min(wait*2, 300) continue # Squid error 503 - raise ServerError(response.status) - except httplib.BadStatusLine, line: - raise PageNotSaved('Bad status line: %s' % line.line) + raise ServerError(response.code) except ServerError: output(u''.join(traceback.format_exception(*sys.exc_info()))) retry_attempt += 1 @@ -1992,7 +1988,7 @@ # to "Wikipedia has a problem", but I'm not sure. Maybe we could # just check for HTTP Status 500 (Internal Server Error)? if ("<title>Wikimedia Error</title>" in data or "has a problem</title>" in data) \ - or response.status == 500: + or response.code == 500: output(u"Server error encountered; will retry in %i minute%s." % (retry_delay, retry_delay != 1 and "s" or "")) time.sleep(60 * retry_delay) @@ -2053,7 +2049,7 @@ # Something went wrong, and we don't know what. Show the # HTML code that hopefully includes some error message. output(u"ERROR: Unexpected response from wiki server.") - output(u" %s (%s) " % (response.status, response.reason)) + output(u" %s" % response.code) output(data) # Unexpected responses should raise an error and not pass, # be it silently or loudly. This should raise an error @@ -2062,7 +2058,7 @@ # We are on the preview page, so the page was not saved raise PageNotSaved - return response.status, response.reason, data + return response.code, data def canBeEdited(self): """Return bool indicating whether this page can be edited. @@ -3285,7 +3281,7 @@ else: response, data = self.site().postForm(address, predata, sysop=True) - if response.status == 302 and not data: + if response.code == 302 and not data: output(u'Changed protection level of page %s.' % self.aslink()) return True else: @@ -3293,7 +3289,7 @@ self.site().checkBlocks(sysop = True) output(u'Failed to change protection level of page %s:' % self.aslink()) - output(u"HTTP response code %s" % response.status) + output(u"HTTP response code %s" % response.code) output(data) return False @@ -3691,7 +3687,7 @@ while True: try: data = self.getData() - except (socket.error, httplib.BadStatusLine, ServerError): + except (socket.error, ServerError): # Print the traceback of the caught exception output(u''.join(traceback.format_exception(*sys.exc_info()))) output(u'DBG> got network error in _GetAll.run. ' \ @@ -5138,14 +5134,6 @@ if not language[0].upper() + language[1:] in self.namespaces(): self._validlanguages.append(language) - #if persistent_http is None: - # persistent_http = config.persistent_http - #self.persistent_http = persistent_http and self.protocol() in ('http', 'https') - #if persistent_http: - # if self.protocol() == 'http': - # self.conn = httplib.HTTPConnection(self.hostname()) - # elif self.protocol() == 'https': - # self.conn = httplib.HTTPSConnection(self.hostname()) self.persistent_http = False def _userIndex(self, sysop = False): @@ -5389,75 +5377,94 @@ """ # TODO: add the authenticate stuff here - - #if False: #self.persistent_http: - # conn = self.conn - #else: - if config.proxy['host']: - conn = httplib.HTTPConnection(config.proxy['host']) - proxyPutAddr = '%s://%s%s' % (self.protocol(), self.hostname(), address) - conn.putrequest('POST', proxyPutAddr) - if type(config.proxy['auth']) == tuple: - import base64 - authcode = base64.b64encode("%s:%s" % (config.proxy['auth'][0], config.proxy['auth'][1]) ) - conn.putheader('Proxy-Authorization', "Basic %s" % authcode ) - + if self.hostname() in config.authenticate.keys(): + uo = authenticateURLopener else: - if self.protocol() == 'http': - conn = httplib.HTTPConnection(self.hostname()) - elif self.protocol() == 'https': - conn = httplib.HTTPSConnection(self.hostname()) + if config.proxy['host'] and type(config.proxy['auth']) == tuple: + proxyHandle = {'http':'http://%s:%s@%s' % (config.proxy['auth'][0], config.proxy['auth'][1], config.proxy['host'] )} + elif config.proxy['host']: + proxyHandle = {'http':'http://%s' % config.proxy['host'] } + else: + proxyHandle = None - conn.putrequest('POST', address) - - # Encode all of this into a HTTP request - # otherwise, it will crash, as other protocols are not supported - + uo = MyURLopener(proxies = proxyHandle) + uo.addheader('Cookie', cookies) + if compress: + uo.addheader('Accept-encoding', 'gzip') if address[-1] == "?": address = address[:-1] - if self.hostname() in config.authenticate.keys(): - import base64 - authcode = base64.b64encode("%s:%s" % (config.authenticate[self.hostname()][0], config.authenticate[self.hostname()][1]) ) - conn.putheader("Authorization", "Basic %s" % authcode ) - - conn.putheader('Content-Length', str(len(data))) - conn.putheader('Content-type', contentType) - conn.putheader('User-agent', useragent) - if cookies: - conn.putheader('Cookie', cookies) - #if False: #self.persistent_http: - # conn.putheader('Connection', 'Keep-Alive') - if compress: - conn.putheader('Accept-encoding', 'gzip') - conn.endheaders() - conn.send(data) + url = '%s://%s%s' % (self.protocol(), self.hostname(), address) - # Prepare the return values - # Note that this can raise network exceptions which are not - # caught here. - try: - response = conn.getresponse() - except httplib.BadStatusLine: - # Blub. - conn.close() - conn.connect() - return self.postData(address, data, contentType, sysop, compress, cookies) + # Try to retrieve the page until it was successfully loaded (just in + # case the server is down or overloaded). + # Wait for retry_idle_time minutes (growing!) between retries. + retry_idle_time = 1 + while True: + try: + if self.hostname() in config.authenticate.keys(): + request = urllib2.Request(url, data) + request.add_header('User-agent', useragent) + opener = urllib2.build_opener() + f = opener.open(request) + else: + f = uo.open(url, data) - data = response.read() + # read & info can raise socket.error + text = f.read() + headers = f.info() + break + except KeyboardInterrupt: + raise + except Exception, e: + if retry: + # We assume that the server is down. Wait some time, then try again. + output(u"%s" % e) + output(u"WARNING: Could not open '%s'. Maybe the server or" % url) + output(u"your connection is down. Retrying in %i minutes..." % retry_idle_time) + time.sleep(retry_idle_time * 60) + # Next time wait longer, but not longer than half an hour + retry_idle_time *= 2 + if retry_idle_time > 30: + retry_idle_time = 30 + else: + raise - if compress and response.getheader('Content-Encoding') == 'gzip': - data = decompress_gzip(data) + contentType = headers.get('content-type', '') + contentEncoding = headers.get('content-encoding', '') - data = data.decode(self.encoding()) - response.close() + # Ensure that all sent data is received + if int(headers.get('content-length', '0')) != len(text) and 'content-length' in headers: + output(u'Warning! len(text) does not match content-length: %s != %s' % \ + (len(text), headers.get('content-length'))) + return self.postData(path, address, data, contentType, sysop, compress, cookie) - if True: #not self.persistent_http: - conn.close() + if compress and contentEncoding == 'gzip': + text = decompress_gzip(text) + R = re.compile('charset=([^\'\";]+)') + m = R.search(contentType) + if m: + charset = m.group(1) + else: + if verbose: + output(u"WARNING: No character set found.") + # UTF-8 as default + charset = 'utf-8' + # Check if this is the charset we expected + self.checkCharset(charset) + # Convert HTML to Unicode + try: + text = unicode(text, charset, errors = 'strict') + except UnicodeDecodeError, e: + print e + output(u'ERROR: Invalid characters found on %s://%s%s, replaced by \\ufffd.' % (self.protocol(), self.hostname(), path)) + # We use error='replace' in case of bad encoding. + text = unicode(text, charset, errors = 'replace') + # If a wiki page, get user data - self._getUserDataOld(data, sysop = sysop) + self._getUserDataOld(text, sysop = sysop) - return response, data + return f, text def getUrl(self, path, retry = None, sysop = False, data = None, compress = True, no_hostname = False, cookie_only=False, back_response=False): @@ -5524,10 +5531,8 @@ if retry: # We assume that the server is down. Wait some time, then try again. output(u"%s" % e) - output(u"""\ -WARNING: Could not open '%s'. Maybe the server or -your connection is down. Retrying in %i minutes...""" - % (url, retry_idle_time)) + output(u"WARNING: Could not open '%s'. Maybe the server or" % url) + output("your connection is down. Retrying in %i minutes..." % retry_idle_time) time.sleep(retry_idle_time * 60) # Next time wait longer, but not longer than half an hour retry_idle_time *= 2 @@ -5545,9 +5550,6 @@ if int(headers.get('content-length', '0')) != len(text) and 'content-length' in headers: output(u'Warning! len(text) does not match content-length: %s != %s' % \ (len(text), headers.get('content-length'))) - #if False: #self.persistent_http - # self.conn.close() - # self.conn.connect() return self.getUrl(path, retry, sysop, data, compress, no_hostname, cookie_only, back_response) if compress and contentEncoding == 'gzip':

14 years, 7 months

SVN: [7520] trunk/pywikipedia/families/wikibooks_family.py

by alexsh＠svn.wikimedia.org

Revision: 7520 Author: alexsh Date: 2009-10-20 23:28:49 +0000 (Tue, 20 Oct 2009) Log Message: ----------- up wb:bn ns from update_namespaces Modified Paths: -------------- trunk/pywikipedia/families/wikibooks_family.py Modified: trunk/pywikipedia/families/wikibooks_family.py =================================================================== --- trunk/pywikipedia/families/wikibooks_family.py 2009-10-20 21:03:37 UTC (rev 7519) +++ trunk/pywikipedia/families/wikibooks_family.py 2009-10-20 23:28:49 UTC (rev 7520) @@ -40,6 +40,7 @@ '_default': [u'Wikibooks', self.namespaces[4]['_default']], 'ar': u'ويكي الكتب', 'bg': u'Уикикниги', + 'bn': u'উইকিবই', 'bs': u'Wikiknjige', 'ca': u'Viquillibres', 'cs': u'Wikiknihy', @@ -88,7 +89,7 @@ 'be': u'Wikibooks размовы', 'bg': u'Уикикниги беседа', 'bm': u'Discussion Wikibooks', - 'bn': u'Wikibooks আলোচনা', + 'bn': u'উইকিবই আলোচনা', 'bs': u'Razgovor s Wikiknjigama', 'ca': u'Viquillibres Discussió', 'cs': u'Wikiknihy diskuse',

14 years, 7 months

SVN: [7519] branches/rewrite/pywikibot/config2.py

by alexsh＠svn.wikimedia.org

Revision: 7519 Author: alexsh Date: 2009-10-20 21:03:37 +0000 (Tue, 20 Oct 2009) Log Message: ----------- don't set WM projet to secure so fast by default Modified Paths: -------------- branches/rewrite/pywikibot/config2.py Modified: branches/rewrite/pywikibot/config2.py =================================================================== --- branches/rewrite/pywikibot/config2.py 2009-10-20 21:00:37 UTC (rev 7518) +++ branches/rewrite/pywikibot/config2.py 2009-10-20 21:03:37 UTC (rev 7519) @@ -70,8 +70,8 @@ # # Security Connection for Wikimedia Projects # -use_SSL_onlogin = True # if available, use SSL when logging in -use_SSL_always = True # if available, use SSL for all API queries +use_SSL_onlogin = False # if available, use SSL when logging in +use_SSL_always = False # if available, use SSL for all API queries # Available security projects available_ssl_project = [

14 years, 7 months

SVN: [7518] branches/rewrite/pywikibot/site.py

by alexsh＠svn.wikimedia.org

Revision: 7518 Author: alexsh Date: 2009-10-20 21:00:37 +0000 (Tue, 20 Oct 2009) Log Message: ----------- take patrolled comment out (permission denied) Modified Paths: -------------- branches/rewrite/pywikibot/site.py Modified: branches/rewrite/pywikibot/site.py =================================================================== --- branches/rewrite/pywikibot/site.py 2009-10-20 07:02:14 UTC (rev 7517) +++ branches/rewrite/pywikibot/site.py 2009-10-20 21:00:37 UTC (rev 7518) @@ -1882,7 +1882,7 @@ "recentchanges: start must be later than end with reverse=False") rcgen = self._generator(api.ListGenerator, type_arg="recentchanges", rcprop="user|comment|timestamp|title|ids" - "|redirect|patrolled|loginfo|flags", + "|redirect|loginfo|flags", namespaces=namespaces, step=step, total=total) if start is not None: @@ -1904,8 +1904,8 @@ filters = {'minor': showMinor, 'bot': showBot, 'anon': showAnon, - 'redirect': showRedirects, - 'patrolled': showPatrolled} + 'redirect': showRedirects,} + #'patrolled': showPatrolled} rcshow = [] for item in filters: if filters[item] is not None:

14 years, 7 months

SVN: [7517] trunk/pywikipedia/catlib.py

by alexsh＠svn.wikimedia.org

Revision: 7517 Author: alexsh Date: 2009-10-20 07:02:14 +0000 (Tue, 20 Oct 2009) Log Message: ----------- typo Modified Paths: -------------- trunk/pywikipedia/catlib.py Modified: trunk/pywikipedia/catlib.py =================================================================== --- trunk/pywikipedia/catlib.py 2009-10-20 06:23:57 UTC (rev 7516) +++ trunk/pywikipedia/catlib.py 2009-10-20 07:02:14 UTC (rev 7517) @@ -225,7 +225,7 @@ count += 1 # For MediaWiki versions where subcats look like articles if memb['ns'] == 14: - yield SUBCATEGORY, Category.(self.site(), memb['title'], sortKey=memb['sortkey']) + yield SUBCATEGORY, Category(self.site(), memb['title'], sortKey=memb['sortkey']) elif memb['ns'] == 6: yield ARTICLE, wikipedia.ImagePage(self.site(), memb['title']) else:

14 years, 7 months

← Newer
1
2
3
4
5
6
7
8
9
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Pywikipedia-svn October 2009