71 lines
3.4 KiB
Diff
71 lines
3.4 KiB
Diff
|
From bea5e1c85bdc0950913790364e18228f20395a3d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Klausner <wiz@NetBSD.org>
|
||
|
|
Date: Thu, 19 May 2016 17:30:05 +0200
|
||
|
|
Subject: print() is a function and needs parentheses.
|
||
|
|
|
||
|
|
Fixes build with python-3.x.
|
||
|
|
|
||
|
|
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
|
||
|
|
Signed-off-by: Uli Schlachter <psychon@znc.in>
|
||
|
|
[yann.morin.1998@free.fr: backport from upstream]
|
||
|
|
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||
|
|
|
||
|
|
diff --git a/xcbgen/xtypes.py b/xcbgen/xtypes.py
|
||
|
|
index c3b5758..b83b119 100644
|
||
|
|
--- a/xcbgen/xtypes.py
|
||
|
|
+++ b/xcbgen/xtypes.py
|
||
|
|
@@ -501,7 +501,7 @@ class ComplexType(Type):
|
||
|
|
int(required_start_align_element.get('align', "4"), 0),
|
||
|
|
int(required_start_align_element.get('offset', "0"), 0))
|
||
|
|
if verbose_align_log:
|
||
|
|
- print "Explicit start-align for %s: %s\n" % (self, self.required_start_align)
|
||
|
|
+ print ("Explicit start-align for %s: %s\n" % (self, self.required_start_align))
|
||
|
|
|
||
|
|
def resolve(self, module):
|
||
|
|
if self.resolved:
|
||
|
|
@@ -592,7 +592,7 @@ class ComplexType(Type):
|
||
|
|
if verbose_align_log:
|
||
|
|
print ("calc_required_start_align: %s has start-align %s"
|
||
|
|
% (str(self), str(self.required_start_align)))
|
||
|
|
- print "Details:\n" + str(log)
|
||
|
|
+ print ("Details:\n" + str(log))
|
||
|
|
if self.required_start_align.offset != 0:
|
||
|
|
print (("WARNING: %s\n\thas start-align with non-zero offset: %s"
|
||
|
|
+ "\n\tsuggest to add explicit definition with:"
|
||
|
|
@@ -619,12 +619,12 @@ class ComplexType(Type):
|
||
|
|
for offset in range(0,align):
|
||
|
|
align_candidate = Alignment(align, offset)
|
||
|
|
if verbose_align_log:
|
||
|
|
- print "trying %s for %s" % (str(align_candidate), str(self))
|
||
|
|
+ print ("trying %s for %s" % (str(align_candidate), str(self)))
|
||
|
|
my_log = AlignmentLog()
|
||
|
|
if self.is_possible_start_align(align_candidate, callstack, my_log):
|
||
|
|
log.append(my_log)
|
||
|
|
if verbose_align_log:
|
||
|
|
- print "found start-align %s for %s" % (str(align_candidate), str(self))
|
||
|
|
+ print ("found start-align %s for %s" % (str(align_candidate), str(self)))
|
||
|
|
return align_candidate
|
||
|
|
else:
|
||
|
|
my_ok_count = my_log.ok_count()
|
||
|
|
@@ -641,7 +641,7 @@ class ComplexType(Type):
|
||
|
|
# none of the candidates applies
|
||
|
|
# this type has illegal internal aligns for all possible start_aligns
|
||
|
|
if verbose_align_log:
|
||
|
|
- print "didn't find start-align for %s" % str(self)
|
||
|
|
+ print ("didn't find start-align for %s" % str(self))
|
||
|
|
log.append(best_log)
|
||
|
|
return None
|
||
|
|
|
||
|
|
@@ -900,7 +900,7 @@ class SwitchType(ComplexType):
|
||
|
|
# aux function for unchecked_get_alignment_after
|
||
|
|
def get_align_for_selected_case_field(self, case_field, start_align, callstack, log):
|
||
|
|
if verbose_align_log:
|
||
|
|
- print "get_align_for_selected_case_field: %s, case_field = %s" % (str(self), str(case_field))
|
||
|
|
+ print ("get_align_for_selected_case_field: %s, case_field = %s" % (str(self), str(case_field)))
|
||
|
|
total_align = start_align
|
||
|
|
for field in self.bitcases:
|
||
|
|
my_callstack = callstack[:]
|
||
|
|
--
|
||
|
|
cgit v0.10.2
|
||
|
|
|