Mercurial Repositories > eric / changeset

--- a/eric6/Globals/__init__.py	Wed May 12 19:47:11 2021 +0200
+++ b/eric6/Globals/__init__.py	Wed May 12 19:48:57 2021 +0200
@@ -246,14 +246,18 @@
     configDir = os.path.expanduser(d)
 
 
-def getPythonModulesDirectory():
+def getPythonLibraryDirectory():
     """
-    Function to determine the path to Python's modules directory.
+    Function to determine the path to Python's library directory.
     
-    @return path to the Python modules directory (string)
+    @return path to the Python library directory
+    @rtype str
     """
     import distutils.sysconfig
     return distutils.sysconfig.get_python_lib(True)
+# backward compatibility for eric < 21.6
+getPythonModulesDirectory = getPythonLibraryDirectory
+# TODO: eric7: delete this
 
 
 def getPyQt5ModulesDirectory():

--- a/eric6/PluginManager/PluginManager.py	Wed May 12 19:47:11 2021 +0200
+++ b/eric6/PluginManager/PluginManager.py	Wed May 12 19:48:57 2021 +0200
@@ -110,7 +110,7 @@
         
         self.pluginDirs = {
             "eric6": os.path.join(getConfig('ericDir'), "Plugins"),
-            "global": os.path.join(Utilities.getPythonModulesDirectory(),
+            "global": os.path.join(Utilities.getPythonLibraryDirectory(),
                                    "eric6plugins"),
             "user": os.path.join(Utilities.getConfigDir(), "eric6plugins"),
         }

--- a/eric6/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py	Wed May 12 19:47:11 2021 +0200
+++ b/eric6/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py	Wed May 12 19:48:57 2021 +0200
@@ -105,7 +105,7 @@
         )
         if self.parameters['cssFile'].startswith("%PYTHON%"):
             self.parameters['cssFile'] = self.parameters['cssFile'].replace(
-                "%PYTHON%", Utilities.getPythonModulesDirectory())
+                "%PYTHON%", Utilities.getPythonLibraryDirectory())
         
         self.ppath = project.getProjectPath()
         self.project = project
@@ -244,9 +244,9 @@
         # 2b. style commandline options
         if self.parameters['cssFile'] != self.defaults['cssFile']:
             cssFile = self.project.getRelativePath(self.parameters['cssFile'])
-            if cssFile.startswith(Utilities.getPythonModulesDirectory()):
+            if cssFile.startswith(Utilities.getPythonLibraryDirectory()):
                 cssFile = cssFile.replace(
-                    Utilities.getPythonModulesDirectory(), "%PYTHON%")
+                    Utilities.getPythonLibraryDirectory(), "%PYTHON%")
             parms['cssFile'] = Utilities.fromNativeSeparators(cssFile)
             args.append('-c')
             if os.path.isabs(self.parameters['cssFile']):

--- a/eric6/Utilities/__init__.py	Wed May 12 19:47:11 2021 +0200
+++ b/eric6/Utilities/__init__.py	Wed May 12 19:48:57 2021 +0200
@@ -52,7 +52,8 @@
 # import these methods into the Utilities namespace
 from Globals import (  # __IGNORE_WARNING__
     isWindowsPlatform, isLinuxPlatform, isMacPlatform, desktopName,
-    getConfigDir, setConfigDir, getPythonModulesDirectory,
+    getConfigDir, setConfigDir, getPythonLibraryDirectory,
+    getPythonModulesDirectory,      # TODO: eric7: delete this line
     getPyQt5ModulesDirectory, getQtBinariesPath, getPyQtToolsPath,
     qVersionTuple)