eric6/UI/CompareDialog.py

branch
without_py2_and_pyqt4
changeset 7192
a22eee00b052
parent 6942
2602857055c5
child 7229
53054eb5b15a
diff -r 960850ec284c -r a22eee00b052 eric6/UI/CompareDialog.py
--- a/eric6/UI/CompareDialog.py	Sat Aug 31 12:29:57 2019 +0200
+++ b/eric6/UI/CompareDialog.py	Sat Aug 31 12:58:11 2019 +0200
@@ -9,10 +9,6 @@
 """
 
 from __future__ import unicode_literals
-try:
-    basestring    # __IGNORE_WARNING__
-except NameError:
-    basestring = str
 
 import re
 from difflib import _mdiff, IS_CHARACTER_JUNK
@@ -288,9 +284,9 @@
         self.diffButton.setEnabled(False)
         self.diffButton.hide()
         
-        if isinstance(lines1, basestring):
+        if isinstance(lines1, str):
             lines1 = lines1.splitlines(True)
-        if isinstance(lines2, basestring):
+        if isinstance(lines2, str):
             lines2 = lines2.splitlines(True)
         
         self.__compare(lines1, lines2)

eric ide

mercurial