Pywikipedia-svn July 2009

pywikipedia-svn@lists.wikimedia.org

9 participants
94 discussions

SVN: [7081] trunk/pywikipedia/query.py
by alexsh＠svn.wikimedia.org 19 Jul '09

19 Jul '09

Revision: 7081 Author: alexsh Date: 2009-07-19 12:42:54 +0000 (Sun, 19 Jul 2009) Log Message: ----------- query.GetData():Add response parameter Modified Paths: -------------- trunk/pywikipedia/query.py Modified: trunk/pywikipedia/query.py =================================================================== --- trunk/pywikipedia/query.py 2009-07-19 12:40:06 UTC (rev 7080) +++ trunk/pywikipedia/query.py 2009-07-19 12:42:54 UTC (rev 7081) @@ -28,7 +28,7 @@ import wikipedia, simplejson, urllib, time -def GetData(params, site = None, verbose = False, useAPI = False, retryCount = 5, encodeTitle = True): +def GetData(params, site = None, verbose = False, useAPI = False, retryCount = 5, encodeTitle = True, back_response = False): """Get data from the query api, and convert it into a data object """ if site is None: @@ -84,11 +84,17 @@ if params['action'] in postAC: res, jsontext = site.postData(path, urllib.urlencode(params.items()), cookies=site.cookies()) else: - jsontext = site.getUrl( path, retry=True, data=data ) + if back_response: + res, jsontext = site.getUrl( path, retry=True, data=data, back_response=True) + else: + jsontext = site.getUrl( path, retry=True, data=data) # This will also work, but all unicode strings will need to be converted from \u notation # decodedObj = eval( jsontext ) - return simplejson.loads( jsontext ) + if back_response: + return res, simplejson.loads( jsontext ) + else: + return simplejson.loads( jsontext ) except ValueError, error: retryCount -= 1

1 0

SVN: [7080] trunk/pywikipedia/wikipedia.py
by alexsh＠svn.wikimedia.org 19 Jul '09

19 Jul '09

Revision: 7080 Author: alexsh Date: 2009-07-19 12:40:06 +0000 (Sun, 19 Jul 2009) Log Message: ----------- site().getUrl(): add response mode parameter Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2009-07-18 22:17:31 UTC (rev 7079) +++ trunk/pywikipedia/wikipedia.py 2009-07-19 12:40:06 UTC (rev 7080) @@ -4708,7 +4708,7 @@ return response, data def getUrl(self, path, retry = None, sysop = False, data = None, - compress = True, no_hostname = False, cookie_only=False): + compress = True, no_hostname = False, cookie_only=False, back_response=False): """ Low-level routine to get a URL from the wiki. @@ -4744,7 +4744,7 @@ # Blub. self.conn.close() self.conn.connect() - return self.getUrl(path, retry, sysop, data, compress) + return self.getUrl(path, retry, sysop, data, compress, back_response=back_response) text = response.read() headers = dict(response.getheaders()) @@ -4815,7 +4815,7 @@ if False: #self.persistent_http self.conn.close() self.conn.connect() - return self.getUrl(path, retry, sysop, data, compress) + return self.getUrl(path, retry, sysop, data, compress, back_response=back_response) if compress and contentEncoding == 'gzip': text = decompress_gzip(text) @@ -4846,7 +4846,10 @@ # If a wiki page, get user data self._getUserData(text, sysop = sysop) - return text + if back_response: + return response, text + else: + return text def _getUserData(self, text, sysop = False, force = True): """

1 0

SVN: [7079] trunk/pywikipedia/families/wikipedia_family.py
by a_engels＠svn.wikimedia.org 19 Jul '09

19 Jul '09

Revision: 7079 Author: a_engels Date: 2009-07-18 22:17:31 +0000 (Sat, 18 Jul 2009) Log Message: ----------- Modified Paths: -------------- trunk/pywikipedia/families/wikipedia_family.py Modified: trunk/pywikipedia/families/wikipedia_family.py =================================================================== --- trunk/pywikipedia/families/wikipedia_family.py 2009-07-18 17:41:49 UTC (rev 7078) +++ trunk/pywikipedia/families/wikipedia_family.py 2009-07-18 22:17:31 UTC (rev 7079) @@ -753,6 +753,7 @@ 'sr': [u'Вишезначна одредница', u'Disambig', u'Вишезначна', u'Višeznačna odrednica'], 'srn': [u'Dp'], + 'stq': [u'Begriepskläärenge'], 'su': [u'Disambig'], 'sv': None, 'sw': [u'Maana'],

1 0

SVN: [7078] trunk/pywikipedia/query.py
by alexsh＠svn.wikimedia.org 19 Jul '09

19 Jul '09

Revision: 7078 Author: alexsh Date: 2009-07-18 17:41:49 +0000 (Sat, 18 Jul 2009) Log Message: ----------- Fix: ERR_INVALID_REQ for url too long Modified Paths: -------------- trunk/pywikipedia/query.py Modified: trunk/pywikipedia/query.py =================================================================== --- trunk/pywikipedia/query.py 2009-07-18 12:27:59 UTC (rev 7077) +++ trunk/pywikipedia/query.py 2009-07-18 17:41:49 UTC (rev 7078) @@ -56,8 +56,16 @@ data = {'titles' : params['titles']} del params['titles'] + postAC = [ + 'edit', 'login', 'purge', 'rollback', 'delete', 'undelete', 'protect', + 'block', 'unblock', 'move', 'emailuser','import', 'userrights', + ] if useAPI: - path = site.api_address() + urllib.urlencode(params.items()) + if params['action'] in postAC: + path = site.api_address() + else: + path = site.api_address() + urllib.urlencode(params.items()) + else: path = site.query_address() + urllib.urlencode(params.items()) @@ -69,10 +77,6 @@ lastError = None retry_idle_time = 5 - postAC = [ - 'edit', 'login', 'purge', 'rollback', 'delete', 'undelete', 'protect', - 'block', 'unblock', 'move', 'emailuser','import', 'userrights', - ] while retryCount >= 0: try:

1 0

SVN: [7077] trunk/pywikipedia/families
by alexsh＠svn.wikimedia.org 18 Jul '09

18 Jul '09

Revision: 7077 Author: alexsh Date: 2009-07-18 12:27:59 +0000 (Sat, 18 Jul 2009) Log Message: ----------- Update wikimedia site version Modified Paths: -------------- trunk/pywikipedia/families/commons_family.py trunk/pywikipedia/families/incubator_family.py trunk/pywikipedia/families/mediawiki_family.py trunk/pywikipedia/families/meta_family.py trunk/pywikipedia/families/species_family.py trunk/pywikipedia/families/test_family.py trunk/pywikipedia/families/wikibooks_family.py trunk/pywikipedia/families/wikinews_family.py trunk/pywikipedia/families/wikipedia_family.py trunk/pywikipedia/families/wikiquote_family.py trunk/pywikipedia/families/wikisource_family.py trunk/pywikipedia/families/wikiversity_family.py trunk/pywikipedia/families/wiktionary_family.py Modified: trunk/pywikipedia/families/commons_family.py =================================================================== --- trunk/pywikipedia/families/commons_family.py 2009-07-17 22:57:00 UTC (rev 7076) +++ trunk/pywikipedia/families/commons_family.py 2009-07-18 12:27:59 UTC (rev 7077) @@ -54,7 +54,7 @@ } def version(self, code): - return '1.16alpha' + return '1.16alpha-wmf' def dbName(self, code): return 'commonswiki_p' Modified: trunk/pywikipedia/families/incubator_family.py =================================================================== --- trunk/pywikipedia/families/incubator_family.py 2009-07-17 22:57:00 UTC (rev 7076) +++ trunk/pywikipedia/families/incubator_family.py 2009-07-18 12:27:59 UTC (rev 7077) @@ -30,7 +30,7 @@ } def version(self, code): - return '1.16alpha' + return '1.16alpha-wmf' def shared_image_repository(self, code): return ('commons', 'commons') Modified: trunk/pywikipedia/families/mediawiki_family.py =================================================================== --- trunk/pywikipedia/families/mediawiki_family.py 2009-07-17 22:57:00 UTC (rev 7076) +++ trunk/pywikipedia/families/mediawiki_family.py 2009-07-18 12:27:59 UTC (rev 7077) @@ -38,7 +38,7 @@ } def version(self, code): - return '1.16alpha' + return '1.16alpha-wmf' def shared_image_repository(self, code): return ('commons', 'commons') Modified: trunk/pywikipedia/families/meta_family.py =================================================================== --- trunk/pywikipedia/families/meta_family.py 2009-07-17 22:57:00 UTC (rev 7076) +++ trunk/pywikipedia/families/meta_family.py 2009-07-18 12:27:59 UTC (rev 7077) @@ -130,7 +130,7 @@ self.cross_allowed = ['meta',] def version(self,code): - return '1.16alpha' + return '1.16alpha-wmf' def shared_image_repository(self, code): return ('commons', 'commons') Modified: trunk/pywikipedia/families/species_family.py =================================================================== --- trunk/pywikipedia/families/species_family.py 2009-07-17 22:57:00 UTC (rev 7076) +++ trunk/pywikipedia/families/species_family.py 2009-07-18 12:27:59 UTC (rev 7077) @@ -26,7 +26,7 @@ self.interwiki_forward = 'wikipedia' def version(self,code): - return '1.16alpha' + return '1.16alpha-wmf' def shared_image_repository(self, code): return ('commons', 'commons') Modified: trunk/pywikipedia/families/test_family.py =================================================================== --- trunk/pywikipedia/families/test_family.py 2009-07-17 22:57:00 UTC (rev 7076) +++ trunk/pywikipedia/families/test_family.py 2009-07-18 12:27:59 UTC (rev 7077) @@ -127,7 +127,7 @@ } def version(self, code): - return '1.13alpha' + return '1.16alpha-wmf' def shared_image_repository(self, code): return ('commons', 'commons') Modified: trunk/pywikipedia/families/wikibooks_family.py =================================================================== --- trunk/pywikipedia/families/wikibooks_family.py 2009-07-17 22:57:00 UTC (rev 7076) +++ trunk/pywikipedia/families/wikibooks_family.py 2009-07-18 12:27:59 UTC (rev 7077) @@ -348,7 +348,7 @@ self.cross_allowed = ['fa', 'fy', 'it', 'ru', 'simple', 'zh'] def version(self, code): - return '1.16alpha' + return '1.16alpha-wmf' def shared_image_repository(self, code): return ('commons', 'commons') Modified: trunk/pywikipedia/families/wikinews_family.py =================================================================== --- trunk/pywikipedia/families/wikinews_family.py 2009-07-17 22:57:00 UTC (rev 7076) +++ trunk/pywikipedia/families/wikinews_family.py 2009-07-18 12:27:59 UTC (rev 7077) @@ -193,7 +193,7 @@ return 'utf-8' def version(self, code): - return '1.16alpha' + return '1.16alpha-wmf' def shared_image_repository(self, code): return ('commons', 'commons') Modified: trunk/pywikipedia/families/wikipedia_family.py =================================================================== --- trunk/pywikipedia/families/wikipedia_family.py 2009-07-17 22:57:00 UTC (rev 7076) +++ trunk/pywikipedia/families/wikipedia_family.py 2009-07-18 12:27:59 UTC (rev 7077) @@ -1100,7 +1100,7 @@ return self.known_families def version(self, code): - return '1.16alpha' + return '1.16alpha-wmf' def dbName(self, code): # returns the name of the MySQL database Modified: trunk/pywikipedia/families/wikiquote_family.py =================================================================== --- trunk/pywikipedia/families/wikiquote_family.py 2009-07-17 22:57:00 UTC (rev 7076) +++ trunk/pywikipedia/families/wikiquote_family.py 2009-07-18 12:27:59 UTC (rev 7077) @@ -263,7 +263,7 @@ } def version(self, code): - return '1.16alpha' + return '1.16alpha-wmf' def code2encodings(self, code): """ Modified: trunk/pywikipedia/families/wikisource_family.py =================================================================== --- trunk/pywikipedia/families/wikisource_family.py 2009-07-17 22:57:00 UTC (rev 7076) +++ trunk/pywikipedia/families/wikisource_family.py 2009-07-18 12:27:59 UTC (rev 7077) @@ -350,7 +350,7 @@ ] def version(self, code): - return '1.16alpha' + return '1.16alpha-wmf' def shared_image_repository(self, code): return ('commons', 'commons') Modified: trunk/pywikipedia/families/wikiversity_family.py =================================================================== --- trunk/pywikipedia/families/wikiversity_family.py 2009-07-17 22:57:00 UTC (rev 7076) +++ trunk/pywikipedia/families/wikiversity_family.py 2009-07-18 12:27:59 UTC (rev 7077) @@ -119,7 +119,7 @@ ] def version(self,code): - return '1.16alpha' + return '1.16alpha-wmf' def shared_image_repository(self, code): return ('commons', 'commons') Modified: trunk/pywikipedia/families/wiktionary_family.py =================================================================== --- trunk/pywikipedia/families/wiktionary_family.py 2009-07-17 22:57:00 UTC (rev 7076) +++ trunk/pywikipedia/families/wiktionary_family.py 2009-07-18 12:27:59 UTC (rev 7077) @@ -449,7 +449,7 @@ self.interwiki_attop = ['pl'] def version(self, code): - return '1.16alpha' + return '1.16alpha-wmf' def shared_image_repository(self, code): return ('commons', 'commons')

