drop Python2.7 WIP, trim usage of "six"

python/cssbeautifier/_main.py

@@ -23,7 +23,6 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-from __future__ import print_function
 import sys
 import os
 import io

python/cssbeautifier/css/beautifier.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import sys
 import re
 import copy
@@ -8,12 +7,6 @@
 from jsbeautifier.core.directives import Directives
 from cssbeautifier.__version__ import __version__
 
-# This is not pretty, but given how we did the version import
-# it is the only way to do this without having setup.py fail on a missing
-# six dependency.
-six = __import__("six")
-
-#
 # The MIT License (MIT)
 
 # Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
@@ -87,11 +80,10 @@ class Beautifier:
     def __init__(self, source_text, opts=default_options()):
         # in javascript, these two differ
         # in python they are the same, different methods are called on them
-        # IMPORTANT: This string must be run through six to handle \u chars
-        self.lineBreak = re.compile(six.u(r"\r\n|[\n\r]"))
+        self.lineBreak = re.compile(r"\r\n|[\n\r]")
         self.allLineBreaks = self.lineBreak
 
-        self.comment_pattern = re.compile(six.u(r"\/\/(?:[^\n\r\u2028\u2029]*)"))
+        self.comment_pattern = re.compile(r"\/\/(?:[^\n\r\u2028\u2029]*)")
         self.block_comment_pattern = re.compile(r"\/\*(?:[\s\S]*?)((?:\*\/)|$)")
 
         if not source_text:

python/jsbeautifier/__init__.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import sys
 import os
 import platform

python/jsbeautifier/cli/__init__.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import sys
 import os
 import platform
@@ -97,26 +96,15 @@ def process_file(file_name, opts, beautify_code):
 
         stream = sys.stdin
         if platform.platform().lower().startswith("windows"):
-            if sys.version_info.major >= 3:
-                # for python 3 on windows this prevents conversion
-                stream = io.TextIOWrapper(sys.stdin.buffer, newline="")
-            elif platform.architecture()[0] == "32bit":
-                # for python 2 x86 on windows this prevents conversion
-                import msvcrt
-
-                msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY)
-            else:
-                raise Exception(
-                    "Pipe to stdin not supported on Windows with Python 2.x 64-bit."
-                )
+            stream = io.TextIOWrapper(sys.stdin.buffer, newline="")
 
         input_string = stream.read()
 
         # if you pipe an empty string, that is a failure
         if input_string == "":
             raise MissingInputStreamError()
     else:
-        stream = io.open(file_name, "rt", newline="", encoding="UTF-8")
+        stream = open(file_name, newline="", encoding="UTF-8")
         input_string = stream.read()
 
     return beautify_code(input_string, opts)
@@ -135,7 +123,7 @@ def mkdir_p(path):
 
 def isFileDifferent(filepath, expected):
     try:
-        return "".join(io.open(filepath, "rt", newline="").readlines()) != expected
+        return "".join(open(filepath, newline="").readlines()) != expected
     except BaseException:
         return True
 
@@ -158,9 +146,7 @@ def get_filepaths_from_params(filepath_params, replace):
         elif "*" in filepath_param or "?" in filepath_param:
             # handle globs
             # empty result is okay
-            if sys.version_info.major == 2 or (
-                sys.version_info.major == 3 and sys.version_info.minor <= 4
-            ):
+            if sys.version_info <= (3, 4):
                 if "**" in filepath_param:
                     raise Exception("Recursive globs not supported on Python <= 3.4.")
                 filepaths.extend(glob.glob(filepath_param))
@@ -207,18 +193,7 @@ def write_beautified_output(pretty, local_options, outfile):
         # python automatically converts newlines in text to "\r\n" when on windows
         # switch to binary to prevent this
         if platform.platform().lower().startswith("windows"):
-            if sys.version_info.major >= 3:
-                # for python 3 on windows this prevents conversion
-                stream = io.TextIOWrapper(sys.stdout.buffer, newline="")
-            elif platform.architecture()[0] == "32bit":
-                # for python 2 x86 on windows this prevents conversion
-                import msvcrt
-
-                msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
-            else:
-                raise Exception(
-                    "Pipe to stdout not supported on Windows with Python 2.x 64-bit."
-                )
+            stream = io.TextIOWrapper(sys.stdout.buffer, newline="")
 
         stream.write(pretty)
     else:
