Changeset 390 for trunk/genshi/input.py

Timestamp:

Oct 24, 2006, 5:52:57 PM (17 years ago)

Author:

cmlenz

Message:

Configurable encoding of template files, closing #65.

• The XMLParser constructor now accepts an optional encoding parameter.
• The MarkupTemplate and TextTemplate class also get an encoding parameter in their initializers.
• A default_encoding can be specified when creating a TemplateLoader instance, but the encoding can also be specified explicitly when calling the load() method.
• Encodings specified using an XML declaration in templates and XML files are now honored (as long as Expat supports them, that is, and it doesn't support many).

File:

• trunk/genshi/input.py (modified) (2 diffs)

trunk/genshi/input.py

@@ -76 +76 @@
     _external_dtd = '\n'.join(_entitydefs)
 
-    def __init__(self, source, filename=None):
+    def __init__(self, source, filename=None, encoding=None):
         """Initialize the parser for the given XML input.
         
         @param source: the XML text as a file-like object
         @param filename: the name of the file, if appropriate
+        @param encoding: the encoding of the file; if not specified, the
+            encoding is assumed to be ASCII, UTF-8, or UTF-16, or whatever the
+            encoding specified in the XML declaration (if any)
         """
         self.source = source
@@ -86 +89 @@
 
         # Setup the Expat parser
-        parser = expat.ParserCreate('utf-8', '}')
+        parser = expat.ParserCreate(encoding, '}')
         parser.buffer_text = True
         parser.returns_unicode = True