BigQuery: added methods for getting keys, items and dict

bigquery/google/cloud/bigquery/table.py

@@ -791,30 +791,40 @@ def keys(self):
         >>> Row(('a', 'b'), {'x': 0, 'y': 1}).keys()
         ['x', 'y']
         """
-        for k in self._xxx_field_to_index.keys():
-            yield k
+        keys = self._xxx_field_to_index.keys()
+        return keys
 
     def items(self):
         """
         Return items as of a dict:
         >>> Row(('a', 'b'), {'x': 0, 'y': 1}).items()
         [('x', 'a'), ('y', 'b')]
         """
-        for k, i in self._xxx_field_to_index.items():
-            yield k, self._xxx_values[i]
-
-    def dict(self):
-        """
-        Return row as a dict object:
-        >>> Row(('a', 'b'), {'x': 0, 'y': 1}).dict()
-        {'x': 'a', 'y': 'b'}
-        """
-        data = {
-            k: self._xxx_values[i]
+        items = [
+            (k, self._xxx_values[i])
             for k, i
             in self._xxx_field_to_index.items()
-        }
-        return data
+        ]
+        return items
+
+    def get(self, key, default = None):
+        """
+        Return value under specified key
+        Defaults to None or specified default
+        if key does not exist:
+        >>> Row(('a', 'b'), {'x': 0, 'y': 1}).get('x')
+        'a'
+        >>> Row(('a', 'b'), {'x': 0, 'y': 1}).get('z')
+        None
+        >>> Row(('a', 'b'), {'x': 0, 'y': 1}).get('z', '')
+        ''
+        >>> Row(('a', 'b'), {'x': 0, 'y': 1}).get('z', default = '')
+        ''
+        """
+        index = self._xxx_field_to_index.get(key)
+        if index is None:
+            return default
+        return values[index]
 
     def __getattr__(self, name):
         value = self._xxx_field_to_index.get(name)

bigquery/tests/unit/test_table.py

@@ -765,9 +765,12 @@ def test_row(self):
         self.assertEqual(row['c'], 3)
         self.assertEqual(len(row), 3)
         self.assertEqual(row.values(), VALUES)
-        self.assertEqual(set(row.keys()), set(['a', 'b', 'c']))
-        self.assertEqual(set(row.items()), set([('a', 1), ('b', 2), ('c', 3)]))
-        self.assertEqual(row.dict(), {'a': 1, 'b': 2, 'c': 3})
+        self.assertEqual(row.keys(), {'a': 1, 'b': 2, 'c': 3}.keys())
+        self.assertEqual(row.items(), {'a': 1, 'b': 2, 'c': 3}.items())
+        self.assertEqual(row.get('a'), 1)
+        self.assertEqual(row.get('d'), None)
+        self.assertEqual(row.get('d', ''), '') 
+        self.assertEqual(row.get('d', default = ''), '') 
         self.assertEqual(repr(row),
                          "Row((1, 2, 3), {'a': 0, 'b': 1, 'c': 2})")
         self.assertFalse(row != row)