From eb837716d8cfd0667f65e86aa7d1d07946315c9a Mon Sep 17 00:00:00 2001
From: woorst <woorst@github.com>
Date: Sun, 23 Jul 2017 13:31:11 -0500
Subject: [PATCH] simplify code to always update keymap

---
 rtv/objects.py        | 6 +++---
 tests/test_config.py  | 7 ++++---
 tests/test_objects.py | 5 +++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/rtv/objects.py b/rtv/objects.py
index 5b76d14..48f0074 100644
--- a/rtv/objects.py
+++ b/rtv/objects.py
@@ -642,16 +642,16 @@ class KeyMap(object):
         self._keymap = None
         self.set_bindings(bindings)
 
-    def set_bindings(self, bindings, mode='update'):
+    def set_bindings(self, bindings):
         new_keymap = {}
         for command, keys in bindings.items():
             if not isinstance(command, Command):
                 command = Command(command)
             new_keymap[command] = keys
 
-        if not self._keymap or mode == 'replace':
+        if not self._keymap:
             self._keymap = new_keymap
-        elif mode == 'update':
+        else:
             self._keymap.update(new_keymap)
 
     def get(self, command):
diff --git a/tests/test_config.py b/tests/test_config.py
index 26e7ee5..060a6e4 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -136,9 +136,10 @@ def test_config_from_file():
 
         fargs, fbindings = Config.get_file(filename=fp.name)
         config = Config(**fargs)
-        config.keymap.set_bindings(fbindings, 'replace')
+        default_keymap = config.keymap._keymap.copy()
+        config.keymap.set_bindings(fbindings)
         assert config.config == {}
-        assert config.keymap._keymap == {}
+        assert config.keymap._keymap == default_keymap
 
         # [rtv]
         rows = ['{0}={1}'.format(key, val) for key, val in args.items()]
@@ -153,7 +154,7 @@ def test_config_from_file():
         fp.flush()
         fargs, fbindings = Config.get_file(filename=fp.name)
         config.update(**fargs)
-        config.keymap.set_bindings(fbindings, 'replace')
+        config.keymap.set_bindings(fbindings)
         assert config.config == args
         assert config.keymap.get('REFRESH') == ['r', '<KEY_F5>']
         assert config.keymap.get('UPVOTE') == ['']
diff --git a/tests/test_objects.py b/tests/test_objects.py
index 6c2b915..e3d8213 100644
--- a/tests/test_objects.py
+++ b/tests/test_objects.py
@@ -372,12 +372,13 @@ def test_objects_keymap():
 
     bindings = {'refresh': ['a', 0x12, '<LF>', '<KEY_UP>']}
     bindings2 = {'upvote': ['b', 0x13, '<KEY_DOWN>']}
-    keymap.set_bindings(bindings, 'replace')
+    keymap._keymap = {}
+    keymap.set_bindings(bindings)
     assert keymap.get('refresh')
     with pytest.raises(exceptions.ConfigError) as e:
         keymap.get('upvote')
     assert 'UPVOTE' in six.text_type(e)
-    keymap.set_bindings(bindings2, 'update')
+    keymap.set_bindings(bindings2)
     assert keymap.get('refresh')
     assert keymap.get('upvote')