diff options
| -rw-r--r-- | ranger/__init__.py | 2 | ||||
| -rwxr-xr-x | ranger/config/commands.py | 15 | ||||
| -rw-r--r-- | ranger/container/file.py | 4 | ||||
| -rw-r--r-- | ranger/container/tags.py | 5 | ||||
| -rw-r--r-- | ranger/core/fm.py | 1 | ||||
| -rw-r--r-- | ranger/core/loader.py | 11 | ||||
| -rw-r--r-- | ranger/core/main.py | 4 | ||||
| -rw-r--r-- | ranger/core/tab.py | 6 | ||||
| -rw-r--r-- | ranger/ext/img_display.py | 3 | ||||
| -rw-r--r-- | ranger/ext/keybinding_parser.py | 3 | ||||
| -rw-r--r-- | ranger/ext/widestring.py | 3 | ||||
| -rw-r--r-- | ranger/gui/bar.py | 6 | ||||
| -rw-r--r-- | ranger/gui/widgets/console.py | 8 |
13 files changed, 34 insertions, 37 deletions
diff --git a/ranger/__init__.py b/ranger/__init__.py index 4dee1e91..b2d99115 100644 --- a/ranger/__init__.py +++ b/ranger/__init__.py @@ -11,6 +11,7 @@ program you want to use to open your files with. from __future__ import (absolute_import, division, print_function) import os +from sys import version_info # Version helper @@ -50,6 +51,7 @@ MACRO_DELIMITER_ESC = '%%' DEFAULT_PAGER = 'less' USAGE = '%prog [options] [path]' VERSION = version_helper() +PY3 = version_info[0] >= 3 # These variables are ignored if the corresponding # XDG environment variable is non-empty and absolute diff --git a/ranger/config/commands.py b/ranger/config/commands.py index 7e244e6f..2656755e 100755 --- a/ranger/config/commands.py +++ b/ranger/config/commands.py @@ -95,6 +95,7 @@ from collections import deque import os import re +from ranger import PY3 from ranger.api.commands import Command @@ -852,11 +853,10 @@ class load_copy_buffer(Command): copy_buffer_filename = 'copy_buffer' def execute(self): - import sys from ranger.container.file import File from os.path import exists fname = self.fm.datapath(self.copy_buffer_filename) - unreadable = IOError if sys.version_info[0] < 3 else OSError + unreadable = OSError if PY3 else IOError try: fobj = open(fname, 'r') except unreadable: @@ -878,10 +878,9 @@ class save_copy_buffer(Command): copy_buffer_filename = 'copy_buffer' def execute(self): - import sys fname = None fname = self.fm.datapath(self.copy_buffer_filename) - unwritable = IOError if sys.version_info[0] < 3 else OSError + unwritable = OSError if PY3 else IOError try: fobj = open(fname, 'w') except unwritable: @@ -1132,24 +1131,22 @@ class bulkrename(Command): def execute(self): # pylint: disable=too-many-locals,too-many-statements,too-many-branches - import sys import tempfile from ranger.container.file import File from ranger.ext.shell_escape import shell_escape as esc - py3 = sys.version_info[0] >= 3 # Create and edit the file list filenames = [f.relative_path for f in self.fm.thistab.get_selection()] with tempfile.NamedTemporaryFile(delete=False) as listfile: listpath = listfile.name - if py3: + if PY3: listfile.write("\n".join(filenames).encode( encoding="utf-8", errors="surrogateescape")) else: listfile.write("\n".join(filenames)) self.fm.execute_file([File(listpath)], app='editor') with (open(listpath, 'r', encoding="utf-8", errors="surrogateescape") if - py3 else open(listpath, 'r')) as listfile: + PY3 else open(listpath, 'r')) as listfile: new_filenames = listfile.read().split("\n") os.unlink(listpath) if all(a == b for a, b in zip(filenames, new_filenames)): @@ -1176,7 +1173,7 @@ class bulkrename(Command): old=esc(old), new=esc(new))) # Make sure not to forget the ending newline script_content = "\n".join(script_lines) + "\n" - if py3: + if PY3: cmdfile.write(script_content.encode(encoding="utf-8", errors="surrogateescape")) else: diff --git a/ranger/container/file.py b/ranger/container/file.py index 6450cfe6..9477abe7 100644 --- a/ranger/container/file.py +++ b/ranger/container/file.py @@ -4,13 +4,13 @@ from __future__ import (absolute_import, division, print_function) import re -import sys +from ranger import PY3 from ranger.container.fsobject import FileSystemObject N_FIRST_BYTES = 256 CONTROL_CHARACTERS = set(list(range(0, 9)) + list(range(14, 32))) -if sys.version_info[0] < 3: +if not PY3: CONTROL_CHARACTERS = set(chr(n) for n in CONTROL_CHARACTERS) # Don't even try to preview files which match this regular expression: diff --git a/ranger/container/tags.py b/ranger/container/tags.py index dabaf6a8..ed5b876a 100644 --- a/ranger/container/tags.py +++ b/ranger/container/tags.py @@ -7,7 +7,8 @@ from __future__ import (absolute_import, division, print_function) from os.path import isdir, exists, dirname, abspath, realpath, expanduser, sep import string -import sys + +from ranger import PY3 ALLOWED_KEYS = string.ascii_letters + string.digits + string.punctuation @@ -72,7 +73,7 @@ class Tags(object): def sync(self): try: - if sys.version_info[0] >= 3: + if PY3: fobj = open(self._filename, 'r', errors='replace') else: fobj = open(self._filename, 'r') diff --git a/ranger/core/fm.py b/ranger/core/fm.py index 7d23c9b6..9461e325 100644 --- a/ranger/core/fm.py +++ b/ranger/core/fm.py @@ -55,7 +55,6 @@ class FM(Actions, # pylint: disable=too-many-instance-attributes self.tabs = {} self.tags = tags self.restorable_tabs = deque([], ranger.MAX_RESTORABLE_TABS) - self.py3 = sys.version_info >= (3, ) self.previews = {} self.default_linemodes = deque() self.loader = Loader() diff --git a/ranger/core/loader.py b/ranger/core/loader.py index 7d4b21e8..dcee568a 100644 --- a/ranger/core/loader.py +++ b/ranger/core/loader.py @@ -9,7 +9,6 @@ from time import time, sleep import math import os.path import select -import sys import errno try: @@ -18,6 +17,7 @@ try: except ImportError: HAVE_CHARDET = False +from ranger import PY3 from ranger.core.shared import FileManagerAware from ranger.ext.safe_path import get_safe_path from ranger.ext.signals import SignalDispatcher @@ -171,14 +171,13 @@ class CommandLoader( # pylint: disable=too-many-instance-attributes self.popenArgs = popenArgs # pylint: disable=invalid-name def generate(self): # pylint: disable=too-many-branches,too-many-statements - py3 = sys.version_info[0] >= 3 popenargs = {} if self.popenArgs is None else self.popenArgs popenargs['stdout'] = popenargs['stderr'] = PIPE popenargs['stdin'] = PIPE if self.input else open(os.devnull, 'r') self.process = process = Popen(self.args, **popenargs) self.signal_emit('before', process=process, loader=self) if self.input: - if py3: + if PY3: import io stdin = io.TextIOWrapper(process.stdin) else: @@ -212,7 +211,7 @@ class CommandLoader( # pylint: disable=too-many-instance-attributes robjs = robjs[0] if robjs == process.stderr: read = robjs.readline() - if py3: + if PY3: read = safe_decode(read) if read: self.fm.notify(read, bad=True) @@ -227,7 +226,7 @@ class CommandLoader( # pylint: disable=too-many-instance-attributes sleep(0.03) if not self.silent: for line in process.stderr: - if py3: + if PY3: line = safe_decode(line) self.fm.notify(line, bad=True) if self.read: @@ -235,7 +234,7 @@ class CommandLoader( # pylint: disable=too-many-instance-attributes if read: read_stdout += read if read_stdout: - if py3: + if PY3: read_stdout = safe_decode(read_stdout) self.stdout_buffer += read_stdout self.finished = True diff --git a/ranger/core/main.py b/ranger/core/main.py index b16b6318..8345060f 100644 --- a/ranger/core/main.py +++ b/ranger/core/main.py @@ -13,7 +13,7 @@ import shutil import sys import tempfile -from ranger import VERSION +from ranger import PY3, VERSION LOG = getLogger(__name__) @@ -74,7 +74,7 @@ def main( return 1 fm = FM() try: - if sys.version_info[0] >= 3: + if PY3: fobj = open(fm.datapath('tagged'), 'r', errors='replace') else: fobj = open(fm.datapath('tagged'), 'r') diff --git a/ranger/core/tab.py b/ranger/core/tab.py index 7bb45d75..cd30d329 100644 --- a/ranger/core/tab.py +++ b/ranger/core/tab.py @@ -5,8 +5,8 @@ from __future__ import (absolute_import, division, print_function) import os from os.path import abspath, normpath, join, expanduser, isdir, dirname -import sys +from ranger import PY3 from ranger.container import settings from ranger.container.history import History from ranger.core.shared import FileManagerAware, SettingsAware @@ -27,9 +27,9 @@ class Tab(FileManagerAware, SettingsAware): # pylint: disable=too-many-instance # "==", and this breaks _set_thisfile_from_signal and _on_tab_change. self.fm.signal_bind('move', self._set_thisfile_from_signal, priority=settings.SIGNAL_PRIORITY_AFTER_SYNC, - weak=(sys.version_info[0] >= 3)) + weak=(PY3)) self.fm.signal_bind('tab.change', self._on_tab_change, - weak=(sys.version_info[0] >= 3)) + weak=(PY3)) def _set_thisfile_from_signal(self, signal): if self == signal.tab: diff --git a/ranger/ext/img_display.py b/ranger/ext/img_display.py index 70983bc7..20198ee1 100644 --- a/ranger/ext/img_display.py +++ b/ranger/ext/img_display.py @@ -30,6 +30,7 @@ from contextlib import contextmanager import codecs from tempfile import NamedTemporaryFile +from ranger import PY3 from ranger.core.shared import FileManagerAware W3MIMGDISPLAY_ENV = "W3MIMGDISPLAY_PATH" @@ -359,7 +360,7 @@ class ITerm2ImageDisplayer(ImageDisplayer, FileManagerAware): elif image_type == 'gif': width, height = struct.unpack('<HH', file_header[6:10]) elif image_type == 'jpeg': - unreadable = IOError if sys.version_info[0] < 3 else OSError + unreadable = OSError if PY3 else IOError try: file_handle.seek(0) size = 2 diff --git a/ranger/ext/keybinding_parser.py b/ranger/ext/keybinding_parser.py index 8703d458..e7dbcfe0 100644 --- a/ranger/ext/keybinding_parser.py +++ b/ranger/ext/keybinding_parser.py @@ -7,7 +7,8 @@ import sys import copy import curses.ascii -PY3 = sys.version_info[0] >= 3 +from ranger import PY3 + digits = set(range(ord('0'), ord('9') + 1)) # pylint: disable=invalid-name # Arbitrary numbers which are not used with curses.KEY_XYZ diff --git a/ranger/ext/widestring.py b/ranger/ext/widestring.py index 390da639..a209e5fe 100644 --- a/ranger/ext/widestring.py +++ b/ranger/ext/widestring.py @@ -7,7 +7,8 @@ from __future__ import (absolute_import, division, print_function) import sys from unicodedata import east_asian_width -PY3 = sys.version_info[0] >= 3 +from ranger import PY3 + ASCIIONLY = set(chr(c) for c in range(1, 128)) NARROW = 1 WIDE = 2 diff --git a/ranger/gui/bar.py b/ranger/gui/bar.py index 3f4b891c..88bf55eb 100644 --- a/ranger/gui/bar.py +++ b/ranger/gui/bar.py @@ -3,14 +3,10 @@ from __future__ import (absolute_import, division, print_function) -import sys - +from ranger import PY3 from ranger.ext.widestring import WideString, utf_char_width -PY3 = sys.version_info[0] >= 3 - - class Bar(object): left = None right = None diff --git a/ranger/gui/widgets/console.py b/ranger/gui/widgets/console.py index d796058c..bf8a12c0 100644 --- a/ranger/gui/widgets/console.py +++ b/ranger/gui/widgets/console.py @@ -317,13 +317,13 @@ class Console(Widget): # pylint: disable=too-many-instance-attributes,too-many- """ Returns a new position by moving word-wise in the line - >>> import sys - >>> if sys.version_info < (3, ): + >>> from ranger import PY3 + >>> if PY3: + ... line = "\\u30AA\\u30CF\\u30E8\\u30A6 world, this is dog" + ... else: ... # Didn't get the unicode test to work on python2, even though ... # it works fine in ranger, even with unicode input... ... line = "ohai world, this is dog" - ... else: - ... line = "\\u30AA\\u30CF\\u30E8\\u30A6 world, this is dog" >>> Console.move_by_word(line, 0, -1) 0 >>> Console.move_by_word(line, 0, 1) |