Use open() instead of QFile and QTextStream

retext-project · Jan 4, 2025 · 4aff25a · 4aff25a
1 parent bfe5269
commit 4aff25a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/ReText/__main__.py b/ReText/__main__.py
@@ -27,12 +27,9 @@
 from PyQt6.QtCore import (
     QCommandLineOption,
     QCommandLineParser,
-    QFile,
     QFileInfo,
-    QIODevice,
     QLibraryInfo,
     Qt,
-    QTextStream,
     QTranslator,
 )
 from PyQt6.QtDBus import QDBusConnection, QDBusInterface
@@ -100,10 +97,8 @@ def main():
     print('Using configuration file:', settings.fileName())
     print('Using cache file:', cache.fileName())
     if globalSettings.appStyleSheet:
-        sheetfile = QFile(globalSettings.appStyleSheet)
-        sheetfile.open(QIODevice.OpenModeFlag.ReadOnly)
-        app.setStyleSheet(QTextStream(sheetfile).readAll())
-        sheetfile.close()
+        with open(globalSettings.appStyleSheet) as sheetfile:
+            app.setStyleSheet(sheetfile.read())
     window = ReTextWindow()
 
     # ReText can change directory when loading files, so we

diff --git a/ReText/window.py b/ReText/window.py
@@ -53,12 +53,10 @@
     QFile,
     QFileInfo,
     QFileSystemWatcher,
-    QIODevice,
     QLocale,
     QMarginsF,
     QStandardPaths,
     Qt,
-    QTextStream,
     QTimer,
     QUrl,
     pyqtSlot,
@@ -488,10 +486,8 @@ def iterateTabs(self):
     def updateStyleSheet(self):
         self.ss = None
         if globalSettings.styleSheet:
-            sheetfile = QFile(globalSettings.styleSheet)
-            sheetfile.open(QIODevice.OpenModeFlag.ReadOnly)
-            self.ss = QTextStream(sheetfile).readAll()
-            sheetfile.close()
+            with open(globalSettings.styleSheet) as sheetfile:
+                self.ss = sheetfile.read()
 
     def initTabWidget(self):
         def dragEnterEvent(e):