From 9094886fbed1258ca1a266559485072896b0e183 Mon Sep 17 00:00:00 2001 From: epage Date: Fri, 20 Mar 2009 02:04:57 +0000 Subject: [PATCH] Cut down one more download git-svn-id: file:///svnroot/gc-dialer/trunk@237 c39d3808-3fe2-4d86-a59f-b7f623ee9f21 --- src/gv_backend.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/gv_backend.py b/src/gv_backend.py index 5b99b7b..aa55fd7 100644 --- a/src/gv_backend.py +++ b/src/gv_backend.py @@ -369,23 +369,21 @@ class GVDialer(object): jsonTree = parse_json(flatJson) return jsonTree - def _grab_account_info(self, accountNumberPage = None): - if accountNumberPage is None: - accountNumberPage = self._browser.download(self._accountNumberURL) + def _grab_account_info(self): + page = self._browser.download(self._forwardURL) - tokenGroup = self._tokenRe.search(accountNumberPage) + tokenGroup = self._tokenRe.search(page) if tokenGroup is None: raise RuntimeError("Could not extract authentication token from GrandCentral") self._token = tokenGroup.group(1) - anGroup = self._accountNumRe.search(accountNumberPage) + anGroup = self._accountNumRe.search(page) if anGroup is None: raise RuntimeError("Could not extract account number from GrandCentral") self._accountNum = anGroup.group(1) - callbackPage = self._browser.download(self._forwardURL) self._callbackNumbers = {} - for match in self._callbackRe.finditer(callbackPage): + for match in self._callbackRe.finditer(page): callbackNumber = match.group(2) callbackName = match.group(1) self._callbackNumbers[callbackNumber] = callbackName -- 1.7.9.5