1 0

SVN: [7076] trunk/pywikipedia/welcome.py
by mfarag＠svn.wikimedia.org 18 Jul '09

18 Jul '09

Revision: 7076 Author: mfarag Date: 2009-07-17 22:57:00 +0000 (Fri, 17 Jul 2009) Log Message: ----------- no longer in use Modified Paths: -------------- trunk/pywikipedia/welcome.py Modified: trunk/pywikipedia/welcome.py =================================================================== --- trunk/pywikipedia/welcome.py 2009-07-17 20:29:14 UTC (rev 7075) +++ trunk/pywikipedia/welcome.py 2009-07-17 22:57:00 UTC (rev 7076) @@ -3,7 +3,7 @@ """ Script to welcome new users. This script works out of the box for Wikis that have been defined in the script. It is currently used on the Dutch, Norwegian, -Arabian, Albanian, Italian Wikipedia, Wikimedia Commons and English Wikiquote. +Albanian, Italian Wikipedia, Wikimedia Commons and English Wikiquote. Note: You can download the latest version available from here: http://botwiki.sno.cc/wiki/Python:Welcome.py @@ -11,7 +11,6 @@ Ensure you have community support before running this bot! URLs to current implementations: -* Arabic Wikinews: http://ar.wikinews.org/wiki/ويكي_الأخبار:سجل_الترحيب * Wikimedia Commons: http://commons.wikimedia.org/wiki/Commons:Welcome_log * Dutch Wikipedia: http://nl.wikipedia.org/wiki/Wikipedia:Logboek_welkom * Italian Wikipedia: http://it.wikipedia.org/wiki/Wikipedia:Benvenuto_log

1 0

SVN: [7075] trunk/pywikipedia
by a_engels＠svn.wikimedia.org 18 Jul '09

18 Jul '09

Revision: 7075 Author: a_engels Date: 2009-07-17 20:29:14 +0000 (Fri, 17 Jul 2009) Log Message: ----------- adding language mhr: Modified Paths: -------------- trunk/pywikipedia/families/wikipedia_family.py trunk/pywikipedia/family.py Modified: trunk/pywikipedia/families/wikipedia_family.py =================================================================== --- trunk/pywikipedia/families/wikipedia_family.py 2009-07-17 13:21:49 UTC (rev 7074) +++ trunk/pywikipedia/families/wikipedia_family.py 2009-07-17 20:29:14 UTC (rev 7075) @@ -896,7 +896,7 @@ 'mk', 'mg', 'ml', 'mt', 'mi', 'mr', 'arz', 'mzn', 'cdo', 'mdf', 'mo', 'mn', 'mus', 'my', 'nah', 'fj', 'nl', 'nds-nl', 'cr', 'ne', 'new', 'ja', 'nap', 'ce', 'pih', 'no', 'nb', 'nn', 'nrm', 'nov', - 'ii', 'oc', 'or', 'om', 'ng', 'hz', 'uz', 'pa', 'pi', 'pag', 'pap', + 'ii', 'oc', 'mhr', 'or', 'om', 'ng', 'hz', 'uz', 'pa', 'pi', 'pag', 'pap', 'ps', 'km', 'pms', 'nds', 'pl', 'pnt', 'pt', 'aa', 'kaa', 'crh', 'ty', 'ksh', 'ro', 'rmy', 'rm', 'qu', 'ru', 'sah', 'se', 'sa', 'sg', 'sc', 'za', 'sco', 'stq', 'st', 'tn', 'sq', 'scn', 'si', 'simple', Modified: trunk/pywikipedia/family.py =================================================================== --- trunk/pywikipedia/family.py 2009-07-17 13:21:49 UTC (rev 7074) +++ trunk/pywikipedia/family.py 2009-07-17 20:29:14 UTC (rev 7075) @@ -27,7 +27,7 @@ 'ln', 'jbo', 'lg', 'lmo', 'hu', 'mk', 'mg', 'ml', 'mt', 'mi', 'mr', 'arz', 'mzn', 'ms', 'cdo', 'mdf', 'mo', 'mn', 'mus', 'my', 'nah', 'na', 'fj', 'nl', 'nds-nl', 'cr', 'ne', 'new', 'ja', 'nap', 'ce', - 'pih', 'no', 'nb', 'nn', 'nrm', 'nov', 'ii', 'oc', 'or', 'om', 'ng', + 'pih', 'no', 'nb', 'nn', 'nrm', 'nov', 'ii', 'oc', 'mhr', 'or', 'om', 'ng', 'hz', 'uz', 'pa', 'pi', 'pag', 'pap', 'ps', 'km', 'pms', 'tpi', 'nds', 'pl', 'tokipona', 'tp', 'pnt', 'pt', 'aa', 'kaa', 'crh', 'ty', 'ksh', 'ro', 'rmy', 'rm', 'qu', 'ru', 'sah', 'se', 'sm', 'sa',

1 0

SVN: [7074] branches/rewrite/pywikibot/page.py
by russblau＠svn.wikimedia.org 17 Jul '09

17 Jul '09

Revision: 7074 Author: russblau Date: 2009-07-17 13:21:49 +0000 (Fri, 17 Jul 2009) Log Message: ----------- bug in botMayEdit(): 'username' was undefined Modified Paths: -------------- branches/rewrite/pywikibot/page.py Modified: branches/rewrite/pywikibot/page.py =================================================================== --- branches/rewrite/pywikibot/page.py 2009-07-17 11:03:57 UTC (rev 7073) +++ branches/rewrite/pywikibot/page.py 2009-07-17 13:21:49 UTC (rev 7074) @@ -640,6 +640,7 @@ """ # TODO: move this to Site object? if config.ignore_bot_templates: #Check the "master ignore switch" return True + username = self.site().user() try: templates = self.templatesWithParams(); except (pywikibot.NoPage,

