Pywikipedia-svn August 2009

pywikipedia-svn@lists.wikimedia.org

11 participants
93 discussions

SVN: [7114] trunk/pywikipedia
by alexsh＠svn.wikimedia.org 06 Aug '09

06 Aug '09

Revision: 7114 Author: alexsh Date: 2009-08-05 21:40:30 +0000 (Wed, 05 Aug 2009) Log Message: ----------- Remove all 'useAPI=True' tag for function set useAPI default True Modified Paths: -------------- trunk/pywikipedia/casechecker.py trunk/pywikipedia/catlib.py trunk/pywikipedia/imageuncat.py trunk/pywikipedia/maintenance/family_check.py trunk/pywikipedia/welcome.py trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/casechecker.py =================================================================== --- trunk/pywikipedia/casechecker.py 2009-08-05 21:39:21 UTC (rev 7113) +++ trunk/pywikipedia/casechecker.py 2009-08-05 21:40:30 UTC (rev 7114) @@ -200,14 +200,14 @@ wlpage = self.whitelists[self.site.lang] wikipedia.output(u'Loading whitelist from %s' % wlpage) wlparams = { - 'action' : 'query', - 'prop' : 'links', - 'titles' : wlpage, - 'redirects' : '', - 'indexpageids' : '', - } + 'action' : 'query', + 'prop' : 'links', + 'titles' : wlpage, + 'redirects' : '', + 'indexpageids' : '', + } - data = query.GetData(self.site.lang, wlparams, wikipedia.verbose, useAPI=True, encodeTitle=False) + data = query.GetData(wlparams, wikipedia.getSite(self.site.lang), wikipedia.verbose, encodeTitle=False) if len(data['query']['pageids']) == 1: pageid = data['query']['pageids'][0] links = data['query']['pages'][pageid]['links'] Modified: trunk/pywikipedia/catlib.py =================================================================== --- trunk/pywikipedia/catlib.py 2009-08-05 21:39:21 UTC (rev 7113) +++ trunk/pywikipedia/catlib.py 2009-08-05 21:40:30 UTC (rev 7114) @@ -533,8 +533,7 @@ 'cmtitle' :CatName, } - data = query.GetData(params, site = site, - useAPI = True, encodeTitle = False) + data = query.GetData(params, site, encodeTitle = False) categories_parsed.append(CatName) try: members = data['query']['categorymembers'] Modified: trunk/pywikipedia/imageuncat.py =================================================================== --- trunk/pywikipedia/imageuncat.py 2009-08-05 21:39:21 UTC (rev 7113) +++ trunk/pywikipedia/imageuncat.py 2009-08-05 21:40:30 UTC (rev 7114) @@ -1243,7 +1243,7 @@ 'leend' :today.strftime(dateformat) } - data = query.GetData(params, site, useAPI = True, encodeTitle = False) + data = query.GetData(params, site, encodeTitle = False) try: for item in data['query']['logevents']: result.append(item['title']) @@ -1279,7 +1279,7 @@ 'rctype' :'edit|log', } - data = query.GetData(params, site, useAPI = True, encodeTitle = False) + data = query.GetData(params, site, encodeTitle = False) try: for item in data['query']['recentchanges']: result.append(item['title']) Modified: trunk/pywikipedia/maintenance/family_check.py =================================================================== --- trunk/pywikipedia/maintenance/family_check.py 2009-08-05 21:39:21 UTC (rev 7113) +++ trunk/pywikipedia/maintenance/family_check.py 2009-08-05 21:40:30 UTC (rev 7114) @@ -17,7 +17,7 @@ 'meta': 'siteinfo', 'siprop': 'namespaces'} try: - data = query.GetData(predata, site = site, useAPI = True)['query']['namespaces'] + data = query.GetData(predata, site)['query']['namespaces'] except wikipedia.ServerError, e: wikipedia.output(u'Warning! %s: %s' % (site, e)) return Modified: trunk/pywikipedia/welcome.py =================================================================== --- trunk/pywikipedia/welcome.py 2009-08-05 21:39:21 UTC (rev 7113) +++ trunk/pywikipedia/welcome.py 2009-08-05 21:40:30 UTC (rev 7114) @@ -506,8 +506,7 @@ 'usprop' :'blockinfo', } - data = query.GetData(params, - useAPI = True, encodeTitle = False) + data = query.GetData(params, encodeTitle = False) # If there's not the blockedby parameter (that means the user isn't blocked), it will return False otherwise True. try: blockedBy = data['query']['users'][0]['blockedby'] Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2009-08-05 21:39:21 UTC (rev 7113) +++ trunk/pywikipedia/wikipedia.py 2009-08-05 21:40:30 UTC (rev 7114) @@ -919,8 +919,7 @@ 'prop' :'info', 'titles' :self.title(), } - data = query.GetData(params, - useAPI = True, encodeTitle = False) + data = query.GetData(params, encodeTitle = False) pageid = data['query']['pages'].keys()[0] if data['query']['pages'][pageid].keys()[0] == 'lastrevid': return data['query']['pages'][pageid]['lastrevid'] # if ok, @@ -952,8 +951,7 @@ 'tllimit' :tllimit, } - data = query.GetData(params, - useAPI = True, encodeTitle = False) + data = query.GetData(params, encodeTitle = False) try: pageid = data['query']['pages'].keys()[0] except KeyError: @@ -1327,7 +1325,7 @@ #if titles: # predata['titles'] = query.ListToParam(titles) - text = query.GetData(predata, useAPI = True)['query']['pages'] + text = query.GetData(predata)['query']['pages'] for pageid in text: if text[pageid].has_key('missing'): @@ -2765,7 +2763,7 @@ 'titles' :self.title(), } try: - data = query.GetData(params, useAPI = True, encodeTitle = False)['query']['pages'] + data = query.GetData(params, encodeTitle = False)['query']['pages'] except KeyError: raise NoPage(u'API Error, nothing found in the APIs') @@ -2829,7 +2827,7 @@ 'titles' :self.title(), 'iiprop' :'url', } - imagedata = query.GetData(params, useAPI = True, encodeTitle = False) + imagedata = query.GetData(params, encodeTitle = False) try: url=imagedata['query']['pages'].values()[0]['imageinfo'][0]['url'] # urlR = re.compile(r'<div class="fullImageLink" id="file">.*?<a href="(?P<url>[^ ]+?)"(?! class="image")|<span class="dangerousLink"><a href="(?P<url2>.+?)"', re.DOTALL) @@ -2899,7 +2897,7 @@ 'prop' :'imageinfo', 'titles' :self.title(), } - data = query.GetData(params, useAPI = True, encodeTitle = False) + data = query.GetData(params, encodeTitle = False) try: # We don't know the page's id, if any other better idea please change it pageid = data['query']['pages'].keys()[0] @@ -2921,7 +2919,7 @@ 'iiprop' :'sha1', } # First of all we need the Hash that identify an image - data = query.GetData(params, useAPI = True, encodeTitle = False) + data = query.GetData(params, encodeTitle = False) pageid = data['query']['pages'].keys()[0] try: hash_found = data['query']['pages'][pageid][u'imageinfo'][0][u'sha1'] @@ -4505,7 +4503,7 @@ 'meta': 'userinfo', 'uiprop': 'blockinfo', } - data = query.GetData(params, self, useAPI = True)['query']['userinfo'] + data = query.GetData(params, self)['query']['userinfo'] return data.has_key('blockby') except NotImplementedError: return False @@ -5121,7 +5119,7 @@ 'meta':'allmessages', } try: - datas = query.GetData(params, useAPI = True)['query']['allmessages'] + datas = query.GetData(params)['query']['allmessages'] except KeyError: raise ServerError("The APIs don't return data, the site may be down") except NotImplementedError: @@ -5222,7 +5220,7 @@ 'meta': 'userinfo', 'uiprop': 'blockinfo|groups|rights|hasmsg|ratelimits|preferencestoken', } - text = query.GetData(params, site = self, useAPI = True, sysop=sysop)['query']['userinfo'] + text = query.GetData(params, self, sysop=sysop)['query']['userinfo'] ##output('%s' % text) # for debug use only else: url = self.edit_address('Non-existing_page') @@ -5503,8 +5501,7 @@ if leuser is not None: params['leuser'] = leuser if letitle is not None: params['letitle'] = letitle while True: - data = query.GetData(params, - useAPI = True, encodeTitle = False) + data = query.GetData(params, encodeTitle = False) try: imagesData = data['query']['logevents'] except KeyError: @@ -5572,8 +5569,7 @@ if rcshow is not None: params['rcshow'] = rcshow if rctype is not None: params['rctype'] = rctype while True: - data = query.GetData(params, - useAPI = True, encodeTitle = False) + data = query.GetData(params, encodeTitle = False) try: rcData = data['query']['recentchanges'] except KeyError: @@ -5709,7 +5705,7 @@ 'rnlimit': '1', #'': '', } - data = query.GetData(params, useAPI = True) + data = query.GetData(params) return Page(self, data['query']['random'][0]['title']) else: """Yield random page via Special:Random""" @@ -5727,7 +5723,7 @@ 'rnlimit': '1', 'rnredirect': '1', } - data = query.GetData(params, useAPI = True) + data = query.GetData(params) return Page(self, data['query']['random'][0]['title']) else: """Yield random redirect page via Special:RandomRedirect.""" @@ -5781,7 +5777,7 @@ params['apfrom'] = start if throttle: get_throttle() - data = query.GetData(params, useAPI = True) + data = query.GetData(params) for p in data['query']['allpages']: yield Page(self, p['title']) @@ -5973,7 +5969,7 @@ 'euquery': url, } while True: - data = query.GetData(params, useAPI = True) + data = query.GetData(params) if data['query']['exturlusage'] == []: break for pages in data['query']['exturlusage']: @@ -6586,7 +6582,7 @@ 'list' :'allimages', 'aisha1' :hash_found, } - allimages = query.GetData(params, site = getSite(self.lang, self.family), useAPI = True, encodeTitle = False)['query']['allimages'] + allimages = query.GetData(params, getSite(self.lang, self.family), encodeTitle = False)['query']['allimages'] files = list() for imagedata in allimages: image = imagedata[u'name']

