mirror of
https://github.com/beautifier/js-beautify.git
synced 2024-11-27 06:30:32 +00:00
Python cleanup
This commit is contained in:
Liam Newman
parent
0762d5108e
commit
9fb8d25496
@ -102,7 +102,7 @@ def set_file_editorconfig_opts(filename, js_options):
|
|||||||
elif _ecoptions["end_of_line"] == "crlf":
|
elif _ecoptions["end_of_line"] == "crlf":
|
||||||
js_options.eol = '\r\n'
|
js_options.eol = '\r\n'
|
||||||
|
|
||||||
except EditorConfigError as ex:
|
except EditorConfigError:
|
||||||
# do not error on bad editor config
|
# do not error on bad editor config
|
||||||
print("Error loading EditorConfig. Ignoring.", file=sys.stderr)
|
print("Error loading EditorConfig. Ignoring.", file=sys.stderr)
|
||||||
|
|
||||||
@ -116,10 +116,10 @@ def beautify_file(file_name, opts = default_options() ):
|
|||||||
|
|
||||||
stream = sys.stdin
|
stream = sys.stdin
|
||||||
input_string = ''.join(stream.readlines())
|
input_string = ''.join(stream.readlines())
|
||||||
except Exception as ex:
|
except Exception:
|
||||||
print("Must pipe input or define at least one file.\n", file=sys.stderr)
|
print("Must pipe input or define at least one file.\n", file=sys.stderr)
|
||||||
usage(sys.stderr)
|
usage(sys.stderr)
|
||||||
raise Exception()
|
raise
|
||||||
else:
|
else:
|
||||||
stream = io.open(file_name, 'rt', newline='')
|
stream = io.open(file_name, 'rt', newline='')
|
||||||
input_string = ''.join(stream.readlines())
|
input_string = ''.join(stream.readlines())
|
||||||
|
|||||||
@ -22,11 +22,11 @@ six = __import__("six")
|
|||||||
# are only applied when a character is found to actually have a
|
# are only applied when a character is found to actually have a
|
||||||
# code point above 128.
|
# code point above 128.
|
||||||
|
|
||||||
_nonASCIIwhitespace = re.compile(six.u("[\u1680\u180e\u2000-\u200a\u202f\u205f\u3000\ufeff]"))
|
_nonASCIIwhitespace = re.compile(six.u(r"[\u1680\u180e\u2000-\u200a\u202f\u205f\u3000\ufeff]"))
|
||||||
_baseASCIIidentifierStartChars = six.u("\x24\x40\x41-\x5a\x5f\x61-\x7a")
|
_baseASCIIidentifierStartChars = six.u(r"\x24\x40\x41-\x5a\x5f\x61-\x7a")
|
||||||
_nonASCIIidentifierStartChars = six.u("\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")
|
_nonASCIIidentifierStartChars = six.u(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")
|
||||||
_baseASCIIidentifierChars = six.u("\x24\x30-\x39\x41-\x5a\x5f\x61-\x7a")
|
_baseASCIIidentifierChars = six.u(r"\x24\x30-\x39\x41-\x5a\x5f\x61-\x7a")
|
||||||
_nonASCIIidentifierChars = six.u("\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")
|
_nonASCIIidentifierChars = six.u(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 + "]")
|
#_nonASCIIidentifierStart = re.compile("[" + _nonASCIIidentifierStartChars + "]")
|
||||||
#_nonASCIIidentifier = re.compile("[" + _nonASCIIidentifierStartChars + _nonASCIIidentifierChars + "]")
|
#_nonASCIIidentifier = re.compile("[" + _nonASCIIidentifierStartChars + _nonASCIIidentifierChars + "]")
|
||||||
|
|
||||||
@ -37,14 +37,14 @@ identifier = re.compile("[" + _baseASCIIidentifierStartChars + _nonASCIIidentif
|
|||||||
|
|
||||||
# Whether a single character denotes a newline.
|
# Whether a single character denotes a newline.
|
||||||
|
|
||||||
newline = re.compile(six.u("[\n\r\u2028\u2029]"))
|
newline = re.compile(six.u(r"[\n\r\u2028\u2029]"))
|
||||||
|
|
||||||
# Matches a whole line break (where CRLF is considered a single
|
# Matches a whole line break (where CRLF is considered a single
|
||||||
# line break). Used to count lines.
|
# line break). Used to count lines.
|
||||||
|
|
||||||
# in javascript, these two differ
|
# in javascript, these two differ
|
||||||
# in python they are the same, different methods are called on them
|
# in python they are the same, different methods are called on them
|
||||||
lineBreak = re.compile(six.u("\r\n|[\n\r\u2028\u2029]"))
|
lineBreak = re.compile(six.u(r"\r\n|[\n\r\u2028\u2029]"))
|
||||||
allLineBreaks = lineBreak
|
allLineBreaks = lineBreak
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -42,7 +42,7 @@ class OutputLine:
|
|||||||
|
|
||||||
def set_indent(self, level):
|
def set_indent(self, level):
|
||||||
self.__character_count = self.__parent.baseIndentLength + level * self.__parent.indent_length
|
self.__character_count = self.__parent.baseIndentLength + level * self.__parent.indent_length
|
||||||
self.__indent_count = level;
|
self.__indent_count = level
|
||||||
|
|
||||||
def last(self):
|
def last(self):
|
||||||
if not self.is_empty():
|
if not self.is_empty():
|
||||||
@ -71,7 +71,7 @@ class OutputLine:
|
|||||||
|
|
||||||
def trim(self):
|
def trim(self):
|
||||||
while self.last() == ' ':
|
while self.last() == ' ':
|
||||||
item = self._items.pop()
|
self.__items.pop()
|
||||||
self.__character_count -= 1
|
self.__character_count -= 1
|
||||||
self.__empty = len(self.__items) == 0
|
self.__empty = len(self.__items) == 0
|
||||||
|
|
||||||
|
|||||||
@ -74,7 +74,7 @@ OPERATOR_POSITION = {
|
|||||||
'after_newline': 'after-newline',
|
'after_newline': 'after-newline',
|
||||||
'preserve_newline': 'preserve-newline'
|
'preserve_newline': 'preserve-newline'
|
||||||
}
|
}
|
||||||
OPERATOR_POSITION_BEFORE_OR_PRESERVE = [OPERATOR_POSITION['before_newline'], OPERATOR_POSITION['preserve_newline']];
|
OPERATOR_POSITION_BEFORE_OR_PRESERVE = [OPERATOR_POSITION['before_newline'], OPERATOR_POSITION['preserve_newline']]
|
||||||
|
|
||||||
def sanitizeOperatorPosition(opPosition):
|
def sanitizeOperatorPosition(opPosition):
|
||||||
if not opPosition:
|
if not opPosition:
|
||||||
@ -158,7 +158,7 @@ class Beautifier:
|
|||||||
|
|
||||||
self.output = Output(self.indent_string, self.baseIndentString)
|
self.output = Output(self.indent_string, self.baseIndentString)
|
||||||
# If testing the ignore directive, start with output disable set to true
|
# If testing the ignore directive, start with output disable set to true
|
||||||
self.output.raw = self.opts.test_output_raw;
|
self.output.raw = self.opts.test_output_raw
|
||||||
|
|
||||||
self.set_mode(MODE.BlockStatement)
|
self.set_mode(MODE.BlockStatement)
|
||||||
return js_source_text
|
return js_source_text
|
||||||
@ -176,7 +176,7 @@ class Beautifier:
|
|||||||
self.opts.brace_style = 'collapse,preserve-inline'
|
self.opts.brace_style = 'collapse,preserve-inline'
|
||||||
|
|
||||||
#split always returns at least one value
|
#split always returns at least one value
|
||||||
split = re.compile("[^a-zA-Z0-9_\-]+").split(self.opts.brace_style)
|
split = re.compile(r"[^a-zA-Z0-9_\-]+").split(self.opts.brace_style)
|
||||||
#preserve-inline in delimited string will trigger brace_preserve_inline
|
#preserve-inline in delimited string will trigger brace_preserve_inline
|
||||||
#Everything else is considered a brace_style and the last one only will
|
#Everything else is considered a brace_style and the last one only will
|
||||||
#have an effect
|
#have an effect
|
||||||
@ -264,7 +264,7 @@ class Beautifier:
|
|||||||
import jsbeautifier.unpackers as unpackers
|
import jsbeautifier.unpackers as unpackers
|
||||||
try:
|
try:
|
||||||
return unpackers.run(source, evalcode)
|
return unpackers.run(source, evalcode)
|
||||||
except unpackers.UnpackingError as error:
|
except unpackers.UnpackingError:
|
||||||
return source
|
return source
|
||||||
|
|
||||||
def is_special_word(self, s):
|
def is_special_word(self, s):
|
||||||
@ -354,7 +354,7 @@ class Beautifier:
|
|||||||
s = current_token.text
|
s = current_token.text
|
||||||
|
|
||||||
self.print_token_line_indentation(current_token)
|
self.print_token_line_indentation(current_token)
|
||||||
self.output.add_token(s);
|
self.output.add_token(s)
|
||||||
|
|
||||||
|
|
||||||
def indent(self):
|
def indent(self):
|
||||||
@ -375,7 +375,7 @@ class Beautifier:
|
|||||||
|
|
||||||
self.flags = BeautifierFlags(mode)
|
self.flags = BeautifierFlags(mode)
|
||||||
self.flags.apply_base(self.previous_flags, self.output.just_added_newline())
|
self.flags.apply_base(self.previous_flags, self.output.just_added_newline())
|
||||||
self.flags.start_line_index = self.output.get_line_number();
|
self.flags.start_line_index = self.output.get_line_number()
|
||||||
|
|
||||||
def restore_mode(self):
|
def restore_mode(self):
|
||||||
if len(self.flag_store) > 0:
|
if len(self.flag_store) > 0:
|
||||||
@ -409,7 +409,7 @@ class Beautifier:
|
|||||||
self.set_mode(MODE.Statement)
|
self.set_mode(MODE.Statement)
|
||||||
self.indent()
|
self.indent()
|
||||||
|
|
||||||
self.handle_whitespace_and_comments(current_token, True);
|
self.handle_whitespace_and_comments(current_token, True)
|
||||||
|
|
||||||
# Issue #276:
|
# Issue #276:
|
||||||
# If starting a new statement with [if, for, while, do], push to a new line.
|
# If starting a new statement with [if, for, while, do], push to a new line.
|
||||||
@ -643,7 +643,7 @@ class Beautifier:
|
|||||||
empty_braces = self.last_type == TOKEN.START_BLOCK
|
empty_braces = self.last_type == TOKEN.START_BLOCK
|
||||||
|
|
||||||
if self.flags.inline_frame and not empty_braces: # try inline_frame (only set if opt.braces-preserve-inline) first
|
if self.flags.inline_frame and not empty_braces: # try inline_frame (only set if opt.braces-preserve-inline) first
|
||||||
self.output.space_before_token = True;
|
self.output.space_before_token = True
|
||||||
elif self.opts.brace_style == 'expand':
|
elif self.opts.brace_style == 'expand':
|
||||||
if not empty_braces:
|
if not empty_braces:
|
||||||
self.print_newline()
|
self.print_newline()
|
||||||
|
|||||||
@ -53,10 +53,10 @@ TOKEN = TokenTypes()
|
|||||||
class Tokenizer:
|
class Tokenizer:
|
||||||
|
|
||||||
number_pattern = re.compile(r'0[xX][0123456789abcdefABCDEF]*|0[oO][01234567]*|0[bB][01]*|\d+n|(?:\.\d+|\d+\.?\d*)(?:[eE][+-]?\d+)?')
|
number_pattern = re.compile(r'0[xX][0123456789abcdefABCDEF]*|0[oO][01234567]*|0[bB][01]*|\d+n|(?:\.\d+|\d+\.?\d*)(?:[eE][+-]?\d+)?')
|
||||||
digit = re.compile('[0-9]')
|
digit = re.compile(r'[0-9]')
|
||||||
|
|
||||||
startXmlRegExp = re.compile('<()([-a-zA-Z:0-9_.]+|{[\s\S]+?}|!\[CDATA\[[\s\S]*?\]\])(\s+{[\s\S]+?}|\s+[-a-zA-Z:0-9_.]+|\s+[-a-zA-Z:0-9_.]+\s*=\s*(\'[^\']*\'|"[^"]*"|{[\s\S]+?}))*\s*(/?)\s*>')
|
startXmlRegExp = re.compile(r'<()([-a-zA-Z:0-9_.]+|{[\s\S]+?}|!\[CDATA\[[\s\S]*?\]\])(\s+{[\s\S]+?}|\s+[-a-zA-Z:0-9_.]+|\s+[-a-zA-Z:0-9_.]+\s*=\s*(\'[^\']*\'|"[^"]*"|{[\s\S]+?}))*\s*(/?)\s*>')
|
||||||
xmlRegExp = re.compile('[\s\S]*?<(\/?)([-a-zA-Z:0-9_.]+|{[\s\S]+?}|!\[CDATA\[[\s\S]*?\]\])(\s+{[\s\S]+?}|\s+[-a-zA-Z:0-9_.]+|\s+[-a-zA-Z:0-9_.]+\s*=\s*(\'[^\']*\'|"[^"]*"|{[\s\S]+?}))*\s*(/?)\s*>')
|
xmlRegExp = re.compile(r'[\s\S]*?<(\/?)([-a-zA-Z:0-9_.]+|{[\s\S]+?}|!\[CDATA\[[\s\S]*?\]\])(\s+{[\s\S]+?}|\s+[-a-zA-Z:0-9_.]+|\s+[-a-zA-Z:0-9_.]+\s*=\s*(\'[^\']*\'|"[^"]*"|{[\s\S]+?}))*\s*(/?)\s*>')
|
||||||
|
|
||||||
positionable_operators = '!= !== % & && * ** + - / : < << <= == === > >= >> >>> ? ^ | ||'.split(' ')
|
positionable_operators = '!= !== % & && * ** + - / : < << <= == === > >= >> >>> ? ^ | ||'.split(' ')
|
||||||
punct = (positionable_operators +
|
punct = (positionable_operators +
|
||||||
@ -75,19 +75,19 @@ class Tokenizer:
|
|||||||
self.opts = opts
|
self.opts = opts
|
||||||
self.indent_string = indent_string
|
self.indent_string = indent_string
|
||||||
# /* ... */ comment ends with nearest */ or end of file
|
# /* ... */ comment ends with nearest */ or end of file
|
||||||
self.block_comment_pattern = re.compile('([\s\S]*?)((?:\*\/)|$)')
|
self.block_comment_pattern = re.compile(r'([\s\S]*?)((?:\*\/)|$)')
|
||||||
|
|
||||||
# comment ends just before nearest linefeed or end of file
|
# comment ends just before nearest linefeed or end of file
|
||||||
self.comment_pattern = re.compile(self.acorn.six.u('([^\n\r\u2028\u2029]*)'))
|
self.comment_pattern = re.compile(self.acorn.six.u(r'([^\n\r\u2028\u2029]*)'))
|
||||||
|
|
||||||
self.directives_block_pattern = re.compile('\/\* beautify( \w+[:]\w+)+ \*\/')
|
self.directives_block_pattern = re.compile(r'\/\* beautify( \w+[:]\w+)+ \*\/')
|
||||||
self.directive_pattern = re.compile(' (\w+)[:](\w+)')
|
self.directive_pattern = re.compile(r' (\w+)[:](\w+)')
|
||||||
self.directives_end_ignore_pattern = re.compile('([\s\S]*?)((?:\/\*\sbeautify\signore:end\s\*\/)|$)')
|
self.directives_end_ignore_pattern = re.compile(r'([\s\S]*?)((?:\/\*\sbeautify\signore:end\s\*\/)|$)')
|
||||||
|
|
||||||
self.template_pattern = re.compile('((<\?php|<\?=)[\s\S]*?\?>)|(<%[\s\S]*?%>)')
|
self.template_pattern = re.compile(r'((<\?php|<\?=)[\s\S]*?\?>)|(<%[\s\S]*?%>)')
|
||||||
|
|
||||||
self.whitespacePattern = re.compile(self.acorn.six.u('[\n\r\u2028\u2029\t ]+'))
|
self.whitespacePattern = re.compile(self.acorn.six.u(r'[\n\r\u2028\u2029\t ]+'))
|
||||||
self.newlinePattern = re.compile(self.acorn.six.u('([\t ]*)(\r\n|[\n\r\u2028\u2029])?'))
|
self.newlinePattern = re.compile(self.acorn.six.u(r'([\t ]*)(\r\n|[\n\r\u2028\u2029])?'))
|
||||||
|
|
||||||
def tokenize(self):
|
def tokenize(self):
|
||||||
self.in_html_comment = False
|
self.in_html_comment = False
|
||||||
@ -95,7 +95,7 @@ class Tokenizer:
|
|||||||
|
|
||||||
next = None
|
next = None
|
||||||
last = None
|
last = None
|
||||||
open = None
|
open_token = None
|
||||||
open_stack = []
|
open_stack = []
|
||||||
comments = []
|
comments = []
|
||||||
|
|
||||||
@ -117,16 +117,16 @@ class Tokenizer:
|
|||||||
|
|
||||||
if next.type == TOKEN.START_BLOCK or next.type == TOKEN.START_EXPR:
|
if next.type == TOKEN.START_BLOCK or next.type == TOKEN.START_EXPR:
|
||||||
next.parent = last
|
next.parent = last
|
||||||
open_stack.append(open)
|
open_stack.append(open_token)
|
||||||
open = next
|
open_token = next
|
||||||
elif (next.type == TOKEN.END_BLOCK or next.type == TOKEN.END_EXPR) and \
|
elif (next.type == TOKEN.END_BLOCK or next.type == TOKEN.END_EXPR) and \
|
||||||
(not open == None and ( \
|
(not open_token == None and ( \
|
||||||
(next.text == ']' and open.text == '[') or \
|
(next.text == ']' and open_token.text == '[') or \
|
||||||
(next.text == ')' and open.text == '(') or \
|
(next.text == ')' and open_token.text == '(') or \
|
||||||
(next.text == '}' and open.text == '{'))):
|
(next.text == '}' and open_token.text == '{'))):
|
||||||
next.parent = open.parent
|
next.parent = open_token.parent
|
||||||
next.opened = open
|
next.opened = open_token
|
||||||
open = open_stack.pop()
|
open_token = open_stack.pop()
|
||||||
|
|
||||||
self.tokens.append(next)
|
self.tokens.append(next)
|
||||||
last = next
|
last = next
|
||||||
@ -240,8 +240,6 @@ class Tokenizer:
|
|||||||
|
|
||||||
sep = c
|
sep = c
|
||||||
esc = False
|
esc = False
|
||||||
esc1 = 0
|
|
||||||
esc2 = 0
|
|
||||||
resulting_string = c
|
resulting_string = c
|
||||||
in_char_class = False
|
in_char_class = False
|
||||||
|
|
||||||
@ -337,7 +335,7 @@ class Tokenizer:
|
|||||||
|
|
||||||
# if we didn't close correctly, keep unformatted.
|
# if we didn't close correctly, keep unformatted.
|
||||||
if not match:
|
if not match:
|
||||||
xmlStr += self.input.match(re.compile('[\s\S]*')).group(0)
|
xmlStr += self.input.match(re.compile(r'[\s\S]*')).group(0)
|
||||||
|
|
||||||
xmlStr = re.sub(self.acorn.allLineBreaks, '\n', xmlStr)
|
xmlStr = re.sub(self.acorn.allLineBreaks, '\n', xmlStr)
|
||||||
return xmlStr, TOKEN.STRING
|
return xmlStr, TOKEN.STRING
|
||||||
@ -400,7 +398,7 @@ class Tokenizer:
|
|||||||
return c, TOKEN.STRING
|
return c, TOKEN.STRING
|
||||||
|
|
||||||
|
|
||||||
if c == '<' and self.input.match(re.compile('\!--')):
|
if c == '<' and self.input.match(re.compile(r'\!--')):
|
||||||
c = '<!--'
|
c = '<!--'
|
||||||
while self.input.hasNext() and not self.input.testChar(self.acorn.newline):
|
while self.input.hasNext() and not self.input.testChar(self.acorn.newline):
|
||||||
c += self.input.next()
|
c += self.input.next()
|
||||||
@ -459,9 +457,9 @@ class Tokenizer:
|
|||||||
|
|
||||||
input_scan.next()
|
input_scan.next()
|
||||||
if input_scan.peek() == 'x':
|
if input_scan.peek() == 'x':
|
||||||
matched = input_scan.match(re.compile('x([0-9A-Fa-f]{2})'))
|
matched = input_scan.match(re.compile(r'x([0-9A-Fa-f]{2})'))
|
||||||
elif input_scan.peek() == 'u':
|
elif input_scan.peek() == 'u':
|
||||||
matched = input_scan.match(re.compile('u([0-9A-Fa-f]{4})'));
|
matched = input_scan.match(re.compile(r'u([0-9A-Fa-f]{4})'))
|
||||||
else:
|
else:
|
||||||
out += '\\'
|
out += '\\'
|
||||||
if input_scan.hasNext():
|
if input_scan.hasNext():
|
||||||
|
|||||||
@ -8,7 +8,7 @@ class TestInputScanner(unittest.TestCase):
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
def test_new(self):
|
def test_new(self):
|
||||||
inputscanner = InputScanner()
|
inputscanner = InputScanner(None)
|
||||||
self.assertEqual(inputscanner.hasNext(), False)
|
self.assertEqual(inputscanner.hasNext(), False)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1,3 +1,4 @@
|
|||||||
|
from __future__ import print_function
|
||||||
import sys
|
import sys
|
||||||
import jsbeautifier
|
import jsbeautifier
|
||||||
|
|
||||||
@ -11,10 +12,10 @@ def test_str(str, expected):
|
|||||||
global fails
|
global fails
|
||||||
res = jsbeautifier.beautify(str, opts)
|
res = jsbeautifier.beautify(str, opts)
|
||||||
if(res == expected):
|
if(res == expected):
|
||||||
print "."
|
print(".")
|
||||||
return True
|
return True
|
||||||
else:
|
else:
|
||||||
print "___got:" + res + "\n___expected:" + expected + "\n"
|
print("___got:" + res + "\n___expected:" + expected + "\n")
|
||||||
fails = fails + 1
|
fails = fails + 1
|
||||||
return False
|
return False
|
||||||
|
|
||||||
@ -24,7 +25,7 @@ expected = "var str = \"Visit W3Schools!\";\nvar n = str.search(/w3Schools/i);\n
|
|||||||
res = test_str(str, expected)
|
res = test_str(str, expected)
|
||||||
|
|
||||||
str = "a=b;\r\nwhile(1){\ng=h;{return'\\w+'};break;eval(function(p,a,c,k,e,d){e=function(c){return c.toString(36)};if(!''.replace(/^/,String)){while(c--){d[c.toString(a)]=k[c]||c.toString(a)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('$(5).4(3(){$(\'.1\').0(2);$(\'.6\').0(d);$(\'.7\').0(b);$(\'.a\').0(8);$(\'.9\').0(c)});',14,14,'html|r5e57|8080|function|ready|document|r1655|rc15b|8888|r39b0|r6ae9|3128|65309|80'.split('|'),0,{}))c=abx;"
|
str = "a=b;\r\nwhile(1){\ng=h;{return'\\w+'};break;eval(function(p,a,c,k,e,d){e=function(c){return c.toString(36)};if(!''.replace(/^/,String)){while(c--){d[c.toString(a)]=k[c]||c.toString(a)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('$(5).4(3(){$(\'.1\').0(2);$(\'.6\').0(d);$(\'.7\').0(b);$(\'.a\').0(8);$(\'.9\').0(c)});',14,14,'html|r5e57|8080|function|ready|document|r1655|rc15b|8888|r39b0|r6ae9|3128|65309|80'.split('|'),0,{}))c=abx;"
|
||||||
expected = "a = b;\nwhile (1) {\n g = h; {\n return '\w+'\n };\n break;\n $(document).ready(function() {\n $('.r5e57').html(8080);\n $('.r1655').html(80);\n $('.rc15b').html(3128);\n $('.r6ae9').html(8888);\n $('.r39b0').html(65309)\n });\n c = abx;"
|
expected = "a = b;\nwhile (1) {\n g = h; {\n return '\\w+'\n };\n break;\n $(document).ready(function() {\n $('.r5e57').html(8080);\n $('.r1655').html(80);\n $('.rc15b').html(3128);\n $('.r6ae9').html(8888);\n $('.r39b0').html(65309)\n });\n c = abx;"
|
||||||
|
|
||||||
res = test_str(str, expected)
|
res = test_str(str, expected)
|
||||||
|
|
||||||
@ -34,4 +35,4 @@ expected = "$(document).ready(function() {\n $(\'.r8ce6\').html(52136);\n
|
|||||||
res = test_str(str, expected)
|
res = test_str(str, expected)
|
||||||
|
|
||||||
if (fails == 0):
|
if (fails == 0):
|
||||||
print "OK"
|
print("OK")
|
||||||
|
|||||||
@ -106,7 +106,7 @@ class Unbaser(object):
|
|||||||
ALPHABET = {
|
ALPHABET = {
|
||||||
62: '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ',
|
62: '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ',
|
||||||
95: (' !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ'
|
95: (' !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ'
|
||||||
'[\]^_`abcdefghijklmnopqrstuvwxyz{|}~')
|
'[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~')
|
||||||
}
|
}
|
||||||
|
|
||||||
def __init__(self, base):
|
def __init__(self, base):
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user