simplify __getattr__

founders4schools · Jun 8, 2017 · abd6af2 · abd6af2
1 parent c9a4079
commit abd6af2
Showing 1 changed file with 8 additions and 14 deletions.
diff --git a/duedil/resources/__init__.py b/duedil/resources/__init__.py
@@ -72,21 +72,15 @@ def __getattr__(self, name):
         """
         lazily return attributes, only contact duedil if necessary
         """
-        try:
-            return super(Resource, self).__getattribute__(name)
-        except AttributeError:
-            if name in self.attribute_names:
-                if not self.loaded:
-                    try:
-                        self.load()
-                    except ValueError:
-                        pass
+        if name in self.attribute_names:
+            if not self.loaded:
                 try:
-                    return super(Resource, self).__getattribute__(name)
-                except AttributeError:
-                    raise
-            else:
-                raise
+                    self.load()
+                except ValueError:
+                    pass
+            return super(Resource, self).__getattribute__(name)
+        else:
+            raise AttributeError
 
     @property
     def endpoint(self):