From 09aa45d15b308041b68c114470c5aceda1466e85 Mon Sep 17 00:00:00 2001
From: Corollax <corollax@gmail.com>
Date: Sun, 2 Jan 2011 17:52:20 -0600
Subject: [PATCH] Remove nonfunctional exception handler

Pull in eos changes too :)
---
 eos                                       | 2 +-
 gui/builtinViewColumns/propertyDisplay.py | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/eos b/eos
index 0e4c3a157..cf4315fb7 160000
--- a/eos
+++ b/eos
@@ -1 +1 @@
-Subproject commit 0e4c3a157bf2b6b68c3239e524ef90d8e25361da
+Subproject commit cf4315fb7affd7e9a713191c18ecc53ac9758184
diff --git a/gui/builtinViewColumns/propertyDisplay.py b/gui/builtinViewColumns/propertyDisplay.py
index 3441b6747..ef6959467 100644
--- a/gui/builtinViewColumns/propertyDisplay.py
+++ b/gui/builtinViewColumns/propertyDisplay.py
@@ -29,10 +29,9 @@ class PropertyDisplay(ViewColumn):
         ViewColumn.__init__(self, fittingView)
         cAttribute = service.Attribute.getInstance()
         attributeSlave = params["attributeSlave"] or params["property"]
-        try:
-            info = cAttribute.getAttributeInfo(attributeSlave)
-        except:
-            info = None
+        # This function can throw an exception if the database isn't sane
+        # We need to do a sanity check before this runs
+        info = cAttribute.getAttributeInfo(attributeSlave)
 
         self.mask = 0
         self.propertyName = params["property"]