small fixes

story645 · story645 · commit 7e6b66b8b91d · 2023-09-21T06:07:20.000-04:00
diff --git a/lib/matplotlib/mpl-data/stylelib/xkcd.mplstyle b/lib/matplotlib/mpl-data/stylelib/xkcd.mplstyle
@@ -27,7 +27,4 @@ figure.facecolor: white
 
 # path
 path.sketch             : (1, 100, 2)
-path.effects.withStroke : {"linewidth": 4, "foreground": 'w' }
-        
-#'path.effects': [
-# patheffects.withStroke(linewidth=4, foreground="w")] 
+path.effects.withStroke : {"linewidth": 4, "foreground": 'w' }
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -748,7 +748,6 @@ def xkcd(
     stack = ExitStack()
     stack.callback(dict.update, rcParams, rcParams.copy())  # type: ignore
 
-    from matplotlib import patheffects
     rcParams.update({**style.library["xkcd"],
                     'path.sketch': (scale, length, randomness)})
     return stack
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -877,13 +877,10 @@ def _validate_dict(d):
             d = ast.literal_eval(d)
         except ValueError:
             pass
-
         if isinstance(d, dict) or (allow_none and (d is None)):
             return d
-
         raise ValueError(f"Input {d!r} must be a dictionary {{'k': v}} "
                          f"{'or None' if allow_none else ''}")
-
     return _validate_dict
 
 
diff --git a/lib/matplotlib/rcsetup.pyi b/lib/matplotlib/rcsetup.pyi
@@ -28,7 +28,7 @@ class ValidateInStrings:
 
 def validate_any(s: Any) -> Any: ...
 def validate_anylist(s: Any) -> list[Any]: ...
-def validate_anydict(allow_none: bool) -> Callable[dict[str,Any], None]: ...
+def validate_anydict(allow_none: bool) -> Callable[Optional[dict[str, Any]]]: ...
 def validate_bool(b: Any) -> bool: ...
 def validate_axisbelow(s: Any) -> bool | Literal["line"]: ...
 def validate_dpi(s: Any) -> Literal["figure"] | float: ...
