--- a/PluginProjectDjango.py Sun Oct 13 18:31:28 2013 +0200
+++ b/PluginProjectDjango.py Fri Oct 25 18:50:04 2013 +0200
@@ -28,11 +28,12 @@
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
@@ -46,6 +47,7 @@
"""
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"]:
@@ -61,6 +63,7 @@
"""
Module function to create the Django configuration page.
+ @param configDlg reference to the configuration dialog
@return reference to the configuration page
"""
global djangoPluginObject
@@ -77,10 +80,10 @@
"""
if e5App().getObject("UserInterface").versionIsNewer('5.0.99', '20120101'):
return {
- "djangoPage": \
- [QCoreApplication.translate("ProjectDjangoPlugin", "Django"),
- os.path.join("ProjectDjango", "icons", "django.png"),
- createDjangoPage, None, None],
+ "djangoPage": [
+ QCoreApplication.translate("ProjectDjangoPlugin", "Django"),
+ os.path.join("ProjectDjango", "icons", "django.png"),
+ createDjangoPage, None, None],
}
else:
return {}
@@ -167,8 +170,8 @@
if self.__ui.versionIsNewer('5.0.99', '20120101'):
error = ""
else:
- error = self.trUtf8("eric5 version is too old, {0}, {1} or newer needed.")\
- .format("5.1.0", "20120101")
+ error = self.trUtf8("eric5 version is too old, {0}, {1} or newer"
+ " needed.").format("5.1.0", "20120101")
return False
return True
@@ -195,34 +198,38 @@
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, \
- TranslationsBrowserFlag, OthersBrowserFlag
- Preferences.setProjectBrowserFlagsDefault("Django",
- SourcesBrowserFlag | \
- FormsBrowserFlag | \
- TranslationsBrowserFlag | \
- OthersBrowserFlag,
+ from Project.ProjectBrowser import SourcesBrowserFlag, \
+ FormsBrowserFlag, TranslationsBrowserFlag, OthersBrowserFlag
+ Preferences.setProjectBrowserFlagsDefault(
+ "Django",
+ SourcesBrowserFlag | FormsBrowserFlag |
+ TranslationsBrowserFlag | OthersBrowserFlag,
)
if self.__e5project.isOpen():
self.__projectOpened()
self.__object.projectOpenedHooks()
- e5App().getObject("Project").projectOpened.connect(self.__projectOpened)
- e5App().getObject("Project").projectClosed.connect(self.__projectClosed)
- e5App().getObject("Project").newProject.connect(self.__projectOpened)
+ e5App().getObject("Project").projectOpened.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)
@@ -242,9 +249,12 @@
"""
e5App().unregisterPluginObject("ProjectDjango")
- e5App().getObject("Project").projectOpened.disconnect(self.__projectOpened)
- e5App().getObject("Project").projectClosed.disconnect(self.__projectClosed)
- e5App().getObject("Project").newProject.disconnect(self.__projectOpened)
+ e5App().getObject("Project").projectOpened.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)
@@ -270,8 +280,8 @@
if self.__ui is not None:
loc = self.__ui.getLocale()
if loc and loc != "C":
- locale_dir = \
- os.path.join(os.path.dirname(__file__), "ProjectDjango", "i18n")
+ locale_dir = os.path.join(
+ os.path.dirname(__file__), "ProjectDjango", "i18n")
translation = "django_%s" % loc
translator = QTranslator(None)
loaded = translator.load(translation, locale_dir)
@@ -279,8 +289,8 @@
self.__translator = translator
e5App().installTranslator(self.__translator)
else:
- print("Warning: translation file '{0}' could not be loaded.".format(
- translation))
+ print("Warning: translation file '{0}' could not be"
+ " loaded.".format(translation))
print("Using default.")
def __projectOpened(self):
@@ -291,7 +301,8 @@
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):
"""
@@ -324,11 +335,12 @@
def lexerAssociationCallback(self, filename):
"""
- Public method to get the lexer association of the Django project type for
- a file.
+ Public method to get the lexer association of the Django project type
+ 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):
@@ -353,18 +365,17 @@
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,
- self.__defaults[key]))
+ return int(Preferences.Prefs.settings.value(
+ 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,
- self.__defaults[key])
+ return Preferences.Prefs.settings.value(
+ self.PreferencesKey + "/" + key, self.__defaults[key])
def setPreferences(self, key, value):
"""
@@ -372,9 +383,9 @@
@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(self.PreferencesKey + "/" + key, value)
+ Preferences.Prefs.settings.setValue(
+ self.PreferencesKey + "/" + key, value)
if key in ["VirtualEnvironmentPy2", "VirtualEnvironmentPy3"]:
self.__reregisterProjectType()
@@ -395,14 +406,18 @@
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)
