Revision: 7600
Author: alexsh
Date: 2009-11-05 18:40:26 +0000 (Thu, 05 Nov 2009)
Log Message:
-----------
cleanup all functions using config.authenticate (combined into the bottom of
wikipedia.py)
Modified Paths:
--------------
trunk/pywikipedia/pageimport.py
trunk/pywikipedia/query.py
trunk/pywikipedia/userlib.py
trunk/pywikipedia/wikipedia.py
Modified: trunk/pywikipedia/pageimport.py
===================================================================
--- trunk/pywikipedia/pageimport.py 2009-11-05 18:16:45 UTC (rev 7599)
+++ trunk/pywikipedia/pageimport.py 2009-11-05 18:40:26 UTC (rev 7600)
@@ -85,14 +85,7 @@
# What namespace do you want?
'namespace': '',
}
- if self.site().hostname() in config.authenticate.keys():
- predata['Content-type'] = 'application/x-www-form-urlencoded'
- predata['User-agent'] = useragent
- data = self.site().urlEncode(predata)
- response = urllib2.urlopen(urllib2.Request('http://' +
self.site().hostname() + address, data))
- data = u''
- else:
- response, data = self.site().postForm(address, predata, sysop
= True)
+ response, data = self.site().postForm(address, predata, sysop =
True)
if data:
wikipedia.output(u'Page imported, checking...')
if wikipedia.Page(self.importsite, target).exists():
Modified: trunk/pywikipedia/query.py
===================================================================
--- trunk/pywikipedia/query.py 2009-11-05 18:16:45 UTC (rev 7599)
+++ trunk/pywikipedia/query.py 2009-11-05 18:40:26 UTC (rev 7600)
@@ -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/userlib.py
===================================================================
--- trunk/pywikipedia/userlib.py 2009-11-05 18:16:45 UTC (rev 7599)
+++ trunk/pywikipedia/userlib.py 2009-11-05 18:40:26 UTC (rev 7600)
@@ -192,14 +192,7 @@
predata['wpEditToken'] = self.site().getToken()
- if self.site().hostname() in wikipedia.config.authenticate.keys():
- predata['Content-type'] = 'application/x-www-form-urlencoded'
- predata['User-agent'] = wikipedia.useragent
- data = self.site().urlEncode(predata)
- response = wikipedia.urllib2.urlopen(urllib2.Request('http://' +
self.site().hostname() + addr, data))
- data = response.read()
- else:
- response, data = self.site().postForm(address, predata, sysop =
False)
+ response, data = self.site().postForm(address, predata, sysop = False)
if data:
if 'var wgAction = "success";' in data:
Modified: trunk/pywikipedia/wikipedia.py
===================================================================
--- trunk/pywikipedia/wikipedia.py 2009-11-05 18:16:45 UTC (rev 7599)
+++ trunk/pywikipedia/wikipedia.py 2009-11-05 18:40:26 UTC (rev 7600)
@@ -1874,16 +1874,6 @@
else:
output(u'Changing page %s' % self.aslink())
# Submit the prepared information
- if self.site().hostname() in config.authenticate.keys():
- predata["Content-type"] = "application/x-www-form-urlencoded"
- predata["User-agent"] = useragent
- data = self.site().urlEncode(predata)
- response =
urllib2.urlopen(urllib2.Request(self.site().protocol() + '://' +
self.site().hostname() + address, data))
- # I'm not sure what to check in this case, so I just assume
- # things went ok. Very naive, I agree.
- data = u''
- # No idea how to get the info now.
- return None
try:
response, data = self.site().postForm(address, predata, sysop)
if response.code == 503:
@@ -2600,14 +2590,7 @@
}
get_throttle(requestsize = 10)
now = time.time()
- if self.site().hostname() in config.authenticate.keys():
- predata["Content-type"] = "application/x-www-form-urlencoded"
- predata["User-agent"] = useragent
- data = self.site.urlEncode(predata)
- response = urllib2.urlopen(urllib2.Request('http://' +
self.site.hostname() + address, data))
- data = response.read()
- else:
- response, data = self.site().postForm(address, predata)
+ response, data = self.site().postForm(address, predata)
data = data.encode(self.site().encoding())
# get_throttle.setDelay(time.time() - now)
output = []
@@ -2766,14 +2749,7 @@
if token:
predata['wpEditToken'] = token
- if self.site().hostname() in config.authenticate.keys():
- predata['Content-type'] = 'application/x-www-form-urlencoded'
- predata['User-agent'] = useragent
- data = self.site().urlEncode(predata)
- response = urllib2.urlopen(urllib2.Request(self.site().protocol()
+ '://' + self.site().hostname() + address, data))
- data = u''
- else:
- response, data = self.site().postForm(address, predata, sysop =
sysop)
+ response, data = self.site().postForm(address, predata, sysop = sysop)
if data == u'' or self.site().mediawiki_message('pagemovedsub') in
data:
if deleteAndMove:
@@ -2898,14 +2874,7 @@
'wpConfirmB': '1',
'wpEditToken': token,
}
- if self.site().hostname() in config.authenticate.keys():
- predata['Content-type'] =
'application/x-www-form-urlencoded'
- predata['User-agent'] = useragent
- data = self.site().urlEncode(predata)
- response =
urllib2.urlopen(urllib2.Request(self.site().protocol() + '://' +
self.site().hostname() + address, data))
- data = u''
- else:
- response, data = self.site().postForm(address, predata,
sysop = True)
+ response, data = self.site().postForm(address, predata, sysop
= True)
if data:
self.site().checkBlocks(sysop = True)
if self.site().mediawiki_message('actioncomplete') in data:
@@ -3274,18 +3243,8 @@
if token:
predata['wpEditToken'] = token
- if self.site().hostname() in config.authenticate.keys():
- predata["Content-type"] = "application/x-www-form-urlencoded"
- predata["User-agent"] = useragent
- data = self.site().urlEncode(predata)
- response = urllib2.urlopen(
- urllib2.Request(
- self.site().protocol() + '://'
- + self.site().hostname() + address,
- data))
- data = u''
- else:
- response, data = self.site().postForm(address, predata, sysop=True)
+
+ response, data = self.site().postForm(address, predata, sysop=True)
if response.code == 302 and not data:
output(u'Changed protection level of page %s.' % self.aslink())
@@ -3860,17 +3819,10 @@
get_throttle(requestsize = len(self.pages))
# Now make the actual request to the server
now = time.time()
- if self.site.hostname() in config.authenticate.keys():
- predata["Content-type"] = "application/x-www-form-urlencoded"
- predata["User-agent"] = useragent
- data = self.site.urlEncode(predata)
- response = urllib2.urlopen(urllib2.Request(self.site.protocol() +
'://' + self.site.hostname() + address, data))
- data = response.read()
- else:
- response, data = self.site.postForm(address, predata)
- # The XML parser doesn't expect a Unicode string, but an encoded
one,
- # so we'll encode it back.
- data = data.encode(self.site.encoding())
+ response, data = self.site.postForm(address, predata)
+ # The XML parser doesn't expect a Unicode string, but an encoded one,
+ # so we'll encode it back.
+ data = data.encode(self.site.encoding())
# get_throttle.setDelay(time.time() - now)
return data
_______________________________________________
Pywikipedia-svn mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/pywikipedia-svn
