From 8f113949721711380b54a535dff9a8ff9e694001 Mon Sep 17 00:00:00 2001 From: epage Date: Tue, 8 Jul 2008 03:39:12 +0000 Subject: [PATCH] Is it just me, or are throwing away unknown exceptions scary? So I removed the catch-alls so we can find what really is needed to be caught and catch and *handle* git-svn-id: file:///svnroot/gc-dialer/trunk@73 c39d3808-3fe2-4d86-a59f-b7f623ee9f21 --- gc_dialer/gc_dialer.py | 24 +++++-------- gc_dialer/gcbackend.py | 94 ++++++++++++++++++------------------------------ 2 files changed, 44 insertions(+), 74 deletions(-) diff --git a/gc_dialer/gc_dialer.py b/gc_dialer/gc_dialer.py index c7036c1..064589f 100755 --- a/gc_dialer/gc_dialer.py +++ b/gc_dialer/gc_dialer.py @@ -223,21 +223,18 @@ class Dialpad(object): gobject.idle_add(self._init_recent_view) def _init_grandcentral(self): - """ deferred initalization of the grandcentral info """ + """ Deferred initalization of the grandcentral info """ - try: - if self._gcBackend.isAuthed(): - if self._gcBackend.getCallbackNumber() is None: - self._gcBackend.setSaneCallback() - except: - pass + if self._gcBackend.isAuthed(): + if self._gcBackend.getCallbackNumber() is None: + self._gcBackend.setSaneCallback() self.setAccountNumber() print "exit init_gc" return False def _init_recent_view(self): - """ deferred initalization of the recent view treeview """ + """ Deferred initalization of the recent view treeview """ recentview = self._widgetTree.get_widget("recentview") recentview.set_model(self._recentmodel) @@ -381,10 +378,7 @@ class Dialpad(object): gobject.idle_add(self._setupCallbackCombo) if hildon: - try: - self._window.set_title(self._notebook.get_tab_label(self._notebook.get_nth_page(page_num)).get_text()) - except: - self._window.set_title("") + self._window.set_title(self._notebook.get_tab_label(self._notebook.get_nth_page(page_num)).get_text()) def _on_dial_clicked(self, widget): """ @@ -445,14 +439,14 @@ class DummyOptions(object): if __name__ == "__main__": - if hildon: + if hildon is not None: gtk.set_application_name("Dialer") - try: + if optparse is not None: parser = optparse.OptionParser() parser.add_option("-t", "--test", action="store_true", dest="test", help="Run tests") (options, args) = parser.parse_args() - except: + else: args = [] options = DummyOptions() diff --git a/gc_dialer/gcbackend.py b/gc_dialer/gcbackend.py index 4f59a0a..4bd4a46 100644 --- a/gc_dialer/gcbackend.py +++ b/gc_dialer/gcbackend.py @@ -61,15 +61,13 @@ class GCDialer(object): if time.time() - self._lastAuthed < 60 and not force: return True - try: - forwardSelectionPage = self._browser.download(GCDialer._forwardselectURL) - self._browser.cookies.save() - if GCDialer._isLoginPageRe.search(forwardSelectionPage) is None: - self._grabToken(forwardSelectionPage) - self._lastAuthed = time.time() - return True - except: - pass + forwardSelectionPage = self._browser.download(GCDialer._forwardselectURL) + self._browser.cookies.save() + if GCDialer._isLoginPageRe.search(forwardSelectionPage) is None: + self._grabToken(forwardSelectionPage) + self._lastAuthed = time.time() + return True + return False def login(self, username, password): @@ -77,15 +75,11 @@ class GCDialer(object): Attempt to login to grandcentral @returns Whether login was successful or not """ - try: - if self.isAuthed(): - return True - loginPostData = urllib.urlencode( {'username' : username , 'password' : password } ) - loginSuccessOrFailurePage = self._browser.download(GCDialer._loginURL, loginPostData) - return self.isAuthed() - except: - pass - return False + if self.isAuthed(): + return True + loginPostData = urllib.urlencode( {'username' : username , 'password' : password } ) + loginSuccessOrFailurePage = self._browser.download(GCDialer._loginURL, loginPostData) + return self.isAuthed() def dial(self, number): """ @@ -106,18 +100,15 @@ class GCDialer(object): if len(number) == 11 and number[0] == 1: number = number[1:] - try: - callSuccessPage = self._browser.download( - GCDialer._clicktocallURL % (self._accessToken, number), - None, {'Referer' : 'http://www.grandcentral.com/mobile/messages'} ) - - if GCDialer._gcDialingStrRe.search(callSuccessPage) is not None: - return True - else: - self._msg = "Grand Central returned an error" - return False - except: - pass + callSuccessPage = self._browser.download( + GCDialer._clicktocallURL % (self._accessToken, number), + None, {'Referer' : 'http://www.grandcentral.com/mobile/messages'} ) + + if GCDialer._gcDialingStrRe.search(callSuccessPage) is not None: + return True + else: + self._msg = "Grand Central returned an error" + return False self._msg = "Unknown Error" return False @@ -189,12 +180,9 @@ class GCDialer(object): @param callbacknumber should be a proper 10 digit number """ print "setCallbackNumber %s" % (callbacknumber) - try: - callbackPostData = urllib.urlencode({'a_t' : self._accessToken, 'default_number' : callbacknumber }) - callbackSetPage = self._browser.download(GCDialer._setforwardURL, callbackPostData) - self._browser.cookies.save() - except: - pass + callbackPostData = urllib.urlencode({'a_t' : self._accessToken, 'default_number' : callbacknumber }) + callbackSetPage = self._browser.download(GCDialer._setforwardURL, callbackPostData) + self._browser.cookies.save() def getCallbackNumber(self): """ @@ -209,34 +197,22 @@ class GCDialer(object): """ @returns Iterable of (personsName, phoneNumber, date, action) """ - try: - recentCallsPage = self._browser.download(GCDialer._inboxallURL) - for match in self._inboxRe.finditer(recentCallsPage): - phoneNumber = match.group(4) - action = match.group(1) - date = match.group(2) - personsName = match.group(3) - yield personsName, phoneNumber, date, action - except: - pass + recentCallsPage = self._browser.download(GCDialer._inboxallURL) + for match in self._inboxRe.finditer(recentCallsPage): + phoneNumber = match.group(4) + action = match.group(1) + date = match.group(2) + personsName = match.group(3) + yield personsName, phoneNumber, date, action def _grabToken(self, data): "Pull the magic cookie from the datastream" atGroup = GCDialer._accessTokenRe.search(data) - try: - self._accessToken = atGroup.group(1) - except: - pass + self._accessToken = atGroup.group(1) anGroup = GCDialer._accountNumRe.search(data) - try: - self._accountNum = anGroup.group(1) - except: - pass + self._accountNum = anGroup.group(1) self._callbackNumbers = {} - try: - for match in GCDialer._callbackRe.finditer(data): - self._callbackNumbers[match.group(1)] = match.group(2) - except: - pass + for match in GCDialer._callbackRe.finditer(data): + self._callbackNumbers[match.group(1)] = match.group(2) -- 1.7.9.5