ExtensionProtobuf/ProjectProtocolsBrowser.py

changeset 12
8ddcd9d47bdf
parent 8
24fdd6e43cd7
child 22
ed2d8f5eaa66
equal deleted inserted replaced
11:edece47f29a5 12:8ddcd9d47bdf
14 import os 14 import os
15 15
16 from PyQt6.QtCore import QProcess, QThread, pyqtSignal 16 from PyQt6.QtCore import QProcess, QThread, pyqtSignal
17 from PyQt6.QtWidgets import QApplication, QDialog, QMenu 17 from PyQt6.QtWidgets import QApplication, QDialog, QMenu
18 18
19 from eric7 import Globals, Preferences, Utilities 19 from eric7 import Preferences
20 from eric7.EricGui import EricPixmapCache 20 from eric7.EricGui import EricPixmapCache
21 from eric7.EricWidgets import EricMessageBox 21 from eric7.EricWidgets import EricMessageBox
22 from eric7.EricWidgets.EricApplication import ericApp 22 from eric7.EricWidgets.EricApplication import ericApp
23 from eric7.EricWidgets.EricProgressDialog import EricProgressDialog 23 from eric7.EricWidgets.EricProgressDialog import EricProgressDialog
24 from eric7.Project.FileCategoryRepositoryItem import FileCategoryRepositoryItem 24 from eric7.Project.FileCategoryRepositoryItem import FileCategoryRepositoryItem
27 ProjectBrowserDirectoryItem, 27 ProjectBrowserDirectoryItem,
28 ProjectBrowserFileItem, 28 ProjectBrowserFileItem,
29 ProjectBrowserSimpleDirectoryItem, 29 ProjectBrowserSimpleDirectoryItem,
30 ) 30 )
31 from eric7.Project.ProjectBrowserRepositoryItem import ProjectBrowserRepositoryItem 31 from eric7.Project.ProjectBrowserRepositoryItem import ProjectBrowserRepositoryItem
32 from eric7.SystemUtilities import FileSystemUtilities, OSUtilities, PythonUtilities
32 from eric7.UI.BrowserModel import ( 33 from eric7.UI.BrowserModel import (
33 BrowserClassAttributeItem, 34 BrowserClassAttributeItem,
34 BrowserClassItem, 35 BrowserClassItem,
35 BrowserFileItem, 36 BrowserFileItem,
36 BrowserMethodItem, 37 BrowserMethodItem,
598 599
599 if grpc: 600 if grpc:
600 env = self.__plugin.getPreferences("grpcPythonEnv") 601 env = self.__plugin.getPreferences("grpcPythonEnv")
601 exe = ericApp().getObject("VirtualEnvManager").getVirtualenvInterpreter(env) 602 exe = ericApp().getObject("VirtualEnvManager").getVirtualenvInterpreter(env)
602 if not exe: 603 if not exe:
603 exe = Globals.getPythonExecutable() 604 exe = PythonUtilities.getPythonExecutable()
604 exeArgs = ["-m", "grpc_tools.protoc"] 605 exeArgs = ["-m", "grpc_tools.protoc"]
605 else: 606 else:
606 exe = self.__plugin.getPreferences("protoc") 607 exe = self.__plugin.getPreferences("protoc")
607 if exe == "": 608 if exe == "":
608 exe = "protoc.exe" if Utilities.isWindowsPlatform() else "protoc" 609 exe = "protoc.exe" if OSUtilities.isWindowsPlatform() else "protoc"
609 if not Utilities.isinpath(exe): 610 if not FileSystemUtilities.isinpath(exe):
610 exe = None 611 exe = None
611 612
612 return exe, exeArgs 613 return exe, exeArgs
613 614
614 def __readStdout(self): 615 def __readStdout(self):

eric ide

mercurial