1 0

SVN: [7073] trunk/pywikipedia/query.py
by multichill＠svn.wikimedia.org 17 Jul '09

17 Jul '09

Revision: 7073 Author: multichill Date: 2009-07-17 11:03:57 +0000 (Fri, 17 Jul 2009) Log Message: ----------- http GET already sends cookies, now POST also sends cookies. This is for example needed when you want to use import in the api. Modified Paths: -------------- trunk/pywikipedia/query.py Modified: trunk/pywikipedia/query.py =================================================================== --- trunk/pywikipedia/query.py 2009-07-15 21:32:58 UTC (rev 7072) +++ trunk/pywikipedia/query.py 2009-07-17 11:03:57 UTC (rev 7073) @@ -78,7 +78,7 @@ try: jsontext = "Nothing received" if params['action'] in postAC: - res, jsontext = site.postData(path, urllib.urlencode(params.items())) + res, jsontext = site.postData(path, urllib.urlencode(params.items()), cookies=site.cookies()) else: jsontext = site.getUrl( path, retry=True, data=data )

1 0

SVN: [7072] trunk/pywikipedia/wikipedia.py
by alexsh＠svn.wikimedia.org 16 Jul '09

16 Jul '09

Revision: 7072 Author: alexsh Date: 2009-07-15 21:32:58 +0000 (Wed, 15 Jul 2009) Log Message: ----------- self.site().linksearch: add API available check (too difficult to talk exception and process when query.GetData work, list format will different if yeild linksearch again) Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2009-07-15 21:05:47 UTC (rev 7071) +++ trunk/pywikipedia/wikipedia.py 2009-07-15 21:32:58 UTC (rev 7072) @@ -5810,6 +5810,13 @@ """Yield Pages from results of Special:Linksearch for 'siteurl'.""" cache = [] R = re.compile('title ?=\"([^<>]*?)\">[^<>]*</a></li>') + #Check API can work + if config.use_api: + try: + d = self.api_address() + del d + except NotImplementedError: + config.use_api = False urlsToRetrieve = [siteurl] if not siteurl.startswith('*.'):

1 0

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Pywikipedia-svn July 2009