From 9d595047c3ed17d0e90972873282b38bea177b9b Mon Sep 17 00:00:00 2001 From: andrei Date: Fri, 2 Jun 2017 00:16:22 -0700 Subject: [PATCH] Actually properly fix GatewayEvent proxying once and for all --- disco/gateway/events.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/disco/gateway/events.py b/disco/gateway/events.py index 90c0594..99b5c03 100644 --- a/disco/gateway/events.py +++ b/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: - _proxy = object.__getattr__(self, '_proxy', None) - if _proxy: - return getattr(_proxy, name) - else: - if hasattr(self, '_proxy'): - return getattr(getattr(self, self._proxy), name) - - return object.__getattribute__(self, name) + try: + _proxy = object.__getattribute__(self, '_proxy') + except AttributeError: + return object.__getattribute__(self, name) + + return getattr(getattr(self, _proxy), name) def debug(func=None, match=None):