diff -r 960850ec284c -r a22eee00b052 eric6/PluginManager/PluginManager.py
--- a/eric6/PluginManager/PluginManager.py Sat Aug 31 12:29:57 2019 +0200
+++ b/eric6/PluginManager/PluginManager.py Sat Aug 31 12:58:11 2019 +0200
@@ -32,7 +32,7 @@
from .PluginExceptions import PluginPathError, PluginModulesError, \
PluginLoadError, PluginActivationError, PluginModuleFormatError, \
- PluginClassFormatError, PluginPy2IncompatibleError
+ PluginClassFormatError
import UI.PixmapCache
@@ -382,8 +382,6 @@
@param reload_ flag indicating to reload the module (boolean)
@exception PluginLoadError raised to indicate an issue loading
the plug-in
- @exception PluginPy2IncompatibleError raised to indicate the Python 2
- incompatibility of a plug-in
"""
try:
fname = "{0}.py".format(os.path.join(directory, name))
@@ -393,21 +391,6 @@
"Module is missing the 'autoactivate' attribute.")
self.__failedModules[name] = module
raise PluginLoadError(name)
- if sys.version_info[0] < 3:
- if not hasattr(module, "python2Compatible"):
- module.error = self.tr(
- "Module is missing the Python2 compatibility flag."
- " Please update.")
- compatible = False
- elif not getattr(module, "python2Compatible", True):
- module.error = self.tr(
- "Module is not Python2 compatible.")
- compatible = False
- else:
- compatible = True
- if not compatible:
- self.__failedModules[name] = module
- raise PluginPy2IncompatibleError(name)
if getattr(module, "autoactivate", False):
self.__inactiveModules[name] = module
else:
@@ -434,9 +417,6 @@
pass
except PluginLoadError:
print("Error loading plug-in module:", name)
- except PluginPy2IncompatibleError:
- print("Error loading plug-in module:", name)
- print("The plug-in is not Python2 compatible.")
except Exception as err:
module = imp.new_module(name)
module.error = self.tr(
