Yaltik/hy
2
0
Fork 0
Code Pull Requests Releases Activity

Merge pull request #1691 from jwilk-forks/isidentifier

Browse Source 
Catch IndentationError in isidentifier()
This commit is contained in:
Kodi Arfer 2018-11-27 17:23:57 -05:00 committed by GitHub
commit 3e0112f362
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS.rst
View File

@ -30,6 +30,7 @@ Bug Fixes
objects. objects.
* Fixed errors from `from __future__ import ...` statements and missing Hy * Fixed errors from `from __future__ import ...` statements and missing Hy
module docstrings caused by automatic importing of Hy builtins. module docstrings caused by automatic importing of Hy builtins.
* Fixed crash in `mangle` for some pathological inputs
0.15.0 0.15.0
============================== ==============================

2
hy/_compat.py
View File

@ -45,7 +45,7 @@ def isidentifier(x):
from io import StringIO from io import StringIO
try: try:
tokens = list(T.generate_tokens(StringIO(x).readline)) tokens = list(T.generate_tokens(StringIO(x).readline))
except T.TokenError: except (T.TokenError, IndentationError):
return False return False
return len(tokens) == 2 and tokens[0][0] == T.NAME return len(tokens) == 2 and tokens[0][0] == T.NAME

4
tests/native_tests/mangling.hy
View File

@ -157,3 +157,7 @@
["⚘-⚘" "hyx_XflowerX_XflowerX"]]] ["⚘-⚘" "hyx_XflowerX_XflowerX"]]]
(assert (= (mangle a) b)) (assert (= (mangle a) b))
(assert (= (unmangle b) a)))) (assert (= (unmangle b) a))))
(defn test-mangle-bad-indent []
; Shouldn't crash with IndentationError
(mangle " 0\n 0"))