Python3 compatibility: fix integer problems

In python3 maxint is not defined, but maxsize is defined in both python2 and python3. The put_text() will not automatically use a value which came in as float due to a pior math function and python3 will throw an exception. The simple answer is to convert it with int() and move on. Signed-off-by: Jason Wessel <[email protected]> Signed-off-by: Ben Pfaff <[email protected]>
qihuaheng · Jul 6, 2017 · fa145f1 · fa145f1
1 parent 4ab6656
commit fa145f1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in
@@ -358,7 +358,7 @@ static void
                     print("        %s" % type.value.initCDefault(valueVar, type.n_min == 0))
                 print("    }")
             else:
-                if type.n_max != sys.maxint:
+                if type.n_max != sys.maxsize:
                     print("    size_t n = MIN(%d, datum->n);" % type.n_max)
                     nMax = "n"
                 else:

diff --git a/python/build/nroff.py b/python/build/nroff.py
@@ -148,6 +148,8 @@ def fatal(msg):
 
 
 def put_text(text, x, y, s):
+    x = int(x)
+    y = int(y)
     extend = x + len(s) - len(text[y])
     if extend > 0:
         text[y] += ' ' * extend