diff --git a/aqt/errors.py b/aqt/errors.py index 821be049e..274822050 100644 --- a/aqt/errors.py +++ b/aqt/errors.py @@ -7,7 +7,7 @@ import re from anki.lang import _ from aqt.qt import * -from aqt.utils import showText, showWarning +from aqt.utils import showText, showWarning, supportText from aqt import mw if not os.environ.get("DEBUG"): @@ -126,10 +126,10 @@ add-ons section of our support site. """) if self.mw.addonManager.dirty: txt = pluginText - error = self._supportText() + self._addonText(error) + "\n" + error + error = supportText() + self._addonText(error) + "\n" + error else: txt = stdText - error = self._supportText() + "\n" + error + error = supportText() + "\n" + error # show dialog txt = txt + "
" + error + "
" @@ -146,27 +146,3 @@ add-ons section of our support site. # highlight importance of first add-on: addons[0] = "{}".format(addons[0]) return txt.format(", ".join(addons)) - - def _supportText(self): - import platform - from aqt.utils import versionWithBuild - - if isWin: - platname = "Windows " + platform.win32_ver()[0] - elif isMac: - platname = "Mac " + platform.mac_ver()[0] - else: - platname = "Linux" - - def schedVer(): - try: - return self.mw.col.schedVer() - except: - return "?" - - return """\ -Anki {} Python {} Qt {} PyQt {} -Platform: {} -Flags: frz={} ao={} sv={} -""".format(versionWithBuild(), platform.python_version(), QT_VERSION_STR, PYQT_VERSION_STR, platname, - getattr(sys, "frozen", False), self.mw.addonManager.dirty, schedVer()) diff --git a/aqt/utils.py b/aqt/utils.py index ee74071f7..b8ae7e5f2 100644 --- a/aqt/utils.py +++ b/aqt/utils.py @@ -567,6 +567,33 @@ def versionWithBuild(): build = "dev" return "%s (%s)" % (appVersion, build) +def supportText(): + import platform + from aqt import mw + from aqt.utils import versionWithBuild + + if isWin: + platname = "Windows " + platform.win32_ver()[0] + elif isMac: + platname = "Mac " + platform.mac_ver()[0] + else: + platname = "Linux" + + def schedVer(): + try: + return mw.col.schedVer() + except: + return "?" + + return """\ +Anki {} Python {} Qt {} PyQt {} +Platform: {} +Flags: frz={} ao={} sv={} +""".format(versionWithBuild(), platform.python_version(), + QT_VERSION_STR, PYQT_VERSION_STR, platname, + getattr(sys, "frozen", False), + mw.addonManager.dirty, schedVer()) + ###################################################################### # adapted from version detection in qutebrowser