Mercurial Repositories > Django Tags Menu / file diff

--- a/ProjectDjangoTagsMenu/DjangoTagsMenuHandler.py	Tue Oct 25 10:48:38 2022 +0200
+++ b/ProjectDjangoTagsMenu/DjangoTagsMenuHandler.py	Wed Dec 21 09:34:06 2022 +0100
@@ -11,12 +11,17 @@
 import os
 
 from PyQt6.QtCore import QObject
-from PyQt6.QtWidgets import QMenu, QInputDialog, QDialog, QApplication
+from PyQt6.QtWidgets import QApplication, QDialog, QInputDialog, QMenu
 
-from eric7 import Utilities
 from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
 
+try:
+    from eric7.SystemUtilities.OSUtilities import getHomeDir, getUserName
+except ImportError:
+    # imports for eric < 23.1
+    from eric7.Utilities import getHomeDir, getUserName
+
 from .DjangoTagInputDialog import DjangoTagInputDialog
 
 
@@ -1623,7 +1628,7 @@
             filename = EricFileDialog.getOpenFileName(
                 None,
                 self.tr("Comment File"),
-                Utilities.getHomeDir(),
+                getHomeDir(),
                 self.tr("All Files (*)"),
             )
             if filename:
@@ -1644,7 +1649,7 @@
                     )
         elif tag == "singlelinecommentdatetime":
             templateText = "{{# {0} by {1} #}}".format(
-                datetime.datetime.now().isoformat().split(), Utilities.getUserName()
+                datetime.datetime.now().isoformat().split(), getUserName()
             )
         elif tag == "htmlcomment":
             templateText = "<!-- {0} -->".format(selectedText)