# HG changeset patch # User Rich Burridge # Date 1332973300 25200 # Node ID cbd9239f6454e06847a58aa0e745c849b67c657b # Parent 32bfb3fa9b600d808f3f1db86cf7caee545488ec 7153019 Update Python lxml bindings to latest version diff -r 32bfb3fa9b60 -r cbd9239f6454 components/python/pylxml/Makefile --- a/components/python/pylxml/Makefile Wed Mar 28 10:58:59 2012 -0700 +++ b/components/python/pylxml/Makefile Wed Mar 28 15:21:40 2012 -0700 @@ -23,11 +23,11 @@ include ../../../make-rules/shared-macros.mk COMPONENT_NAME= lxml -COMPONENT_VERSION= 2.1.2 +COMPONENT_VERSION= 2.3.3 COMPONENT_PROJECT_URL= http://lxml.de/ COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tgz -COMPONENT_ARCHIVE_HASH= sha1:5354b3dd5f0bd16589da9970e0da7df60aaaa2f5 +COMPONENT_ARCHIVE_HASH= sha1:891de38322643e6f052533be8b415f0c30e65ce7 COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)files/$(COMPONENT_ARCHIVE) # disable optimization to prevent the Studio compilers from spinning diff -r 32bfb3fa9b60 -r cbd9239f6454 components/python/pylxml/pylxml-26.p5m --- a/components/python/pylxml/pylxml-26.p5m Wed Mar 28 10:58:59 2012 -0700 +++ b/components/python/pylxml/pylxml-26.p5m Wed Mar 28 15:21:40 2012 -0700 @@ -29,9 +29,13 @@ value=org.opensolaris.category.2008:Development/Python set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) -set name=org.opensolaris.arc-caseid \ - value=PSARC/2009/579 +set name=org.opensolaris.arc-caseid value=PSARC/2009/579 set name=org.opensolaris.consolidation value=$(CONSOLIDATION) +dir path=lib/python2.6/vendor-packages/lxml/isoschematron/resources +dir path=lib/python2.6/vendor-packages/lxml/isoschematron/resources/rng +dir path=lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl +dir \ + path=lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1 dir path=usr dir path=usr/lib dir path=usr/lib/python2.6 @@ -41,6 +45,7 @@ path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info dir path=usr/lib/python2.6/vendor-packages/lxml/64 dir path=usr/lib/python2.6/vendor-packages/lxml/html +dir path=usr/lib/python2.6/vendor-packages/lxml/isoschematron file \ path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info/PKG-INFO file \ @@ -60,25 +65,48 @@ file path=usr/lib/python2.6/vendor-packages/lxml/cssselect.py file path=usr/lib/python2.6/vendor-packages/lxml/doctestcompare.py file path=usr/lib/python2.6/vendor-packages/lxml/etree.so +file path=usr/lib/python2.6/vendor-packages/lxml/etree_defs.h +file path=usr/lib/python2.6/vendor-packages/lxml/etreepublic.pxd file path=usr/lib/python2.6/vendor-packages/lxml/html/ElementSoup.py file path=usr/lib/python2.6/vendor-packages/lxml/html/__init__.py file path=usr/lib/python2.6/vendor-packages/lxml/html/_dictmixin.py file path=usr/lib/python2.6/vendor-packages/lxml/html/_diffcommand.py +file path=usr/lib/python2.6/vendor-packages/lxml/html/_html5builder.py file path=usr/lib/python2.6/vendor-packages/lxml/html/_setmixin.py file path=usr/lib/python2.6/vendor-packages/lxml/html/builder.py file path=usr/lib/python2.6/vendor-packages/lxml/html/clean.py file path=usr/lib/python2.6/vendor-packages/lxml/html/defs.py file path=usr/lib/python2.6/vendor-packages/lxml/html/diff.py file path=usr/lib/python2.6/vendor-packages/lxml/html/formfill.py +file path=usr/lib/python2.6/vendor-packages/lxml/html/html5parser.py file path=usr/lib/python2.6/vendor-packages/lxml/html/soupparser.py file path=usr/lib/python2.6/vendor-packages/lxml/html/usedoctest.py +file path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/__init__.py +file \ + path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/rng/iso-schematron.rng +file \ + path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/RNG2Schtrn.xsl +file \ + path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/XSD2Schtrn.xsl +file \ + path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_abstract_expand.xsl +file \ + path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_dsdl_include.xsl +file \ + path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_schematron_message.xsl +file \ + path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_schematron_skeleton_for_xslt1.xsl +file \ + path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_svrl_for_xslt1.xsl +file \ + path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/readme.txt file path=usr/lib/python2.6/vendor-packages/lxml/objectify.so file path=usr/lib/python2.6/vendor-packages/lxml/pyclasslookup.py file path=usr/lib/python2.6/vendor-packages/lxml/sax.py +file path=usr/lib/python2.6/vendor-packages/lxml/tree.pxd file path=usr/lib/python2.6/vendor-packages/lxml/usedoctest.py license pylxml.copyright license="BSD, PSF, GPL" # force a dependency on the lxml package depend fmri=library/python-2/lxml@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \ type=require - diff -r 32bfb3fa9b60 -r cbd9239f6454 components/python/pylxml/pylxml-27.p5m --- a/components/python/pylxml/pylxml-27.p5m Wed Mar 28 10:58:59 2012 -0700 +++ b/components/python/pylxml/pylxml-27.p5m Wed Mar 28 15:21:40 2012 -0700 @@ -24,7 +24,7 @@ set name=pkg.fmri \ value=pkg:/library/python-2/lxml-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) set name=pkg.summary \ - value="Pythonic 2.6 binding for the libxml2 and libxslt libraries" + value="Pythonic 2.7 binding for the libxml2 and libxslt libraries" set name=info.classification \ value=org.opensolaris.category.2008:Development/Python set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) @@ -34,6 +34,11 @@ set name=org.opensolaris.consolidation value=$(CONSOLIDATION) license pylxml.copyright license="BSD, PSF, GPL" +dir path=lib/python2.7/vendor-packages/lxml/isoschematron/resources +dir path=lib/python2.7/vendor-packages/lxml/isoschematron/resources/rng +dir path=lib/python2.7/vendor-packages/lxml/isoschematron/resources/xsl +dir \ + path=lib/python2.7/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1 dir path=usr/lib/python2.7 dir path=usr/lib/python2.7/vendor-packages dir path=usr/lib/python2.7/vendor-packages/lxml @@ -54,6 +59,8 @@ file path=usr/lib/python2.7/vendor-packages/lxml/doctestcompare.py file path=usr/lib/python2.7/vendor-packages/lxml/ElementInclude.py file path=usr/lib/python2.7/vendor-packages/lxml/etree.so +file path=usr/lib/python2.7/vendor-packages/lxml/etree_defs.h +file path=usr/lib/python2.7/vendor-packages/lxml/etreepublic.pxd file path=usr/lib/python2.7/vendor-packages/lxml/html/__init__.py file path=usr/lib/python2.7/vendor-packages/lxml/html/_dictmixin.py file path=usr/lib/python2.7/vendor-packages/lxml/html/_diffcommand.py @@ -64,14 +71,34 @@ file path=usr/lib/python2.7/vendor-packages/lxml/html/diff.py file path=usr/lib/python2.7/vendor-packages/lxml/html/ElementSoup.py file path=usr/lib/python2.7/vendor-packages/lxml/html/formfill.py +file path=usr/lib/python2.7/vendor-packages/lxml/html/html5parser.py file path=usr/lib/python2.7/vendor-packages/lxml/html/soupparser.py file path=usr/lib/python2.7/vendor-packages/lxml/html/usedoctest.py +file path=usr/lib/python2.7/vendor-packages/lxml/isoschematron/__init__.py +file \ + path=usr/lib/python2.7/vendor-packages/lxml/isoschematron/resources/rng/iso-schematron.rng +file \ + path=usr/lib/python2.7/vendor-packages/lxml/isoschematron/resources/xsl/RNG2Schtrn.xsl +file \ + path=usr/lib/python2.7/vendor-packages/lxml/isoschematron/resources/xsl/XSD2Schtrn.xsl +file \ + path=usr/lib/python2.7/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_abstract_expand.xsl +file \ + path=usr/lib/python2.7/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_dsdl_include.xsl +file \ + path=usr/lib/python2.7/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_schematron_message.xsl +file \ + path=usr/lib/python2.7/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_schematron_skeleton_for_xslt1.xsl +file \ + path=usr/lib/python2.7/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_svrl_for_xslt1.xsl +file \ + path=usr/lib/python2.7/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/readme.txt file path=usr/lib/python2.7/vendor-packages/lxml/objectify.so file path=usr/lib/python2.7/vendor-packages/lxml/pyclasslookup.py file path=usr/lib/python2.7/vendor-packages/lxml/sax.py +file path=usr/lib/python2.7/vendor-packages/lxml/tree.pxd file path=usr/lib/python2.7/vendor-packages/lxml/usedoctest.py # force a dependency on the lxml package depend fmri=library/python-2/lxml@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \ type=require - diff -r 32bfb3fa9b60 -r cbd9239f6454 components/python/pylxml/pylxml.copyright --- a/components/python/pylxml/pylxml.copyright Wed Mar 28 10:58:59 2012 -0700 +++ b/components/python/pylxml/pylxml.copyright Wed Mar 28 15:21:40 2012 -0700 @@ -58,6 +58,172 @@ -------------------------------------------------------------------- +iso-schematron.rng: +------------------- + +(c) International Organization for Standardization 2005. +Permission to copy in any form is granted for use with conforming +SGML systems and applications as defined in ISO 8879, +provided this notice is included in all copies. + +-------------------------------------------------------------------- + +iso_abstract_expand.xsl: +------------------------ + +LEGAL INFORMATION + +Copyright (c) 2000-2008 Rick Jelliffe and Academia Sinica Computing Center, Taiwan + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from +the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim +that you wrote the original software. If you use this software in a product, +an acknowledgment in the product documentation would be appreciated but is +not required. + +2. Altered source versions must be plainly marked as such, and must not be +misrepresented as being the original software. + +3. This notice may not be removed or altered from any source distribution. + +-------------------------------------------------------------------- + +iso_dsdl_include.xsl: +--------------------- + +LEGAL INFORMATION + +Copyright (c) 2008 Rick Jelliffe + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from +the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim +that you wrote the original software. If you use this software in a product, +an acknowledgment in the product documentation would be appreciated but is +not required. + +2. Altered source versions must be plainly marked as such, and must not be +misrepresented as being the original software. + +3. This notice may not be removed or altered from any source distribution. + +-------------------------------------------------------------------- + +iso_schematron_message.xsl: +--------------------------- + +Copyright (c) 2000,2001 Rick Jelliffe and Academia Sinica Computing Center, +Taiwan + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from +the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim +that you wrote the original software. If you use this software in a product, +an acknowledgment in the product documentation would be appreciated but is +not required. + +2. Altered source versions must be plainly marked as such, and must not be +misrepresented as being the original software. + +3. This notice may not be removed or altered from any source distribution. + +-------------------------------------------------------------------- + +iso_schematron_skeleton_for_xslt1.xsl: +-------------------------------------- + +LEGAL INFORMATION + +Copyright (c) 2000-2008 Rick Jelliffe and Academia Sinica Computing Center, +Taiwan + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from +the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim +that you wrote the original software. If you use this software in a product, +an acknowledgment in the product documentation would be appreciated but is +not required. + +2. Altered source versions must be plainly marked as such, and must not be +misrepresented as being the original software. + +3. This notice may not be removed or altered from any source distribution. + +-------------------------------------------------------------------- + +iso_svrl_for_xslt1.xsl: +----------------------- + +Copyright (c) 2001, 2006 Rick Jelliffe and Academia Sinica Computing Center, +Taiwan + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from +the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim +that you wrote the original software. If you use this software in a product, +an acknowledgment in the product documentation would be appreciated but is +not required. + +2. Altered source versions must be plainly marked as such, and must not be +misrepresented as being the original software. + +3. This notice may not be removed or altered from any source distribution. + +-------------------------------------------------------------------- + +RNG2Schtrn.xsl: +--------------- + + Stylesheet for extracting Schematron information from a RELAX-NG schema. + Based on the stylesheet for extracting Schematron information from + W3C XML Schema. + Created by Eddie Robertsson 2002/06/01 + 2009/12/10 hj: changed Schematron namespace to ISO URI (Holger Joukl) + +-------------------------------------------------------------------- + +XSD2Schtrn.xsl: +--------------- + + based on an original transform by Eddie Robertsson + 2001/04/21 fn: added support for included schemas + 2001/06/27 er: changed XMl Schema prefix from xsd: to xs: and + changed to the Rec namespace + 2009/12/10 hj: changed Schematron namespace to ISO URI (Holger Joukl) + +-------------------------------------------------------------------- + Oracle elects to use only the GNU Lesser General Public License version 2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software where a choice of LGPL/GPL license versions are made available with the