1 0

SVN: [7113] trunk/pywikipedia/query.py
by alexsh＠svn.wikimedia.org 06 Aug '09

06 Aug '09

Revision: 7113 Author: alexsh Date: 2009-08-05 21:39:21 +0000 (Wed, 05 Aug 2009) Log Message: ----------- query.py: set useAPI default True..(query.php is removed for long times, not necessary to set it default) Modified Paths: -------------- trunk/pywikipedia/query.py Modified: trunk/pywikipedia/query.py =================================================================== --- trunk/pywikipedia/query.py 2009-08-05 21:25:39 UTC (rev 7112) +++ trunk/pywikipedia/query.py 2009-08-05 21:39:21 UTC (rev 7113) @@ -14,8 +14,7 @@ 'rvprop' :'user|timestamp|content', } - print query.GetData(params, - useAPI = True, encodeTitle = False) + print query.GetData(params, encodeTitle = False) """ # @@ -28,7 +27,7 @@ import wikipedia, simplejson, urllib, time -def GetData(params, site = None, verbose = False, useAPI = False, retryCount = 5, encodeTitle = True, sysop = False, back_response = False): +def GetData(params, site = None, verbose = False, useAPI = True, retryCount = 5, encodeTitle = True, sysop = False, back_response = False): """Get data from the query api, and convert it into a data object """ if site is None:

1 0

SVN: [7112] trunk/pywikipedia/wikipedia.py
by alexsh＠svn.wikimedia.org 06 Aug '09

06 Aug '09

Revision: 7112 Author: alexsh Date: 2009-08-05 21:25:39 +0000 (Wed, 05 Aug 2009) Log Message: ----------- Site()._load() and Site()._getUserData(): for reduce load time, Add query API option to collect user data. (use ac=query,meta=userinfo) Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2009-08-05 06:24:39 UTC (rev 7111) +++ trunk/pywikipedia/wikipedia.py 2009-08-05 21:25:39 UTC (rev 7112) @@ -1499,6 +1499,7 @@ predata['wpWatchthis'] = '1' # Give the token, but only if one is supplied. if token: + ##output(token) # for debug use only predata['wpEditToken'] = token # Sorry, single-site exception... @@ -1630,6 +1631,7 @@ except NoUsername: raise LockedPage() if not newToken and "<textarea" in data: + ##if "<textarea" in data: # for debug use only, if badtoken still happen # We might have been using an outdated token output(u"Changing page has failed. Retrying.") return self._putPage(text, comment, watchArticle, minorEdit, newPage, token=self.site().getToken(sysop = sysop, getagain = True), newToken = True, sysop = sysop) @@ -4519,6 +4521,7 @@ else: self._load(sysop = sysop) index = self._userIndex(sysop) + ##output('%s' % self._rights[index]) #for debug use return right in self._rights[index] def server_time(self): @@ -4874,126 +4877,209 @@ * text - the page text * sysop - is the user a sysop? """ - if '<div id="globalWrapper">' not in text: - # Not a wiki page - return index = self._userIndex(sysop) - # Check for blocks - but only if version is 1.11 (userinfo is available) - # and the user data was not yet loaded - if self.versionnumber() >= 11 and (not self._userData[index] or force): - blocked = self._getBlock(sysop = sysop) - if blocked and not self._isBlocked[index]: + if type(text) == dict: #text is dict, query from API + # Check for blocks - but only if version is 1.11 (userinfo is available) + # and the user data was not yet loaded + if text.has_key('blockedby') and not self._isBlocked[index]: # Write a warning if not shown earlier if sysop: account = 'Your sysop account' else: account = 'Your account' output(u'WARNING: %s on %s is blocked. Editing using this account will stop the run.' % (account, self)) - self._isBlocked[index] = blocked + self._isBlocked[index] = text.has_key('blockedby') - # Check for new messages - if '<div class="usermessage">' in text: - if not self._messages[index]: - # User has *new* messages - if sysop: - output(u'NOTE: You have new messages in your sysop account on %s' % self) - else: - output(u'NOTE: You have new messages on %s' % self) - self._messages[index] = True - else: - self._messages[index] = False + # Check for new messages, show key 'messages' in dict. + if text.has_key('messages'): + if not self._messages[index]: + # User has *new* messages + if sysop: + output(u'NOTE: You have new messages in your sysop account on %s' % self) + else: + output(u'NOTE: You have new messages on %s' % self) + self._messages[index] = True + else: + self._messages[index] = False - # Don't perform other checks if the data was already loaded - if self._userData[index] and not force: - return + # Don't perform other checks if the data was already loaded + if self._userData[index] and not force: + return - # Search for the the user page link at the top. - # Note that the link of anonymous users (which doesn't exist at all - # in Wikimedia sites) has the ID pt-anonuserpage, and thus won't be - # found here. - userpageR = re.compile('<li id="pt-userpage"><a href=".+?">(?P<username>.+?)</a></li>') - m = userpageR.search(text) - if m: - self._isLoggedIn[index] = True - self._userName[index] = m.group('username') - else: - self._isLoggedIn[index] = False - # No idea what is the user name, and it isn't important - self._userName[index] = None + # Get username. + # anonymous mode will show key 'anon' + if not text.has_key('anon'): + self._isLoggedIn[index] = True + self._userName[index] = text['name'] + else: + self._isLoggedIn[index] = False + # No idea what is the user name, and it isn't important + self._userName[index] = None - # Check user groups, if possible (introduced in 1.10) - groupsR = re.compile(r'var wgUserGroups = \[\"(.+)\"\];') - m = groupsR.search(text) - checkLocal = True - if default_code in self.family.cross_allowed: # if current languages in cross allowed list, check global bot flag. - globalgroupsR = re.compile(r'var wgGlobalGroups = \[\"(.+)\"\];') - mg = globalgroupsR.search(text) - if mg: # the account had global permission - globalRights = mg.group(1) - globalRights = globalRights.split('","') - self._rights[index] = globalRights + # Check user groups and rights + if text.has_key('groups') and text['groups'] != []: + self._rights[index] = text['groups'] + self._rights[index].extend(text['rights']) + # Warnings + # Don't show warnings for not logged in users, they will just fail to + # do any action if self._isLoggedIn[index]: - if 'Global_bot' in globalRights: # This account has the global bot flag, no need to check local flags. - checkLocal = False - else: - output(u'Your bot account does not have global the bot flag, checking local flag.') + if 'bot' not in self._rights[index] and config.notify_unflagged_bot: + # Sysop + bot flag = Sysop flag in MediaWiki < 1.7.1? + if sysop: + output(u'Note: Your sysop account on %s does not have a bot flag. Its edits will be visible in the recent changes.' % self) + else: + output(u'WARNING: Your account on %s does not have a bot flag. Its edits will be visible in the recent changes and it may get blocked.' % self) + if sysop and 'sysop' not in self._rights[index]: + output(u'WARNING: Your sysop account on %s does not seem to have sysop rights. You may not be able to perform any sysop-restricted actions using it.' % self) + else: + # key groups is not exists, setup a default rights + self._rights[index] = [] + if self._isLoggedIn[index]: + # Logged in user + self._rights[index].append('user') + # Assume bot, and thus autoconfirmed + self._rights[index].extend(['bot', 'autoconfirmed']) + if sysop: + # Assume user reported as a sysop indeed has the sysop rights + self._rights[index].append('sysop') + # Assume the user has the default rights if API not query back + self._rights[index].extend(['read', 'createaccount', 'edit', 'upload', 'createpage', 'createtalk', 'move', 'upload']) + #remove Duplicate rights + self._rights[index] = list(set(self._rights[index])) + + # Search for a token + if text.has_key('preferencestoken') and len(text['preferencestoken']) > 2: + # anonymous token is '+\\', check len('+\\') = 2 + # if preferencestoken > 2, it must be loggedin. + self._token[index] = text['preferencestoken'] + if self._rights[index] is not None: + # In this case, token and rights are loaded - user data is now loaded + self._userData[index] = True + else: + output(u'WARNING: Token not found on %s. You will not be able to edit any page.' % self) else: - if verbose: output(u'Note: this language does not allow global bots.') - if m and checkLocal: - rights = m.group(1) - rights = rights.split('", "') - if '*' in rights: - rights.remove('*') - self._rights[index] = rights - # Warnings - # Don't show warnings for not logged in users, they will just fail to - # do any action - if self._isLoggedIn[index]: - if 'bot' not in self._rights[index] and config.notify_unflagged_bot: - # Sysop + bot flag = Sysop flag in MediaWiki < 1.7.1? + #ordinary mode to get data from edit page HTMLs and JavaScripts + + if '<div id="globalWrapper">' not in text: + # Not a wiki page + return + # Check for blocks - but only if version is 1.11 (userinfo is available) + # and the user data was not yet loaded + if self.versionnumber() >= 11 and (not self._userData[index] or force): + blocked = self._getBlock(sysop = sysop) + if blocked and not self._isBlocked[index]: + # Write a warning if not shown earlier if sysop: - output(u'Note: Your sysop account on %s does not have a bot flag. Its edits will be visible in the recent changes.' % self) + account = 'Your sysop account' else: - output(u'WARNING: Your account on %s does not have a bot flag. Its edits will be visible in the recent changes and it may get blocked.' % self) - if sysop and 'sysop' not in self._rights[index]: - output(u'WARNING: Your sysop account on %s does not seem to have sysop rights. You may not be able to perform any sysop-restricted actions using it.' % self) - else: - # We don't have wgUserGroups, and can't check the rights - self._rights[index] = [] - if self._isLoggedIn[index]: - # Logged in user - self._rights[index].append('user') - # Assume bot, and thus autoconfirmed - self._rights[index].extend(['bot', 'autoconfirmed']) - if sysop: - # Assume user reported as a sysop indeed has the sysop rights - self._rights[index].append('sysop') - # Assume the user has the default rights - self._rights[index].extend(['read', 'createaccount', 'edit', 'upload', 'createpage', 'createtalk', 'move', 'upload']) - if 'bot' in self._rights[index] or 'sysop' in self._rights[index]: - self._rights[index].append('apihighlimits') - if 'sysop' in self._rights[index]: - self._rights[index].extend(['delete', 'undelete', 'block', 'protect', 'import', 'deletedhistory', 'unwatchedpages']) + account = 'Your account' + output(u'WARNING: %s on %s is blocked. Editing using this account will stop the run.' % (account, self)) + self._isBlocked[index] = blocked - # Search for a token - tokenR = re.compile(r"\<input type='hidden' value=\"(.*?)\" name=\"wpEditToken\"") - tokenloc = tokenR.search(text) - if tokenloc: - self._token[index] = tokenloc.group(1) - if self._rights[index] is not None: - # In this case, token and rights are loaded - user data is now loaded - self._userData[index] = True - else: - # Token not found - # Possible reason for this is the user is blocked, don't show a - # warning in this case, otherwise do show a warning - # Another possible reason is that the page cannot be edited - ensure - # there is a textarea and the tab "view source" is not shown - if u'<textarea' in text and u'<li id="ca-viewsource"' not in text and not self._isBlocked[index]: + # Check for new messages + if '<div class="usermessage">' in text: + if not self._messages[index]: + # User has *new* messages + if sysop: + output(u'NOTE: You have new messages in your sysop account on %s' % self) + else: + output(u'NOTE: You have new messages on %s' % self) + self._messages[index] = True + else: + self._messages[index] = False + + # Don't perform other checks if the data was already loaded + if self._userData[index] and not force: + return + + # Search for the the user page link at the top. + # Note that the link of anonymous users (which doesn't exist at all + # in Wikimedia sites) has the ID pt-anonuserpage, and thus won't be + # found here. + userpageR = re.compile('<li id="pt-userpage"><a href=".+?">(?P<username>.+?)</a></li>') + m = userpageR.search(text) + if m: + self._isLoggedIn[index] = True + self._userName[index] = m.group('username') + else: + self._isLoggedIn[index] = False + # No idea what is the user name, and it isn't important + self._userName[index] = None + + # Check user groups, if possible (introduced in 1.10) + groupsR = re.compile(r'var wgUserGroups = \[\"(.+)\"\];') + m = groupsR.search(text) + checkLocal = True + if default_code in self.family.cross_allowed: # if current languages in cross allowed list, check global bot flag. + globalgroupsR = re.compile(r'var wgGlobalGroups = \[\"(.+)\"\];') + mg = globalgroupsR.search(text) + if mg: # the account had global permission + globalRights = mg.group(1) + globalRights = globalRights.split('","') + self._rights[index] = globalRights + if self._isLoggedIn[index]: + if 'Global_bot' in globalRights: # This account has the global bot flag, no need to check local flags. + checkLocal = False + else: + output(u'Your bot account does not have global the bot flag, checking local flag.') + else: + if verbose: output(u'Note: this language does not allow global bots.') + if m and checkLocal: + rights = m.group(1) + rights = rights.split('", "') + if '*' in rights: + rights.remove('*') + self._rights[index] = rights + # Warnings + # Don't show warnings for not logged in users, they will just fail to + # do any action + if self._isLoggedIn[index]: + if 'bot' not in self._rights[index] and config.notify_unflagged_bot: + # Sysop + bot flag = Sysop flag in MediaWiki < 1.7.1? + if sysop: + output(u'Note: Your sysop account on %s does not have a bot flag. Its edits will be visible in the recent changes.' % self) + else: + output(u'WARNING: Your account on %s does not have a bot flag. Its edits will be visible in the recent changes and it may get blocked.' % self) + if sysop and 'sysop' not in self._rights[index]: + output(u'WARNING: Your sysop account on %s does not seem to have sysop rights. You may not be able to perform any sysop-restricted actions using it.' % self) + else: + # We don't have wgUserGroups, and can't check the rights + self._rights[index] = [] + if self._isLoggedIn[index]: + # Logged in user + self._rights[index].append('user') + # Assume bot, and thus autoconfirmed + self._rights[index].extend(['bot', 'autoconfirmed']) + if sysop: + # Assume user reported as a sysop indeed has the sysop rights + self._rights[index].append('sysop') + # Assume the user has the default rights + self._rights[index].extend(['read', 'createaccount', 'edit', 'upload', 'createpage', 'createtalk', 'move', 'upload']) + if 'bot' in self._rights[index] or 'sysop' in self._rights[index]: + self._rights[index].append('apihighlimits') + if 'sysop' in self._rights[index]: + self._rights[index].extend(['delete', 'undelete', 'block', 'protect', 'import', 'deletedhistory', 'unwatchedpages']) + + # Search for a token + tokenR = re.compile(r"\<input type='hidden' value=\"(.*?)\" name=\"wpEditToken\"") + tokenloc = tokenR.search(text) + if tokenloc: + self._token[index] = tokenloc.group(1) + if self._rights[index] is not None: + # In this case, token and rights are loaded - user data is now loaded + self._userData[index] = True + else: # Token not found - output(u'WARNING: Token not found on %s. You will not be able to edit any page.' % self) + # Possible reason for this is the user is blocked, don't show a + # warning in this case, otherwise do show a warning + # Another possible reason is that the page cannot be edited - ensure + # there is a textarea and the tab "view source" is not shown + if u'<textarea' in text and u'<li id="ca-viewsource"' not in text and not self._isBlocked[index]: + # Token not found + output(u'WARNING: Token not found on %s. You will not be able to edit any page.' % self) def mediawiki_message(self, key): """Return the MediaWiki message text for key "key" """ @@ -5121,10 +5207,26 @@ if verbose: output(u'Getting information for site %s' % self) - + + try: + api_url = self.api_address() + del api_url + except NotImplementedError: + config.use_api = False + # Get data - url = self.edit_address('Non-existing_page') - text = self.getUrl(url, sysop = sysop) + if config.use_api and self.versionnumber() >= 11: + #Query userinfo + params = { + 'action': 'query', + 'meta': 'userinfo', + 'uiprop': 'blockinfo|groups|rights|hasmsg|ratelimits|preferencestoken', + } + text = query.GetData(params, site = self, useAPI = True, sysop=sysop)['query']['userinfo'] + ##output('%s' % text) # for debug use only + else: + url = self.edit_address('Non-existing_page') + text = self.getUrl(url, sysop = sysop) # Parse data self._getUserData(text, sysop = sysop, force = force) @@ -5862,7 +5964,7 @@ if not siteurl.startswith('*.'): urlsToRetrieve.append('*.' + siteurl) if config.use_api: - output(u'Querying API...') + output(u'Querying API exturlusage...') for url in urlsToRetrieve: params = { 'action': 'query',

