Merge branch 'lint'

1 files changed, 7 insertions, 5 deletions

diff --git a/ranger.py b/ranger.py
index 864acf27..3aa62eec 100755
--- a/ranger.py
+++ b/ranger.py
@@ -20,20 +20,22 @@ if [ "$(cat -- "$tempfile")" != "$(echo -n `pwd`)" ]; then
 fi
 rm -f -- "$tempfile"
 return $returnvalue
-""" and None
+"""
+
+from __future__ import (absolute_import, print_function)
 
 import sys
 from os.path import exists, abspath
 
 # Need to find out whether or not the flag --clean was used ASAP,
 # because --clean is supposed to disable bytecode compilation
-argv = sys.argv[1:sys.argv.index('--')] if '--' in sys.argv else sys.argv[1:]
-sys.dont_write_bytecode = '-c' in argv or '--clean' in argv
+ARGV = sys.argv[1:sys.argv.index('--')] if '--' in sys.argv else sys.argv[1:]
+sys.dont_write_bytecode = '-c' in ARGV or '--clean' in ARGV
 
 # Don't import ./ranger when running an installed binary at /usr/.../ranger
 if __file__[:4] == '/usr' and exists('ranger') and abspath('.') in sys.path:
     sys.path.remove(abspath('.'))
 
 # Start ranger
-import ranger
-sys.exit(ranger.main())
+import ranger  # NOQA pylint: disable=import-self,wrong-import-position
+sys.exit(ranger.main())  # pylint: disable=no-member