diff -r 45e7bb09c120 -r 80c06d472826 src/eric7/Preferences/__init__.py
--- a/src/eric7/Preferences/__init__.py Tue Oct 18 16:05:20 2022 +0200
+++ b/src/eric7/Preferences/__init__.py Tue Oct 18 16:06:21 2022 +0200
@@ -12,8 +12,8 @@
functions. The data is stored in a file in a subdirectory of the users home
directory. The individual configuration data is accessed by accessor functions
defined on the module level. The module is simply imported wherever it is
-needed with the statement 'import Preferences'. Do not use
-'from Preferences import *' to import it.
+needed with the statement 'from eric7 import Preferences'. Do not use
+'from eric7.Preferences import *' to import it.
"""
import ast
@@ -46,14 +46,14 @@
QWebEngineSettings = None
from PyQt6.Qsci import QsciScintilla, QsciLexerPython
-from EricWidgets import EricFileDialog
-from EricWidgets.EricIconBar import EricIconBar
-
-from EricNetwork.EricFtp import EricFtpProxyType
-
-import Globals
-
-from Project.ProjectBrowserFlags import (
+from eric7.EricWidgets import EricFileDialog
+from eric7.EricWidgets.EricIconBar import EricIconBar
+
+from eric7.EricNetwork.EricFtp import EricFtpProxyType
+
+from eric7 import Globals
+
+from eric7.Project.ProjectBrowserFlags import (
SourcesBrowserFlag,
FormsBrowserFlag,
ResourcesBrowserFlag,
@@ -64,7 +64,7 @@
AllBrowsersFlag,
)
-from QScintilla.Shell import ShellHistoryStyle
+from eric7.QScintilla.Shell import ShellHistoryStyle
class Prefs:
@@ -1604,7 +1604,7 @@
"""
Module function to initialize the central configuration store.
"""
- from EricWidgets.EricApplication import ericApp
+ from eric7.EricWidgets.EricApplication import ericApp
Prefs.settings = QSettings(
QSettings.Format.IniFormat,
@@ -1671,12 +1671,12 @@
def importPreferences():
"""
- Module function to import preferences from a file previously saved by
+ Module function to from eric7 import Preferences from a file previously saved by
the export function.
"""
filename = EricFileDialog.getOpenFileName(
None,
- QCoreApplication.translate("Preferences", "Import Preferences"),
+ QCoreApplication.translate("Preferences", "from eric7 import Preferences"),
"",
QCoreApplication.translate(
"Preferences", "Properties File (*.ini);;All Files (*)"
@@ -1795,11 +1795,11 @@
)
if venvName:
try:
- from EricWidgets.EricApplication import ericApp
+ from eric7.EricWidgets.EricApplication import ericApp
virtualenvManager = ericApp().getObject("VirtualEnvManager")
except KeyError:
- from VirtualEnv.VirtualenvManager import VirtualenvManager
+ from eric7.VirtualEnv.VirtualenvManager import VirtualenvManager
virtualenvManager = VirtualenvManager()
interpreter = virtualenvManager.getVirtualenvInterpreter(venvName)
@@ -2010,7 +2010,7 @@
"ProxyPassword/Https",
"ProxyPassword/Ftp",
]:
- from Utilities.crypto import pwConvert
+ from eric7.Utilities.crypto import pwConvert
return pwConvert(
Prefs.settings.value("UI/" + key, Prefs.uiDefaults[key]), encode=False
@@ -2088,7 +2088,7 @@
"ProxyPassword/Https",
"ProxyPassword/Ftp",
]:
- from Utilities.crypto import pwConvert
+ from eric7.Utilities.crypto import pwConvert
Prefs.settings.setValue("UI/" + key, pwConvert(value, encode=True))
elif key in [
@@ -2404,9 +2404,9 @@
keyList = Prefs.settings.childKeys()
Prefs.settings.endGroup()
- import QScintilla.Lexers
-
- editorLexerAssocDefaults = QScintilla.Lexers.getDefaultLexerAssociations()
+ from eric7.QScintilla import Lexers
+
+ editorLexerAssocDefaults = Lexers.getDefaultLexerAssociations()
if len(keyList) == 0:
# build from scratch
@@ -2874,7 +2874,7 @@
Prefs.settings.endArray()
return feeds
elif key in ["SyncFtpPassword", "SyncEncryptionKey"]:
- from Utilities.crypto import pwConvert
+ from eric7.Utilities.crypto import pwConvert
return pwConvert(
Prefs.settings.value("WebBrowser/" + key, Prefs.webBrowserDefaults[key]),
@@ -3053,7 +3053,7 @@
Prefs.settings.setValue("Icon", v[2])
Prefs.settings.endArray()
elif key in ["SyncFtpPassword", "SyncEncryptionKey"]:
- from Utilities.crypto import pwConvert
+ from eric7.Utilities.crypto import pwConvert
Prefs.settings.setValue("WebBrowser/" + key, pwConvert(value, encode=True))
elif key in ["SafeBrowsingUpdateDateTime"]:
@@ -3072,7 +3072,7 @@
@param key the key of the value to get
@return the requested system setting
"""
- from Utilities import supportedCodecs
+ from eric7.Utilities import supportedCodecs
if key in ["StringEncoding", "IOEncoding"]:
encoding = Prefs.settings.value("System/" + key, Prefs.sysDefaults[key])
@@ -3197,7 +3197,7 @@
@return the requested user setting
"""
if key == "MailServerPassword":
- from Utilities.crypto import pwConvert
+ from eric7.Utilities.crypto import pwConvert
return pwConvert(
Prefs.settings.value("User/" + key, Prefs.userDefaults[key]), encode=False
@@ -3236,11 +3236,11 @@
@param value the value to be set
"""
if key == "MailServerPassword":
- from Utilities.crypto import pwConvert
+ from eric7.Utilities.crypto import pwConvert
Prefs.settings.setValue("User/" + key, pwConvert(value, encode=True))
elif key == "MasterPassword":
- from Utilities.crypto.py3PBKDF2 import hashPassword
+ from eric7.Utilities.crypto.py3PBKDF2 import hashPassword
Prefs.settings.setValue("User/" + key, hashPassword(value))
else:
@@ -3879,7 +3879,7 @@
@param oldPassword current master password (string)
@param newPassword new master password (string)
"""
- from Utilities.crypto import pwRecode
+ from eric7.Utilities.crypto import pwRecode
for key in [
"ProxyPassword/Http",
