RF: Style updates

Author: pauldmccarthy

nibabel/tests/test_wrapstruct.py

@@ -183,15 +183,10 @@ def test_mappingness(self):
         assert_equal(hdr.get(keys[0]), vals[0])
         assert_equal(hdr.get(keys[0], 'default'), vals[0])
 
-        # make sure .get returns values 
-        # which evaluate to False. We
-        # have to use a different falsy
-        # value depending on the data
-        # type of the first header field.
-        if np.issubdtype(hdr_dt[0], np.number):
-            falsyval = 0
-        else:
-            falsyval = b''
+        # make sure .get returns values which evaluate to False. We have to
+        # use a different falsy value depending on the data type of the first
+        # header field.
+        falsyval = 0 if np.issubdtype(hdr_dt[0], np.number) else b''
 
         hdr[keys[0]] = falsyval
         assert_equal(hdr[keys[0]], falsyval)

nibabel/wrapstruct.py

@@ -343,10 +343,7 @@ def items(self):
 
     def get(self, k, d=None):
         ''' Return value for the key k if present or d otherwise'''
-        if k in self.keys():
-            return self._structarr[k]
-        else:
-            return d
+        return self._structarr[k] if k in self.keys() else d
 
     def check_fix(self, logger=None, error_level=None):
         ''' Check structured data with checks