diff options
| author | Andrew Manison <amanison@anselsystems.com> | 2010-06-19 09:02:05 +0000 |
|---|---|---|
| committer | Andrew Manison <amanison@anselsystems.com> | 2010-06-19 09:02:05 +0000 |
| commit | 85fd77589be2f6c970ca6895afa1520e0a2fda04 (patch) | |
| tree | 6b9d172b005b2657e541424da71009dcd2a1f3c4 /testing/py-xml/fix-python2.6.patch | |
| parent | 8fdcdf953f865c691b01d546a0baea1a1143deeb (diff) | |
| parent | 253afa4a86bcb0959ca8b7fb269f482058847a9b (diff) | |
| download | aports-85fd77589be2f6c970ca6895afa1520e0a2fda04.tar.bz2 aports-85fd77589be2f6c970ca6895afa1520e0a2fda04.tar.xz | |
Merge remote branch 'alpine/master'
Conflicts:
main/openssl/APKBUILD
Diffstat (limited to 'testing/py-xml/fix-python2.6.patch')
| -rw-r--r-- | testing/py-xml/fix-python2.6.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/testing/py-xml/fix-python2.6.patch b/testing/py-xml/fix-python2.6.patch new file mode 100644 index 0000000000..7bf1c46fc9 --- /dev/null +++ b/testing/py-xml/fix-python2.6.patch @@ -0,0 +1,28 @@ +diff -ur a/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py b/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py +--- a/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py 2003-03-11 15:01:34.000000000 +0100 ++++ b/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py 2009-05-25 16:32:26.000000000 +0200 +@@ -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) ++ asp = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') ++ self._step = ParsedStep.ParsedStep(asp, nt, ppl) + return + + def evaluate(self, context): +diff -ur a/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py b/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py +--- a/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py 2003-03-11 15:01:34.000000000 +0100 ++++ b/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py 2009-05-25 16:27:55.000000000 +0200 +@@ -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) ++ asp = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') ++ self._middle = ParsedStep.ParsedStep(asp, nt, ppl) + + def evaluate(self, context): + res = [] |