rpms/python-4Suite-XML/F-13 python-4Suite-XML-1.0.2-tests-as.patch, NONE, 1.1 python-4Suite-XML.spec, 1.15, 1.16

[Miloslav Trmac]

Author: mitr

Update of /cvs/pkgs/rpms/python-4Suite-XML/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28444

Modified Files:
	python-4Suite-XML.spec 
Added Files:
	python-4Suite-XML-1.0.2-tests-as.patch 
Log Message:
* Fri Feb 26 2010 Miloslav Trmač <mitr at redhat.com> - 1.0.2-9
- Don't use "as" identifier in the test suite
  Resolves: #564872
- Point URL: to something that doesn't fail with 503
- Update source URL


python-4Suite-XML-1.0.2-tests-as.patch:
 test_location_path.py |    4 ++--
 test_step.py          |   20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

--- NEW FILE python-4Suite-XML-1.0.2-tests-as.patch ---
diff -urN 4Suite-XML/test/Xml/XPath/Core/test_location_path.py 4Suite-XML-1.0.2/test/Xml/XPath/Core/test_location_path.py
--- 4Suite-XML/test/Xml/XPath/Core/test_location_path.py	2004-10-05 00:55:01.000000000 +0200
+++ 4Suite-XML-1.0.2/test/Xml/XPath/Core/test_location_path.py	2010-02-26 16:37:33.916336763 +0100
@@ -15,8 +15,8 @@
     DomTree = tester.test_data['tree']
 
     nt = ParsedNodeTest.ParsedNameTest('*')
-    as = ParsedAxisSpecifier.ParsedAxisSpecifier('child')
-    step = ParsedStep.ParsedStep(as,nt,None)
+    as_ = ParsedAxisSpecifier.ParsedAxisSpecifier('child')
+    step = ParsedStep.ParsedStep(as_,nt,None)
     # [(expression, context, expected)...]
     tests = [(ParsedAbbreviatedAbsoluteLocationPath(step),
               Context.Context(DomTree.CHILD2, 1, 1),
diff -urN 4Suite-XML/test/Xml/XPath/Core/test_step.py 4Suite-XML-1.0.2/test/Xml/XPath/Core/test_step.py
--- 4Suite-XML/test/Xml/XPath/Core/test_step.py	2001-09-15 20:46:11.000000000 +0200
+++ 4Suite-XML-1.0.2/test/Xml/XPath/Core/test_step.py	2010-02-26 16:38:10.654334053 +0100
@@ -21,38 +21,38 @@
     tests = []
 
     # Test 1
-    as = ParsedAxisSpecifier.ParsedAxisSpecifier('ancestor')
+    as_ = ParsedAxisSpecifier.ParsedAxisSpecifier('ancestor')
     nt = ParsedNodeTest.ParsedNameTest('*')
-    s = ParsedStep.ParsedStep(as, nt)
+    s = ParsedStep.ParsedStep(as_, nt)
     tests.append((s, [DomTree.ROOT]))
     
     # Test 2
-    as = ParsedAxisSpecifier.ParsedAxisSpecifier('ancestor-or-self')
-    s = ParsedStep.ParsedStep(as, nt, None)
+    as_ = ParsedAxisSpecifier.ParsedAxisSpecifier('ancestor-or-self')
+    s = ParsedStep.ParsedStep(as_, nt, None)
     tests.append((s, [DomTree.ROOT, DomTree.CHILD1]))
 
     # Test 3
-    as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
+    as_ = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
     nt = ParsedNodeTest.ParsedNameTest('GCHILD')
-    s = ParsedStep.ParsedStep(as, nt)
+    s = ParsedStep.ParsedStep(as_, nt)
     tests.append((s, DomTree.GCHILDREN1))
     
     # Test 4
-    as = ParsedAxisSpecifier.ParsedAxisSpecifier('child')
+    as_ = ParsedAxisSpecifier.ParsedAxisSpecifier('child')
     nt = ParsedNodeTest.ParsedNameTest('GCHILD')
     left = ParsedExpr.ParsedFunctionCallExpr('position', [])
     right = ParsedExpr.ParsedNLiteralExpr('1')
     exp = ParsedExpr.ParsedEqualityExpr('=', left, right)
     pl = ParsedPredicateList.ParsedPredicateList([exp])
-    s = ParsedStep.ParsedStep(as, nt, pl)
+    s = ParsedStep.ParsedStep(as_, nt, pl)
     tests.append((s, [DomTree.GCHILD11]))
 
     # Test 5
     right = ParsedExpr.ParsedNLiteralExpr('1')
     pl = ParsedPredicateList.ParsedPredicateList([right])
-    as = ParsedAxisSpecifier.ParsedAxisSpecifier('child')
+    as_ = ParsedAxisSpecifier.ParsedAxisSpecifier('child')
     nt = ParsedNodeTest.ParsedNameTest('GCHILD')
-    s = ParsedStep.ParsedStep(as,nt,pl)
+    s = ParsedStep.ParsedStep(as_,nt,pl)
     tests.append((s, [DomTree.GCHILD11]))
     
     tester.testDone()


Index: python-4Suite-XML.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-4Suite-XML/F-13/python-4Suite-XML.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- python-4Suite-XML.spec	3 Nov 2009 13:53:16 -0000	1.15
+++ python-4Suite-XML.spec	26 Feb 2010 17:10:33 -0000	1.16
@@ -2,15 +2,18 @@
 
 Name: python-4Suite-XML
 Version: 1.0.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: A collection of XML-related technologies for Python
 
 Group: Development/Libraries
 License: ASL 1.1
-URL: http://www.4suite.org/
-Source0: http://dl.sourceforge.net/foursuite/4Suite-XML-%{version}.tar.bz2
+URL: http://foursuite.sourceforge.net/
+Source0: http://downloads.sourceforge.net/foursuite/4Suite-XML-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# https://sourceforge.net/tracker/?func=detail&aid=2891269&group_id=39954&atid=428294
 Patch0: python-4Suite-XML-1.0.2-expat-dos.patch
+# https://sourceforge.net/tracker/?func=detail&aid=2959726&group_id=39954&atid=428294
+Patch1: python-4Suite-XML-1.0.2-tests-as.patch
 BuildRequires: python-devel
 
 %description
@@ -25,6 +28,7 @@ Its major components include the followi
 %prep
 %setup -q -n 4Suite-XML-%{version}
 %patch0 -p1 -b .expat-dos
+%patch1 -p1 -b .tests-as
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -60,6 +64,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/4Suite
 
 %changelog
+* Fri Feb 26 2010 Miloslav Trmač <mitr at redhat.com> - 1.0.2-9
+- Don't use "as" identifier in the test suite
+  Resolves: #564872
+- Point URL: to something that doesn't fail with 503
+- Update source URL
+
 * Tue Nov  3 2009 Miloslav Trmač <mitr at redhat.com> - 1.0.2-8
 - Fix an expat DoS
   Related: #531697