From e112536ce2b5df8e9e4bab578d9411c8ff28ad09 Mon Sep 17 00:00:00 2001
From: Rapptz <rapptz@gmail.com>
Date: Fri, 29 Apr 2016 08:27:19 -0400
Subject: [PATCH] Simplify User.display_name a bit.

---
 discord/user.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/discord/user.py b/discord/user.py
index b1cc0b4c3..ce68775f6 100644
--- a/discord/user.py
+++ b/discord/user.py
@@ -133,6 +133,5 @@ class User:
         if they have a server specific nickname then that
         is returned instead.
         """
-        nickname = getattr(self, 'nick', None)
-        return nickname if nickname is not None else self.name
+        return getattr(self, 'nick', self.name)