Revision: 7470 Author: alexsh Date: 2009-10-14 21:34:02 +0000 (Wed, 14 Oct 2009)
Log Message: ----------- remove all query.ListToParam()
Modified Paths: -------------- trunk/pywikipedia/redirect.py trunk/pywikipedia/userlib.py trunk/pywikipedia/wikipedia.py
Modified: trunk/pywikipedia/redirect.py =================================================================== --- trunk/pywikipedia/redirect.py 2009-10-14 19:53:42 UTC (rev 7469) +++ trunk/pywikipedia/redirect.py 2009-10-14 21:34:02 UTC (rev 7470) @@ -354,7 +354,7 @@ } for apiQ in self._next_redirects_via_api_commandline(number, namespaces, start, until): # wikipedia.output (u'===apiQ=%s' % apiQ) - params['pageids'] = query.ListToParam(apiQ) + params['pageids'] = apiQ data = query.GetData(params, self.site) # wikipedia.output(u'===RESULT===\n%s\n' % result) redirects = {}
Modified: trunk/pywikipedia/userlib.py =================================================================== --- trunk/pywikipedia/userlib.py 2009-10-14 19:53:42 UTC (rev 7469) +++ trunk/pywikipedia/userlib.py 2009-10-14 21:34:02 UTC (rev 7470) @@ -197,7 +197,7 @@ params['uclimit'] = 5000
if namespace: - params['ucnamespace'] = query.ListToParam(namespace) + params['ucnamespace'] = namespace # An user is likely to contribute on several pages, # keeping track of titles nbresults = 0 @@ -534,8 +534,8 @@ params = { 'action': 'query', 'list': 'users', - 'usprop': 'blockinfo|groups|editcount|registration|emailable|gender', - 'ususers': query.ListToParam(names), + 'usprop': ['blockinfo', 'groups', 'editcount', 'registration', 'emailable', 'gender'], + 'ususers': names, } #if site.versionnumber() >= 16: # params['ustoken'] = 'userrights'
Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2009-10-14 19:53:42 UTC (rev 7469) +++ trunk/pywikipedia/wikipedia.py 2009-10-14 21:34:02 UTC (rev 7470) @@ -734,8 +734,8 @@ params = { 'action': 'query', 'titles': self.title(), - 'prop': 'revisions|info', - 'rvprop': 'content|ids|flags|timestamp|user|comment|size', + 'prop': ['revisions','info'], + 'rvprop': ['content','ids','flags','timestamp','user','comment','size'], 'rvlimit': 1, 'inprop': 'protection',#|talkid|subjectid', 'intoken': 'edit', @@ -1433,7 +1433,7 @@ 'titles': self.title(), } #if titles: - # predata['titles'] = query.ListToParam(titles) + # predata['titles'] = titles
text = query.GetData(predata, self.site())['query']['pages']
@@ -2900,7 +2900,7 @@ 'list': 'deletedrevs', 'drfrom': self.titleWithoutNamespace(), 'drnamespace': self.namespace(), - 'drprop': 'revid|user|comment|content',#|minor|len|token + 'drprop': ['revid','user','comment','content'],#','minor','len','token'], 'drlimit': 100, 'drdir': 'older', #'': '', @@ -3024,7 +3024,7 @@ for ts in self._deletedRevs: if self._deletedRevs[ts][4]: selected.append(ts) - params['timestamps'] = query.ListToParam(ts), + params['timestamps'] = ts,
result = query.GetData(params, self.site(), sysop=True) if 'error' in result: @@ -3142,8 +3142,8 @@ 'action': 'protect', 'title': self.title(), 'token': token, - 'protections': query.ListToParam(protections), - 'expiry': query.ListToParam(expiry), + 'protections': protections, + 'expiry': expiry, #'': '', } if reason: @@ -3346,7 +3346,7 @@ params = { 'action' :'query', 'prop' :'revisions', - 'rvprop' :'user|timestamp', + 'rvprop' :['user','timestamp'], 'rvlimit' :limit, 'titles' :self.title(), } @@ -5870,10 +5870,10 @@ params = { 'action': 'query', 'meta': 'userinfo', - 'uiprop': 'blockinfo|groups|rights|hasmsg|ratelimits', + 'uiprop': ['blockinfo','groups','rights','hasmsg','ratelimits'], } if self.versionnumber() >= 14: - params['uiprop'] += '|preferencestoken' + params['uiprop'].append('preferencestoken')
text = query.GetData(params, self, sysop=sysop)['query']['userinfo'] self._getUserData(text, sysop = sysop, force = force) @@ -5950,8 +5950,8 @@ 'rctype': 'new', 'rcnamespace': namespace, 'rclimit': int(number), - 'rcprop': 'title|timestamp|sizes|user|comment', - 'rcshow': '!bot|!redirect', + 'rcprop': ['title','timestamp','sizes','user','comment'], + 'rcshow': ['!bot','!redirect'], #'': '', } data = query.GetData(params, self)['query']['recentchanges'] @@ -6249,7 +6249,7 @@ 'action' : 'query', 'list' : 'recentchanges', 'rctype' : rctype, - 'rcprop' : 'user|comment|timestamp|title|ids|loginfo', #|flags|sizes|redirect|patrolled' + 'rcprop' : ['user','comment','timestamp','title','ids','loginfo'], #','flags','sizes','redirect','patrolled'] 'rclimit' : int(number), } if rcstart is not None: params['rcstart'] = rcstart @@ -8018,7 +8018,7 @@
def parsetime2stamp(tz): s = time.strptime(tz, "%Y-%m-%dT%H:%M:%SZ") - return time.strftime("%Y%m%d%H%M%S", s) + return int(time.strftime("%Y%m%d%H%M%S", s))
class MyURLopener(urllib.FancyURLopener): version="PythonWikipediaBot/1.0"