summary refs log tree commit diff stats
diff options
context:
space:
mode:
authornfnty <git@nfnty.se>2017-01-26 05:44:34 +0100
committernfnty <git@nfnty.se>2017-01-26 05:44:34 +0100
commitc557a1ce33edad3aecedb0e84cbb84ccdde45b30 (patch)
tree891bb659916b9d1f7f855350b1e9e51671050642
parent2d8affddf55ab352afce58b846da45b90d715b9b (diff)
downloadranger-c557a1ce33edad3aecedb0e84cbb84ccdde45b30.tar.gz
core.main: Remove COMPAT `options.py`
Has been deprecated and warned about for over 4 years.
-rw-r--r--ranger/core/main.py21
1 files changed, 0 insertions, 21 deletions
diff --git a/ranger/core/main.py b/ranger/core/main.py
index 23debc76..4cf62afe 100644
--- a/ranger/core/main.py
+++ b/ranger/core/main.py
@@ -352,27 +352,6 @@ def load_settings(  # pylint: disable=too-many-locals,too-many-branches,too-many
                     fm.notify(ex_msg, bad=True)
             ranger.fm = None
 
-        # COMPAT: Load the outdated options.py
-        # options.py[oc] are deliberately ignored
-        if os.path.exists(fm.confpath("options.py")):
-            module = __import__('options')
-            from ranger.container.settings import ALLOWED_SETTINGS
-            for setting in ALLOWED_SETTINGS:
-                if hasattr(module, setting):
-                    fm.settings[setting] = getattr(module, setting)
-
-            sys.stderr.write(
-                """******************************
-Warning: The configuration file 'options.py' is deprecated.
-Please move all settings to the file 'rc.conf', converting lines like
-    "preview_files = False"
-to
-    "set preview_files false"
-If you had python code in the options.py that you'd like to keep, simply
-copy & paste it to a .py file in ~/.config/ranger/plugins/.
-Remove the options.py or discard stderr to get rid of this warning.
-******************************\n""")
-
         allow_access_to_confdir(ranger.args.confdir, False)
     else:
         fm.source(fm.relpath('config', 'rc.conf'))