aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.pylintrc2
-rw-r--r--ranger/config/.pylintrc2
-rwxr-xr-xranger/config/commands.py31
-rw-r--r--ranger/container/settings.py10
-rw-r--r--ranger/gui/color.py36
-rw-r--r--tests/pylint/test_py2_compat.py12
6 files changed, 51 insertions, 42 deletions
diff --git a/.pylintrc b/.pylintrc
index 3fdcbaa8..994ddf62 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -13,7 +13,7 @@ max-branches=16
[FORMAT]
max-line-length = 99
enable=no-absolute-import,old-division
-disable=cyclic-import,duplicate-code,fixme,import-outside-toplevel,locally-disabled,locally-enabled,missing-docstring,no-else-break,no-else-continue,no-else-raise,no-else-return,redefined-variable-type,stop-iteration-return,useless-object-inheritance
+disable=cyclic-import,duplicate-code,fixme,import-outside-toplevel,locally-disabled,locally-enabled,missing-docstring,no-else-break,no-else-continue,no-else-raise,no-else-return,raise-missing-from,redefined-variable-type,stop-iteration-return,super-with-arguments,useless-object-inheritance
[TYPECHECK]
ignored-classes=ranger.core.actions.Actions
diff --git a/ranger/config/.pylintrc b/ranger/config/.pylintrc
index cc79f97c..316bf189 100644
--- a/ranger/config/.pylintrc
+++ b/ranger/config/.pylintrc
@@ -5,4 +5,4 @@ class-rgx=[a-z][a-z0-9_]{1,30}$
[FORMAT]
max-line-length = 99
max-module-lines=3000
-disable=duplicate-code,fixme,import-outside-toplevel,locally-disabled,locally-enabled,missing-docstring,no-else-return
+disable=duplicate-code,fixme,import-outside-toplevel,locally-disabled,locally-enabled,missing-docstring,no-else-return,super-with-arguments
diff --git a/ranger/config/commands.py b/ranger/config/commands.py
index b7b02e73..9031e7a2 100755
--- a/ranger/config/commands.py
+++ b/ranger/config/commands.py
@@ -1465,22 +1465,21 @@ class scout(Command):
Multiple flags can be combined. For example, ":scout -gpt" would create
a :filter-like command using globbing.
"""
- # pylint: disable=bad-whitespace
- AUTO_OPEN = 'a'
- OPEN_ON_ENTER = 'e'
- FILTER = 'f'
- SM_GLOB = 'g'
- IGNORE_CASE = 'i'
- KEEP_OPEN = 'k'
- SM_LETTERSKIP = 'l'
- MARK = 'm'
- UNMARK = 'M'
- PERM_FILTER = 'p'
- SM_REGEX = 'r'
- SMART_CASE = 's'
- AS_YOU_TYPE = 't'
- INVERT = 'v'
- # pylint: enable=bad-whitespace
+
+ AUTO_OPEN = "a"
+ OPEN_ON_ENTER = "e"
+ FILTER = "f"
+ SM_GLOB = "g"
+ IGNORE_CASE = "i"
+ KEEP_OPEN = "k"
+ SM_LETTERSKIP = "l"
+ MARK = "m"
+ UNMARK = "M"
+ PERM_FILTER = "p"
+ SM_REGEX = "r"
+ SMART_CASE = "s"
+ AS_YOU_TYPE = "t"
+ INVERT = "v"
def __init__(self, *args, **kwargs):
super(scout, self).__init__(*args, **kwargs)
diff --git a/ranger/container/settings.py b/ranger/container/settings.py
index 7549325a..677ea3b8 100644
--- a/ranger/container/settings.py
+++ b/ranger/container/settings.py
@@ -14,13 +14,11 @@ from ranger.gui.colorscheme import _colorscheme_name_to_class
# Use these priority constants to trigger events at specific points in time
# during processing of the signals "setopt" and "setopt.<some_setting_name>"
-# pylint: disable=bad-whitespace
-SIGNAL_PRIORITY_RAW = 2.0 # signal.value will be raw
-SIGNAL_PRIORITY_SANITIZE = 1.0 # (Internal) post-processing signal.value
-SIGNAL_PRIORITY_BETWEEN = 0.6 # sanitized signal.value, old fm.settings.XYZ
-SIGNAL_PRIORITY_SYNC = 0.2 # (Internal) updating fm.settings.XYZ
+SIGNAL_PRIORITY_RAW = 2.0 # signal.value will be raw
+SIGNAL_PRIORITY_SANITIZE = 1.0 # (Internal) post-processing signal.value
+SIGNAL_PRIORITY_BETWEEN = 0.6 # sanitized signal.value, old fm.settings.XYZ
+SIGNAL_PRIORITY_SYNC = 0.2 # (Internal) updating fm.settings.XYZ
SIGNAL_PRIORITY_AFTER_SYNC = 0.1 # after fm.settings.XYZ was updated
-# pylint: enable=bad-whitespace
ALLOWED_SETTINGS = {
diff --git a/ranger/gui/color.py b/ranger/gui/color.py
index 8f6439c7..81d8b44b 100644
--- a/ranger/gui/color.py
+++ b/ranger/gui/color.py
@@ -49,27 +49,27 @@ def get_color(fg, bg):
return COLOR_PAIRS[key]
-# pylint: disable=invalid-name,bad-whitespace
-black = curses.COLOR_BLACK
-blue = curses.COLOR_BLUE
-cyan = curses.COLOR_CYAN
-green = curses.COLOR_GREEN
-magenta = curses.COLOR_MAGENTA
-red = curses.COLOR_RED
-white = curses.COLOR_WHITE
-yellow = curses.COLOR_YELLOW
-default = -1
-
-normal = curses.A_NORMAL
-bold = curses.A_BOLD
-blink = curses.A_BLINK
-reverse = curses.A_REVERSE
-underline = curses.A_UNDERLINE
-invisible = curses.A_INVIS
+# pylint: disable=invalid-name
+black = curses.COLOR_BLACK
+blue = curses.COLOR_BLUE
+cyan = curses.COLOR_CYAN
+green = curses.COLOR_GREEN
+magenta = curses.COLOR_MAGENTA
+red = curses.COLOR_RED
+white = curses.COLOR_WHITE
+yellow = curses.COLOR_YELLOW
+default = -1
+
+normal = curses.A_NORMAL
+bold = curses.A_BOLD
+blink = curses.A_BLINK
+reverse = curses.A_REVERSE
+underline = curses.A_UNDERLINE
+invisible = curses.A_INVIS
dim = curses.A_DIM
default_colors = (default, default, normal)
-# pylint: enable=invalid-name,bad-whitespace
+# pylint: enable=invalid-name
curses.setupterm()
# Adding BRIGHT to a color achieves what `bold` was used for.
diff --git a/tests/pylint/test_py2_compat.py b/tests/pylint/test_py2_compat.py
index a5d2e284..bd1ace65 100644
--- a/tests/pylint/test_py2_compat.py
+++ b/tests/pylint/test_py2_compat.py
@@ -5,6 +5,9 @@ import py2_compat
import astroid
import pylint.testutils
+from sys import version_info
+PY2 = version_info[0] < 3
+
class TestPy2CompatibilityChecker(pylint.testutils.CheckerTestCase):
CHECKER_CLASS = py2_compat.Py2CompatibilityChecker
@@ -42,6 +45,9 @@ class TestPy2CompatibilityChecker(pylint.testutils.CheckerTestCase):
self.checker.visit_classdef(from_new)
def test_print_without_import(self):
+ if PY2:
+ return
+
print_function_call = astroid.extract_node("""
print("Print function call without importing print_function")
""")
@@ -73,6 +79,9 @@ class TestPy2CompatibilityChecker(pylint.testutils.CheckerTestCase):
self.checker.visit_call(nested_print_function_call)
def test_print_late_import(self):
+ if PY2:
+ return
+
early_print_function_call = astroid.extract_node("""
print("Nested print with import in scope") #@
def f():
@@ -91,6 +100,9 @@ class TestPy2CompatibilityChecker(pylint.testutils.CheckerTestCase):
self.checker.visit_call(early_print_function_call)
def test_implicit_format_spec(self):
+ if PY2:
+ return
+
implicit_format_spec = astroid.extract_node("""
"{}".format("implicit") #@
""")