diff -r 960850ec284c -r a22eee00b052 scripts/install-debugclients.py
--- a/scripts/install-debugclients.py Sat Aug 31 12:29:57 2019 +0200
+++ b/scripts/install-debugclients.py Sat Aug 31 12:58:11 2019 +0200
@@ -12,17 +12,6 @@
"""
from __future__ import unicode_literals, print_function
-try:
- import cStringIO as io
- try:
- from PyQt5 import sip
- except ImportError:
- import sip
- sip.setapi('QString', 2)
- sip.setapi('QVariant', 2)
- sip.setapi('QTextStream', 2)
-except (ImportError):
- import io # __IGNORE_WARNING__
import sys
import os
@@ -30,6 +19,7 @@
import compileall
import shutil
import fnmatch
+import io
# Define the globals.
progName = None
@@ -53,7 +43,6 @@
global currDir
if sys.platform.startswith("win"):
- # different meaning of input between Py2 and Py3
try:
input("Press enter to continue...")
except (EOFError, SyntaxError):
@@ -253,9 +242,8 @@
global progName, modDir, doCleanup, doCompile, distDir
global sourceDir
- if sys.version_info < (2, 7, 0) or sys.version_info > (3, 9, 9):
- print('Sorry, eric6 requires at least Python 2.7 or '
- 'Python 3 for running.')
+ if sys.version_info < (3, 5, 0) or sys.version_info > (3, 99, 99):
+ print('Sorry, eric6 requires at least Python 3.5 for running.')
exit(5)
progName = os.path.basename(argv[0])
@@ -317,7 +305,6 @@
if doCompile:
print("\nCompiling source files ...")
skipRe = re.compile(r"DebugClients[\\/]Python[\\/]")
- # Hide compile errors (mainly because of Py2/Py3 differences)
sys.stdout = io.StringIO()
if distDir:
compileall.compile_dir(
