PY3: bytes.maketrans, string.maketrans is a PY2 only function

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/buildtools/wafsamba/samba_patterns.py b/buildtools/wafsamba/samba_patterns.py
index dc59c38b492cb11bd30bdf5ac665867a55fb64d4..d0fe965c730f374817bcc9d7a04e0c7c7c50a946 100644 (file)
--- a/buildtools/wafsamba/samba_patterns.py
+++ b/buildtools/wafsamba/samba_patterns.py
@@ -155,7 +155,7 @@ def write_build_options(task):
     keys_header_other = []
     keys_misc = []
     if sys.hexversion>0x300000f:
-        trans_table = bytes.maketrans('.-()', '____')
+        trans_table = bytes.maketrans(b'.-()', b'____')
     else:
         import string
         trans_table = string.maketrans('.-()', '____')

diff --git a/source4/heimdal/lib/wind/generate.py b/source4/heimdal/lib/wind/generate.py
index 1d708c6a3c470d1fb8227e86af5adffcc0b6c528..91dc151ce87e3d1012d5917d7c126f984004e0bf 100644 (file)
--- a/source4/heimdal/lib/wind/generate.py
+++ b/source4/heimdal/lib/wind/generate.py
@@ -37,6 +37,7 @@
 import datetime
 import string
 import os
+import sys
 
 class GeneratedFile :
     "Represents a generated file"
@@ -56,7 +57,11 @@ class GeneratedFile :
 
 class Header(GeneratedFile) :
     "Represents a generated header file"
-    guardTrans = string.maketrans('-.', '__')
+    if sys.hexversion>0x300000f:
+        guardTrans = bytes.maketrans(b'-.', b'__')
+    else:
+        import string
+        guardTrans = string.maketrans('-.', '__')
     def makeGuard(self) :
         """Return a name to be used as ifdef guard"""
         return string.upper(string.translate(self.name, self.guardTrans))