Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2019-06-07 19:02:55 +03:00
parent f3de2b4be7 254f88f805
commit ddcf388270
43 changed files with 446 additions and 112 deletions
@@ -827,7 +827,7 @@ class CppHeaderParser(object):
            if state == DOCSTRING:
                pos = l.find("*/")
                if pos < 0:
-                    docstring += l + "\n"
+                    docstring += l0
                    continue
                docstring += l[:pos] + "\n"
                l = l[pos+2:]