From ae1e9312cacb5ccf80b6ab69891d1aea9a9dd6c9 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: May 14 2015 06:08:57 +0000 Subject: Simplify this code block and reduce redundancy Thanks at @ralph @ralphbean --- diff --git a/pagure/lib/git.py b/pagure/lib/git.py index 866b24f..5e72af5 100644 --- a/pagure/lib/git.py +++ b/pagure/lib/git.py @@ -276,21 +276,15 @@ def get_user_from_json(session, jsondata, key='user'): """ user = None - username = jsondata.get(key, None) - if username: - username = username.get('name') - fullname = jsondata.get(key, {}) + username = fullname = useremails = default_email = None - if fullname: - fullname = fullname.get('fullname') + data = json.data.get(key, None) - useremails = jsondata.get(key, {}) - if useremails: - useremails = useremails.get('emails') - - default_email = jsondata.get(key, {}) - if default_email: - default_email = default_email.get('name') + if data: + username = data.get('name') + fullname = data.get('fullname') + useremails = data.get('emails') + default_email = data.get('default_email') if not default_email and useremails: default_email = useremails[0]