diff --git a/python/jsbeautifier/core/inputscanner.py b/python/jsbeautifier/core/inputscanner.py index 95dabfd91..82f497b2d 100644 --- a/python/jsbeautifier/core/inputscanner.py +++ b/python/jsbeautifier/core/inputscanner.py @@ -119,7 +119,7 @@ def readUntilAfter(self, pattern): def get_regexp(self, pattern, match_from=False): result = None # strings are converted to regexp - if isinstance(pattern, self.__six.string_types) and pattern != "": + if isinstance(pattern, str) and pattern != "": result = re.compile(pattern) elif pattern is not None: result = re.compile(pattern.pattern) diff --git a/python/jsbeautifier/javascript/acorn.py b/python/jsbeautifier/javascript/acorn.py index 933376e44..54fa20bfd 100644 --- a/python/jsbeautifier/javascript/acorn.py +++ b/python/jsbeautifier/javascript/acorn.py @@ -46,34 +46,34 @@ _unicodeEscapeOrCodePoint = six.u(r"\\u[0-9a-fA-F]{4}|\\u\{[0-9a-fA-F]+\}") _identifierStart = ( - six.u("(?:") + "(?:" + _unicodeEscapeOrCodePoint - + six.u("|[") + + "|[" + _baseASCIIidentifierStartChars + _nonASCIIidentifierStartChars - + six.u("])") + + "])" ) _identifierChars = ( - six.u("(?:") + "(?:" + _unicodeEscapeOrCodePoint - + six.u("|[") + + "|[" + _baseASCIIidentifierChars + _nonASCIIidentifierStartChars + _nonASCIIidentifierChars - + six.u("])*") + + "])*" ) identifier = re.compile(_identifierStart + _identifierChars) identifierStart = re.compile(_identifierStart) identifierMatch = re.compile( - six.u("(?:") + "(?:" + _unicodeEscapeOrCodePoint - + six.u("|[") + + "|[" + _baseASCIIidentifierChars + _nonASCIIidentifierStartChars + _nonASCIIidentifierChars - + six.u("])+") + + "])+" ) _nonASCIIwhitespace = re.compile(