Mercurial Repositories > eric / file diff

--- a/src/eric7/Preferences/__init__.py	Sun Nov 06 11:22:39 2022 +0100
+++ b/src/eric7/Preferences/__init__.py	Mon Nov 07 17:19:58 2022 +0100
@@ -49,6 +49,7 @@
 from eric7 import Globals
 from eric7.EricNetwork.EricFtp import EricFtpProxyType
 from eric7.EricWidgets import EricFileDialog
+from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricWidgets.EricIconBar import EricIconBar
 from eric7.Project.ProjectBrowserFlags import (
     AllBrowsersFlag,
@@ -61,6 +62,8 @@
     TranslationsBrowserFlag,
 )
 from eric7.QScintilla.Shell import ShellHistoryStyle
+from eric7.Utilities.crypto import pwConvert
+from eric7.Utilities.crypto.py3PBKDF2 import hashPassword
 
 
 class Prefs:
@@ -1791,11 +1794,11 @@
         )
         if venvName:
             try:
-                from eric7.EricWidgets.EricApplication import ericApp
-
                 virtualenvManager = ericApp().getObject("VirtualEnvManager")
             except KeyError:
-                from eric7.VirtualEnv.VirtualenvManager import VirtualenvManager
+                from eric7.VirtualEnv.VirtualenvManager import (  # __IGNORE_WARNING__
+                    VirtualenvManager,
+                )
 
                 virtualenvManager = VirtualenvManager()
             interpreter = virtualenvManager.getVirtualenvInterpreter(venvName)
@@ -2006,8 +2009,6 @@
         "ProxyPassword/Https",
         "ProxyPassword/Ftp",
     ]:
-        from eric7.Utilities.crypto import pwConvert
-
         return pwConvert(
             Prefs.settings.value("UI/" + key, Prefs.uiDefaults[key]), encode=False
         )
@@ -2084,8 +2085,6 @@
         "ProxyPassword/Https",
         "ProxyPassword/Ftp",
     ]:
-        from eric7.Utilities.crypto import pwConvert
-
         Prefs.settings.setValue("UI/" + key, pwConvert(value, encode=True))
     elif key in [
         "ProxyType/Ftp",
@@ -2395,13 +2394,13 @@
     @return a reference to the list of lexer associations
         (dictionary of strings)
     """
+    from eric7.QScintilla import Lexers
+
     editorLexerAssoc = {}
     Prefs.settings.beginGroup("Editor/LexerAssociations")
     keyList = Prefs.settings.childKeys()
     Prefs.settings.endGroup()
 
-    from eric7.QScintilla import Lexers
-
     editorLexerAssocDefaults = Lexers.getDefaultLexerAssociations()
 
     if len(keyList) == 0:
@@ -2870,8 +2869,6 @@
         Prefs.settings.endArray()
         return feeds
     elif key in ["SyncFtpPassword", "SyncEncryptionKey"]:
-        from eric7.Utilities.crypto import pwConvert
-
         return pwConvert(
             Prefs.settings.value("WebBrowser/" + key, Prefs.webBrowserDefaults[key]),
             encode=False,
@@ -3049,8 +3046,6 @@
             Prefs.settings.setValue("Icon", v[2])
         Prefs.settings.endArray()
     elif key in ["SyncFtpPassword", "SyncEncryptionKey"]:
-        from eric7.Utilities.crypto import pwConvert
-
         Prefs.settings.setValue("WebBrowser/" + key, pwConvert(value, encode=True))
     elif key in ["SafeBrowsingUpdateDateTime"]:
         # value is a QDateTime
@@ -3193,8 +3188,6 @@
     @return the requested user setting
     """
     if key == "MailServerPassword":
-        from eric7.Utilities.crypto import pwConvert
-
         return pwConvert(
             Prefs.settings.value("User/" + key, Prefs.userDefaults[key]), encode=False
         )
@@ -3232,12 +3225,8 @@
     @param value the value to be set
     """
     if key == "MailServerPassword":
-        from eric7.Utilities.crypto import pwConvert
-
         Prefs.settings.setValue("User/" + key, pwConvert(value, encode=True))
     elif key == "MasterPassword":
-        from eric7.Utilities.crypto.py3PBKDF2 import hashPassword
-
         Prefs.settings.setValue("User/" + key, hashPassword(value))
     else:
         Prefs.settings.setValue("User/" + key, value)