summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2015-05-03 12:35:14 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2015-05-03 12:35:14 (GMT)
commitb9c04db64fd0315a30c4360d7ad33b975d5fbfc1 (patch)
tree6808962bfec78dbf717d903a2893984b3988e3dd
parent122f4b1bda8262ace6aa021935e8c605a17c3748 (diff)
downloadcpython-b9c04db64fd0315a30c4360d7ad33b975d5fbfc1.zip
cpython-b9c04db64fd0315a30c4360d7ad33b975d5fbfc1.tar.gz
cpython-b9c04db64fd0315a30c4360d7ad33b975d5fbfc1.tar.bz2
Issue #23330: h2py now supports arbitrary filenames in #include.
-rw-r--r--Misc/NEWS3
-rwxr-xr-xTools/scripts/h2py.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index b0a87a7..b787c84 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -254,8 +254,11 @@ Documentation
Tools/Demos
-----------
+- Issue #23330: h2py now supports arbitrary filenames in #include.
+
- Issue #24031: make patchcheck now supports git checkouts, too.
+
What's New in Python 3.4.3?
===========================
diff --git a/Tools/scripts/h2py.py b/Tools/scripts/h2py.py
index 4f871d9..0967fc2 100755
--- a/Tools/scripts/h2py.py
+++ b/Tools/scripts/h2py.py
@@ -29,7 +29,7 @@ p_macro = re.compile(
'^[\t ]*#[\t ]*define[\t ]+'
'([a-zA-Z0-9_]+)\(([_a-zA-Z][_a-zA-Z0-9]*)\)[\t ]+')
-p_include = re.compile('^[\t ]*#[\t ]*include[\t ]+<([a-zA-Z0-9_/\.]+)')
+p_include = re.compile('^[\t ]*#[\t ]*include[\t ]+<([^>\n]+)>')
p_comment = re.compile(r'/\*([^*]+|\*+[^/])*(\*+/)?')
p_cpp_comment = re.compile('//.*')