@@ -227,17 +202,9 @@ def write_beautified_output(pretty, local_options, outfile):
 
             # python automatically converts newlines in text to "\r\n" when on windows
             # set newline to empty to prevent this
-            with io.open(outfile, "wt", newline="", encoding="UTF-8") as f:
+            with open(outfile, "w", newline="", encoding="UTF-8") as f:
                 if not local_options.keep_quiet:
                     print("beautified " + outfile, file=sys.stdout)
-
-                try:
-                    f.write(pretty)
-                except TypeError:
-                    # This is not pretty, but given how we did the version import
-                    # it is the only way to do this without having setup.py
-                    # fail on a missing six dependency.
-                    six = __import__("six")
-                    f.write(six.u(pretty))
+                f.write(pretty)
         elif not local_options.keep_quiet:
             print("beautified " + outfile + " - unchanged", file=sys.stdout)

python/jsbeautifier/core/inputscanner.py

@@ -27,7 +27,6 @@
 
 class InputScanner:
     def __init__(self, input_string):
-        self.__six = __import__("six")
         if input_string is None:
             input_string = ""
         self.__input = input_string
@@ -119,7 +118,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)

python/jsbeautifier/javascript/acorn.py

@@ -11,11 +11,6 @@
 #     http://marijnhaverbeke.nl/git/acorn
 #     https://github.com/marijnh/acorn.git
 
-# This is not pretty, but given how we did the version import
-# it is the only way to do this without having setup.py fail on a missing
-# six dependency.
-six = __import__("six")
-
 # ## Character categories
 
 # acorn used char codes to squeeze the last bit of performance out
@@ -24,71 +19,68 @@
 # 65 through 91 are uppercase letters.
 # permit _ (95).
 # 97 through 123 are lowercase letters.
-_baseASCIIidentifierStartChars = six.u(r"\x23\x24\x40\x41-\x5a\x5f\x61-\x7a")
+_baseASCIIidentifierStartChars = r"\x23\x24\x40\x41-\x5a\x5f\x61-\x7a"
 
 # inside an identifier @ is not allowed but 0-9 are.
-_baseASCIIidentifierChars = six.u(r"\x24\x30-\x39\x41-\x5a\x5f\x61-\x7a")
+_baseASCIIidentifierChars = r"\x24\x30-\x39\x41-\x5a\x5f\x61-\x7a"
 
 # Big ugly regular expressions that match characters in the
 # whitespace, identifier, and identifier-start categories. These
 # are only applied when a character is found to actually have a
 # code point above 128.
