refactor: Remove copy_keys utility function

has2k1 · Sep 17, 2024 · b09cc0f · b09cc0f
1 parent 621195c
commit b09cc0f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 27 deletions.
diff --git a/plotnine/_utils/__init__.py b/plotnine/_utils/__init__.py
@@ -733,27 +733,6 @@ def make_line_segments(
     return segments
 
 
-def copy_keys(source, destination, keys=None):
-    """
-    Add keys in source to destination
-
-    Parameters
-    ----------
-    source : dict
-
-    destination: dict
-
-    keys : None | iterable
-        The keys in source to be copied into destination. If
-        None, then `keys = destination.keys()`
-    """
-    if keys is None:
-        keys = destination.keys()
-    for k in set(source) & set(keys):
-        destination[k] = source[k]
-    return destination
-
-
 def get_kwarg_names(func):
     """
     Return a list of valid kwargs to function func

diff --git a/plotnine/geoms/geom.py b/plotnine/geoms/geom.py
@@ -6,7 +6,6 @@
 from itertools import chain, repeat
 
 from .._utils import (
-    copy_keys,
     data_mapping_as_kwargs,
     is_list_like,
     remove_missing,
@@ -83,8 +82,12 @@ def __init__(
         self._kwargs = kwargs  # Will be used to create stat & layer
 
         # separate aesthetics and parameters
-        self.aes_params = copy_keys(kwargs, {}, self.aesthetics())
-        self.params = copy_keys(kwargs, deepcopy(self.DEFAULT_PARAMS))
+        self.aes_params = {
+            ae: kwargs[ae] for ae in self.aesthetics() & set(kwargs)
+        }
+        self.params = self.DEFAULT_PARAMS | {
+            k: v for k, v in kwargs.items() if k in self.DEFAULT_PARAMS
+        }
         self.mapping = kwargs["mapping"]
         self.data = kwargs["data"]
         self._stat = stat.from_geom(self)

diff --git a/plotnine/stats/stat.py b/plotnine/stats/stat.py
@@ -7,7 +7,6 @@
 
 from .._utils import (
     check_required_aesthetics,
-    copy_keys,
     data_mapping_as_kwargs,
     groupby_apply,
     remove_missing,
@@ -75,10 +74,12 @@ def __init__(
     ):
         kwargs = data_mapping_as_kwargs((data, mapping), kwargs)
         self._kwargs = kwargs  # Will be used to create the geom
-        self.params = copy_keys(kwargs, deepcopy(self.DEFAULT_PARAMS))
+        self.params = self.DEFAULT_PARAMS | {
+            k: v for k, v in kwargs.items() if k in self.DEFAULT_PARAMS
+        }
         self.DEFAULT_AES = aes(**self.DEFAULT_AES)
         self.aes_params = {
-            ae: kwargs[ae] for ae in (self.aesthetics() & kwargs.keys())
+            ae: kwargs[ae] for ae in self.aesthetics() & set(kwargs)
         }
 
     @staticmethod