update helper func name

mikeywaites · Jun 16, 2016 · 55b067c · 55b067c
1 parent 984b498
commit 55b067c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/kim/pipelines/base.py b/kim/pipelines/base.py
@@ -9,7 +9,7 @@
 from functools import wraps
 
 from kim.exception import StopPipelineExecution, FieldError
-from kim.utils import attr_or_key, set_attr_or_key, merge
+from kim.utils import attr_or_key, set_attr_or_key, attr_or_key_update
 
 
 class Pipe(object):
@@ -258,7 +258,7 @@ def update_output_to_source(session):
     source = session.field.opts.source
     try:
         if source == '__self__':
-            merge(session.output, session.data)
+            attr_or_key_update(session.output, session.data)
         else:
             set_attr_or_key(session.output, session.field.opts.source, session.data)
     except (TypeError, AttributeError):

diff --git a/kim/utils.py b/kim/utils.py
@@ -60,7 +60,7 @@ def set_attr_or_key(obj, name, value):
     _set_attr_or_key(obj, components[-1], value)
 
 
-def merge(obj, value):
+def attr_or_key_update(obj, value):
     """If obj is a dict, add keys from value to it with update(),
     otherwise use setattr to set every attribute from value on obj
     """