Merge d26e9cc into 3065872

holoviews/core/accessors.py

@@ -495,12 +495,13 @@ def __init__(self, obj, mode=None):
         self._obj = obj
 
 
-    def get(self, group=None, backend=None):
+    def get(self, group=None, backend=None, defaults=True):
         """Returns the corresponding Options object.
 
         Args:
             group: The options group. Flattens across groups if None.
             backend: Current backend if None otherwise chosen backend.
+            defaults: Whether to include default option values
 
         Returns:
             Options object associated with the object containing the
@@ -511,7 +512,8 @@ def get(self, group=None, backend=None):
         groups = Options._option_groups if group is None else [group]
         backend = backend if backend else Store.current_backend
         for group in groups:
-            optsobj = Store.lookup_options(backend, self._obj, group)
+            optsobj = Store.lookup_options(backend, self._obj, group,
+                                           defaults=defaults)
             keywords = dict(keywords, **optsobj.kwargs)
         return Options(**keywords)
 

holoviews/core/options.py

@@ -1257,10 +1257,10 @@ def lookup_options(cls, backend, obj, group, defaults=True):
         if obj.id in cls._custom_options[backend]:
             return cls._custom_options[backend][obj.id].closest(
                 obj, group, defaults, backend=backend)
-        elif defaults:
-            return cls._options[backend].closest(obj, group, defaults, backend=backend)
+        elif not defaults:
+            return Options()
         else:
-            return OptionTree(groups=cls._options[backend].groups)
+            return cls._options[backend].closest(obj, group, defaults, backend=backend)
 
     @classmethod
     def lookup(cls, backend, obj):