Attachment #97803 for bug #136596

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

Lines 7-13 Link Here

(-)py-xml.new/Makefile (-1 / +1 lines)
7		7
8	PORTNAME= xml	8	PORTNAME= xml
9	PORTVERSION= 0.8.4	9	PORTVERSION= 0.8.4
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= textproc python	11	CATEGORIES= textproc python
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= pyxml	13	MASTER_SITE_SUBDIR= pyxml




--- xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py.orig	2009-07-09 08:48:55.000000000 +0800
+++ xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py	2009-07-09 08:49:09.000000000 +0800
@@ -24,8 +24,8 @@
         self._rel = rel
         nt = ParsedNodeTest.ParsedNodeTest('node', '')
         ppl = ParsedPredicateList.ParsedPredicateList([])
-        as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
-        self._step = ParsedStep.ParsedStep(as, nt, ppl)
+        as26 = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
+        self._step = ParsedStep.ParsedStep(as26, nt, ppl)
         return
 
     def evaluate(self, context):




--- xml/xpath/ParsedAbbreviatedRelativeLocationPath.py.orig	2009-07-09 08:43:39.000000000 +0800
+++ xml/xpath/ParsedAbbreviatedRelativeLocationPath.py	2009-07-09 08:43:56.000000000 +0800
@@ -28,8 +28,8 @@
         self._right = right
         nt = ParsedNodeTest.ParsedNodeTest('node','')
         ppl = ParsedPredicateList.ParsedPredicateList([])
-        as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
-        self._middle = ParsedStep.ParsedStep(as, nt, ppl)
+        as26 = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
+        self._middle = ParsedStep.ParsedStep(as26, nt, ppl)
 
     def evaluate(self, context):
         res = []

Lines 532-538 Link Here

(-)py-xml.new/pkg-plist (+4 lines)
532	%%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/NamespaceNode.pyc	532	%%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/NamespaceNode.pyc
533	%%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/NamespaceNode.pyo	533	%%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/NamespaceNode.pyo
534	%%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/ParsedAbbreviatedAbsoluteLocationPath.py	534	%%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/ParsedAbbreviatedAbsoluteLocationPath.py
		535	%%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/ParsedAbbreviatedAbsoluteLocationPath.pyc
		536	%%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/ParsedAbbreviatedAbsoluteLocationPath.pyo
535	%%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/ParsedAbbreviatedRelativeLocationPath.py	537	%%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/ParsedAbbreviatedRelativeLocationPath.py
		538	%%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/ParsedAbbreviatedRelativeLocationPath.pyc
		539	%%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/ParsedAbbreviatedRelativeLocationPath.pyo
536	%%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/ParsedAbsoluteLocationPath.py	540	%%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/ParsedAbsoluteLocationPath.py
537	%%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/ParsedAbsoluteLocationPath.pyc	541	%%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/ParsedAbsoluteLocationPath.pyc
538	%%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/ParsedAbsoluteLocationPath.pyo	542	%%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/ParsedAbsoluteLocationPath.pyo

Return to bug 136596

Line 0 Link Here

(-)py-xml.new/files/patch-xml-xpath-ParsedAbbreviatedAbsoluteLocationPath.py (+13 lines)
	1	--- xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py.orig 2009-07-09 08:48:55.000000000 +0800
	2	+++ xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py 2009-07-09 08:49:09.000000000 +0800
	3	@@ -24,8 +24,8 @@
	4	self._rel = rel
	5	nt = ParsedNodeTest.ParsedNodeTest('node', '')
	6	ppl = ParsedPredicateList.ParsedPredicateList([])
	7	- as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
	8	- self._step = ParsedStep.ParsedStep(as, nt, ppl)
	9	+ as26 = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
	10	+ self._step = ParsedStep.ParsedStep(as26, nt, ppl)
	11	return
	12
	13	def evaluate(self, context):

Line 0 Link Here

(-)py-xml.new/files/patch-xml-xpath-ParsedAbbreviatedRelativeLocationPath.py (+13 lines)
	1	--- xml/xpath/ParsedAbbreviatedRelativeLocationPath.py.orig 2009-07-09 08:43:39.000000000 +0800
	2	+++ xml/xpath/ParsedAbbreviatedRelativeLocationPath.py 2009-07-09 08:43:56.000000000 +0800
	3	@@ -28,8 +28,8 @@
	4	self._right = right
	5	nt = ParsedNodeTest.ParsedNodeTest('node','')
	6	ppl = ParsedPredicateList.ParsedPredicateList([])
	7	- as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
	8	- self._middle = ParsedStep.ParsedStep(as, nt, ppl)
	9	+ as26 = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
	10	+ self._middle = ParsedStep.ParsedStep(as26, nt, ppl)
	11
	12	def evaluate(self, context):
	13	res = []