Sat, 08 Apr 2017 19:23:04 +0200
Fixed an issue causing eric to not start with Python2 anymore.
--- a/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleChecker.py Fri Apr 07 18:42:03 2017 +0200 +++ b/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleChecker.py Sat Apr 08 19:23:04 2017 +0200 @@ -7,9 +7,13 @@ Module implementing the code style checker. """ +try: # Only for Py2 + import Queue as queue +except ImportError: + import queue + import sys import multiprocessing -import queue import pycodestyle from NamingStyleChecker import NamingStyleChecker
--- a/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py Fri Apr 07 18:42:03 2017 +0200 +++ b/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py Sat Apr 08 19:23:04 2017 +0200 @@ -8,12 +8,17 @@ Module implementing the syntax check for Python 2/3. """ +try: # Only for Py2 + import Queue as queue +except ImportError: + import queue + import ast import re import sys import traceback import multiprocessing -import queue + try: from pyflakes.checker import Checker
--- a/Plugins/CheckerPlugins/SyntaxChecker/jsCheckSyntax.py Fri Apr 07 18:42:03 2017 +0200 +++ b/Plugins/CheckerPlugins/SyntaxChecker/jsCheckSyntax.py Sat Apr 08 19:23:04 2017 +0200 @@ -10,10 +10,14 @@ from __future__ import unicode_literals +try: # Only for Py2 + import Queue as queue +except ImportError: + import queue + import os import sys import multiprocessing -import queue def initService():
--- a/Plugins/CheckerPlugins/Tabnanny/Tabnanny.py Fri Apr 07 18:42:03 2017 +0200 +++ b/Plugins/CheckerPlugins/Tabnanny/Tabnanny.py Sat Apr 08 19:23:04 2017 +0200 @@ -46,10 +46,13 @@ import tokenize try: import StringIO as io + import Queue as queue except (ImportError): import io # __IGNORE_WARNING__ + import queue + import multiprocessing -import queue + if not hasattr(tokenize, 'NL'): raise ValueError("tokenize.NL doesn't exist -- tokenize module too old")