[Python-checkins] cpython (merge 3.4 -> default): Issue #23330: h2py now supports arbitrary filenames in #include.

[serhiy.storchaka]

https://hg.python.org/cpython/rev/f49e7e315d65
changeset:   95866:f49e7e315d65
parent:      95863:eb6052605fd8
parent:      95865:0079465a9425
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Sun May 03 15:36:37 2015 +0300
summary:
  Issue #23330: h2py now supports arbitrary filenames in #include.

files:
  Misc/NEWS             |  3 +++
  Tools/scripts/h2py.py |  2 +-
  2 files changed, 4 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -65,8 +65,11 @@
 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
--- a/Tools/scripts/h2py.py
+++ b/Tools/scripts/h2py.py
@@ -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('//.*')

-- 
Repository URL: https://hg.python.org/cpython