changeset:   95864:b32ca610c9e6
branch:      2.7
parent:      95850:5d356223f075
user:        Serhiy Storchaka <storchaka@gmail.com>
date:        Sun May 03 15:35:02 2015 +0300
files:       Misc/NEWS Tools/scripts/h2py.py
description:
Issue #23330: h2py now supports arbitrary filenames in #include.


diff -r 5d356223f075 -r b32ca610c9e6 Misc/NEWS
--- a/Misc/NEWS	Sat May 02 15:09:22 2015 -0400
+++ b/Misc/NEWS	Sun May 03 15:35:02 2015 +0300
@@ -210,6 +210,8 @@
 Tools/Demos
 -----------
 
+- Issue #23330: h2py now supports arbitrary filenames in #include.
+
 - Issue #6639: Module-level turtle functions no longer raise TclError after
   closing the window.
 
diff -r 5d356223f075 -r b32ca610c9e6 Tools/scripts/h2py.py
--- a/Tools/scripts/h2py.py	Sat May 02 15:09:22 2015 -0400
+++ b/Tools/scripts/h2py.py	Sun May 03 15:35:02 2015 +0300
@@ -29,7 +29,7 @@
   '^[\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('//.*')