diff --git a/.gitignore b/.gitignore index ad90cc081..de80392d5 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,4 @@ aqt/forms locale tools/runanki.system -aqt/buildhash.py +anki/buildhash.py diff --git a/anki/sync.py b/anki/sync.py index dc947d912..e7da9dc6d 100644 --- a/anki/sync.py +++ b/anki/sync.py @@ -10,7 +10,7 @@ import requests from anki.db import DB, DBError from anki.utils import ids2str, intTime, json, platDesc, checksum, devMode from anki.consts import * -from aqt.utils import versionWithBuild +from anki.utils import versionWithBuild from .hooks import runHook import anki from .lang import ngettext diff --git a/anki/utils.py b/anki/utils.py index 52ae5a636..05cdf3126 100644 --- a/anki/utils.py +++ b/anki/utils.py @@ -407,3 +407,13 @@ class TimedLog: sys.stderr.write("%5dms: %s(): %s\n" % ((time.time() - self._last)*1000, fn, s)) self._last = time.time() +# Version +############################################################################## + +def versionWithBuild(): + from anki import version + try: + from anki.buildhash import build + except: + build = "dev" + return "%s (%s)" % (version, build) diff --git a/aqt/about.py b/aqt/about.py index a209a45bb..b86293909 100644 --- a/aqt/about.py +++ b/aqt/about.py @@ -4,7 +4,8 @@ from aqt.qt import * import aqt.forms -from aqt.utils import versionWithBuild, supportText, tooltip +from anki.utils import versionWithBuild +from aqt.utils import supportText, tooltip class ClosableQDialog(QDialog): def reject(self): diff --git a/aqt/update.py b/aqt/update.py index 10272943d..37b525235 100644 --- a/aqt/update.py +++ b/aqt/update.py @@ -7,10 +7,8 @@ import requests from aqt.qt import * import aqt -from aqt.utils import openLink -from anki.utils import json, platDesc -from aqt.utils import showText -from aqt.utils import versionWithBuild +from aqt.utils import openLink, showText +from anki.utils import platDesc, versionWithBuild class LatestVersionFinder(QThread): diff --git a/aqt/utils.py b/aqt/utils.py index 12d14c999..c1c508249 100644 --- a/aqt/utils.py +++ b/aqt/utils.py @@ -3,10 +3,11 @@ # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html from aqt.qt import * -import re, os, sys, urllib.request, urllib.parse, urllib.error, subprocess +import re, os, sys, subprocess import aqt from anki.sound import stripSounds -from anki.utils import isWin, isMac, invalidFilename, noBundledLibs +from anki.utils import isWin, isMac, invalidFilename, noBundledLibs, \ + versionWithBuild def openHelp(section): link = aqt.appHelpSite @@ -565,18 +566,9 @@ def qtMenuShortcutWorkaround(qmenu): ###################################################################### -def versionWithBuild(): - from aqt import appVersion - try: - from aqt.buildhash import build - except: - 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]