1 0

SVN: [7111] trunk/pywikipedia/query.py
by alexsh＠svn.wikimedia.org 05 Aug '09

05 Aug '09

Revision: 7111 Author: alexsh Date: 2009-08-05 06:24:39 +0000 (Wed, 05 Aug 2009) Log Message: ----------- query.GetData(): add sysop parameter for handle cookie in postData and getUrl Modified Paths: -------------- trunk/pywikipedia/query.py Modified: trunk/pywikipedia/query.py =================================================================== --- trunk/pywikipedia/query.py 2009-08-04 21:29:45 UTC (rev 7110) +++ trunk/pywikipedia/query.py 2009-08-05 06:24:39 UTC (rev 7111) @@ -28,7 +28,7 @@ import wikipedia, simplejson, urllib, time -def GetData(params, site = None, verbose = False, useAPI = False, retryCount = 5, encodeTitle = True, back_response = False): +def GetData(params, site = None, verbose = False, useAPI = False, retryCount = 5, encodeTitle = True, sysop = False, back_response = False): """Get data from the query api, and convert it into a data object """ if site is None: @@ -82,12 +82,12 @@ try: jsontext = "Nothing received" if params['action'] in postAC: - res, jsontext = site.postData(path, urllib.urlencode(params.items()), cookies=site.cookies()) + res, jsontext = site.postData(path, urllib.urlencode(params.items()), cookies=site.cookies(), sysop=sysop) else: if back_response: - res, jsontext = site.getUrl( path, retry=True, data=data, back_response=True) + res, jsontext = site.getUrl( path, retry=True, data=data, sysop=sysop, back_response=True) else: - jsontext = site.getUrl( path, retry=True, data=data) + jsontext = site.getUrl( path, retry=True, sysop=sysop, data=data) # This will also work, but all unicode strings will need to be converted from \u notation # decodedObj = eval( jsontext )

