Django Project: comparison PluginProjectDjango.py

-:df55ca77e25f
+:76d04dd67367
 # Start-of-Header
 name = "Django Project Plugin"
 author = "Detlev Offenbach <detlev@die-offenbachs.de>"
 autoactivate = True
 deactivateable = True
-version = "3.2.0"
+version = "3.2.1"
 className = "ProjectDjangoPlugin"
 packageName = "ProjectDjango"
 shortDescription = "Project support for Django projects."
-longDescription = """This plugin implements project support for Django projects."""
+longDescription = \
+"""This plugin implements project support for Django projects."""
 needsRestart = False
 pyqtApi = 2
 # End-of-Header
 error = ""
 def apiFiles(language):
 """
 Module function to return the API files made available by this plugin.
+@param language language to get APIs for (string)
 @return list of API filenames (list of string)
 """
 if language in ["Python3",  "Python2"]:
 apisDir = \
 os.path.join(os.path.dirname(__file__), "ProjectDjango", "APIs")
 def createDjangoPage(configDlg):
 """
 Module function to create the Django configuration page.
+@param configDlg reference to the configuration dialog
 @return reference to the configuration page
 """
 global djangoPluginObject
 from ProjectDjango.ConfigurationPage.DjangoPage import DjangoPage
 page = DjangoPage(djangoPluginObject)
 @return dictionary containing the relevant data
 """
 if e5App().getObject("UserInterface").versionIsNewer('5.0.99', '20120101'):
 return {
-"djangoPage": \
+"djangoPage": [
-[QCoreApplication.translate("ProjectDjangoPlugin", "Django"),
+QCoreApplication.translate("ProjectDjangoPlugin", "Django"),
 os.path.join("ProjectDjango", "icons", "django.png"),
 createDjangoPage, None, None],
 }
 else:
 return {}
 global error
 if self.__ui.versionIsNewer('5.0.99', '20120101'):
 error = ""
 else:
-error = self.trUtf8("eric5 version is too old, {0}, {1} or newer needed.")\
+error = self.trUtf8("eric5 version is too old, {0}, {1} or newer"
-.format("5.1.0", "20120101")
+" needed.").format("5.1.0", "20120101")
 return False
 return True
 def activate(self):
 self.__supportedVariants = self.__object.supportedPythonVariants()
 if self.__supportedVariants:
 try:
-self.__e5project.registerProjectType("Django", self.trUtf8("Django"),
+self.__e5project.registerProjectType(
+"Django", self.trUtf8("Django"),
 self.fileTypesCallback,
 lexerAssociationCallback=self.lexerAssociationCallback,
 binaryTranslationsCallback=self.binaryTranslationsCallback,
 progLanguages=self.__supportedVariants[:])
 except TypeError:
 # for backward compatibility
-self.__e5project.registerProjectType("Django", self.trUtf8("Django"),
+self.__e5project.registerProjectType(
+"Django", self.trUtf8("Django"),
 self.fileTypesCallback,
 lexerAssociationCallback=self.lexerAssociationCallback,
 binaryTranslationsCallback=self.binaryTranslationsCallback)
-from Project.ProjectBrowser import SourcesBrowserFlag, FormsBrowserFlag, \
+from Project.ProjectBrowser import SourcesBrowserFlag, \
-TranslationsBrowserFlag, OthersBrowserFlag
+FormsBrowserFlag, TranslationsBrowserFlag, OthersBrowserFlag
-Preferences.setProjectBrowserFlagsDefault("Django",
+Preferences.setProjectBrowserFlagsDefault(
-SourcesBrowserFlag | \
+"Django",
-FormsBrowserFlag | \
+SourcesBrowserFlag | FormsBrowserFlag |
-TranslationsBrowserFlag | \
+TranslationsBrowserFlag | OthersBrowserFlag,
-OthersBrowserFlag,
 )
 if self.__e5project.isOpen():
 self.__projectOpened()
 self.__object.projectOpenedHooks()
-e5App().getObject("Project").projectOpened.connect(self.__projectOpened)
+e5App().getObject("Project").projectOpened.connect(
-e5App().getObject("Project").projectClosed.connect(self.__projectClosed)
+self.__projectOpened)
-e5App().getObject("Project").newProject.connect(self.__projectOpened)
+e5App().getObject("Project").projectClosed.connect(
+self.__projectClosed)
+e5App().getObject("Project").newProject.connect(
+self.__projectOpened)
 e5App().getObject("Project").projectOpenedHooks.connect(
 self.__object.projectOpenedHooks)
 e5App().getObject("Project").projectClosedHooks.connect(
 self.__object.projectClosedHooks)
 """
 Public method to deactivate this plugin.
 """
 e5App().unregisterPluginObject("ProjectDjango")
-e5App().getObject("Project").projectOpened.disconnect(self.__projectOpened)
+e5App().getObject("Project").projectOpened.disconnect(
-e5App().getObject("Project").projectClosed.disconnect(self.__projectClosed)
+self.__projectOpened)
-e5App().getObject("Project").newProject.disconnect(self.__projectOpened)
+e5App().getObject("Project").projectClosed.disconnect(
+self.__projectClosed)
+e5App().getObject("Project").newProject.disconnect(
+self.__projectOpened)
 e5App().getObject("Project").projectOpenedHooks.disconnect(
 self.__object.projectOpenedHooks)
 e5App().getObject("Project").projectClosedHooks.disconnect(
 self.__object.projectClosedHooks)
 Private method to load the translation file.
 """
 if self.__ui is not None:
 loc = self.__ui.getLocale()
 if loc and loc != "C":
