[Checkins] SVN: grokui.admin/branches/ulif-securitynotifications/src/grokui/admin/security.py Handle expected exceptions correctly.

[Uli Fouquet]

Log message for revision 94240:
  Handle expected exceptions correctly.

Changed:
  U   grokui.admin/branches/ulif-securitynotifications/src/grokui/admin/security.py

-=-
Modified: grokui.admin/branches/ulif-securitynotifications/src/grokui/admin/security.py
===================================================================
--- grokui.admin/branches/ulif-securitynotifications/src/grokui/admin/security.py	2008-12-22 00:30:33 UTC (rev 94239)
+++ grokui.admin/branches/ulif-securitynotifications/src/grokui/admin/security.py	2008-12-22 09:46:20 UTC (rev 94240)
@@ -121,13 +121,17 @@
         url = urlparse.urljoin(self.lookup_url, filename)
         try:
             self._message = urllib2.urlopen(url).read()
+            self._warningstate = True
+        except (urllib2.HTTPError, OSError), e:
+            if (getattr(e, 'code', None) == 404) or (
+                getattr(e, 'errno', None) == 2):
+                # No security warning found, good message.
+                self._message = u''
+                self._warningstate = False
         except:
-            # Currently we tolerate any error, while only certain
-            # ones, like HTTPError 404 or OSError 'File not found'
-            # should be accepted.
-            #
-            # In case of an error we assume, that there is no security
-            # notification available.
+            # An unexpected problem occured...
+            pass
+        if self._message == self.MSG_DISABLED:
             self._message = u''
         self.last_lookup = time.time()
         return