summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorToon Nolten <toonn@toonn.io>2018-02-25 12:48:01 +0100
committerGitHub <noreply@github.com>2018-02-25 12:48:01 +0100
commitfb3c1a21231b7f4dc0a1190332c55a73dba2bab9 (patch)
tree4240e2bfbbdbcec32629dd4fc8c7ceb0902f71c0
parentc2b9dd31de649f19805f07f58814d3054d3c9c54 (diff)
parent806fc471e0bfe044c4b8524db35b5828f1f40b89 (diff)
downloadranger-fb3c1a21231b7f4dc0a1190332c55a73dba2bab9.tar.gz
Merge pull request #1091 from toonn/embeddednull
Catch the right errors in addstr
-rw-r--r--ranger/gui/curses_shortcuts.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/ranger/gui/curses_shortcuts.py b/ranger/gui/curses_shortcuts.py
index ac067d01..14f1e0e4 100644
--- a/ranger/gui/curses_shortcuts.py
+++ b/ranger/gui/curses_shortcuts.py
@@ -35,7 +35,9 @@ class CursesShortcuts(SettingsAware):
 
         try:
             self.win.addstr(*args)
-        except (curses.error, TypeError):
+        except (curses.error, TypeError, ValueError):
+            # a TypeError changed to ValueError from version 3.5 onwards
+            # https://bugs.python.org/issue22215
             if len(args) > 1:
                 self.win.move(y, x)