Skip to content

Commit 1deef3b

Browse files
committed
Bump lxml limit and re-enable Append example [skip appveyor]
In the initial version of PR 4235, an added example was left commented out because it triggered an lxml failure. Thanks to @jcbrill, reminded that there's a global limit for lxml, which SCons can set in the docbook module. This is being bumped a bit, allowing the build to work. Rebased at the same time, so force-pushing. Signed-off-by: Mats Wichmann <[email protected]>
1 parent 8944abc commit 1deef3b

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

SCons/Environment.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -620,21 +620,22 @@ specify the value as <constant>None</constant>.
620620
</para>
621621

622622
<!--TODO: at last check, this newly created example blew up SConsDoc/lxml -->
623-
<!--example_commands>
623+
<example_commands>
624624
env = Environment()
625625
env.Append(CPPDEFINES =[("ONE", 1), ("TWO", )])
626626
print("CPPDEFINES =", env['CPPDEFINES'])
627627
env.Append(CPPDEFINES ={"THREE": 3, "FOUR": None})
628628
print("CPPDEFINES =", env['CPPDEFINES'])
629629
print("CPPDEFINES will expand to ", env.subst('$_CPPDEFFLAGS'))
630-
</example_commands-->
630+
</example_commands>
631631

632-
<!--screen>
632+
<screen>
633+
$ scons -Q
633634
CPPDEFINES = [('ONE', 1), ('TWO',)]
634635
CPPDEFINES = [('ONE', 1), ('TWO',), {'THREE': 3, 'FOUR': None}]
635636
CPPDEFINES will expand to -DONE=1 -DTWO -DTHREE=3 -DFOUR
636637
scons: `.' is up to date.
637-
</screen-->
638+
</screen>
638639

639640
<para>
640641
See &cv-link-CPPDEFINES; for more details.

SCons/Tool/docbook/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
# lxml etree XSLT global max traversal depth
7070
#
7171

72-
lmxl_xslt_global_max_depth = 3100
72+
lmxl_xslt_global_max_depth = 3600
7373

7474
if has_lxml and lmxl_xslt_global_max_depth:
7575
def __lxml_xslt_set_global_max_depth(max_depth):

0 commit comments

Comments
 (0)