cleanup/quieter print_vals method

cfpb · Nov 7, 2016 · 1b22428 · 1b22428
1 parent 7c546ad
commit 1b22428
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/paying_for_college/models.py b/paying_for_college/models.py
@@ -745,15 +745,19 @@ def print_vals(obj, val_list=False, val_dict=False, noprint=False):
     keylist = sorted([key for key in obj._meta.get_all_field_names()],
                      key=lambda s: s.lower())
     if val_list:
-        newlist = []
+        values = []
         for key in keylist:
             try:
-                print "%s: %s" % (key, obj.__getattribute__(key))
-            except:
-                pass
-            else:
-                newlist.append(key)
-        return [obj.__getattribute__(key) for key in newlist]
+                value = obj.__getattribute__(key)
+            except AttributeError:
+                continue
+
+            values.append(value)
+
+            if not noprint:
+                print "%s: %s" % (key, value)
+
+        return values
     elif val_dict:
         return obj.__dict__
     else: