From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SPAvu-0001wj-2E for garchives@archives.gentoo.org; Tue, 01 May 2012 11:07:50 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 51ADEE074E; Tue, 1 May 2012 11:07:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 12407E074E for ; Tue, 1 May 2012 11:07:34 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 694E11B4023 for ; Tue, 1 May 2012 11:07:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 331F4E5403 for ; Tue, 1 May 2012 11:07:33 +0000 (UTC) From: "Sven Vermeulen" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sven Vermeulen" Message-ID: <1335870424.9b390581239ff7a6e5002c49fb5d44e074c6d96b.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/sedoctool.py X-VCS-Directories: support/ X-VCS-Committer: SwifT X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: 9b390581239ff7a6e5002c49fb5d44e074c6d96b X-VCS-Branch: master Date: Tue, 1 May 2012 11:07:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 8c2565e4-4261-4107-bd1d-87ff8edb6f65 X-Archives-Hash: c5334e92337aebbe8f27946cf3012617 commit: 9b390581239ff7a6e5002c49fb5d44e074c6d96b Author: Sven Vermeulen siphos be> AuthorDate: Tue May 1 11:07:04 2012 +0000 Commit: Sven Vermeulen siphos be> CommitDate: Tue May 1 11:07:04 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/hardened-refp= olicy.git;a=3Dcommit;h=3D9b390581 More fixes on python3, including String.split and cStringIO changes --- support/pyplate.py | 6 +++--- support/sedoctool.py | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/support/pyplate.py b/support/pyplate.py index c7532cc..22385e9 100644 --- a/support/pyplate.py +++ b/support/pyplate.py @@ -51,7 +51,7 @@ PyPlate defines the following directives: # =20 from __future__ import nested_scopes -import sys, string, re, cStringIO +import sys, string, re, io =20 re_directive =3D re.compile("\[\[(.*)\]\]") re_for_loop =3D re.compile("for (.*) in (.*)") @@ -82,7 +82,7 @@ class Template: file.close() =20 def parse_string(self, template): - file =3D cStringIO.StringIO(template) + file =3D io.StringIO(template) self.parse(file) file.close() =20 @@ -111,7 +111,7 @@ class Template: file.close() =20 def execute_string(self, data): - s =3D cStringIO.StringIO() + s =3D io.StringIO() self.execute(s, data) return s.getvalue() =20 diff --git a/support/sedoctool.py b/support/sedoctool.py index 9050719..cd3f1ce 100644 --- a/support/sedoctool.py +++ b/support/sedoctool.py @@ -62,7 +62,7 @@ def gen_booleans_conf(doc, file_name, namevalue_list): for node in doc.getElementsByTagName("bool"): for desc in node.getElementsByTagName("desc"): bool_desc =3D format_txt_desc(desc) - s =3D string.split(bool_desc, "\n") + s =3D bool_desc.split("\n") file_name.write("#\n") for line in s: file_name.write("# %s\n" % line) @@ -87,7 +87,7 @@ def gen_booleans_conf(doc, file_name, namevalue_list): for node in doc.getElementsByTagName("tunable"): for desc in node.getElementsByTagName("desc"): bool_desc =3D format_txt_desc(desc) - s =3D string.split(bool_desc, "\n") + s =3D bool_desc.split("\n") file_name.write("#\n") for line in s: file_name.write("# %s\n" % line) @@ -105,7 +105,7 @@ def gen_booleans_conf(doc, file_name, namevalue_list)= : bool_val =3D BOOL_DISABLED =20 if bool_name and bool_val: - file_name.write("%s =3D %s\n\n" % (bool_name, bool_val)) + file_name.write("%s =3D %s\n\n" % (bool_name, bool_val)) bool_name =3D bool_val =3D None =20 def gen_module_conf(doc, file_name, namevalue_list): @@ -153,7 +153,7 @@ def gen_module_conf(doc, file_name, namevalue_list): for desc in node.getElementsByTagName("summary"): if not desc.parentNode =3D=3D node: continue - s =3D string.split(format_txt_desc(desc), "\n") + s =3D format_txt_desc(desc).split("\n") for line in s: file_name.write("# %s\n" % line) =20