1 0

SVN: [7110] trunk/pywikipedia/maintenance/update_namespaces.py
by alexsh＠svn.wikimedia.org 05 Aug '09

05 Aug '09

Revision: 7110 Author: alexsh Date: 2009-08-04 21:29:45 +0000 (Tue, 04 Aug 2009) Log Message: ----------- disable update main family in default way, remove -nomain and add -upmain to enable it Modified Paths: -------------- trunk/pywikipedia/maintenance/update_namespaces.py Modified: trunk/pywikipedia/maintenance/update_namespaces.py =================================================================== --- trunk/pywikipedia/maintenance/update_namespaces.py 2009-08-04 21:28:28 UTC (rev 7109) +++ trunk/pywikipedia/maintenance/update_namespaces.py 2009-08-04 21:29:45 UTC (rev 7110) @@ -3,7 +3,7 @@ both the generic family.py and the site-specific family. options: - -nomain Don't modify the main family.py + -upmain Modify the main family.py, too. -wikimedia Update all the wikimedia families """ # @@ -103,11 +103,11 @@ if __name__ == '__main__': try: - update_main_family = True + update_main_family = False update_wikimedia = False for arg in wikipedia.handleArgs(): - if arg == '-nomain': - update_main_family = False + if arg == '-upmain': + update_main_family = True elif arg == '-wikimedia': update_wikimedia = True

