From patchwork Sat Dec 15 18:14:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Iooss X-Patchwork-Id: 10732289 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8AF8E112C for ; Sat, 15 Dec 2018 18:15:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D53A2A458 for ; Sat, 15 Dec 2018 18:15:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6B51B2A466; Sat, 15 Dec 2018 18:15:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 68B292A458 for ; Sat, 15 Dec 2018 18:15:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727216AbeLOSPY (ORCPT ); Sat, 15 Dec 2018 13:15:24 -0500 Received: from mx1.polytechnique.org ([129.104.30.34]:36824 "EHLO mx1.polytechnique.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726615AbeLOSPY (ORCPT ); Sat, 15 Dec 2018 13:15:24 -0500 Received: from localhost.localdomain (32.206.133.77.rev.sfr.net [77.133.206.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ssl.polytechnique.org (Postfix) with ESMTPSA id DABA7564785 for ; Sat, 15 Dec 2018 19:15:20 +0100 (CET) From: Nicolas Iooss To: selinux@vger.kernel.org Subject: [PATCH 1/2] mcstrans: convert test scripts to Python 3 Date: Sat, 15 Dec 2018 19:14:54 +0100 Message-Id: <20181215181455.31643-1-nicolas.iooss@m4x.org> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 X-AV-Checked: ClamAV using ClamSMTP at svoboda.polytechnique.org (Sat Dec 15 19:15:21 2018 +0100 (CET)) X-Org-Mail: nicolas.iooss.2010@polytechnique.org Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Nicolas Iooss --- mcstrans/share/util/mlscolor-test | 8 ++++---- mcstrans/share/util/mlstrans-test | 11 +++++------ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/mcstrans/share/util/mlscolor-test b/mcstrans/share/util/mlscolor-test index 7b8d809b7ac5..447389704beb 100644 --- a/mcstrans/share/util/mlscolor-test +++ b/mcstrans/share/util/mlscolor-test @@ -20,17 +20,17 @@ for arg in sys.argv[1:]: context, expected = line.split("=") rc, raw = selinux_trans_to_raw_context(context) if rc < 0: - print "Unable to get raw context of '%s'" % (context) + print("Unable to get raw context of '%s'" % (context)) errors += 1 continue rc, colors = selinux_raw_context_to_color(raw) if rc < 0: - print "Unable to get colors for '%s'" % (context) + print("Unable to get colors for '%s'" % (context)) errors += 1 continue colors = colors.rstrip() if colors != expected: - print "For '%s' got\n\t'%s' expected\n\t'%s'" % (context, colors, expected) + print("For '%s' got\n\t'%s' expected\n\t'%s'" % (context, colors, expected)) errors += 1 continue f.close() @@ -38,6 +38,6 @@ for arg in sys.argv[1:]: s = "s" if errors == 1: s = "" -print "mlscolor-test done with %d error%s" % (errors, s) +print("mlscolor-test done with %d error%s" % (errors, s)) sys.exit(errors) diff --git a/mcstrans/share/util/mlstrans-test b/mcstrans/share/util/mlstrans-test index f854f7b3c2d6..3ff4444ab000 100644 --- a/mcstrans/share/util/mlstrans-test +++ b/mcstrans/share/util/mlstrans-test @@ -10,22 +10,22 @@ def untrans(trans, val): global errors, verbose (rc, raw) = selinux_trans_to_raw_context(trans) if raw != val: - print "untrans: '%s' -> '%s' != '%s' FAILED" % (trans, raw, val) + print("untrans: '%s' -> '%s' != '%s' FAILED" % (trans, raw, val)) errors += 1 else: if verbose: - print "untrans: %s -> %s != %s SUCCESS" % (trans, raw, val) + print("untrans: %s -> %s != %s SUCCESS" % (trans, raw, val)) def trans(raw, val): global errors, verbose (rc, trans) = selinux_raw_to_trans_context(raw) if trans != val: - print "trans: '%s' -> '%s' != '%s' FAILED" % (raw, trans, val) + print("trans: '%s' -> '%s' != '%s' FAILED" % (raw, trans, val)) errors += 1 else: if verbose: - print "trans: %s -> %s != %s SUCCESS" % (raw, trans, val) + print("trans: %s -> %s != %s SUCCESS" % (raw, trans, val)) if len(sys.argv) > 1 and sys.argv[1] == "-v": verbose = 1 @@ -38,7 +38,6 @@ for arg in sys.argv[1:]: if not line.strip(): continue line = line.rstrip('\n') -# print line if (line.find("==") != -1): t, r = line.split("==") untrans("a:b:c:" + t, "a:b:c:" + r) @@ -51,6 +50,6 @@ for arg in sys.argv[1:]: s = "s" if errors == 1: s = "" -print "mlstrans-test done with %d error%s" % (errors, s) +print("mlstrans-test done with %d error%s" % (errors, s)) sys.exit(errors) From patchwork Sat Dec 15 18:14:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Iooss X-Patchwork-Id: 10732287 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1D6D0112C for ; Sat, 15 Dec 2018 18:15:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 011542A459 for ; Sat, 15 Dec 2018 18:15:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E4FDC2A46F; Sat, 15 Dec 2018 18:15:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 896562A459 for ; Sat, 15 Dec 2018 18:15:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726615AbeLOSPZ (ORCPT ); Sat, 15 Dec 2018 13:15:25 -0500 Received: from mx1.polytechnique.org ([129.104.30.34]:32885 "EHLO mx1.polytechnique.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726683AbeLOSPZ (ORCPT ); Sat, 15 Dec 2018 13:15:25 -0500 Received: from localhost.localdomain (32.206.133.77.rev.sfr.net [77.133.206.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ssl.polytechnique.org (Postfix) with ESMTPSA id 66A65564785 for ; Sat, 15 Dec 2018 19:15:22 +0100 (CET) From: Nicolas Iooss To: selinux@vger.kernel.org Subject: [PATCH 2/2] mcstrans: fix Python linter warnings on test scripts Date: Sat, 15 Dec 2018 19:14:55 +0100 Message-Id: <20181215181455.31643-2-nicolas.iooss@m4x.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181215181455.31643-1-nicolas.iooss@m4x.org> References: <20181215181455.31643-1-nicolas.iooss@m4x.org> MIME-Version: 1.0 X-AV-Checked: ClamAV using ClamSMTP at svoboda.polytechnique.org (Sat Dec 15 19:15:22 2018 +0100 (CET)) X-Org-Mail: nicolas.iooss.2010@polytechnique.org Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Nicolas Iooss --- mcstrans/share/util/mlscolor-test | 9 +++++---- mcstrans/share/util/mlstrans-test | 12 +++++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/mcstrans/share/util/mlscolor-test b/mcstrans/share/util/mlscolor-test index 447389704beb..03fc4be40375 100644 --- a/mcstrans/share/util/mlscolor-test +++ b/mcstrans/share/util/mlscolor-test @@ -1,7 +1,8 @@ #!/usr/bin/python -E import sys -import re -from selinux import * +import selinux + + verbose = 0 errors = 0 @@ -18,12 +19,12 @@ for arg in sys.argv[1:]: line = line.rstrip('\n') # print line context, expected = line.split("=") - rc, raw = selinux_trans_to_raw_context(context) + rc, raw = selinux.selinux_trans_to_raw_context(context) if rc < 0: print("Unable to get raw context of '%s'" % (context)) errors += 1 continue - rc, colors = selinux_raw_context_to_color(raw) + rc, colors = selinux.selinux_raw_context_to_color(raw) if rc < 0: print("Unable to get colors for '%s'" % (context)) errors += 1 diff --git a/mcstrans/share/util/mlstrans-test b/mcstrans/share/util/mlstrans-test index 3ff4444ab000..c026d00ef9c7 100644 --- a/mcstrans/share/util/mlstrans-test +++ b/mcstrans/share/util/mlstrans-test @@ -1,14 +1,15 @@ #!/usr/bin/python -E import sys -import re -from selinux import * +import selinux + + verbose = 0 errors = 0 def untrans(trans, val): global errors, verbose - (rc, raw) = selinux_trans_to_raw_context(trans) + (rc, raw) = selinux.selinux_trans_to_raw_context(trans) if raw != val: print("untrans: '%s' -> '%s' != '%s' FAILED" % (trans, raw, val)) errors += 1 @@ -19,7 +20,7 @@ def untrans(trans, val): def trans(raw, val): global errors, verbose - (rc, trans) = selinux_raw_to_trans_context(raw) + (rc, trans) = selinux.selinux_raw_to_trans_context(raw) if trans != val: print("trans: '%s' -> '%s' != '%s' FAILED" % (raw, trans, val)) errors += 1 @@ -27,6 +28,7 @@ def trans(raw, val): if verbose: print("trans: %s -> %s != %s SUCCESS" % (raw, trans, val)) + if len(sys.argv) > 1 and sys.argv[1] == "-v": verbose = 1 @@ -38,7 +40,7 @@ for arg in sys.argv[1:]: if not line.strip(): continue line = line.rstrip('\n') - if (line.find("==") != -1): + if line.find("==") != -1: t, r = line.split("==") untrans("a:b:c:" + t, "a:b:c:" + r) trans("a:b:c:" + r, "a:b:c:" + t)