Merge dfc8fc8 into 980ecab

holoviz · Feb 21, 2019 · cca5235 · cca5235
2 parents 980ecab + dfc8fc8
commit cca5235
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/examples/user_guide/03-Applying_Customization.ipynb b/examples/user_guide/03-Applying_Customization.ipynb
@@ -736,7 +736,7 @@
     "full_literal_spec = {\n",
     "    'Curve': {'style':dict(color='orange')}, \n",
     "    'Curve.Sinusoid': {'style':dict(color='grey')}, \n",
-    "    'Curve.Sinusoid.Squared ': {'style':dict(color='black'),\n",
+    "    'Curve.Sinusoid.Squared': {'style':dict(color='black'),\n",
     "                                'plot':dict(interpolation='steps-mid')}}\n",
     "curves.opts(full_literal_spec)"
    ]

diff --git a/holoviews/core/options.py b/holoviews/core/options.py
@@ -1452,7 +1452,6 @@ def register(cls, associations, backend, style_aliases={}):
         Register the supplied dictionary of associations between
         elements and plotting classes to the specified backend.
         """
-        from .overlay import CompositeOverlay
         if backend not in cls.registry:
             cls.registry[backend] = {}
         cls.registry[backend].update(associations)
@@ -1478,11 +1477,11 @@ def register(cls, associations, backend, style_aliases={}):
 
             opt_groups = {'plot':   Options(allowed_keywords=plot_opts),
                           'output': Options(allowed_keywords=Options._output_allowed_kws)}
-            if not isinstance(view_class, CompositeOverlay) or hasattr(plot, 'style_opts'):
-                 opt_groups.update({'style': Options(allowed_keywords=style_opts),
-                                    'norm':  Options(framewise=False, axiswise=False,
-                                                     allowed_keywords=['framewise',
-                                                                       'axiswise'])})
+
+            opt_groups.update({'style': Options(allowed_keywords=style_opts),
+                               'norm':  Options(framewise=False, axiswise=False,
+                                                allowed_keywords=['framewise',
+                                                                  'axiswise'])})
 
             name = view_class.__name__
             cls._options[backend][name] = opt_groups

diff --git a/holoviews/util/__init__.py b/holoviews/util/__init__.py
@@ -118,7 +118,7 @@ def _group_kwargs_to_options(cls, obj, kwargs):
                             ','.join(repr(k) for k in kwargs.keys()))
 
         # Check whether the user is specifying targets (such as 'Image.Foo')
-        targets = [all(k[0].isupper() for k in grp.keys()) for grp in kwargs.values()]
+        targets = [grp and all(k[0].isupper() for k in grp) for grp in kwargs.values()]
         if any(targets) and not all(targets):
             raise Exception("Cannot mix target specification keys such as 'Image' with non-target keywords.")
         elif not any(targets):