Fixed merge problems

2010-11-19 21:19:20 +05:30
parent 18c474d9b6
commit df9096834a
1 changed files with 1 additions and 1 deletions
--- 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