summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2015-05-03 12:36:37 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2015-05-03 12:36:37 (GMT)
commitd2a694c1bef8ead810c5973ca806a6e63f7ebd4c (patch)
treedadf33fbb11914faae44c4fc8fbc0c36bed8f6bf
parent24559e483400073c6ae1446c0ac2a7990c755f02 (diff)
parentb9c04db64fd0315a30c4360d7ad33b975d5fbfc1 (diff)
downloadcpython-d2a694c1bef8ead810c5973ca806a6e63f7ebd4c.zip
cpython-d2a694c1bef8ead810c5973ca806a6e63f7ebd4c.tar.gz
cpython-d2a694c1bef8ead810c5973ca806a6e63f7ebd4c.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 f2a8594..7aa596f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -65,8 +65,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.5.0 alpha 4?
===================================
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('//.*')