mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-02-11 02:07:37 -08:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
# HG changeset patch
|
|
# User Alan Kennedy <alan@xhaus.com>
|
|
# Date 1333300584 -3600
|
|
# Node ID a972112ac1b155ef41b3f8ce195251bc6cc3ebce
|
|
# Parent 920a60f5d5b5fdf46f4f26c75cab42e2a671be2f
|
|
#1537: Fix for classloading issues with MATLAB/OpenJDK
|
|
|
|
diff --git a/Lib/xml/parsers/expat.py b/Lib/xml/parsers/expat.py
|
|
--- a/Lib/xml/parsers/expat.py
|
|
+++ b/Lib/xml/parsers/expat.py
|
|
@@ -47,12 +47,8 @@ from org.xml.sax.helpers import XMLReade
|
|
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"
|
|
+_mangled_xerces_parser_name = "org.python.apache.xerces.parsers.SAXParser"
|
|
+_xerces_parser_name = "org.apache.xerces.parsers.SAXParser"
|
|
|
|
|
|
# @expat args registry
|
|
@@ -88,7 +84,11 @@ class XMLParser(object):
|
|
"not %s" % type(namespace_separator).__name__)
|
|
raise TypeError(error)
|
|
|
|
- self._reader = XMLReaderFactory.createXMLReader(_xerces_parser)
|
|
+ # See http://bugs.jython.org/issue1537
|
|
+ try:
|
|
+ self._reader = XMLReaderFactory.createXMLReader(_mangled_xerces_parser_name)
|
|
+ except:
|
|
+ self._reader = XMLReaderFactory.createXMLReader(_xerces_parser_name)
|
|
|
|
if self.namespace_separator is None:
|
|
try:
|
|
|