Making _gc_rule_to_dict map null to empty dict.

dhermes · Sep 7, 2015 · ae9bc33 · ae9bc33
1 parent 572190c
commit ae9bc33
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/gcloud_bigtable/happybase/table.py b/gcloud_bigtable/happybase/table.py
@@ -85,7 +85,8 @@ def _gc_rule_to_dict(gc_rule):
 
     Otherwise, just returns the input without change.
 
-    :type gc_rule: :class:`.GarbageCollectionRule`,
+    :type gc_rule: :data:`NoneType <types.NoneType>`,
+                   :class:`.GarbageCollectionRule`,
                    :class:`.GarbageCollectionRuleIntersection`, or
                    :class:`.GarbageCollectionRuleUnion`
     :param gc_rule: A garbae collection rule to convert to a dictionary
@@ -97,7 +98,9 @@ def _gc_rule_to_dict(gc_rule):
     :returns: The converted garbage collection rule.
     """
     result = gc_rule
-    if isinstance(gc_rule, GarbageCollectionRule):
+    if gc_rule is None:
+        result = {}
+    elif isinstance(gc_rule, GarbageCollectionRule):
         result = {}
         # We assume that the GC rule has a single value.
         if gc_rule.max_num_versions is not None:

diff --git a/gcloud_bigtable/happybase/test_table.py b/gcloud_bigtable/happybase/test_table.py
@@ -44,6 +44,11 @@ def _callFUT(self, gc_rule):
         from gcloud_bigtable.happybase.table import _gc_rule_to_dict
         return _gc_rule_to_dict(gc_rule)
 
+    def test_with_null(self):
+        gc_rule = None
+        result = self._callFUT(gc_rule)
+        self.assertEqual(result, {})
+
     def test_with_max_versions(self):
         from gcloud_bigtable.column_family import GarbageCollectionRule