From 9144ce85704f028487b5fe8c57ee01657d0967d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergiusz=20=27q3k=27=20Baza=C5=84ski?= <q3k@q3k.org>
Date: Mon, 9 Oct 2017 21:05:31 +0100
Subject: [PATCH] Simplify LDAP data extraction.

---
 auth.py | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/auth.py b/auth.py
index cdd9a8e..633bc09 100644
--- a/auth.py
+++ b/auth.py
@@ -243,21 +243,10 @@ class LDAPUserProxy(object):
             raise Exception('No such username.')
         dn, data = res[0]
 
-        self.gecos = None
-        if 'gecos' in data and data['gecos']:
-            self.gecos = data['gecos'][0]
-
-        self.mifare_hashes = []
-        if 'mifareIDHash' in data:
-            self.mifare_hashes = data['mifareIDHash']
-
-        self.phone = None
-        if 'mobile' in data and data['mobile']:
-            self.phone = data['mobile'][0]
-
-        self.personal_email = None
-        if 'mailRoutingAddress' in data and data['mailRoutingAddress']:
-            self.personal_email = data['mailRoutingAddress']
+        self.gecos = data.get('gecos', [None, ])[0]
+        self.mifare_hashes = data.get('mifareIDHash', [])
+        self.phone = data.get('mobile', [None, ])[0]
+        self.personal_email = data.get('mailRoutingAddress', [])
 
     def __repr__(self):
         active = 'active' if self.is_active else 'inactive'