diff options
| author |   Sven Vermeulen <sven.vermeulen@siphos.be> | 2012-05-01 13:07:04 +0200 |
|---|---|---|
| committer | Sven Vermeulen <sven.vermeulen@siphos.be> | 2012-05-01 13:07:04 +0200 |
| commit | 9b390581239ff7a6e5002c49fb5d44e074c6d96b (patch) | |
| tree | 0d057943f4e5546fa5bdecbd565c1985ad831ed5 /support | |
| parent | Still some whitespace left to fix (diff) | |
| download | hardened-refpolicy-9b390581239ff7a6e5002c49fb5d44e074c6d96b.tar.gz hardened-refpolicy-9b390581239ff7a6e5002c49fb5d44e074c6d96b.tar.bz2 hardened-refpolicy-9b390581239ff7a6e5002c49fb5d44e074c6d96b.zip | |
More fixes on python3, including String.split and cStringIO changes
Diffstat (limited to 'support')
| -rw-r--r-- | support/pyplate.py | 6 | ||||
| -rw-r--r-- | support/sedoctool.py | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/support/pyplate.py b/support/pyplate.py index c7532cc5..22385e9c 100644 --- a/support/pyplate.py +++ b/support/pyplate.py @@ -51,7 +51,7 @@ PyPlate defines the following directives: # from __future__ import nested_scopes -import sys, string, re, cStringIO +import sys, string, re, io re_directive = re.compile("\[\[(.*)\]\]") re_for_loop = re.compile("for (.*) in (.*)") @@ -82,7 +82,7 @@ class Template: file.close() def parse_string(self, template): - file = cStringIO.StringIO(template) + file = io.StringIO(template) self.parse(file) file.close() @@ -111,7 +111,7 @@ class Template: file.close() def execute_string(self, data): - s = cStringIO.StringIO() + s = io.StringIO() self.execute(s, data) return s.getvalue() diff --git a/support/sedoctool.py b/support/sedoctool.py index 90507195..cd3f1ce9 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 = format_txt_desc(desc) - s = string.split(bool_desc, "\n") + s = 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 = format_txt_desc(desc) - s = string.split(bool_desc, "\n") + s = 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 = BOOL_DISABLED if bool_name and bool_val: - file_name.write("%s = %s\n\n" % (bool_name, bool_val)) + file_name.write("%s = %s\n\n" % (bool_name, bool_val)) bool_name = bool_val = None 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 == node: continue - s = string.split(format_txt_desc(desc), "\n") + s = format_txt_desc(desc).split("\n") for line in s: file_name.write("# %s\n" % line) |