diff -r 61a1757626ac -r 3750abc45d5e src/eric7/Utilities/__init__.py
--- a/src/eric7/Utilities/__init__.py Mon May 22 08:46:00 2023 +0200
+++ b/src/eric7/Utilities/__init__.py Mon May 22 09:07:37 2023 +0200
@@ -295,7 +295,7 @@
if guess and guess["confidence"] > 0.95 and guess["encoding"] is not None:
codec = guess["encoding"].lower()
return str(text, codec), "{0}-guessed".format(codec)
- except (UnicodeError, LookupError):
+ except (LookupError, UnicodeError):
pass
except ImportError:
pass
@@ -392,7 +392,7 @@
if coding:
try:
etext, encoding = text.encode(coding), coding
- except (UnicodeError, LookupError):
+ except (LookupError, UnicodeError):
# Error: Declared encoding is incorrect
raise CodingError(coding)
else:
@@ -483,7 +483,7 @@
if guess and guess["encoding"] is not None:
codec = guess["encoding"].lower()
return str(buffer, encoding=codec)
- except (UnicodeError, LookupError):
+ except (LookupError, UnicodeError):
pass
except ImportError:
pass
@@ -717,7 +717,7 @@
"""
try:
source, encoding = readEncodedFile(filename)
- except (UnicodeError, OSError):
+ except (OSError, UnicodeError):
return {}
return extractFlags(source)
@@ -1058,7 +1058,7 @@
from PyQt6 import QtCharts # __IGNORE_WARNING_I10__
info.append(" PyQt6-Charts {0}".format(QtCharts.PYQT_CHART_VERSION_STR))
- except (ImportError, AttributeError):
+ except (AttributeError, ImportError):
info.append(" PyQt6-Charts not installed")
try:
from PyQt6 import QtWebEngineCore # __IGNORE_WARNING_I10__
@@ -1066,7 +1066,7 @@
info.append(
" PyQt6-WebEngine {0}".format(QtWebEngineCore.PYQT_WEBENGINE_VERSION_STR)
)
- except (ImportError, AttributeError):
+ except (AttributeError, ImportError):
info.append(" PyQt6-WebEngine not installed")
info.append(" PyQt6-QScintilla {0}".format(QSCINTILLA_VERSION_STR))
info.append(" sip {0}".format(sip_version_str))
