| 1 |
commit: 9b390581239ff7a6e5002c49fb5d44e074c6d96b |
| 2 |
Author: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be> |
| 3 |
AuthorDate: Tue May 1 11:07:04 2012 +0000 |
| 4 |
Commit: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be> |
| 5 |
CommitDate: Tue May 1 11:07:04 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=9b390581 |
| 7 |
|
| 8 |
More fixes on python3, including String.split and cStringIO changes |
| 9 |
|
| 10 |
--- |
| 11 |
support/pyplate.py | 6 +++--- |
| 12 |
support/sedoctool.py | 8 ++++---- |
| 13 |
2 files changed, 7 insertions(+), 7 deletions(-) |
| 14 |
|
| 15 |
diff --git a/support/pyplate.py b/support/pyplate.py |
| 16 |
index c7532cc..22385e9 100644 |
| 17 |
--- a/support/pyplate.py |
| 18 |
+++ b/support/pyplate.py |
| 19 |
@@ -51,7 +51,7 @@ PyPlate defines the following directives: |
| 20 |
# |
| 21 |
|
| 22 |
from __future__ import nested_scopes |
| 23 |
-import sys, string, re, cStringIO |
| 24 |
+import sys, string, re, io |
| 25 |
|
| 26 |
re_directive = re.compile("\[\[(.*)\]\]") |
| 27 |
re_for_loop = re.compile("for (.*) in (.*)") |
| 28 |
@@ -82,7 +82,7 @@ class Template: |
| 29 |
file.close() |
| 30 |
|
| 31 |
def parse_string(self, template): |
| 32 |
- file = cStringIO.StringIO(template) |
| 33 |
+ file = io.StringIO(template) |
| 34 |
self.parse(file) |
| 35 |
file.close() |
| 36 |
|
| 37 |
@@ -111,7 +111,7 @@ class Template: |
| 38 |
file.close() |
| 39 |
|
| 40 |
def execute_string(self, data): |
| 41 |
- s = cStringIO.StringIO() |
| 42 |
+ s = io.StringIO() |
| 43 |
self.execute(s, data) |
| 44 |
return s.getvalue() |
| 45 |
|
| 46 |
|
| 47 |
diff --git a/support/sedoctool.py b/support/sedoctool.py |
| 48 |
index 9050719..cd3f1ce 100644 |
| 49 |
--- a/support/sedoctool.py |
| 50 |
+++ b/support/sedoctool.py |
| 51 |
@@ -62,7 +62,7 @@ def gen_booleans_conf(doc, file_name, namevalue_list): |
| 52 |
for node in doc.getElementsByTagName("bool"): |
| 53 |
for desc in node.getElementsByTagName("desc"): |
| 54 |
bool_desc = format_txt_desc(desc) |
| 55 |
- s = string.split(bool_desc, "\n") |
| 56 |
+ s = bool_desc.split("\n") |
| 57 |
file_name.write("#\n") |
| 58 |
for line in s: |
| 59 |
file_name.write("# %s\n" % line) |
| 60 |
@@ -87,7 +87,7 @@ def gen_booleans_conf(doc, file_name, namevalue_list): |
| 61 |
for node in doc.getElementsByTagName("tunable"): |
| 62 |
for desc in node.getElementsByTagName("desc"): |
| 63 |
bool_desc = format_txt_desc(desc) |
| 64 |
- s = string.split(bool_desc, "\n") |
| 65 |
+ s = bool_desc.split("\n") |
| 66 |
file_name.write("#\n") |
| 67 |
for line in s: |
| 68 |
file_name.write("# %s\n" % line) |
| 69 |
@@ -105,7 +105,7 @@ def gen_booleans_conf(doc, file_name, namevalue_list): |
| 70 |
bool_val = BOOL_DISABLED |
| 71 |
|
| 72 |
if bool_name and bool_val: |
| 73 |
- file_name.write("%s = %s\n\n" % (bool_name, bool_val)) |
| 74 |
+ file_name.write("%s = %s\n\n" % (bool_name, bool_val)) |
| 75 |
bool_name = bool_val = None |
| 76 |
|
| 77 |
def gen_module_conf(doc, file_name, namevalue_list): |
| 78 |
@@ -153,7 +153,7 @@ def gen_module_conf(doc, file_name, namevalue_list): |
| 79 |
for desc in node.getElementsByTagName("summary"): |
| 80 |
if not desc.parentNode == node: |
| 81 |
continue |
| 82 |
- s = string.split(format_txt_desc(desc), "\n") |
| 83 |
+ s = format_txt_desc(desc).split("\n") |
| 84 |
for line in s: |
| 85 |
file_name.write("# %s\n" % line) |
Archives