From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1FDF7139083 for ; Mon, 10 Apr 2017 16:59:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B0520E0D1B; Mon, 10 Apr 2017 16:59:34 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 834E0E0D1B for ; Mon, 10 Apr 2017 16:59:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A369C33BEBE for ; Mon, 10 Apr 2017 16:59:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CB308742F for ; Mon, 10 Apr 2017 16:59:30 +0000 (UTC) From: "Sven Vermeulen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sven Vermeulen" Message-ID: <1491843529.b64d2694b612f6962fb43f87557a9562253c68fd.swift@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: support/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: support/pyplate.py support/segenxml.py X-VCS-Directories: support/ X-VCS-Committer: swift X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: b64d2694b612f6962fb43f87557a9562253c68fd X-VCS-Branch: master Date: Mon, 10 Apr 2017 16:59:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f941967f-eb08-42f3-b8ae-10845275d57e X-Archives-Hash: 4d5d8a99d61de498296b9c4d10a0537d commit: b64d2694b612f6962fb43f87557a9562253c68fd Author: Nicolas Iooss m4x org> AuthorDate: Sat Apr 8 09:41:05 2017 +0000 Commit: Sven Vermeulen gentoo org> CommitDate: Mon Apr 10 16:58:49 2017 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=b64d2694 Use raw strings in regular expressions Python 3.6 complains about the strings which are used as regular expression in the support scripts: File "support/segenxml.py", line 37 INTERFACE = re.compile("^\s*(interface|template)\(`(\w*)'") ^ SyntaxError: invalid escape sequence \s support/pyplate.py | 16 ++++++++-------- support/segenxml.py | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/support/pyplate.py b/support/pyplate.py index 28c61088..d0e7fe26 100644 --- a/support/pyplate.py +++ b/support/pyplate.py @@ -54,14 +54,14 @@ PyPlate defines the following directives: import sys, re, io -re_directive = re.compile("\[\[(.*)\]\]") -re_for_loop = re.compile("for (.*) in (.*)") -re_if = re.compile("if (.*)") -re_elif = re.compile("elif (.*)") -re_def = re.compile("def (.*?)\((.*)\)") -re_call = re.compile("call (.*?)\((.*)\)") -re_exec = re.compile("exec (.*)") -re_comment = re.compile("#(.*)#") +re_directive = re.compile(r"\[\[(.*)\]\]") +re_for_loop = re.compile(r"for (.*) in (.*)") +re_if = re.compile(r"if (.*)") +re_elif = re.compile(r"elif (.*)") +re_def = re.compile(r"def (.*?)\((.*)\)") +re_call = re.compile(r"call (.*?)\((.*)\)") +re_exec = re.compile(r"exec (.*)") +re_comment = re.compile(r"#(.*)#") ############################################################ # Template parser diff --git a/support/segenxml.py b/support/segenxml.py index 383428df..e37ea041 100644 --- a/support/segenxml.py +++ b/support/segenxml.py @@ -34,7 +34,7 @@ output_dir = "" # -> ("interface", "kernel_read_system_state") # "template(`base_user_template',`" # -> ("template", "base_user_template") -INTERFACE = re.compile("^\s*(interface|template)\(`(\w*)'") +INTERFACE = re.compile(r"^\s*(interface|template)\(`(\w*)'") # Matches either a gen_bool or a gen_tunable statement. Will give the tuple: # ("tunable" or "bool", name, "true" or "false") @@ -43,7 +43,7 @@ INTERFACE = re.compile("^\s*(interface|template)\(`(\w*)'") # -> ("bool", "secure_mode", "false") # "gen_tunable(allow_kerberos, false)" # -> ("tunable", "allow_kerberos", "false") -BOOLEAN = re.compile("^\s*gen_(tunable|bool)\(\s*(\w*)\s*,\s*(true|false)\s*\)") +BOOLEAN = re.compile(r"^\s*gen_(tunable|bool)\(\s*(\w*)\s*,\s*(true|false)\s*\)") # Matches a XML comment in the policy, which is defined as any line starting # with two # and at least one character of white space. Will give the single @@ -54,7 +54,7 @@ BOOLEAN = re.compile("^\s*gen_(tunable|bool)\(\s*(\w*)\s*,\s*(true|false)\s*\)") # -> ("") # "## The domain allowed access. " # -> ("The domain allowed access.") -XML_COMMENT = re.compile("^##\s+(.*?)\s*$") +XML_COMMENT = re.compile(r"^##\s+(.*?)\s*$") # FUNCTIONS