Mercurial Repositories > eric / file diff

--- a/eric7/QScintilla/Editor.py	Mon May 17 19:58:15 2021 +0200
+++ b/eric7/QScintilla/Editor.py	Tue May 18 18:19:47 2021 +0200
@@ -3314,7 +3314,7 @@
             path,
             Lexers.getSaveFileFiltersList(True, True),
             defaultFilter,
-            E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite))
+            E5FileDialog.DontConfirmOverwrite)
         
         if fn:
             if fn.endswith("."):
@@ -4525,8 +4525,6 @@
         if Preferences.getEditor("FoldingMargin"):
             self.setMarginWidth(self.__foldMargin, 16)
             folding = Preferences.getEditor("FoldingStyle")
-            with contextlib.suppress(AttributeError):
-                folding = QsciScintilla.FoldStyle(folding)
             self.setFolding(folding, self.__foldMargin)
             self.setFoldMarginColors(
                 Preferences.getEditorColour("FoldmarginBackground"),
@@ -4536,7 +4534,7 @@
                 Preferences.getEditorColour("FoldMarkersBackground"))
         else:
             self.setMarginWidth(self.__foldMargin, 0)
-            self.setFolding(QsciScintilla.FoldStyle.NoFoldStyle,
+            self.setFolding(QsciScintilla.FoldStyle.NoFoldStyle.value,
                             self.__foldMargin)
     
     def __resizeLinenoMargin(self):
@@ -6855,7 +6853,7 @@
             configDir,
             self.tr("Macro files (*.macro)"),
             "",
-            E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite))
+            E5FileDialog.DontConfirmOverwrite)
         
         if not fname:
             return  # user aborted