eric: comparison eric6/QScintilla/Editor.py

-:f7cb83647621
+:72721823d453
 # check filetype
 from . import Lexers
 supportedLanguages = Lexers.getSupportedLanguages()
 if self.filetype in supportedLanguages:
 bindName = supportedLanguages[self.filetype][1]
-elif self.filetype in ["Python", "Python2", "Python3",
+elif self.filetype in ["Python", "Python3", "MicroPython"]:
-"MicroPython"]:
 bindName = "dummy.py"
 if not bindName and line0.startswith("#!"):
 # #! marker detection
 if "python3" in line0:
 bindName = "dummy.py"
 self.filetype = "Python3"
-elif "python2" in line0:
-bindName = "dummy.py"
-self.filetype = "Python2"
 elif "python" in line0:
 bindName = "dummy.py"
-self.filetype = "Python2"
+self.filetype = "Python3"
 elif "pypy3" in line0:
 bindName = "dummy.py"
 self.filetype = "Python3"
-elif "pypy2" in line0:
-bindName = "dummy.py"
-self.filetype = "Python2"
 elif "pypy" in line0:
 bindName = "dummy.py"
-self.filetype = "Python2"
+self.filetype = "Python3"
 elif ("/bash" in line0 or "/sh" in line0):
 bindName = "dummy.sh"
 elif "ruby" in line0:
 bindName = "dummy.rb"
 self.filetype = "Ruby"
 if match:
 mode = match.group(1).lower()
 if mode in ["python3", "pypy3"]:
 bindName = "dummy.py"
 self.filetype = "Python3"
-elif mode in ["python2", "pypy2", "python", "pypy"]:
-bindName = "dummy.py"
-self.filetype = "Python2"
 elif mode == "ruby":
 bindName = "dummy.rb"
 self.filetype = "Ruby"
 elif mode == "perl":
 bindName = "dummy.pl"
 Private method to select a specific pygments lexer.
 @return name of the selected pygments lexer (string)
 """
 from pygments.lexers import get_all_lexers
-lexerList = sorted(l[0] for l in get_all_lexers())
+lexerList = sorted(lex[0] for lex in get_all_lexers())
 try:
 lexerSel = lexerList.index(
 self.getLanguage(normalized=False, forPygments=True))
 except ValueError:
 lexerSel = 0
 if language == "Python":
 # correction for Python
 pyVer = Utilities.determinePythonVersion(
 filename, self.text(0), self)
 language = "Python{0}".format(pyVer)
-if language in ['Python2', 'Python3', 'MicroPython', 'Ruby',
+if language in ['Python3', 'MicroPython', 'Ruby',
 'JavaScript', 'YAML', 'JSON']:
 self.filetype = language
 else:
 self.filetype = ""
 else:
 self.apiLanguage.startswith("Pygments|")
 ):
 lang = self.lexer_.name()
 if normalized:
 # adjust some Pygments lexer names
-if lang == "Python":
+if lang == "Python 3":
-lang = "Python2"
-elif lang == "Python 3":
 lang = "Python3"
 else:
 lang = self.apiLanguage
 if forPygments:
 # adjust some names to Pygments lexer names
-if lang == "Python2":
+if lang == "Python3":
-lang = "Python"
-elif lang == "Python3":
 lang = "Python 3"
 return lang
 def getApiLanguage(self):
 """
 """
 return self.encoding
 def __getPyVersion(self):
 """
-Private method to return the Python main version (2 or 3) or 0 if it's
+Private method to return the Python main version or 0 if it's
 not a Python file at all.
-@return Python version (2 or 3) or 0 if it's not a Python file (int)
+@return Python version or 0 if it's not a Python file (int)
 """
 return Utilities.determinePythonVersion(
 self.fileName, self.text(0), self)
 def isPyFile(self):
 """
 Public method to return a flag indicating a Python (2 or 3) file.
-@return flag indicating a Python (2 or 3) file (boolean)
+@return flag indicating a Python3 file (boolean)
 """
-return self.__getPyVersion() in [2, 3]
+return self.__getPyVersion() == 3
 def isPy2File(self):
 """
 Public method to return a flag indicating a Python2 file.
-@return flag indicating a Python2 file (boolean)
+@return flag reporting always False
-"""
+@rtype bool
-return self.__getPyVersion() == 2
+"""
+# kept to keep the API compatible for plugins
+return False
 def isPy3File(self):
 """
 Public method to return a flag indicating a Python3 file.
 )
 coEnable = (
 (coEnable or
 os.path.isfile("{0}.coverage".format(basename)) or
 os.path.isfile("{0}.coverage".format(tbasename))) and
-(self.project.isPy3Project() or
+self.project.isPy3Project()
-self.project.isPy2Project())
 )
 # now check ourselves
 fn = self.getFileName()
 if fn is not None:
 Private method to clear warnings of a specific kind.
 @param warningKind kind of warning to clear (Editor.WarningCode,
 Editor.WarningStyle)
 """
-assert warningKind in [Editor.WarningCode, Editor.WarningStyle]
 for handle in list(self.warnings.keys()):
 warnings = []
 for msg, warningType in self.warnings[handle]:
 if warningType == warningKind:
 continue
 matcher = difflib.SequenceMatcher(None, oldL, newL)
 formatStr = "@@{0} {1} {2} {3}"
 commands = []
 for token, i1, i2, j1, j2 in matcher.get_opcodes():
-if token == "insert":
+if token == "insert":               # secok
 commands.append(formatStr.format("i", j1, j2 - j1, -1))
 commands.extend(newL[j1:j2])
-elif token == "delete":
+elif token == "delete":             # secok
 commands.append(formatStr.format("d", j1, i2 - i1, -1))
-elif token == "replace":
+elif token == "replace":            # secok
 commands.append(formatStr.format("r", j1, i2 - i1, j2 - j1))
 commands.extend(newL[j1:j2])
 return "\n".join(commands) + "\n"

Mercurial Repositories > eric / file comparison

comparison: eric6/QScintilla/Editor.py

eric6/QScintilla/Editor.py