Mercurial Repositories > eric / file comparison
comparison: PluginManager/PluginManager.py
PluginManager/PluginManager.py
- changeset 6008
- ac5057f80f60
- parent 5904
- 2ff6078532c0
- child 6048
- 82ad8ec9548c
equal
deleted
inserted
replaced
| 6007:82d44dc0fb3b | 6008:ac5057f80f60 |
|---|---|
| 302 develPluginPath, develPluginName = \ | 302 develPluginPath, develPluginName = \ |
| 303 Utilities.splitPath(self.__develPluginFile) | 303 Utilities.splitPath(self.__develPluginFile) |
| 304 if self.isValidPluginName(develPluginName): | 304 if self.isValidPluginName(develPluginName): |
| 305 develPluginName = develPluginName[:-3] | 305 develPluginName = develPluginName[:-3] |
| 306 | 306 |
| 307 for pluginName in self.__foundCoreModules: | |
| 308 # global and user plugins have priority | |
| 309 if pluginName not in self.__foundGlobalModules and \ | |
| 310 pluginName not in self.__foundUserModules and \ | |
| 311 pluginName != develPluginName: | |
| 312 self.loadPlugin(pluginName, self.pluginDirs["eric6"]) | |
| 313 | |
| 314 for pluginName in self.__foundGlobalModules: | 307 for pluginName in self.__foundGlobalModules: |
| 315 # user plugins have priority | 308 # user and core plug-ins have priority |
| 316 if pluginName not in self.__foundUserModules and \ | 309 if pluginName not in self.__foundUserModules and \ |
| 310 pluginName not in self.__foundCoreModules and \ | |
| 317 pluginName != develPluginName: | 311 pluginName != develPluginName: |
| 318 self.loadPlugin(pluginName, self.pluginDirs["global"]) | 312 self.loadPlugin(pluginName, self.pluginDirs["global"]) |
| 319 | 313 |
| 320 for pluginName in self.__foundUserModules: | 314 for pluginName in self.__foundUserModules: |
| 315 # core plug-ins have priority | |
| 316 if pluginName not in self.__foundCoreModules and \ | |
| 317 pluginName != develPluginName: | |
| 318 self.loadPlugin(pluginName, self.pluginDirs["user"]) | |
| 319 | |
| 320 for pluginName in self.__foundCoreModules: | |
| 321 # plug-in under development has priority | |
| 321 if pluginName != develPluginName: | 322 if pluginName != develPluginName: |
| 322 self.loadPlugin(pluginName, self.pluginDirs["user"]) | 323 self.loadPlugin(pluginName, self.pluginDirs["eric6"]) |
| 323 | 324 |
| 324 if develPluginName: | 325 if develPluginName: |
| 325 self.loadPlugin(develPluginName, develPluginPath) | 326 self.loadPlugin(develPluginName, develPluginPath) |
| 326 self.__develPluginName = develPluginName | 327 self.__develPluginName = develPluginName |
| 327 | 328 |
