summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--ranger/container/settingobject.py1
-rw-r--r--ranger/core/shared.py16
2 files changed, 1 insertions, 16 deletions
diff --git a/ranger/container/settingobject.py b/ranger/container/settingobject.py
index 3562f444..e6acf35b 100644
--- a/ranger/container/settingobject.py
+++ b/ranger/container/settingobject.py
@@ -56,7 +56,6 @@ class SettingObject(SignalDispatcher, FileManagerAware):
 	def __init__(self):
 		SignalDispatcher.__init__(self)
 		self.__dict__['_settings'] = dict()
-		self.__dict__['_setting_sources'] = list()
 		for name in ALLOWED_SETTINGS:
 			self.signal_bind('setopt.'+name,
 					self._raw_set_with_signal, priority=0.2)
diff --git a/ranger/core/shared.py b/ranger/core/shared.py
index ec791f22..d7bf90b6 100644
--- a/ranger/core/shared.py
+++ b/ranger/core/shared.py
@@ -33,8 +33,7 @@ class SettingsAware(Awareness):
 
 	@staticmethod
 	def _setup(clean=True):
-		from ranger.container.settingobject import SettingObject, \
-				ALLOWED_SETTINGS
+		from ranger.container.settingobject import SettingObject
 		import ranger
 		import sys
 		settings = SettingObject()
@@ -61,19 +60,6 @@ class SettingsAware(Awareness):
 		settings.signal_bind('setopt.use_preview_script',
 				after_setting_use_preview_script, priority=1)
 
-		if not clean:
-			# add the custom options to the list of setting sources
-			sys.path[0:0] = [ranger.arg.confdir]
-			try:
-				import options as my_options
-			except ImportError:
-				# XXX: This mistakenly ignores ImportErrors inside options.py
-				# It should only ignore missing options.py instead.
-				pass
-			else:
-				settings._setting_sources.append(my_options)
-			del sys.path[0]
-
 		SettingsAware.settings = settings
 
 def _sanitize_setting_column_ratios(signal):