|
 |
b289ab4 |
diff --git a/doc/include_anchors.py b/doc/include_anchors.py
|
|
|
b289ab4 |
--- a/doc/include_anchors.py
|
|
|
b289ab4 |
+++ b/doc/include_anchors.py
|
|
|
b289ab4 |
@@ -13,12 +13,12 @@
|
|
|
b289ab4 |
import os
|
|
|
b289ab4 |
|
|
|
b289ab4 |
|
|
|
b289ab4 |
-pat1a = re.compile('include::([a-zA-Z0-9_\.\-/\/]+\/)\.([^\_]+)\_[a-zA-Z0-9]*\.py\[\]')
|
|
|
b289ab4 |
-pat1b = re.compile('include::([a-zA-Z0-9_\.\-/\/]+\/)\.([^\_]+)\_[a-zA-Z0-9]*\.sh\[\]')
|
|
|
b289ab4 |
-pat1c = re.compile('include::([a-zA-Z0-9_\.\-/\/]+\/)\.([^\_]+)\_[a-zA-Z0-9]*\.h\[\]')
|
|
|
b289ab4 |
-pat1d = re.compile('include::([a-zA-Z0-9_\.\-/\/]+\/)\.([^\_]+)\_[a-zA-Z0-9]*\.cpp\[\]')
|
|
|
b289ab4 |
-pat2 = re.compile('([^@]+)@([a-zA-Z0-9]+):')
|
|
|
b289ab4 |
-pat3 = re.compile('([^@]+)@:([a-zA-Z0-9]+)')
|
|
|
b289ab4 |
+pat1a = re.compile(r'include::([a-zA-Z0-9_\.\-/\/]+\/)\.([^\_]+)\_[a-zA-Z0-9]*\.py\[\]')
|
|
|
b289ab4 |
+pat1b = re.compile(r'include::([a-zA-Z0-9_\.\-/\/]+\/)\.([^\_]+)\_[a-zA-Z0-9]*\.sh\[\]')
|
|
|
b289ab4 |
+pat1c = re.compile(r'include::([a-zA-Z0-9_\.\-/\/]+\/)\.([^\_]+)\_[a-zA-Z0-9]*\.h\[\]')
|
|
|
b289ab4 |
+pat1d = re.compile(r'include::([a-zA-Z0-9_\.\-/\/]+\/)\.([^\_]+)\_[a-zA-Z0-9]*\.cpp\[\]')
|
|
|
b289ab4 |
+pat2 = re.compile(r'([^@]+)@([a-zA-Z0-9]+):')
|
|
|
b289ab4 |
+pat3 = re.compile(r'([^@]+)@:([a-zA-Z0-9]+)')
|
|
|
b289ab4 |
|
|
|
b289ab4 |
processed = set()
|
|
|
b289ab4 |
|
|
|
b289ab4 |
@@ -44,18 +44,18 @@
|
|
|
b289ab4 |
del anchors[anchor]
|
|
|
b289ab4 |
else:
|
|
|
b289ab4 |
for anchor in anchors:
|
|
|
b289ab4 |
- os.write(anchors[anchor].fileno(), line)
|
|
|
b289ab4 |
+ os.write(anchors[anchor].fileno(), bytearray(line, 'utf-8'))
|
|
|
b289ab4 |
INPUT.close()
|
|
|
b289ab4 |
for anchor in anchors:
|
|
|
b289ab4 |
if anchor != '':
|
|
|
b289ab4 |
- print "ERROR: anchor '%s' did not terminate" % anchor
|
|
|
b289ab4 |
+ print("ERROR: anchor '%s' did not terminate" % anchor)
|
|
|
b289ab4 |
anchors[anchor].close()
|
|
|
b289ab4 |
#
|
|
|
b289ab4 |
processed.add(bname)
|
|
|
b289ab4 |
|
|
|
b289ab4 |
|
|
|
b289ab4 |
for file in sys.argv[1:]:
|
|
|
b289ab4 |
- print "Processing file '%s' ..." % file
|
|
|
b289ab4 |
+ print("Processing file '%s' ..." % file)
|
|
|
b289ab4 |
INPUT = open(file, 'r')
|
|
|
b289ab4 |
for line in INPUT:
|
|
|
b289ab4 |
suffix = None
|
|
|
b289ab4 |
@@ -82,8 +82,8 @@
|
|
|
b289ab4 |
#print "HERE", line, suffix
|
|
|
b289ab4 |
fname = m.group(1)+m.group(2)+'.'+suffix
|
|
|
b289ab4 |
if not os.path.exists(fname):
|
|
|
b289ab4 |
- print line
|
|
|
b289ab4 |
- print "ERROR: file '%s' does not exist!" % fname
|
|
|
b289ab4 |
+ print(line)
|
|
|
b289ab4 |
+ print("ERROR: file '%s' does not exist!" % fname)
|
|
|
b289ab4 |
sys.exit(1)
|
|
|
b289ab4 |
process(m.group(1), m.group(2), suffix)
|
|
|
b289ab4 |
INPUT.close()
|