From 93d83e760be89293a7c32819b9bf55565f03f160 Mon Sep 17 00:00:00 2001 From: Arthur Milchior Date: Sun, 26 Apr 2020 14:42:54 +0200 Subject: [PATCH 1/2] remove a try, for code clarity --- qt/aqt/addcards.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/qt/aqt/addcards.py b/qt/aqt/addcards.py index 8b4da53a2..754609e4d 100644 --- a/qt/aqt/addcards.py +++ b/qt/aqt/addcards.py @@ -123,14 +123,11 @@ class AddCards(QDialog): if oldNote: if not keep: self.removeTempNote(oldNote) - for n in range(len(note.fields)): - try: - if not keep or flds[n]["sticky"]: - note.fields[n] = oldNote.fields[n] - else: - note.fields[n] = "" - except IndexError: - break + for n in range(min(len(note.fields), len(oldNote.fields))): + if not keep or flds[n]["sticky"]: + note.fields[n] = oldNote.fields[n] + else: + note.fields[n] = "" self.setAndFocusNote(note) def removeTempNote(self, note: Note) -> None: From 3378daeca363f1459fb50ddf1cb071c8b16c6a42 Mon Sep 17 00:00:00 2001 From: Arthur Milchior Date: Sun, 26 Apr 2020 14:46:05 +0200 Subject: [PATCH 2/2] remove an useless asignment Because fields of new notes are empty by default --- qt/aqt/addcards.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/qt/aqt/addcards.py b/qt/aqt/addcards.py index 754609e4d..6e46b4cad 100644 --- a/qt/aqt/addcards.py +++ b/qt/aqt/addcards.py @@ -126,8 +126,6 @@ class AddCards(QDialog): for n in range(min(len(note.fields), len(oldNote.fields))): if not keep or flds[n]["sticky"]: note.fields[n] = oldNote.fields[n] - else: - note.fields[n] = "" self.setAndFocusNote(note) def removeTempNote(self, note: Note) -> None: