about summary refs log tree commit diff stats
path: root/ranger/container
diff options
context:
space:
mode:
Diffstat (limited to 'ranger/container')
-rw-r--r--ranger/container/__init__.py2
-rw-r--r--ranger/container/bookmarks.py2
-rw-r--r--ranger/container/settingobject.py2
3 files changed, 2 insertions, 4 deletions
diff --git a/ranger/container/__init__.py b/ranger/container/__init__.py
index 01eb6043..21a336bc 100644
--- a/ranger/container/__init__.py
+++ b/ranger/container/__init__.py
@@ -3,6 +3,4 @@ This package includes container-objects which are
 used to manage stored data
 """
 from ranger.container.history import History
-from .keymap import KeyMap, KeyManager
-from .keybuffer import KeyBuffer
 from .bookmarks import Bookmarks
diff --git a/ranger/container/bookmarks.py b/ranger/container/bookmarks.py
index f115c753..0dcfcbc3 100644
--- a/ranger/container/bookmarks.py
+++ b/ranger/container/bookmarks.py
@@ -89,7 +89,7 @@ class Bookmarks(object):
 		if key in self.dct:
 			return self.dct[key]
 		else:
-			raise KeyError("Nonexistant Bookmark!")
+			raise KeyError("Nonexistant Bookmark: `%s'!" % key)
 
 	def __setitem__(self, key, value):
 		"""Bookmark <value> to the key <key>.
diff --git a/ranger/container/settingobject.py b/ranger/container/settingobject.py
index a245db21..4d95536a 100644
--- a/ranger/container/settingobject.py
+++ b/ranger/container/settingobject.py
@@ -31,7 +31,7 @@ ALLOWED_SETTINGS = {
 	'draw_borders': bool,
 	'flushinput': bool,
 	'hidden_filter': lambda x: isinstance(x, str) or hasattr(x, 'match'),
-	'load_default_rc': bool,
+	'load_default_rc': (bool, type(None)),
 	'max_console_history_size': (int, type(None)),
 	'max_history_size': (int, type(None)),
 	'mouse_enabled': bool,