Remove use of builtins from the future python 2 package

Author: MHendricks

preditor/enum.py

@@ -2,7 +2,6 @@
 
 import abc
 import re
-from builtins import str as text
 from numbers import Number
 
 # =============================================================================
@@ -203,7 +202,7 @@ def __eq__(self, value):
             return self.number == value.number
         if isinstance(value, int):
             return self.number == value
-        if isinstance(value, str) or isinstance(value, text):
+        if isinstance(value, str):
             if self._compareStr(value):
                 return True
         return False

preditor/gui/console.py

@@ -5,7 +5,6 @@
 import sys
 import time
 import traceback
-from builtins import str as text
 from functools import partial
 from typing import Optional
 
@@ -344,7 +343,7 @@ def insertFromMimeData(self, mimeData):
                 r'\"\<\>\?\`\-\=\[\]\\\;\'\,\.\/ \t\n]'
             )
         )
-        newText = text(txt)
+        newText = str(txt)
         for each in exp.findall(newText):
             newText = newText.replace(each, '?')
 

preditor/gui/loggerwindow.py

@@ -9,7 +9,6 @@
 import shutil
 import sys
 import warnings
-from builtins import bytes
 from datetime import datetime, timedelta
 from enum import IntEnum
 from functools import partial

preditor/osystem.py

@@ -11,7 +11,6 @@
 import os
 import subprocess
 import sys
-from builtins import str as text
 
 import preditor
 
@@ -241,7 +240,7 @@ def normalize(i):
         ]
         path = os.path.pathsep.join(paths)
         # subprocess does not accept unicode in python 2
-        if sys.version_info[0] == 2 and isinstance(path, text):
+        if sys.version_info[0] == 2 and isinstance(path, str):
             path = path.encode('utf8')
         env['PATH'] = path
 

preditor/scintilla/lexers/maxscriptlexer.py

@@ -1,7 +1,6 @@
 from __future__ import absolute_import
 
 import re
-from builtins import str as text
 
 from .. import Qsci, QsciScintilla
 
@@ -212,7 +211,7 @@ def styleText(self, start, end):
 
         # cache objects used by processChunk that do not need updated every time it is
         # called
-        self.hlkwords = set(text(self.keywords(self.SmartHighlight)).lower().split())
+        self.hlkwords = set(str(self.keywords(self.SmartHighlight)).lower().split())
         self.chunkRegex = re.compile('([^A-Za-z0-9]*)([A-Za-z0-9]*)')
         kwrds = set(MS_KEYWORDS.split())