Attachment #667154 for bug #698954

View | Details | Raw Unified | Return to bug 698954
Collapse All | Expand All




# -*- coding: UTF-8 -*-
# Copyright 2004-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

import io
import os
import sys
import io

import xml.sax.handler
from xml.sax.saxutils import XMLGenerator
from xml.sax.saxutils import quoteattr

import javatoolkit.xml.sax

class SaxRewriter(XMLGenerator):
    """
    Using Sax gives us the support for writing back doctypes and all easily


    def process(self, in_stream, callback):
        self.startElement = callback
        javatoolkit.xml.sax.parse_string(in_stream.encode('UTF8'), content_handler=self, features={xml.sax.handler.feature_external_ges: 1})
        parseString(in_stream.encode('UTF8'), self)
        self.p('\n')

# vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4 nowrap:




# Copyright 2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

import io
import xml.sax
import xml.sax.xmlreader

def _make_parser(*, content_handler=None, dtd_handler=None, entity_resolver=None, error_handler=None, locale=None, features=None, properties=None):
    parser = xml.sax.make_parser()

    if content_handler is not None:
        parser.setContentHandler(content_handler)
    if dtd_handler is not None:
        parser.setDTDHandler(dtd_handler)
    if entity_resolver is not None:
        parser.setEntityResolver(entity_resolver)
    if error_handler is not None:
        parser.setErrorHandler(error_handler)
    if locale is not None:
        parser.setLocale(locale)
    if features is not None:
        for feature, value in features.items():
            parser.setFeature(feature, value)
    if properties is not None:
        for property, value in properties.items():
            parser.setProperty(property, value)

    return parser

def parse(source, *, content_handler=None, dtd_handler=None, entity_resolver=None, error_handler=None, locale=None, features=None, properties=None):
    parser = _make_parser(content_handler=content_handler, dtd_handler=dtd_handler, entity_resolver=entity_resolver, error_handler=error_handler, locale=locale, features=features, properties=properties)

    parser.parse(source)

def parse_string(string, *, content_handler=None, dtd_handler=None, entity_resolver=None, error_handler=None, locale=None, features=None, properties=None):
    parser = _make_parser(content_handler=content_handler, dtd_handler=dtd_handler, entity_resolver=entity_resolver, error_handler=error_handler, locale=locale, features=features, properties=properties)

    inputsource = xml.sax.xmlreader.InputSource()
    if isinstance(string, str):
        inputsource.setCharacterStream(io.StringIO(string))
    else:
        inputsource.setByteStream(io.BytesIO(string))

    parser.parse(inputsource)




#!/usr/bin/env python3
# Copyright 2004-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2


import sys
import io
import sys

from optparse import OptionParser, make_option

import xml.sax.handler
from xml.sax.saxutils import XMLGenerator, escape, quoteattr

import javatoolkit.xml.sax


def add_gentoo_classpath(document):

        XMLGenerator.__init__(self, self.buffer, 'UTF-8')

    def process(self, in_stream):
        javatoolkit.xml.sax.parse(in_stream, content_handler=self, features={xml.sax.handler.feature_external_ges: 1})
        parse(in_stream, self)
        self.p('\n')

    def startElement(self, name, attrs):
- 

Return to bug 698954

Lines 1-13 Link Here

(-)a/src/py/xml-rewrite-2.py (-8 / +10 lines)
1	#!/usr/bin/env python3	1	#!/usr/bin/env python3
2	# Copyright 2004-2006 Gentoo Foundation	2	# Copyright 2004-2020 Gentoo Authors
3	# Distributed under the terms of the GNU General Public Licence v2	3	# Distributed under the terms of the GNU General Public License v2
4		4
5		5
6	import sys
7	import io	6	import io
8	from xml.sax.saxutils import quoteattr, escape	7	import sys
		8
9	from optparse import OptionParser, make_option	9	from optparse import OptionParser, make_option
10	from xml.sax.saxutils import XMLGenerator	10
		11	import xml.sax.handler
		12	from xml.sax.saxutils import XMLGenerator, escape, quoteattr
		13
		14	import javatoolkit.xml.sax
11		15
12		16
13	def add_gentoo_classpath(document):	17	def add_gentoo_classpath(document):
Lines 190-197 class SaxRewriter(XMLGenerator, StreamRewriterBase): Link Here
190	XMLGenerator.__init__(self, self.buffer, 'UTF-8')	194	XMLGenerator.__init__(self, self.buffer, 'UTF-8')
191		195
192	def process(self, in_stream):	196	def process(self, in_stream):
193	from xml.sax import parse	197	javatoolkit.xml.sax.parse(in_stream, content_handler=self, features={xml.sax.handler.feature_external_ges: 1})
194	parse(in_stream, self)
195	self.p('\n')	198	self.p('\n')
196		199
197	def startElement(self, name, attrs):	200	def startElement(self, name, attrs):
198	-

Lines 1-14 Link Here

(-)a/src/py/javatoolkit/xml/SaxRewriter.py (-4 / +6 lines)
1	# -- coding: UTF-8 --	1	# -- coding: UTF-8 --
2	# Copyright 2004-2005 Gentoo Foundation	2	# Copyright 2004-2020 Gentoo Authors
3	# Distributed under the terms of the GNU General Public License v2	3	# Distributed under the terms of the GNU General Public License v2
4		4
		5	import io
5	import os	6	import os
6	import sys	7	import sys
7	import io
8		8
		9	import xml.sax.handler
9	from xml.sax.saxutils import XMLGenerator	10	from xml.sax.saxutils import XMLGenerator
10	from xml.sax.saxutils import quoteattr	11	from xml.sax.saxutils import quoteattr
11		12
		13	import javatoolkit.xml.sax
		14
12	class SaxRewriter(XMLGenerator):	15	class SaxRewriter(XMLGenerator):
13	"""	16	"""
14	Using Sax gives us the support for writing back doctypes and all easily	17	Using Sax gives us the support for writing back doctypes and all easily
Lines 124-131 class SaxRewriter(XMLGenerator): Link Here
124		127
125	def process(self, in_stream, callback):	128	def process(self, in_stream, callback):
126	self.startElement = callback	129	self.startElement = callback
127	from xml.sax import parseString	130	javatoolkit.xml.sax.parse_string(in_stream.encode('UTF8'), content_handler=self, features={xml.sax.handler.feature_external_ges: 1})
128	parseString(in_stream.encode('UTF8'), self)
129	self.p('\n')	131	self.p('\n')
130		132
131	# vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4 nowrap:	133	# vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4 nowrap:

Line 0 Link Here

(-)a/src/py/javatoolkit/xml/sax.py (+44 lines)
	1	# Copyright 2020 Gentoo Authors
	2	# Distributed under the terms of the GNU General Public License v2
	3
	4	import io
	5	import xml.sax
	6	import xml.sax.xmlreader
	7
	8	def _make_parser(*, content_handler=None, dtd_handler=None, entity_resolver=None, error_handler=None, locale=None, features=None, properties=None):
	9	parser = xml.sax.make_parser()
	10
	11	if content_handler is not None:
	12	parser.setContentHandler(content_handler)
	13	if dtd_handler is not None:
	14	parser.setDTDHandler(dtd_handler)
	15	if entity_resolver is not None:
	16	parser.setEntityResolver(entity_resolver)
	17	if error_handler is not None:
	18	parser.setErrorHandler(error_handler)
	19	if locale is not None:
	20	parser.setLocale(locale)
	21	if features is not None:
	22	for feature, value in features.items():
	23	parser.setFeature(feature, value)
	24	if properties is not None:
	25	for property, value in properties.items():
	26	parser.setProperty(property, value)
	27
	28	return parser
	29
	30	def parse(source, *, content_handler=None, dtd_handler=None, entity_resolver=None, error_handler=None, locale=None, features=None, properties=None):
	31	parser = _make_parser(content_handler=content_handler, dtd_handler=dtd_handler, entity_resolver=entity_resolver, error_handler=error_handler, locale=locale, features=features, properties=properties)
	32
	33	parser.parse(source)
	34
	35	def parse_string(string, *, content_handler=None, dtd_handler=None, entity_resolver=None, error_handler=None, locale=None, features=None, properties=None):
	36	parser = _make_parser(content_handler=content_handler, dtd_handler=dtd_handler, entity_resolver=entity_resolver, error_handler=error_handler, locale=locale, features=features, properties=properties)
	37
	38	inputsource = xml.sax.xmlreader.InputSource()
	39	if isinstance(string, str):
	40	inputsource.setCharacterStream(io.StringIO(string))
	41	else:
	42	inputsource.setByteStream(io.BytesIO(string))
	43
	44	parser.parse(inputsource)