1 0

SVN: [7109] trunk/pywikipedia/speedy_delete.py
by alexsh＠svn.wikimedia.org 05 Aug '09

05 Aug '09

Revision: 7109 Author: alexsh Date: 2009-08-04 21:28:28 +0000 (Tue, 04 Aug 2009) Log Message: ----------- update zh CSD reason Modified Paths: -------------- trunk/pywikipedia/speedy_delete.py Modified: trunk/pywikipedia/speedy_delete.py =================================================================== --- trunk/pywikipedia/speedy_delete.py 2009-08-04 20:41:16 UTC (rev 7108) +++ trunk/pywikipedia/speedy_delete.py 2009-08-04 21:28:28 UTC (rev 7109) @@ -398,7 +398,7 @@ 'test':u'[[WP:CSD#G2]]: 測試頁', 'vand':u'[[WP:CSD#G3]]: 純粹破壞', 'cont':u'[[WP:CSD#G4]]: 非常短，而且沒有定義或內容。', - 'rep':u'[[WP:CSD#G5]]: 重新建立的內容', + 'rep':u'[[WP:CSD#G5]]: 重複的條目或是重新建立的內容', 'oprj':u'[[WP:CSD#G7]]: 內容來自其他中文計劃', 'text':u'[[WP:CSD#G9]]: 只有相關連結、項目的頁面', 'auth':u'[[WP:CSD#G10]]: 原作者請求',

