From 8a9d2a032ea03b1840839fea80350627f39b1dea Mon Sep 17 00:00:00 2001
From: blitzman <ryan.xgamer99@gmail.com>
Date: Wed, 8 Feb 2017 00:00:16 -0500
Subject: [PATCH] Revert the try... except, see #960

---
 eos/gamedata.py              |  9 +++------
 eos/modifiedAttributeDict.py | 18 ++++++------------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/eos/gamedata.py b/eos/gamedata.py
index fca14263a..10317dab2 100644
--- a/eos/gamedata.py
+++ b/eos/gamedata.py
@@ -244,12 +244,9 @@ class Item(EqBase):
         return self.__attributes
 
     def getAttribute(self, key, default=None):
-        try:
-            if key in self.attributes:
-                return self.attributes[key].value
-            else:
-                return default
-        except AttributeError:
+        if key in self.attributes:
+            return self.attributes[key].value
+        else:
             return default
 
     def isType(self, type):
diff --git a/eos/modifiedAttributeDict.py b/eos/modifiedAttributeDict.py
index 417a459c2..e558dc64d 100644
--- a/eos/modifiedAttributeDict.py
+++ b/eos/modifiedAttributeDict.py
@@ -26,23 +26,17 @@ cappingAttrKeyCache = {}
 
 class ItemAttrShortcut(object):
     def getModifiedItemAttr(self, key, default=None):
-        try:
-            if key in self.itemModifiedAttributes:
-                return self.itemModifiedAttributes[key]
-            else:
-                return default
-        except AttributeError:
+        if key in self.itemModifiedAttributes:
+            return self.itemModifiedAttributes[key]
+        else:
             return default
 
 
 class ChargeAttrShortcut(object):
     def getModifiedChargeAttr(self, key, default=None):
-        try:
-            if key in self.chargeModifiedAttributes:
-                return self.chargeModifiedAttributes[key]
-            else:
-                return default
-        except AttributeError:
+        if key in self.chargeModifiedAttributes:
+            return self.chargeModifiedAttributes[key]
+        else:
             return default