diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | ranger/container/tags.py | 2 | ||||
| -rw-r--r-- | ranger/ext/img_display.py | 2 | ||||
| -rw-r--r-- | ranger/gui/widgets/taskview.py | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/Makefile b/Makefile index a2fe08cc..99d3f53e 100644 --- a/Makefile +++ b/Makefile @@ -95,7 +95,7 @@ test_doctest: done test_pytest: - echo "Running py.test tests..." + @echo "Running py.test tests..." py.test tests test: test_pylint test_flake8 test_doctest test_pytest diff --git a/ranger/container/tags.py b/ranger/container/tags.py index 7aed5131..dabaf6a8 100644 --- a/ranger/container/tags.py +++ b/ranger/container/tags.py @@ -102,7 +102,7 @@ class Tags(object): def _parse(self, fobj): result = dict() for line in fobj: - line = line.strip() + line = line.rstrip('\n') if len(line) > 2 and line[1] == ':': tag, path = line[0], line[2:] if tag in ALLOWED_KEYS: diff --git a/ranger/ext/img_display.py b/ranger/ext/img_display.py index c88b5a77..c55d835e 100644 --- a/ranger/ext/img_display.py +++ b/ranger/ext/img_display.py @@ -121,6 +121,8 @@ class W3MImageDisplayer(ImageDisplayer): self.process.stdin.write(input_gen) self.process.stdin.flush() self.process.stdout.readline() + self.quit() + self.is_initialized = False def clear(self, start_x, start_y, width, height): if not self.is_initialized or self.process.poll() is not None: diff --git a/ranger/gui/widgets/taskview.py b/ranger/gui/widgets/taskview.py index 2c0cafb0..a4633e15 100644 --- a/ranger/gui/widgets/taskview.py +++ b/ranger/gui/widgets/taskview.py @@ -84,7 +84,7 @@ class TaskView(Widget, Accumulator): if i is None: i = self.pointer - self.fm.loader.move(_from=i, to=to) + self.fm.loader.move(pos_src=i, pos_dest=to) def press(self, key): self.fm.ui.keymaps.use_keymap('taskview') |