-# IMPORTANT: These strings must be run through six to handle \u chars
-_nonASCIIidentifierStartChars = six.u(
+_nonASCIIidentifierStartChars = (
     r"\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376\u0377\u037a-\u037d\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u0527\u0531-\u0556\u0559\u0561-\u0587\u05d0-\u05ea\u05f0-\u05f2\u0620-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06e5\u06e6\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07ca-\u07ea\u07f4\u07f5\u07fa\u0800-\u0815\u081a\u0824\u0828\u0840-\u0858\u08a0\u08a2-\u08ac\u0904-\u0939\u093d\u0950\u0958-\u0961\u0971-\u0977\u0979-\u097f\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c33\u0c35-\u0c39\u0c3d\u0c58\u0c59\u0c60\u0c61\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cde\u0ce0\u0ce1\u0cf1\u0cf2\u0d05-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d\u0d4e\u0d60\u0d61\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32\u0e33\u0e40-\u0e46\u0e81\u0e82\u0e84\u0e87\u0e88\u0e8a\u0e8d\u0e94-\u0e97\u0e99-\u0e9f\u0ea1-\u0ea3\u0ea5\u0ea7\u0eaa\u0eab\u0ead-\u0eb0\u0eb2\u0eb3\u0ebd\u0ec0-\u0ec4\u0ec6\u0edc-\u0edf\u0f00\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8c\u1000-\u102a\u103f\u1050-\u1055\u105a-\u105d\u1061\u1065\u1066\u106e-\u1070\u1075-\u1081\u108e\u10a0-\u10c5\u10c7\u10cd\u10d0-\u10fa\u10fc-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f4\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f0\u1700-\u170c\u170e-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17d7\u17dc\u1820-\u1877\u1880-\u18a8\u18aa\u18b0-\u18f5\u1900-\u191c\u1950-\u196d\u1970-\u1974\u1980-\u19ab\u19c1-\u19c7\u1a00-\u1a16\u1a20-\u1a54\u1aa7\u1b05-\u1b33\u1b45-\u1b4b\u1b83-\u1ba0\u1bae\u1baf\u1bba-\u1be5\u1c00-\u1c23\u1c4d-\u1c4f\u1c5a-\u1c7d\u1ce9-\u1cec\u1cee-\u1cf1\u1cf5\u1cf6\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u2071\u207f\u2090-\u209c\u2102\u2107\u210a-\u2113\u2115\u2119-\u211d\u2124\u2126\u2128\u212a-\u212d\u212f-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u2c00-\u2c2e\u2c30-\u2c5e\u2c60-\u2ce4\u2ceb-\u2cee\u2cf2\u2cf3\u2d00-\u2d25\u2d27\u2d2d\u2d30-\u2d67\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u2e2f\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303c\u3041-\u3096\u309d-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312d\u3131-\u318e\u31a0-\u31ba\u31f0-\u31ff\u3400-\u4db5\u4e00-\u9fcc\ua000-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua61f\ua62a\ua62b\ua640-\ua66e\ua67f-\ua697\ua6a0-\ua6ef\ua717-\ua71f\ua722-\ua788\ua78b-\ua78e\ua790-\ua793\ua7a0-\ua7aa\ua7f8-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8f2-\ua8f7\ua8fb\ua90a-\ua925\ua930-\ua946\ua960-\ua97c\ua984-\ua9b2\ua9cf\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uaa60-\uaa76\uaa7a\uaa80-\uaaaf\uaab1\uaab5\uaab6\uaab9-\uaabd\uaac0\uaac2\uaadb-\uaadd\uaae0-\uaaea\uaaf2-\uaaf4\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uabc0-\uabe2\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc"
 )
-_nonASCIIidentifierChars = six.u(
+_nonASCIIidentifierChars = (
     r"\u0300-\u036f\u0483-\u0487\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u0620-\u0649\u0672-\u06d3\u06e7-\u06e8\u06fb-\u06fc\u0730-\u074a\u0800-\u0814\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0840-\u0857\u08e4-\u08fe\u0900-\u0903\u093a-\u093c\u093e-\u094f\u0951-\u0957\u0962-\u0963\u0966-\u096f\u0981-\u0983\u09bc\u09be-\u09c4\u09c7\u09c8\u09d7\u09df-\u09e0\u0a01-\u0a03\u0a3c\u0a3e-\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a66-\u0a71\u0a75\u0a81-\u0a83\u0abc\u0abe-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0ae2-\u0ae3\u0ae6-\u0aef\u0b01-\u0b03\u0b3c\u0b3e-\u0b44\u0b47\u0b48\u0b4b-\u0b4d\u0b56\u0b57\u0b5f-\u0b60\u0b66-\u0b6f\u0b82\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd7\u0be6-\u0bef\u0c01-\u0c03\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62-\u0c63\u0c66-\u0c6f\u0c82\u0c83\u0cbc\u0cbe-\u0cc4\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5\u0cd6\u0ce2-\u0ce3\u0ce6-\u0cef\u0d02\u0d03\u0d46-\u0d48\u0d57\u0d62-\u0d63\u0d66-\u0d6f\u0d82\u0d83\u0dca\u0dcf-\u0dd4\u0dd6\u0dd8-\u0ddf\u0df2\u0df3\u0e34-\u0e3a\u0e40-\u0e45\u0e50-\u0e59\u0eb4-\u0eb9\u0ec8-\u0ecd\u0ed0-\u0ed9\u0f18\u0f19\u0f20-\u0f29\u0f35\u0f37\u0f39\u0f41-\u0f47\u0f71-\u0f84\u0f86-\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u1000-\u1029\u1040-\u1049\u1067-\u106d\u1071-\u1074\u1082-\u108d\u108f-\u109d\u135d-\u135f\u170e-\u1710\u1720-\u1730\u1740-\u1750\u1772\u1773\u1780-\u17b2\u17dd\u17e0-\u17e9\u180b-\u180d\u1810-\u1819\u1920-\u192b\u1930-\u193b\u1951-\u196d\u19b0-\u19c0\u19c8-\u19c9\u19d0-\u19d9\u1a00-\u1a15\u1a20-\u1a53\u1a60-\u1a7c\u1a7f-\u1a89\u1a90-\u1a99\u1b46-\u1b4b\u1b50-\u1b59\u1b6b-\u1b73\u1bb0-\u1bb9\u1be6-\u1bf3\u1c00-\u1c22\u1c40-\u1c49\u1c5b-\u1c7d\u1cd0-\u1cd2\u1d00-\u1dbe\u1e01-\u1f15\u200c\u200d\u203f\u2040\u2054\u20d0-\u20dc\u20e1\u20e5-\u20f0\u2d81-\u2d96\u2de0-\u2dff\u3021-\u3028\u3099\u309a\ua640-\ua66d\ua674-\ua67d\ua69f\ua6f0-\ua6f1\ua7f8-\ua800\ua806\ua80b\ua823-\ua827\ua880-\ua881\ua8b4-\ua8c4\ua8d0-\ua8d9\ua8f3-\ua8f7\ua900-\ua909\ua926-\ua92d\ua930-\ua945\ua980-\ua983\ua9b3-\ua9c0\uaa00-\uaa27\uaa40-\uaa41\uaa4c-\uaa4d\uaa50-\uaa59\uaa7b\uaae0-\uaae9\uaaf2-\uaaf3\uabc0-\uabe1\uabec\uabed\uabf0-\uabf9\ufb20-\ufb28\ufe00-\ufe0f\ufe20-\ufe26\ufe33\ufe34\ufe4d-\ufe4f\uff10-\uff19\uff3f"
 )
 # _nonASCIIidentifierStart = re.compile("[" + _nonASCIIidentifierStartChars + "]")
 # _nonASCIIidentifier = re.compile("[" + _nonASCIIidentifierStartChars + _nonASCIIidentifierChars + "]")
 
-_unicodeEscapeOrCodePoint = six.u(r"\\u[0-9a-fA-F]{4}|\\u\{[0-9a-fA-F]+\}")
+_unicodeEscapeOrCodePoint = 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(
-    six.u(r"[\u1680\u180e\u2000-\u200a\u202f\u205f\u3000\ufeff]")
+    r"[\u1680\u180e\u2000-\u200a\u202f\u205f\u3000\ufeff]"
 )
 
 # Whether a single character denotes a newline.
-# IMPORTANT: This string must be run through six to handle \u chars
-newline = re.compile(six.u(r"[\n\r\u2028\u2029]"))
+newline = re.compile(r"[\n\r\u2028\u2029]")
 
 # Matches a whole line break (where CRLF is considered a single
 # line break). Used to count lines.
 
 # in javascript, these two differ
 # in python they are the same, different methods are called on them
-# IMPORTANT: This string must be run through six to handle \u chars
-lineBreak = re.compile(six.u(r"\r\n|[\n\r\u2028\u2029]"))
+lineBreak = re.compile(r"\r\n|[\n\r\u2028\u2029]")
 allLineBreaks = lineBreak

python/jsbeautifier/javascript/tokenizer.py

@@ -131,15 +131,9 @@ class TokenizerPatterns(BaseTokenizerPatterns):
     def __init__(self, input_scanner, acorn, options):
         BaseTokenizerPatterns.__init__(self, input_scanner)
 
-        # This is not pretty, but given how we did the version import
-        # it is the only way to do this without having setup.py fail on a missing
-        # six dependency.
-        six = __import__("six")
-
-        # IMPORTANT: This string must be run through six to handle \u chars
         self.whitespace = self.whitespace.matching(
-            six.u(r"\u00A0\u1680\u180e\u2000-\u200a\u202f\u205f\u3000\ufeff"),
-            six.u(r"\u2028\u2029"),
+            r"\u00A0\u1680\u180e\u2000-\u200a\u202f\u205f\u3000\ufeff",
+            r"\u2028\u2029",
         )
 
         pattern = Pattern(input_scanner)
@@ -150,7 +144,7 @@ def __init__(self, input_scanner, acorn, options):
         )
         self.number = pattern.matching(number_pattern)
         self.punct = pattern.matching(punct_pattern)
-        self.comment = pattern.starting_with(r"//").until(six.u(r"[\n\r\u2028\u2029]"))
+        self.comment = pattern.starting_with(r"//").until(r"[\n\r\u2028\u2029]")
         self.block_comment = pattern.starting_with(r"/\*").until_after(r"\*/")
         self.html_comment_start = pattern.matching(r"<!--")
         self.html_comment_end = pattern.matching(r"-->")
@@ -159,8 +153,8 @@ def __init__(self, input_scanner, acorn, options):
 
         self.xml = pattern.matching(xmlRegExp)
 
-        self.single_quote = templatable.until(six.u(r"['\\\n\r\u2028\u2029]"))
-        self.double_quote = templatable.until(six.u(r'["\\\n\r\u2028\u2029]'))
+        self.single_quote = templatable.until(r"['\\\n\r\u2028\u2029]")
+        self.double_quote = templatable.until(r'["\\\n\r\u2028\u2029]')
         self.template_text = templatable.until(r"[`\\$]")
         self.template_expression = templatable.until(r"[`}\\]")
 
@@ -579,7 +573,7 @@ def unescape_string(self, s):
         #         return String.fromCharCode(parseInt(val, 16));
         #     })
         # However, dealing with '\xff', '\\xff', '\\\xff' makes this more fun.
-        out = self.acorn.six.u("")
+        out = ""
         escaped = 0
 
         input_scan = InputScanner(s)
@@ -630,6 +624,6 @@ def unescape_string(self, s):
                 # single-quote, apostrophe, backslash - escape these
                 out += "\\" + chr(escaped)
             else:
-                out += self.acorn.six.unichr(escaped)
+                out += chr(escaped)
 
         return out

python/jsbeautifier/unpackers/myobfuscate.py

@@ -31,14 +31,7 @@
 
 import re
 import base64
-
-# Python 2 retrocompatibility
-# pylint: disable=F0401
-# pylint: disable=E0611
-try:
-    from urllib import unquote
-except ImportError:
-    from urllib.parse import unquote
+from urllib.parse import unquote
 
 from jsbeautifier.unpackers import UnpackingError
 

python/jsbeautifier/unpackers/packer.py

@@ -66,10 +66,7 @@ def lookup(match):
         return symtab[unbase(word)] or word
 
     payload = payload.replace("\\\\", "\\").replace("\\'", "'")
-    if sys.version_info.major == 2:
-        source = re.sub(r"\b\w+\b", lookup, payload)
-    else:
-        source = re.sub(r"\b\w+\b", lookup, payload, flags=re.ASCII)
+    source = re.sub(r"\b\w+\b", lookup, payload, flags=re.ASCII)
     return _replacestrings(source)
 
 
@@ -115,7 +112,7 @@ def _replacestrings(source):
     return beginstr + source + endstr
 
 
-class Unbaser(object):
+class Unbaser:
     """Functor for a given base. Will efficiently convert
     strings to natural numbers."""
 
@@ -142,9 +139,9 @@ def __init__(self, base):
         else:
             # Build conversion dictionary cache
             try:
-                self.dictionary = dict(
-                    (cipher, index) for index, cipher in enumerate(self.ALPHABET[base])
-                )
+                self.dictionary = {
+                    cipher: index for index, cipher in enumerate(self.ALPHABET[base])
+                }
             except KeyError:
                 raise TypeError("Unsupported base encoding.")