Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 1 | From bea5e1c85bdc0950913790364e18228f20395a3d Mon Sep 17 00:00:00 2001 |
| 2 | From: Thomas Klausner <wiz@NetBSD.org> |
| 3 | Date: Thu, 19 May 2016 17:30:05 +0200 |
| 4 | Subject: [PATCH 2/2] print() is a function and needs parentheses. |
| 5 | |
| 6 | Fixes build with python-3.x. |
| 7 | |
| 8 | Signed-off-by: Thomas Klausner <wiz@NetBSD.org> |
| 9 | Signed-off-by: Uli Schlachter <psychon@znc.in> |
| 10 | |
| 11 | Upstream-Status: Backport |
| 12 | |
| 13 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
| 14 | --- |
| 15 | xcbgen/xtypes.py | 12 ++++++------ |
| 16 | 1 file changed, 6 insertions(+), 6 deletions(-) |
| 17 | |
| 18 | diff --git a/xcbgen/xtypes.py b/xcbgen/xtypes.py |
| 19 | index c3b5758..b83b119 100644 |
| 20 | --- a/xcbgen/xtypes.py |
| 21 | +++ b/xcbgen/xtypes.py |
| 22 | @@ -501,7 +501,7 @@ class ComplexType(Type): |
| 23 | int(required_start_align_element.get('align', "4"), 0), |
| 24 | int(required_start_align_element.get('offset', "0"), 0)) |
| 25 | if verbose_align_log: |
| 26 | - print "Explicit start-align for %s: %s\n" % (self, self.required_start_align) |
| 27 | + print ("Explicit start-align for %s: %s\n" % (self, self.required_start_align)) |
| 28 | |
| 29 | def resolve(self, module): |
| 30 | if self.resolved: |
| 31 | @@ -592,7 +592,7 @@ class ComplexType(Type): |
| 32 | if verbose_align_log: |
| 33 | print ("calc_required_start_align: %s has start-align %s" |
| 34 | % (str(self), str(self.required_start_align))) |
| 35 | - print "Details:\n" + str(log) |
| 36 | + print ("Details:\n" + str(log)) |
| 37 | if self.required_start_align.offset != 0: |
| 38 | print (("WARNING: %s\n\thas start-align with non-zero offset: %s" |
| 39 | + "\n\tsuggest to add explicit definition with:" |
| 40 | @@ -619,12 +619,12 @@ class ComplexType(Type): |
| 41 | for offset in range(0,align): |
| 42 | align_candidate = Alignment(align, offset) |
| 43 | if verbose_align_log: |
| 44 | - print "trying %s for %s" % (str(align_candidate), str(self)) |
| 45 | + print ("trying %s for %s" % (str(align_candidate), str(self))) |
| 46 | my_log = AlignmentLog() |
| 47 | if self.is_possible_start_align(align_candidate, callstack, my_log): |
| 48 | log.append(my_log) |
| 49 | if verbose_align_log: |
| 50 | - print "found start-align %s for %s" % (str(align_candidate), str(self)) |
| 51 | + print ("found start-align %s for %s" % (str(align_candidate), str(self))) |
| 52 | return align_candidate |
| 53 | else: |
| 54 | my_ok_count = my_log.ok_count() |
| 55 | @@ -641,7 +641,7 @@ class ComplexType(Type): |
| 56 | # none of the candidates applies |
| 57 | # this type has illegal internal aligns for all possible start_aligns |
| 58 | if verbose_align_log: |
| 59 | - print "didn't find start-align for %s" % str(self) |
| 60 | + print ("didn't find start-align for %s" % str(self)) |
| 61 | log.append(best_log) |
| 62 | return None |
| 63 | |
| 64 | @@ -900,7 +900,7 @@ class SwitchType(ComplexType): |
| 65 | # aux function for unchecked_get_alignment_after |
| 66 | def get_align_for_selected_case_field(self, case_field, start_align, callstack, log): |
| 67 | if verbose_align_log: |
| 68 | - print "get_align_for_selected_case_field: %s, case_field = %s" % (str(self), str(case_field)) |
| 69 | + print ("get_align_for_selected_case_field: %s, case_field = %s" % (str(self), str(case_field))) |
| 70 | total_align = start_align |
| 71 | for field in self.bitcases: |
| 72 | my_callstack = callstack[:] |
| 73 | -- |
| 74 | 2.9.0 |
| 75 | |