Mercurial Repositories > Protobuf and gRPC Extension / changeset

--- a/ExtensionProtobuf/ProjectProtocolsBrowser.py	Mon Dec 12 16:55:58 2022 +0100
+++ b/ExtensionProtobuf/ProjectProtocolsBrowser.py	Tue Dec 20 15:01:13 2022 +0100
@@ -16,7 +16,7 @@
 from PyQt6.QtCore import QProcess, QThread, pyqtSignal
 from PyQt6.QtWidgets import QApplication, QDialog, QMenu
 
-from eric7 import Globals, Preferences, Utilities
+from eric7 import Preferences
 from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
@@ -29,6 +29,7 @@
     ProjectBrowserSimpleDirectoryItem,
 )
 from eric7.Project.ProjectBrowserRepositoryItem import ProjectBrowserRepositoryItem
+from eric7.SystemUtilities import FileSystemUtilities, OSUtilities, PythonUtilities
 from eric7.UI.BrowserModel import (
     BrowserClassAttributeItem,
     BrowserClassItem,
@@ -600,13 +601,13 @@
             env = self.__plugin.getPreferences("grpcPythonEnv")
             exe = ericApp().getObject("VirtualEnvManager").getVirtualenvInterpreter(env)
             if not exe:
-                exe = Globals.getPythonExecutable()
+                exe = PythonUtilities.getPythonExecutable()
             exeArgs = ["-m", "grpc_tools.protoc"]
         else:
             exe = self.__plugin.getPreferences("protoc")
             if exe == "":
-                exe = "protoc.exe" if Utilities.isWindowsPlatform() else "protoc"
-            if not Utilities.isinpath(exe):
+                exe = "protoc.exe" if OSUtilities.isWindowsPlatform() else "protoc"
+            if not FileSystemUtilities.isinpath(exe):
                 exe = None
 
         return exe, exeArgs

--- a/PluginExtensionProtobuf.py	Mon Dec 12 16:55:58 2022 +0100
+++ b/PluginExtensionProtobuf.py	Tue Dec 20 15:01:13 2022 +0100
@@ -11,9 +11,10 @@
 
 from PyQt6.QtCore import QCoreApplication, QObject, QTranslator
 
-from eric7 import Globals, Preferences
+from eric7 import Preferences
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
+from eric7.SystemUtilities import OSUtilities, PythonUtilities
 from ExtensionProtobuf import protoclbr
 from ExtensionProtobuf.ProjectProtocolsBrowser import ProjectProtocolsBrowser
 
@@ -22,7 +23,7 @@
 author = "Detlev Offenbach <detlev@die-offenbachs.de>"
 autoactivate = True
 deactivateable = True
-version = "10.1.0"
+version = "10.1.1"
 className = "ProtobufExtensionPlugin"
 packageName = "ExtensionProtobuf"
 shortDescription = "Support for the development of Protobuf and gRPC projects"
@@ -67,7 +68,7 @@
     else:
         exe = protobufExtensionPluginObject.getPreferences("protoc")
         if not exe:
-            exe = "protoc.exe" if Globals.isWindowsPlatform() else "protoc"
+            exe = "protoc.exe" if OSUtilities.isWindowsPlatform() else "protoc"
 
         protocData = {
             "programEntry": True,
@@ -105,7 +106,7 @@
             ericApp().getObject("VirtualEnvManager").getVirtualenvInterpreter(env)
         )
         if not interpreter:
-            interpreter = Globals.getPythonExecutable()
+            interpreter = PythonUtilities.getPythonExecutable()
 
         grpcData = {
             "programEntry": True,

Binary file PluginExtensionProtobuf.zip has changed

--- a/changelog.md	Mon Dec 12 16:55:58 2022 +0100
+++ b/changelog.md	Tue Dec 20 15:01:13 2022 +0100
@@ -1,6 +1,10 @@
 ChangeLog
 ---------
 
+__Version 10.1.1__
+
+- changed some import statements
+
 __Version 10.1.0__
 
 - moved the Protobuf class browser to this plugin