[Lxml-checkins] r32242 - lxml/trunk/src/lxml

[scoder at codespeak.net]

Author: scoder
Date: Wed Sep 13 08:52:03 2006
New Revision: 32242

Modified:
   lxml/trunk/src/lxml/relaxng.pxi
   lxml/trunk/src/lxml/xmlschema.pxi
Log:
cleanup of filename encoding in RNG and XML Schema

Modified: lxml/trunk/src/lxml/relaxng.pxi
==============================================================================
--- lxml/trunk/src/lxml/relaxng.pxi	(original)
+++ lxml/trunk/src/lxml/relaxng.pxi	Wed Sep 13 08:52:03 2006
@@ -44,9 +44,8 @@
             if filename is None:
                 # XXX assume a string object
                 filename = file
-            else:
-                filename = _encodeFilename(filename)
-            parser_ctxt = relaxng.xmlRelaxNGNewParserCtxt(filename)
+            filename = _encodeFilename(filename)
+            parser_ctxt = relaxng.xmlRelaxNGNewParserCtxt(_cstr(filename))
         else:
             raise RelaxNGParseError, "No tree or file given"
 

Modified: lxml/trunk/src/lxml/xmlschema.pxi
==============================================================================
--- lxml/trunk/src/lxml/xmlschema.pxi	(original)
+++ lxml/trunk/src/lxml/xmlschema.pxi	Wed Sep 13 08:52:03 2006
@@ -50,9 +50,8 @@
             if filename is None:
                 # XXX assume a string object
                 filename = file
-            else:
-                filename = _encodeFilename(filename)
-            parser_ctxt = xmlschema.xmlSchemaNewParserCtxt(filename)
+            filename = _encodeFilename(filename)
+            parser_ctxt = xmlschema.xmlSchemaNewParserCtxt(_cstr(filename))
             self._c_schema = xmlschema.xmlSchemaParse(parser_ctxt)
             xmlschema.xmlSchemaFreeParserCtxt(parser_ctxt)
         else: