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): """