From 7c262e71fa8953129883427e3bcd26671d4df242 Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Sat, 23 Jan 2021 14:17:18 -0600 Subject: [PATCH] Refactor _fetchUrl()s implicit POST to explicit post_request()s --- fanficfare/adapters/adapter_bloodtiesfancom.py | 2 +- fanficfare/adapters/adapter_buffygilescom.py | 2 +- fanficfare/adapters/adapter_deepinmysoulnet.py | 2 +- fanficfare/adapters/adapter_dokugacom.py | 4 ++-- fanficfare/adapters/adapter_dracoandginnycom.py | 2 +- fanficfare/adapters/adapter_efpfanficnet.py | 2 +- fanficfare/adapters/adapter_fanficauthorsnet.py | 2 +- fanficfare/adapters/adapter_fanficcastletvnet.py | 2 +- fanficfare/adapters/adapter_fanfictionjunkiesde.py | 2 +- fanficfare/adapters/adapter_fanfictionnet.py | 3 +-- fanficfare/adapters/adapter_iketernalnet.py | 2 +- fanficfare/adapters/adapter_imagineeficcom.py | 2 +- fanficfare/adapters/adapter_merlinficdtwinscouk.py | 2 +- .../adapters/adapter_occlumencysycophanthexcom.py | 2 +- fanficfare/adapters/adapter_phoenixsongnet.py | 2 +- .../adapters/adapter_potterheadsanonymouscom.py | 2 +- fanficfare/adapters/adapter_samandjacknet.py | 2 +- fanficfare/adapters/adapter_sheppardweircom.py | 2 +- fanficfare/adapters/adapter_storiesonlinenet.py | 6 +++--- fanficfare/adapters/adapter_tenhawkpresents.py | 2 +- fanficfare/adapters/adapter_themasquenet.py | 2 +- fanficfare/adapters/adapter_thepetulantpoetesscom.py | 2 +- fanficfare/adapters/adapter_trekiverseorg.py | 2 +- fanficfare/adapters/adapter_tthfanficorg.py | 2 +- fanficfare/adapters/adapter_twilightednet.py | 2 +- fanficfare/adapters/adapter_wwwlushstoriescom.py | 4 +--- fanficfare/adapters/base_efiction_adapter.py | 2 +- fanficfare/adapters/base_xenforoforum_adapter.py | 2 +- fanficfare/configurable.py | 6 +++--- fanficfare/fetcher.py | 12 ++++++------ 30 files changed, 40 insertions(+), 43 deletions(-) diff --git a/fanficfare/adapters/adapter_bloodtiesfancom.py b/fanficfare/adapters/adapter_bloodtiesfancom.py index f72c09f7..c378c65a 100644 --- a/fanficfare/adapters/adapter_bloodtiesfancom.py +++ b/fanficfare/adapters/adapter_bloodtiesfancom.py @@ -118,7 +118,7 @@ class BloodTiesFansComAdapter(BaseSiteAdapter): # XXX logger.debug("Will now login to URL (%s) as (%s)" % (loginUrl, params['penname'])) - d = self._fetchUrl(loginUrl, params) + d = self.post_request(loginUrl, params) if "Member Account" not in d : #Member Account logger.info("Failed to login to URL %s as %s" % (loginUrl, diff --git a/fanficfare/adapters/adapter_buffygilescom.py b/fanficfare/adapters/adapter_buffygilescom.py index 903cacdf..6bf004e6 100644 --- a/fanficfare/adapters/adapter_buffygilescom.py +++ b/fanficfare/adapters/adapter_buffygilescom.py @@ -95,7 +95,7 @@ class BuffyGilesComAdapter(BaseSiteAdapter): logger.debug("Will now login to URL (%s) as (%s)" % (loginUrl, params['penname'])) - d = self._fetchUrl(loginUrl, params) + d = self.post_request(loginUrl, params) if "Member Account" not in d : #Member Account logger.info("Failed to login to URL %s as %s" % (loginUrl, diff --git a/fanficfare/adapters/adapter_deepinmysoulnet.py b/fanficfare/adapters/adapter_deepinmysoulnet.py index f23b002b..93202403 100644 --- a/fanficfare/adapters/adapter_deepinmysoulnet.py +++ b/fanficfare/adapters/adapter_deepinmysoulnet.py @@ -95,7 +95,7 @@ class DeepInMySoulNetAdapter(BaseSiteAdapter): # XXX logger.debug("Will now login to URL (%s) as (%s)" % (loginUrl, params['penname'])) - d = self._fetchUrl(loginUrl, params) + d = self.post_request(loginUrl, params) if "Member Account" not in d : #Member Account logger.info("Failed to login to URL %s as %s" % (loginUrl, diff --git a/fanficfare/adapters/adapter_dokugacom.py b/fanficfare/adapters/adapter_dokugacom.py index f145d1ac..e7da63f5 100644 --- a/fanficfare/adapters/adapter_dokugacom.py +++ b/fanficfare/adapters/adapter_dokugacom.py @@ -104,10 +104,10 @@ class DokugaComAdapter(BaseSiteAdapter): logger.debug("Will now login to URL (%s) as (%s)" % (loginUrl, params['username'])) - d = self._fetchUrl(loginUrl, params) + d = self.post_request(loginUrl, params) if "Your session has expired. Please log in again." in d: - d = self._fetchUrl(loginUrl, params) + d = self.post_request(loginUrl, params) if "Logout" not in d : #Member Account logger.info("Failed to login to URL %s as %s" % (loginUrl, diff --git a/fanficfare/adapters/adapter_dracoandginnycom.py b/fanficfare/adapters/adapter_dracoandginnycom.py index c7fbd508..81485304 100644 --- a/fanficfare/adapters/adapter_dracoandginnycom.py +++ b/fanficfare/adapters/adapter_dracoandginnycom.py @@ -94,7 +94,7 @@ class DracoAndGinnyComAdapter(BaseSiteAdapter): logger.debug("Will now login to URL (%s) as (%s)" % (loginUrl, params['penname'])) - d = self._fetchUrl(loginUrl, params) + d = self.post_request(loginUrl, params) if "Member Account" not in d : #Member Account logger.info("Failed to login to URL %s as %s" % (loginUrl, diff --git a/fanficfare/adapters/adapter_efpfanficnet.py b/fanficfare/adapters/adapter_efpfanficnet.py index a16d01e2..82764764 100644 --- a/fanficfare/adapters/adapter_efpfanficnet.py +++ b/fanficfare/adapters/adapter_efpfanficnet.py @@ -93,7 +93,7 @@ class EFPFanFicNet(BaseSiteAdapter): logger.debug("Will now login to URL (%s) as (%s)" % (loginUrl, params['penname'])) - d = self._fetchUrl(loginUrl, params) + d = self.post_request(loginUrl, params) if '' in d : # register for new account link logger.info("Failed to login to URL %s as %s" % (loginUrl, diff --git a/fanficfare/adapters/adapter_fanficauthorsnet.py b/fanficfare/adapters/adapter_fanficauthorsnet.py index 8fc4bc22..d61a20fe 100644 --- a/fanficfare/adapters/adapter_fanficauthorsnet.py +++ b/fanficfare/adapters/adapter_fanficauthorsnet.py @@ -166,7 +166,7 @@ class FanficAuthorsNetAdapter(BaseSiteAdapter): raise exceptions.FailedToLogin('You need to have your username and password set.',params['username']) try: - data = self._fetchUrl(url+'index/', params, usecache=False) + data = self.post_request(url+'index/', params, usecache=False) except HTTPError as e: if e.code == 404: raise exceptions.StoryDoesNotExist("Code: 404. {0}".format(url)) diff --git a/fanficfare/adapters/adapter_fanficcastletvnet.py b/fanficfare/adapters/adapter_fanficcastletvnet.py index 3ba0e9b2..d3ae2d1f 100644 --- a/fanficfare/adapters/adapter_fanficcastletvnet.py +++ b/fanficfare/adapters/adapter_fanficcastletvnet.py @@ -110,7 +110,7 @@ class FanficCastleTVNetAdapter(BaseSiteAdapter): # XXX logger.debug("Will now login to URL (%s) as (%s)" % (loginUrl, params['penname'])) - d = self._fetchUrl(loginUrl, params) + d = self.post_request(loginUrl, params) if "Member Account" not in d : #Member Account logger.info("Failed to login to URL %s as %s" % (loginUrl, diff --git a/fanficfare/adapters/adapter_fanfictionjunkiesde.py b/fanficfare/adapters/adapter_fanfictionjunkiesde.py index a2278d14..c51b8101 100644 --- a/fanficfare/adapters/adapter_fanfictionjunkiesde.py +++ b/fanficfare/adapters/adapter_fanfictionjunkiesde.py @@ -119,7 +119,7 @@ class FanfictionJunkiesDeAdapter(BaseSiteAdapter): # XXX logger.debug("Will now login to URL (%s) as (%s)" % (loginUrl, params['penname'])) - d = self._fetchUrl(loginUrl, params) + d = self.post_request(loginUrl, params) if "Member Account" not in d : #Member Account logger.info("Failed to login to URL %s as %s" % (loginUrl, diff --git a/fanficfare/adapters/adapter_fanfictionnet.py b/fanficfare/adapters/adapter_fanfictionnet.py index fa057c3d..4c750f1e 100644 --- a/fanficfare/adapters/adapter_fanfictionnet.py +++ b/fanficfare/adapters/adapter_fanfictionnet.py @@ -72,12 +72,11 @@ class FanFictionNetSiteAdapter(BaseSiteAdapter): def getSiteURLPattern(self): return r"https?://(www|m)?\.fanfiction\.net/s/\d+(/\d+)?(/|/[^/]+)?/?$" - def _fetchUrl(self,url,parameters=None,extrasleep=1.0,usecache=True): + def _fetchUrl(self,url,extrasleep=1.0,usecache=True): ## ffnet(and, I assume, fpcom) tends to fail more if hit too ## fast. This is in additional to what ever the ## slow_down_sleep_time setting is. return BaseSiteAdapter._fetchUrl(self,url, - parameters=parameters, extrasleep=extrasleep, usecache=usecache) diff --git a/fanficfare/adapters/adapter_iketernalnet.py b/fanficfare/adapters/adapter_iketernalnet.py index cd2a8090..e0fb4ba8 100644 --- a/fanficfare/adapters/adapter_iketernalnet.py +++ b/fanficfare/adapters/adapter_iketernalnet.py @@ -94,7 +94,7 @@ class IkEternalNetAdapter(BaseSiteAdapter): logger.debug("Will now login to URL (%s) as (%s)" % (loginUrl, params['penname'])) - d = self._fetchUrl(loginUrl, params) + d = self.post_request(loginUrl, params) if "Member Account" not in d : #Member Account logger.info("Failed to login to URL %s as %s" % (loginUrl, diff --git a/fanficfare/adapters/adapter_imagineeficcom.py b/fanficfare/adapters/adapter_imagineeficcom.py index 992f88a2..c519eec4 100644 --- a/fanficfare/adapters/adapter_imagineeficcom.py +++ b/fanficfare/adapters/adapter_imagineeficcom.py @@ -94,7 +94,7 @@ class ImagineEFicComAdapter(BaseSiteAdapter): logger.debug("Will now login to URL (%s) as (%s)" % (loginUrl, params['penname'])) - d = self._fetchUrl(loginUrl, params) + d = self.post_request(loginUrl, params) if "Member Account" not in d : #Member Account logger.info("Failed to login to URL %s as %s" % (loginUrl, diff --git a/fanficfare/adapters/adapter_merlinficdtwinscouk.py b/fanficfare/adapters/adapter_merlinficdtwinscouk.py index 9c5eec6b..4a5fc403 100644 --- a/fanficfare/adapters/adapter_merlinficdtwinscouk.py +++ b/fanficfare/adapters/adapter_merlinficdtwinscouk.py @@ -94,7 +94,7 @@ class MerlinFicDtwinsCoUk(BaseSiteAdapter): logger.debug("Will now login to URL (%s) as (%s)" % (loginUrl, params['penname'])) - d = self._fetchUrl(loginUrl, params) + d = self.post_request(loginUrl, params) if "Member Account" not in d : #Member Account logger.info("Failed to login to URL %s as %s" % (loginUrl, diff --git a/fanficfare/adapters/adapter_occlumencysycophanthexcom.py b/fanficfare/adapters/adapter_occlumencysycophanthexcom.py index a9658dc8..cab2b357 100644 --- a/fanficfare/adapters/adapter_occlumencysycophanthexcom.py +++ b/fanficfare/adapters/adapter_occlumencysycophanthexcom.py @@ -97,7 +97,7 @@ class OcclumencySycophantHexComAdapter(BaseSiteAdapter): logger.debug("Will now login to URL (%s) as (%s)" % (loginUrl, params['penname'])) - d = self._fetchUrl(loginUrl, params) + d = self.post_request(loginUrl, params) if "Logout" not in d : #Member Account logger.info("Failed to login to URL %s as %s" % (loginUrl, diff --git a/fanficfare/adapters/adapter_phoenixsongnet.py b/fanficfare/adapters/adapter_phoenixsongnet.py index ec4bbf56..58143d29 100644 --- a/fanficfare/adapters/adapter_phoenixsongnet.py +++ b/fanficfare/adapters/adapter_phoenixsongnet.py @@ -91,7 +91,7 @@ class PhoenixSongNetAdapter(BaseSiteAdapter): loginUrl = 'https://' + self.getSiteDomain() + '/users/processlogin.php' logger.debug("Will now login to URL (%s) as (%s)" % (loginUrl, params['txtusername'])) - d = self._fetchUrl(loginUrl, params) + d = self.post_request(loginUrl, params) if 'Please login to continue.' in d : #Member Account logger.info("Failed to login to URL %s as %s" % (loginUrl, diff --git a/fanficfare/adapters/adapter_potterheadsanonymouscom.py b/fanficfare/adapters/adapter_potterheadsanonymouscom.py index a280c242..6015a5f5 100644 --- a/fanficfare/adapters/adapter_potterheadsanonymouscom.py +++ b/fanficfare/adapters/adapter_potterheadsanonymouscom.py @@ -94,7 +94,7 @@ class PotterHeadsAnonymousComAdapter(BaseSiteAdapter): logger.debug("Will now login to URL (%s) as (%s)" % (loginUrl, params['penname'])) - d = self._fetchUrl(loginUrl, params) + d = self.post_request(loginUrl, params) if "Member Account" not in d : #Member Account logger.info("Failed to login to URL %s as %s" % (loginUrl, diff --git a/fanficfare/adapters/adapter_samandjacknet.py b/fanficfare/adapters/adapter_samandjacknet.py index 1044c6cc..ba4d7f58 100644 --- a/fanficfare/adapters/adapter_samandjacknet.py +++ b/fanficfare/adapters/adapter_samandjacknet.py @@ -118,7 +118,7 @@ class SamAndJackNetAdapter(BaseSiteAdapter): # XXX logger.debug("Will now login to URL (%s) as (%s)" % (loginUrl, params['penname'])) - d = self._fetchUrl(loginUrl, params) + d = self.post_request(loginUrl, params) if "Member Account" not in d : #Member Account logger.info("Failed to login to URL %s as %s" % (loginUrl, diff --git a/fanficfare/adapters/adapter_sheppardweircom.py b/fanficfare/adapters/adapter_sheppardweircom.py index 96bc34f5..d57af295 100644 --- a/fanficfare/adapters/adapter_sheppardweircom.py +++ b/fanficfare/adapters/adapter_sheppardweircom.py @@ -118,7 +118,7 @@ class SheppardWeirComAdapter(BaseSiteAdapter): # XXX logger.debug("Will now login to URL (%s) as (%s)" % (loginUrl, params['penname'])) - d = self._fetchUrl(loginUrl, params) + d = self.post_request(loginUrl, params) if "Member Account" not in d : #Member Account logger.info("Failed to login to URL %s as %s" % (loginUrl, diff --git a/fanficfare/adapters/adapter_storiesonlinenet.py b/fanficfare/adapters/adapter_storiesonlinenet.py index f937a99c..32d79054 100644 --- a/fanficfare/adapters/adapter_storiesonlinenet.py +++ b/fanficfare/adapters/adapter_storiesonlinenet.py @@ -139,7 +139,7 @@ class StoriesOnlineNetAdapter(BaseSiteAdapter): postAction, '','','')) # try: - data = self._fetchUrl(postUrl,params,usecache=False) + data = self.post_request(postUrl,params,usecache=False) # logger.debug(data) # except HTTPError as e: # if e.code == 307: @@ -161,7 +161,7 @@ class StoriesOnlineNetAdapter(BaseSiteAdapter): # '','','')) try: - data = self._fetchUrl(postUrl,params,usecache=False) + data = self.post_request(postUrl,params,usecache=False) # logger.debug(data) except HTTPError as e: if e.code == 307: @@ -169,7 +169,7 @@ class StoriesOnlineNetAdapter(BaseSiteAdapter): try: ## need to hit redirect URL so cookies get set for ## the story site domain. I think. - data = self._fetchUrl(e.headers['Location'],params,usecache=False) + data = self.post_request(e.headers['Location'],params,usecache=False) except HTTPError as e: if e.code == 307: # logger.debug(e) diff --git a/fanficfare/adapters/adapter_tenhawkpresents.py b/fanficfare/adapters/adapter_tenhawkpresents.py index 0d1447e7..c295977a 100644 --- a/fanficfare/adapters/adapter_tenhawkpresents.py +++ b/fanficfare/adapters/adapter_tenhawkpresents.py @@ -91,7 +91,7 @@ class TenhawkPresentsSiteAdapter(BaseSiteAdapter): logger.debug("Will now login to URL (%s) as (%s)" % (loginUrl, params['penname'])) - d = self._fetchUrl(loginUrl, params) + d = self.post_request(loginUrl, params) if "Member Account" not in d : #Member Account logger.info("Failed to login to URL %s as %s" % (loginUrl, diff --git a/fanficfare/adapters/adapter_themasquenet.py b/fanficfare/adapters/adapter_themasquenet.py index c3e18253..7a40e7bf 100644 --- a/fanficfare/adapters/adapter_themasquenet.py +++ b/fanficfare/adapters/adapter_themasquenet.py @@ -101,7 +101,7 @@ class TheMasqueNetAdapter(BaseSiteAdapter): logger.debug("Will now login to URL (%s) as (%s)" % (loginUrl, params['penname'])) - d = self._fetchUrl(loginUrl, params) + d = self.post_request(loginUrl, params) if "Member Account" not in d : #Member Account logger.info("Failed to login to URL %s as %s" % (loginUrl, diff --git a/fanficfare/adapters/adapter_thepetulantpoetesscom.py b/fanficfare/adapters/adapter_thepetulantpoetesscom.py index e22b3ecb..6cc1151b 100644 --- a/fanficfare/adapters/adapter_thepetulantpoetesscom.py +++ b/fanficfare/adapters/adapter_thepetulantpoetesscom.py @@ -93,7 +93,7 @@ class ThePetulantPoetessComAdapter(BaseSiteAdapter): logger.debug("Will now login to URL (%s) as (%s)" % (loginUrl, params['penname'])) - d = self._fetchUrl(loginUrl, params) + d = self.post_request(loginUrl, params) if "My Account Page" not in d : #Member Account logger.info("Failed to login to URL %s as %s" % (loginUrl, diff --git a/fanficfare/adapters/adapter_trekiverseorg.py b/fanficfare/adapters/adapter_trekiverseorg.py index 7dd98a60..7717d4c8 100644 --- a/fanficfare/adapters/adapter_trekiverseorg.py +++ b/fanficfare/adapters/adapter_trekiverseorg.py @@ -97,7 +97,7 @@ class TrekiverseOrgAdapter(BaseSiteAdapter): logger.debug("Will now login to URL (%s) as (%s)" % (loginUrl, params['penname'])) - d = self._fetchUrl(loginUrl, params) + d = self.post_request(loginUrl, params) if "Member Account" not in d : #Member Account logger.info("Failed to login to URL %s as %s" % (loginUrl, diff --git a/fanficfare/adapters/adapter_tthfanficorg.py b/fanficfare/adapters/adapter_tthfanficorg.py index d0291037..5dc50334 100644 --- a/fanficfare/adapters/adapter_tthfanficorg.py +++ b/fanficfare/adapters/adapter_tthfanficorg.py @@ -106,7 +106,7 @@ class TwistingTheHellmouthSiteAdapter(BaseSiteAdapter): params['ctkn']=soup.find('input', {'name':'ctkn'})['value'] params[soup.find('input', {'id':'password'})['name']] = params['password'] - d = self._fetchUrl(loginUrl, params) + d = self.post_request(loginUrl, params) if "Stories Published" not in d : #Member Account logger.info("Failed to login to URL %s as %s" % (loginUrl, diff --git a/fanficfare/adapters/adapter_twilightednet.py b/fanficfare/adapters/adapter_twilightednet.py index bd6c799e..5ce7d968 100644 --- a/fanficfare/adapters/adapter_twilightednet.py +++ b/fanficfare/adapters/adapter_twilightednet.py @@ -85,7 +85,7 @@ class TwilightedNetSiteAdapter(BaseSiteAdapter): logger.debug("Will now login to URL (%s) as (%s)" % (loginUrl, params['penname'])) - d = self._fetchUrl(loginUrl, params) + d = self.post_request(loginUrl, params) if "Member Account" not in d : #Member Account logger.info("Failed to login to URL %s as %s" % (loginUrl, diff --git a/fanficfare/adapters/adapter_wwwlushstoriescom.py b/fanficfare/adapters/adapter_wwwlushstoriescom.py index ff5d68fb..d5693f45 100644 --- a/fanficfare/adapters/adapter_wwwlushstoriescom.py +++ b/fanficfare/adapters/adapter_wwwlushstoriescom.py @@ -107,13 +107,11 @@ class WWWLushStoriesComAdapter(BaseSiteAdapter): # XXX return r"http(s)?://www\.lushstories\.com/stories/(?P[^/]+)/(?P.+?)\.aspx" ################################################################################################ - def _fetchUrl(self,url,parameters=None,extrasleep=None,usecache=True): + def _fetchUrl(self,url,usecache=True): ## lushstories.com sets unescaped cookies with cause ## httplib.py to fail. self.get_configuration().set_cookiejar(self.get_configuration().get_empty_cookiejar()) return BaseSiteAdapter._fetchUrl(self,url, - parameters=parameters, - extrasleep=extrasleep, usecache=usecache) ################################################################################################ def get_page(self, page): diff --git a/fanficfare/adapters/base_efiction_adapter.py b/fanficfare/adapters/base_efiction_adapter.py index 7e4374aa..b19dd1d9 100644 --- a/fanficfare/adapters/base_efiction_adapter.py +++ b/fanficfare/adapters/base_efiction_adapter.py @@ -260,7 +260,7 @@ class BaseEfictionAdapter(BaseSiteAdapter): logger.debug("Will now login to URL (%s) as (%s)" % (self.getLoginUrl(), params['penname'])) - d = self._fetchUrl(self.getLoginUrl(), params) + d = self.post_request(self.getLoginUrl(), params) if self.getMessageMemberAccount() not in d : #Member Account logger.info("Failed to login to URL <%s> as '%s'" % (self.getLoginUrl(), params['penname'])) diff --git a/fanficfare/adapters/base_xenforoforum_adapter.py b/fanficfare/adapters/base_xenforoforum_adapter.py index ad17f621..23ad4d8b 100644 --- a/fanficfare/adapters/base_xenforoforum_adapter.py +++ b/fanficfare/adapters/base_xenforoforum_adapter.py @@ -226,7 +226,7 @@ class BaseXenForoForumAdapter(BaseSiteAdapter): logger.debug("Will now login to URL (%s) as (%s)" % (loginUrl, params['login'])) - d = self._fetchUrl(loginUrl, params) + d = self.post_request(loginUrl, params) if "Log Out" not in d: # logger.debug(d) diff --git a/fanficfare/configurable.py b/fanficfare/configurable.py index 7490fa40..45d42849 100644 --- a/fanficfare/configurable.py +++ b/fanficfare/configurable.py @@ -1001,9 +1001,9 @@ class Configurable(object): def post_request(self, url, parameters={}, usecache=True): - return self.configuration.fetcher._postUrl(url, - parameters=parameters, - usecache=usecache) + return self.configuration.fetcher.post_request(url, + parameters=parameters, + usecache=usecache) def _fetchUrlOpened(self, url, parameters=None, diff --git a/fanficfare/fetcher.py b/fanficfare/fetcher.py index 2c6d4a99..f58c3080 100644 --- a/fanficfare/fetcher.py +++ b/fanficfare/fetcher.py @@ -73,7 +73,7 @@ class Fetcher(object): self.save_cache_file = None self.save_cookiejar_file = None - + def get_empty_cookiejar(self): return cl.LWPCookieJar() @@ -240,11 +240,11 @@ class Fetcher(object): time.sleep(rt) # Assumes application/x-www-form-urlencoded. parameters, headers are dict()s - def _postUrl(self, url, - parameters={}, - headers={}, - extrasleep=None, - usecache=True): + def post_request(self, url, + parameters={}, + headers={}, + extrasleep=None, + usecache=True): ''' When should cache be cleared or not used? logins...