-locale_dir = \
+locale_dir = os.path.join(
-os.path.join(os.path.dirname(__file__), "ProjectDjango", "i18n")
+os.path.dirname(__file__), "ProjectDjango", "i18n")
 translation = "django_%s" % loc
 translator = QTranslator(None)
 loaded = translator.load(translation, locale_dir)
 if loaded:
 self.__translator = translator
 e5App().installTranslator(self.__translator)
 else:
-print("Warning: translation file '{0}' could not be loaded.".format(
+print("Warning: translation file '{0}' could not be"
-translation))
+" loaded.".format(translation))
 print("Using default.")
 def __projectOpened(self):
 """
 Private slot to handle the projectOpened signal.
 """
 if self.__e5project.getProjectType() == "Django":
 projectAct = self.__ui.getMenuBarAction("project")
 actions = self.__ui.menuBar().actions()
 insertAct = actions[actions.index(projectAct) + 1]
-self.__mainAct = self.__ui.menuBar().insertMenu(insertAct, self.__mainMenu)
+self.__mainAct = self.__ui.menuBar().insertMenu(
+insertAct, self.__mainMenu)
 def __projectClosed(self):
 """
 Private slot to handle the projectClosed signal.
 """
 fileTypes = {}
 return fileTypes
 def lexerAssociationCallback(self, filename):
 """
-Public method to get the lexer association of the Django project type for
+Public method to get the lexer association of the Django project type
-a file.
+for a file.
 @param filename name of the file (string)
-@return name of the lexer (string) (Pygments lexers are prefixed with 'Pygments|')
+@return name of the lexer (string) (Pygments lexers are prefixed with
+'Pygments|')
 """
 for pattern, language in self.lexerAssociations.items():
 if fnmatch.fnmatch(filename, pattern):
 return language
 def getPreferences(self, key):
 """
 Public method to retrieve the various settings.
 @param key the key of the value to get
-@param prefClass preferences class used as the storage area
 @return the requested setting
 """
 if key in ["RecentNumberApps"]:
-return int(Preferences.Prefs.settings.value(self.PreferencesKey + "/" + key,
+return int(Preferences.Prefs.settings.value(
-self.__defaults[key]))
+self.PreferencesKey + "/" + key, self.__defaults[key]))
 elif key in ["UsePlainPythonPy2", "UsePlainPythonPy3", "UseIPv6"]:
 return Preferences.toBool(Preferences.Prefs.settings.value(
 self.PreferencesKey + "/" + key, self.__defaults[key]))
 else:
-return Preferences.Prefs.settings.value(self.PreferencesKey + "/" + key,
+return Preferences.Prefs.settings.value(
-self.__defaults[key])
+self.PreferencesKey + "/" + key, self.__defaults[key])
 def setPreferences(self, key, value):
 """
 Public method to store the various settings.
 @param key the key of the setting to be set (string)
 @param value the value to be set
-@param prefClass preferences class used as the storage area
+"""
-"""
+Preferences.Prefs.settings.setValue(
-Preferences.Prefs.settings.setValue(self.PreferencesKey + "/" + key, value)
+self.PreferencesKey + "/" + key, value)
 if key in ["VirtualEnvironmentPy2", "VirtualEnvironmentPy3"]:
 self.__reregisterProjectType()
 elif key == "TranslationsEditor":
 if self.__object:
 # step 2: register again with new language settings
 self.__supportedVariants = supportedVariants
 if self.__supportedVariants:
 try:
-self.__e5project.registerProjectType("Django", self.trUtf8("Django"),
+self.__e5project.registerProjectType(
+"Django", self.trUtf8("Django"),
 self.fileTypesCallback,
 lexerAssociationCallback=self.lexerAssociationCallback,
-binaryTranslationsCallback=self.binaryTranslationsCallback,
+binaryTranslationsCallback=
+self.binaryTranslationsCallback,
 progLanguages=self.__supportedVariants[:])
 except TypeError:
 # for backward compatibility
-self.__e5project.registerProjectType("Django", self.trUtf8("Django"),
+self.__e5project.registerProjectType(
+"Django", self.trUtf8("Django"),
 self.fileTypesCallback,
 lexerAssociationCallback=self.lexerAssociationCallback,
-binaryTranslationsCallback=self.binaryTranslationsCallback)
+binaryTranslationsCallback=
+self.binaryTranslationsCallback)

Mercurial Repositories > Django Project / file comparison

comparison: PluginProjectDjango.py

PluginProjectDjango.py