Merge branch 'release/3.0.0+repack-1'3.0.0+repack-1

1 files changed, 6 insertions, 5 deletions

diff --git a/src/engine/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/docbook.py b/src/engine/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/docbook.py
index c070602..e7b8cfa 100644
--- a/src/engine/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/docbook.py
+++ b/src/engine/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/docbook.py
@@ -1,5 +1,6 @@
 # docbook.py: extension module
 # $Id: docbook.py 8353 2009-03-17 16:57:50Z mzjn $
+from __future__ import print_function
 
 import sys
 import string
@@ -82,7 +83,7 @@ def adjustColumnWidths(ctx, nodeset):
         relParts.append(relPart)
         absParts.append(pixels)
 
-        col = col.next
+        col = col.__next__
 
     # Ok, now we have the relative widths and absolute widths in
     # two parallel arrays.
@@ -116,7 +117,7 @@ def adjustColumnWidths(ctx, nodeset):
             pixelWidth = convertLength(tableWidth)
 
         if pixelWidth <= absTotal:
-            print "Table is wider than table width"
+            print("Table is wider than table width")
         else:
             pixelWidth = pixelWidth - absTotal
 
@@ -151,7 +152,7 @@ def adjustColumnWidths(ctx, nodeset):
             col.setProp("width", widths[count])
 
         count = count+1
-        col = col.next
+        col = col.__next__
 
     return nodeset
 
@@ -163,10 +164,10 @@ def convertLength(length):
     m = re.search('([+-]?[\d\.]+)(\S+)', length)
     if m != None and m.lastindex > 1:
         unit = pixelsPerInch
-        if unitHash.has_key(m.group(2)):
+        if m.group(2) in unitHash:
             unit = unitHash[m.group(2)]
         else:
-            print "Unrecognized length: " + m.group(2)
+            print("Unrecognized length: " + m.group(2))
 
         pixels = unit * float(m.group(1))
     else: