[Jython-checkins] SF.net SVN: jython:[5891] trunk/jython

[<pj...@us...>]

Revision: 5891
          http://jython.svn.sourceforge.net/jython/?rev=5891&view=rev
Author:   pjenvey
Date:     2009-01-08 21:49:36 +0000 (Thu, 08 Jan 2009)

Log Message:
-----------
jarjar xerces into jython-complete and check for the mangled name

Modified Paths:
--------------
    trunk/jython/Lib/xml/parsers/expat.py
    trunk/jython/build.xml

Modified: trunk/jython/Lib/xml/parsers/expat.py
===================================================================
--- trunk/jython/Lib/xml/parsers/expat.py	2009-01-08 21:26:19 UTC (rev 5890)
+++ trunk/jython/Lib/xml/parsers/expat.py	2009-01-08 21:49:36 UTC (rev 5891)
@@ -47,7 +47,15 @@
 from org.xml.sax.helpers import DefaultHandler, XMLReaderFactory
 from org.xml.sax.ext import DefaultHandler2
 
+# Xerces
+try:
+    # Name mangled by jarjar?
+    import org.python.apache.xerces.parsers.SAXParser
+    _xerces_parser = "org.python.apache.xerces.parsers.SAXParser"
+except ImportError:
+    _xerces_parser = "org.apache.xerces.parsers.SAXParser"
 
+
 def ParserCreate(encoding=None, namespace_separator=None):
     return XMLParser(encoding, namespace_separator)
 
@@ -77,9 +85,7 @@
                      "not %s" % type(namespace_separator).__name__)
             raise TypeError(error)
 
-        XMLReader = XMLReaderFactory.createXMLReader
-        xerces_parser = "org.apache.xerces.parsers.SAXParser"
-        self._reader = XMLReader(xerces_parser)
+        self._reader = XMLReaderFactory.createXMLReader(_xerces_parser)
 
         if self.namespace_separator is None:
             try:

Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml	2009-01-08 21:26:19 UTC (rev 5890)
+++ trunk/jython/build.xml	2009-01-08 21:49:36 UTC (rev 5891)
@@ -520,6 +520,8 @@
             <rule pattern="org.jruby.ext.posix.**" result="org.python.posix.@1"/>
             <zipfileset src="extlibs/constantine-0.4.jar"/>
             <rule pattern="com.kenai.constantine.**" result="org.python.constantine.@1"/>
+            <zipfileset src="extlibs/xercesImpl.jar"/>
+            <rule pattern="org.apache.**" result="org.python.apache.@1"/>
             <manifest>
                 <attribute name="Main-Class" value="org.python.util.jython" />
                 <attribute name="Built-By" value="${user.name}" />


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.