eric: comparison eric6/HexEdit/HexEditMainWindow.py

-:fb0ef164f536
+:698ae46f40a4
 """
 Module implementing the hex editor main window.
 """
 import os
+import contextlib
 from PyQt5.QtCore import (
 pyqtSignal, pyqtSlot, QFile, QFileInfo, QSize, QCoreApplication, QLocale
 )
 from PyQt5.QtGui import QKeySequence
 @param parent parent widget of this window (QWidget)
 @param fromEric flag indicating whether it was called from within
 eric (boolean)
 @param project reference to the project object (Project)
 """
-super(HexEditMainWindow, self).__init__(parent)
+super().__init__(parent)
 self.setObjectName("eric6_hex_editor")
 self.__srHistory = {
 "search": [],
 # list of recent searches (tuple of format type index and
 state = self.saveState()
 Preferences.setHexEditor("HexEditorState", state)
 Preferences.setGeometry("HexEditorGeometry", self.saveGeometry())
-try:
+with contextlib.suppress(ValueError):
 if self.__fromEric or len(self.__class__.windows) > 1:
 del self.__class__.windows[
 self.__class__.windows.index(self)]
-except ValueError:
-pass
 if not self.__fromEric:
 Preferences.syncPreferences()
 self.__saveRecent()
 def __openHexFileNewWindow(self):
 """
 Private slot called to open a binary file in new hex editor window.
 """
-if not self.__lastOpenPath:
+if (
-if self.__project and self.__project.isOpen():
+not self.__lastOpenPath and
-self.__lastOpenPath = self.__project.getProjectPath()
+self.__project is not None and
+self.__project.isOpen()
+):
+self.__lastOpenPath = self.__project.getProjectPath()
 fileName = E5FileDialog.getOpenFileName(
 self,
 self.tr("Open binary file in new window"),
 self.__lastOpenPath,
 def __openHexFile(self):
 """
 Private slot to open a binary file.
 """
 if self.__maybeSave():
-if not self.__lastOpenPath:
+if (
-if self.__project and self.__project.isOpen():
+not self.__lastOpenPath and
-self.__lastOpenPath = self.__project.getProjectPath()
+self.__project is not None and
+self.__project.isOpen()
+):
+self.__lastOpenPath = self.__project.getProjectPath()
 fileName = E5FileDialog.getOpenFileName(
 self,
 self.tr("Open binary file"),
 self.__lastOpenPath,
 Private method to save a binary file.
 @return flag indicating success
 @rtype bool
 """
-if not self.__fileName:
+ok = (
-ok = self.__saveHexFileAs()
+self.__saveHexDataFile(self.__fileName)
-else:
+if self.__fileName else
-ok = self.__saveHexDataFile(self.__fileName)
+self.__saveHexFileAs()
+)
 if ok:
 self.__editor.undoStack().setClean()
 return ok
 Private method to save the data to a new file.
 @return flag indicating success
 @rtype bool
 """
-if not self.__lastSavePath:
+if (
-if self.__project and self.__project.isOpen():
+not self.__lastSavePath and
-self.__lastSavePath = self.__project.getProjectPath()
+self.__project is not None and
+self.__project.isOpen()
+):
+self.__lastSavePath = self.__project.getProjectPath()
 if not self.__lastSavePath and self.__lastOpenPath:
 self.__lastSavePath = self.__lastOpenPath
 fileName = E5FileDialog.getSaveFileName(
 self,
 @param selectionOnly flag indicating to save the selection only
 @type bool
 """
 savePath = self.__lastSavePath
-if not savePath:
+if (
-if self.__project and self.__project.isOpen():
+not savePath and
-savePath = self.__project.getProjectPath()
+self.__project is not None and
+self.__project.isOpen()
+):
+savePath = self.__project.getProjectPath()
 if not savePath and self.__lastOpenPath:
 savePath = self.__lastOpenPath
 fileName, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
 self,
 self, self.tr("eric Hex Editor"),
 self.tr("Cannot write file '{0}:\n{1}.")
 .format(fileName, file.errorString()))
 return
-if selectionOnly:
+readableData = (
-readableData = self.__editor.selectionToReadableString()
+self.__editor.selectionToReadableString()
-else:
+if selectionOnly else
-readableData = self.__editor.toReadableString()
+self.__editor.toReadableString()
+)
 res = file.write(readableData.encode("latin1")) != -1
 file.close()
 if not res:
 E5MessageBox.warning(
 """
 self.__fileName = fileName
 # insert filename into list of recently opened files
 self.__addToRecentList(fileName)
-if not self.__fileName:
+shownName = (
-shownName = self.tr("Untitled")
+self.tr("Untitled")
-else:
+if not self.__fileName else
-shownName = self.__strippedName(self.__fileName)
+self.__strippedName(self.__fileName)
+)
 self.setWindowTitle(self.tr("{0}[*] - {1}")
 .format(shownName, self.tr("Hex Editor")))
 self.setWindowModified(self.__editor.isModified())
 """
 Private method to handle the search action.
 """
 self.__replaceWidget.hide()
 self.__gotoWidget.hide()
-if self.__editor.hasSelection():
+txt = (
-txt = self.__editor.selectionToHexString()
+self.__editor.selectionToHexString()
-else:
+if self.__editor.hasSelection() else
-txt = ""
+""
+)
 self.__searchWidget.show(txt)
 def __replace(self):
 """
 Private method to handle the replace action.
 """
 self.__searchWidget.hide()
 self.__gotoWidget.hide()
-if self.__editor.hasSelection():
+txt = (
-txt = self.__editor.selectionToHexString()
+self.__editor.selectionToHexString()
-else:
+if self.__editor.hasSelection() else
-txt = ""
+""
+)
 self.__replaceWidget.show(txt)
 def __goto(self):
 """
 Private method to handle the goto action.
 def __showPreferences(self):
 """
 Private slot to set the preferences.
 """
-from Preferences.ConfigurationDialog import ConfigurationDialog
+from Preferences.ConfigurationDialog import (
+ConfigurationDialog, ConfigurationMode
+)
 dlg = ConfigurationDialog(
 None, 'Configuration', True, fromEric=True,
-displayMode=ConfigurationDialog.HexEditorMode)
+displayMode=ConfigurationMode.HEXEDITORMODE)
 dlg.preferencesChanged.connect(
 self.__preferencesChangedByLocalPreferencesDialog)
 dlg.show()
 dlg.showConfigurationPageByName("hexEditorPage")
 dlg.exec()
 """
 self.__loadRecent()
 self.__recentMenu.clear()
-idx = 1
+for idx, rs in enumerate(self.__recent, start=1):
-for rs in self.__recent:
+formatStr = '&{0:d}. {1}' if idx < 10 else '{0:d}. {1}'
-if idx < 10:
-formatStr = '&{0:d}. {1}'
-else:
-formatStr = '{0:d}. {1}'
 act = self.__recentMenu.addAction(
 formatStr.format(
 idx,
 Utilities.compactPath(
 rs, HexEditMainWindow.maxMenuFilePathLen)))
 act.setData(rs)
 act.setEnabled(QFileInfo(rs).exists())
-idx += 1
 self.__recentMenu.addSeparator()
 self.__recentMenu.addAction(self.tr('&Clear'), self.__clearRecent)
 @pyqtSlot(QAction)

Mercurial Repositories > eric / file comparison

comparison: eric6/HexEdit/HexEditMainWindow.py

eric6/HexEdit/HexEditMainWindow.py