Actually properly fix GatewayEvent proxying once and for all

disco/gateway/events.py

@@ -64,15 +64,12 @@ class GatewayEvent(six.with_metaclass(GatewayEventMeta, Model)):
         return cls(obj, client)
 
     def __getattr__(self, name):
-        if six.PY3:
+        try:
-            _proxy = object.__getattr__(self, '_proxy', None)
+            _proxy = object.__getattribute__(self, '_proxy')
-            if _proxy:
+        except AttributeError:
-                return getattr(_proxy, name)
+            return object.__getattribute__(self, name)
-        else:
+
-            if hasattr(self, '_proxy'):
+        return getattr(getattr(self, _proxy), name)
-                return getattr(getattr(self, self._proxy), name)
-
-        return object.__getattribute__(self, name)
 
 
 def debug(func=None, match=None):