소스 검색

yes: deal with UnicodeDecodeError in input(), fixes #6984

if retry is True, it will just retry to get a valid answer.
if retry is False, it will return the default.

the code can be tested by entering "error" (without the quotes).
Thomas Waldmann 5 달 전
부모
커밋
9d1107ea80
1개의 변경된 파일8개의 추가작업 그리고 1개의 파일을 삭제
  1. 8 1
      src/borg/helpers/yes_no.py

+ 8 - 1
src/borg/helpers/yes_no.py

@@ -8,6 +8,9 @@ FALSISH = ("No", "NO", "no", "N", "n", "0")
 TRUISH = ("Yes", "YES", "yes", "Y", "y", "1")
 DEFAULTISH = ("Default", "DEFAULT", "default", "D", "d", "")
 
+ERROR = "error"
+assert ERROR not in TRUISH + FALSISH + DEFAULTISH
+
 
 def yes(
     msg=None,
@@ -88,10 +91,14 @@ def yes(
             if not prompt:
                 return default
             try:
-                answer = input()
+                answer = input()  # this may raise UnicodeDecodeError, #6984
+                if answer == ERROR:  # for testing purposes
+                    raise UnicodeDecodeError("?", b"?", 0, 1, "?")  # args don't matter
             except EOFError:
                 # avoid defaultish[0], defaultish could be empty
                 answer = truish[0] if default else falsish[0]
+            except UnicodeDecodeError:
+                answer = ERROR
         if answer in defaultish:
             if default_msg:
                 output(default_msg, "accepted_default")