about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authornfnty <git@nfnty.se>2017-02-06 21:27:45 +0100
committernfnty <git@nfnty.se>2017-02-06 21:41:25 +0100
commit01ba7b58201ac2b6b6b9f80183cc2b90b7102714 (patch)
treebf5b08fa20d6fe2b0fa7de63c95bb2bf1747efb2
parentabacb776a7aab93ccab66512975a465d4c28a5ee (diff)
downloadranger-01ba7b58201ac2b6b6b9f80183cc2b90b7102714.tar.gz
api: Fix backwards compatibility
Remove deprecated file
-rw-r--r--ranger/api/__init__.py6
-rw-r--r--ranger/api/commands.py9
-rw-r--r--ranger/api/options.py14
3 files changed, 8 insertions, 21 deletions
diff --git a/ranger/api/__init__.py b/ranger/api/__init__.py
index e933ddfa..b1e84ad4 100644
--- a/ranger/api/__init__.py
+++ b/ranger/api/__init__.py
@@ -5,9 +5,11 @@
 
 from __future__ import (absolute_import, division, print_function)
 
-import ranger  # NOQA
+import ranger
+from ranger.core.linemode import LinemodeBase
 
-from ranger.core.linemode import LinemodeBase  # NOQA
+
+__all__ = ['ranger', 'LinemodeBase', 'hook_init', 'hook_ready', 'register_linemode']
 
 
 # Hooks for use in plugins:
diff --git a/ranger/api/commands.py b/ranger/api/commands.py
index e486d234..b9e0d6e9 100644
--- a/ranger/api/commands.py
+++ b/ranger/api/commands.py
@@ -7,17 +7,16 @@ from __future__ import (absolute_import, division, print_function)
 
 import os
 import re
-# COMPAT pylint: disable=unused-import
-from collections import deque  # NOQA
-from ranger.api import LinemodeBase, hook_init, hook_ready, register_linemode  # NOQA
-# pylint: enable=unused-import
 
 import ranger
 from ranger import MACRO_DELIMITER, MACRO_DELIMITER_ESC
 from ranger.core.shared import FileManagerAware
 from ranger.ext.lazy_property import lazy_property
+from ranger.api import LinemodeBase, hook_init, hook_ready, register_linemode  # COMPAT
+
+
+__all__ = ['Command', 'LinemodeBase', 'hook_init', 'hook_ready', 'register_linemode']  # COMPAT
 
-__all__ = ['Command']
 
 _SETTINGS_RE = re.compile(r'^\s*([^\s]+?)=(.*)$')
 _ALIAS_LINE_RE = re.compile(r'(\s+)')
diff --git a/ranger/api/options.py b/ranger/api/options.py
deleted file mode 100644
index 37738ce8..00000000
--- a/ranger/api/options.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is part of ranger, the console file manager.
-# License: GNU GPL version 3, see the file "AUTHORS" for details.
-
-# THIS WHOLE FILE IS OBSOLETE AND EXISTS FOR BACKWARDS COMPATIBILITIY
-
-from __future__ import (absolute_import, division, print_function)
-
-# pylint: disable=unused-import
-import re  # NOQA
-from re import compile as regexp  # NOQA
-
-from ranger.api import LinemodeBase, hook_init, hook_ready, register_linemode  # NOQA
-from ranger.gui import color  # NOQA
-# pylint: enable=unused-import