diff options
| author | Muthu Subramanian <sumuthu@novell.com> | 2010-11-19 21:19:20 +0530 |
|---|---|---|
| committer | Muthu Subramanian <sumuthu@novell.com> | 2010-11-19 21:19:20 +0530 |
| commit | df9096834a89fde2bfee0e84e35ecc0a42c8d0ac (patch) | |
| tree | 194198fad004d4cef1a7eb2deb75f53cee978b1e | |
| parent | 18c474d9b625e4ac1e7c3b8edd4b7262d5a86352 (diff) | |
Fixed merge problems
| -rwxr-xr-x | helpcontent2/to-wiki/wikiconv2.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/helpcontent2/to-wiki/wikiconv2.py b/helpcontent2/to-wiki/wikiconv2.py index d0eb3a8cf4..1327e55e42 100755 --- a/helpcontent2/to-wiki/wikiconv2.py +++ b/helpcontent2/to-wiki/wikiconv2.py @@ -874,7 +874,7 @@ class XhpParser: self.current_app = i[1] break - file = open(filename, "r") + file = codecs.open(filename, "r", "utf-8") p = xml.parsers.expat.ParserCreate() p.StartElementHandler = self.start_element |