1 0

SVN: [7108] trunk/pywikipedia/wikipedia.py
by erwin85＠svn.wikimedia.org 05 Aug '09

05 Aug '09

Revision: 7108 Author: erwin85 Date: 2009-08-04 20:41:16 +0000 (Tue, 04 Aug 2009) Log Message: ----------- Fix getFileVersionHistory Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2009-08-04 08:20:10 UTC (rev 7107) +++ trunk/pywikipedia/wikipedia.py 2009-08-04 20:41:16 UTC (rev 7108) @@ -2868,7 +2868,7 @@ """ result = [] - history = re.search('(?s)<table class="filehistory">.+?</table>', self.getImagePageHtml()) + history = re.search('(?s)<table class="wikitable filehistory">.+?</table>', self.getImagePageHtml()) if history: lineR = re.compile(r'<tr>(?:<td>.*?</td>){1,2}<td.*?><a href=".+?">(?P<datetime>.+?)</a></td><td>.*?(?P<resolution>\d+\xd7\d+) <span.*?>\((?P<filesize>.+?)\)</span></td><td><a href=".+?"(?: class="new"|) title=".+?">(?P<username>.+?)</a>.*?</td><td>(?:.*?<span class="comment">\((?P<comment>.*?)\)</span>)?</td></tr>') if not lineR.search(history.group()):

1 0

SVN: [7107] trunk/pywikipedia/families/wikipedia_family.py
by valhallasw＠svn.wikimedia.org 04 Aug '09

04 Aug '09

Revision: 7107 Author: valhallasw Date: 2009-08-04 08:20:10 +0000 (Tue, 04 Aug 2009) Log Message: ----------- Updated crossnamespace to ar, per bug #2822705 Modified Paths: -------------- trunk/pywikipedia/families/wikipedia_family.py Modified: trunk/pywikipedia/families/wikipedia_family.py =================================================================== --- trunk/pywikipedia/families/wikipedia_family.py 2009-08-04 06:27:42 UTC (rev 7106) +++ trunk/pywikipedia/families/wikipedia_family.py 2009-08-04 08:20:10 UTC (rev 7107) @@ -979,6 +979,7 @@ '_default': { 'pt': [102], 'als': [104], + 'ar': [104], 'en': [12], 'es': [104], 'fi': [4],

1 0

SVN: [7106] trunk/pywikipedia/pagegenerators.py
by purodha＠svn.wikimedia.org 04 Aug '09

04 Aug '09

Revision: 7106 Author: purodha Date: 2009-08-04 06:27:42 +0000 (Tue, 04 Aug 2009) Log Message: ----------- index was off by one. Modified Paths: -------------- trunk/pywikipedia/pagegenerators.py Modified: trunk/pywikipedia/pagegenerators.py =================================================================== --- trunk/pywikipedia/pagegenerators.py 2009-08-04 02:00:14 UTC (rev 7105) +++ trunk/pywikipedia/pagegenerators.py 2009-08-04 06:27:42 UTC (rev 7106) @@ -1075,7 +1075,7 @@ gen = AllpagesPageGenerator(firstPageTitle, namespace, includeredirects=False) elif arg.startswith('-redirectonly'): - firstPageTitle = arg[15:] + firstPageTitle = arg[14:] if not firstPageTitle: firstPageTitle = wikipedia.input( u'At which page do you want to start?')

1 0

SVN: [7105] trunk/pywikipedia/family.py
by valhallasw＠svn.wikimedia.org 04 Aug '09

04 Aug '09

Revision: 7105 Author: valhallasw Date: 2009-08-04 02:00:14 +0000 (Tue, 04 Aug 2009) Log Message: ----------- Updated redirect for qu (fixes bug #2829501, based on MessagesQu.php r54295) Modified Paths: -------------- trunk/pywikipedia/family.py Modified: trunk/pywikipedia/family.py =================================================================== --- trunk/pywikipedia/family.py 2009-08-04 01:49:38 UTC (rev 7104) +++ trunk/pywikipedia/family.py 2009-08-04 02:00:14 UTC (rev 7105) @@ -3445,7 +3445,7 @@ 'pl': [u'patrz', u'przekieruj', u'tam'], 'pms': [u'rinvia', u'rinvio'], 'pt-br': [u'redirecionamento'], - 'qu': [u'redirección'], + 'qu': [u'pusapuna', u'redirección'], 'rmy': [u'redirecteaza'], 'ro': [u'redirecteaza'], 'ru': [u'перенаправление', u'перенапр'],

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 August 2009