Changeset 2789:e5c02fe0e72c in livinglogic.python.xist

Show
Ignore:
Timestamp:
07/16/07 21:36:24 (12 years ago)
Author:
Walter Doerwald <walter@…>
Branch:
default
Message:

Merge in rel-2-15-3.

Files:
42 modified

Legend:

Unmodified
Added
Removed
  • NEWS.xml

    r2783 r2789  
    5656<item>The <class>Attrs</class> methods <method>updatenew</method> and 
    5757<method>updatexisting</method> have been removed.</item> 
     58</ulist> 
     59</section> 
     60 
     61 
     62<section><title>Changes in 2.15.3 (released 07/16/2007)</title> 
     63<ulist> 
     64<item>use a consistent license (MIT) everywhere. This should make 
     65&xist; Debian compatible.</item> 
     66<item>Change the Python quotes example, so that it works even if 
     67there's no <filename>python-quotes.xml</filename> in the current 
     68directory.</item> 
    5869</ulist> 
    5970</section> 
  • demos/python-quotes/python-quotes.py

    r2427 r2789  
    88import qel_xmlns, rdf_xmlns, rdfs_xmlns, cc_xmlns, dc_xmlns 
    99 
    10 url = "python-quotes.xml" 
     10urls = ("python-quotes.xml", "http://www.amk.ca/quotations/python-quotes.xml") 
    1111 
    1212 
     
    1515    prefixes = xsc.Prefixes(xml=xml) 
    1616    base = "root:python-quotes.html" 
    17     e = parsers.parseURL(url, base=base, saxparser=parsers.ExpatParser, nspool=nspool, prefixes=prefixes, validate=False) 
    18     e = e[qel_xmlns.quotations][0] 
    19     e = e.compact().conv() 
    20     e.write(open("python-quotes.html", "wb"), base=base, encoding="iso-8859-1", validate=False) 
     17    e = None 
     18    for url in urls: 
     19        try: 
     20            e = parsers.parseURL(url, base=base, saxparser=parsers.ExpatParser, nspool=nspool, prefixes=prefixes, validate=False) 
     21        except IOError: 
     22            pass 
     23    if e is not None: 
     24        e = e[qel_xmlns.quotations][0] 
     25        e = e.compact().conv() 
     26        e.write(open("python-quotes.html", "wb"), base=base, encoding="iso-8859-1", validate=False) 
     27    else: 
     28        raise IOError("can't load XML") 
  • setup.py

    r2692 r2789  
    2828Environment :: Web Environment 
    2929Intended Audience :: Developers 
    30 License :: OSI Approved :: Python License (CNRI Python License) 
     30License :: OSI Approved :: MIT License 
    3131Operating System :: OS Independent 
    3232Programming Language :: Python 
     
    6363    url="http://www.livinglogic.de/Python/xist/", 
    6464    download_url="http://www.livinglogic.de/Python/xist/Download.html", 
    65     license="Python", 
     65    license="MIT", 
    6666    classifiers=CLASSIFIERS.strip().splitlines(), 
    6767    keywords=",".join(KEYWORDS.strip().splitlines()), 
  • src/ll/__init__.py

    r2618 r2789  
    55## Copyright 1999-2007 by Walter Dörwald 
    66## 
    7 ## All Rights Reserved 
     7## Permission is hereby granted, free of charge, to any person obtaining a copy 
     8## of this software and associated documentation files (the "Software"), to deal 
     9## in the Software without restriction, including without limitation the rights 
     10## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
     11## copies of the Software, and to permit persons to whom the Software is 
     12## furnished to do so, subject to the following conditions: 
    813## 
    9 ## Permission to use, copy, modify, and distribute this software and its documentation 
    10 ## for any purpose and without fee is hereby granted, provided that the above copyright 
    11 ## notice appears in all copies and that both that copyright notice and this permission 
    12 ## notice appear in supporting documentation, and that the name of LivingLogic AG or 
    13 ## the author not be used in advertising or publicity pertaining to distribution of the 
    14 ## software without specific, written prior permission. 
     14## The above copyright notice and this permission notice shall be included in 
     15## all copies or substantial portions of the Software. 
    1516## 
    16 ## LIVINGLOGIC AG AND THE AUTHOR DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, 
    17 ## INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
    18 ## LIVINGLOGIC AG OR THE AUTHOR BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
    19 ## DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER 
    20 ## IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR 
    21 ## IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 
     17## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
     18## IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
     19## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
     20## AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
     21## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
     22## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
     23## THE SOFTWARE. 
    2224 
    2325 
  • src/ll/xist/__init__.py

    r2618 r2789  
    55## Copyright 1999-2007 by Walter Dörwald 
    66## 
    7 ## All Rights Reserved 
     7## Permission is hereby granted, free of charge, to any person obtaining a copy 
     8## of this software and associated documentation files (the "Software"), to deal 
     9## in the Software without restriction, including without limitation the rights 
     10## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
     11## copies of the Software, and to permit persons to whom the Software is 
     12## furnished to do so, subject to the following conditions: 
    813## 
    9 ## Permission to use, copy, modify, and distribute this software and its documentation 
    10 ## for any purpose and without fee is hereby granted, provided that the above copyright 
    11 ## notice appears in all copies and that both that copyright notice and this permission 
    12 ## notice appear in supporting documentation, and that the name of LivingLogic AG or 
    13 ## the author not be used in advertising or publicity pertaining to distribution of the 
    14 ## software without specific, written prior permission. 
     14## The above copyright notice and this permission notice shall be included in 
     15## all copies or substantial portions of the Software. 
    1516## 
    16 ## LIVINGLOGIC AG AND THE AUTHOR DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, 
    17 ## INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
    18 ## LIVINGLOGIC AG OR THE AUTHOR BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
    19 ## DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER 
    20 ## IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR 
    21 ## IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 
     17## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
     18## IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
     19## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
     20## AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
     21## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
     22## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
     23## THE SOFTWARE. 
     24 
    2225 
    2326""" 
  • src/ll/xist/cssparsers.py

    r2618 r2789  
    88## 
    99## See xist/__init__.py for the license 
     10 
    1011 
    1112""" 
  • src/ll/xist/ns/__init__.py

    r2618 r2789  
    88## 
    99## See xist/__init__.py for the license 
     10 
    1011 
    1112""" 
  • src/ll/xist/ns/abbr.py

    r2618 r2789  
    88## 
    99## See xist/__init__.py for the license 
     10 
    1011 
    1112""" 
  • src/ll/xist/ns/chars.py

    r2618 r2789  
    88## 
    99## See xist/__init__.py for the license 
     10 
    1011 
    1112""" 
  • src/ll/xist/ns/code.py

    r2682 r2789  
    88## 
    99## See xist/__init__.py for the license 
     10 
    1011 
    1112""" 
  • src/ll/xist/ns/docbook.py

    r2657 r2789  
    88## 
    99## See xist/__init__.py for the license 
     10 
    1011 
    1112""" 
  • src/ll/xist/ns/fo.py

    r2756 r2789  
    88## 
    99## See xist/__init__.py for the license 
     10 
    1011 
    1112""" 
  • src/ll/xist/ns/form.py

    r2666 r2789  
    88## 
    99## See xist/__init__.py for the license 
     10 
    1011 
    1112""" 
  • src/ll/xist/ns/html.py

    r2782 r2789  
    88## 
    99## See xist/__init__.py for the license 
     10 
    1011 
    1112""" 
  • src/ll/xist/ns/htmlspecials.py

    r2665 r2789  
    88## 
    99## See xist/__init__.py for the license 
     10 
    1011 
    1112""" 
  • src/ll/xist/ns/ihtml.py

    r2618 r2789  
    88## 
    99## See xist/__init__.py for the license 
     10 
    1011 
    1112""" 
  • src/ll/xist/ns/jsp.py

    r2618 r2789  
    88## 
    99## See xist/__init__.py for the license 
     10 
    1011 
    1112""" 
  • src/ll/xist/ns/kid.py

    r2618 r2789  
    88## 
    99## See xist/__init__.py for the license 
     10 
    1011 
    1112""" 
  • src/ll/xist/ns/meta.py

    r2666 r2789  
    88## 
    99## See xist/__init__.py for the license 
     10 
    1011 
    1112""" 
  • src/ll/xist/ns/metal.py

    r2618 r2789  
    88## 
    99## See xist/__init__.py for the license 
     10 
    1011 
    1112""" 
  • src/ll/xist/ns/php.py

    r2618 r2789  
    88## 
    99## See xist/__init__.py for the license 
     10 
    1011 
    1112""" 
  • src/ll/xist/ns/rng.py

    r2618 r2789  
    88## 
    99## See xist/__init__.py for the license 
     10 
    1011 
    1112""" 
  • src/ll/xist/ns/ruby.py

    r2618 r2789  
    88## 
    99## See xist/__init__.py for the license 
     10 
    1011 
    1112""" 
  • src/ll/xist/ns/specials.py

    r2618 r2789  
    88## 
    99## See xist/__init__.py for the license 
     10 
    1011 
    1112""" 
  • src/ll/xist/ns/struts_config.py

    r2618 r2789  
    88## 
    99## See xist/__init__.py for the license 
     10 
    1011 
    1112""" 
  • src/ll/xist/ns/struts_html.py

    r2618 r2789  
    88## 
    99## See xist/__init__.py for the license 
     10 
    1011 
    1112""" 
  • src/ll/xist/ns/tal.py

    r2618 r2789  
    88## 
    99## See xist/__init__.py for the license 
     10 
    1011 
    1112""" 
  • src/ll/xist/ns/tld.py

    r2725 r2789  
    88## 
    99## See xist/__init__.py for the license 
     10 
    1011 
    1112""" 
  • src/ll/xist/ns/wml.py

    r2618 r2789  
    88## 
    99## See xist/__init__.py for the license 
     10 
    1011 
    1112""" 
  • src/ll/xist/ns/xlink.py

    r2618 r2789  
    88## 
    99## See xist/__init__.py for the license 
     10 
    1011 
    1112""" 
  • src/ll/xist/ns/xml.py

    r2687 r2789  
    88## 
    99## See xist/__init__.py for the license 
     10 
    1011 
    1112""" 
  • src/ll/xist/options.py

    r2618 r2789  
    88## 
    99## See xist/__init__.py for the license 
     10 
    1011 
    1112""" 
  • src/ll/xist/parsers.py

    r2785 r2789  
    88## 
    99## See xist/__init__.py for the license 
     10 
    1011 
    1112""" 
  • src/ll/xist/publishers.py

    r2727 r2789  
    88## 
    99## See xist/__init__.py for the license 
     10 
    1011 
    1112""" 
  • src/ll/xist/scripts/doc2txt.py

    r2618 r2789  
    99## See xist/__init__.py for the license 
    1010 
     11 
    1112""" 
    1213Module that uses the w3m browser to generate a text version 
    13 of a docbook fragment. 
    14 Usage: python docbooklite2text.py spam.xml spam.txt 
     14of a doc fragment. 
     15Usage: python doc2txt.py spam.xml spam.txt 
    1516       to generate spam.txt from spam.xml 
    1617""" 
  • src/ll/xist/scripts/dtd2xsc.py

    r2644 r2789  
    88## 
    99## See xist/__init__.py for the license 
     10 
    1011 
    1112""" 
  • src/ll/xist/scripts/xml2xsc.py

    r2522 r2789  
    11#!/usr/bin/env python 
    22# -*- coding: iso-8859-1 -*- 
     3 
     4## Copyright 1999-2007 by LivingLogic AG, Bayreuth/Germany. 
     5## Copyright 1999-2007 by Walter Dörwald 
     6## 
     7## All Rights Reserved 
     8## 
     9## See xist/__init__.py for the license 
    310 
    411 
  • src/ll/xist/sims.py

    r2618 r2789  
    88## 
    99## See xist/__init__.py for the license 
     10 
    1011 
    1112""" 
  • src/ll/xist/utils.py

    r2618 r2789  
    88## 
    99## See xist/__init__.py for the license 
     10 
    1011 
    1112""" 
  • src/ll/xist/xfind.py

    r2787 r2789  
    88## 
    99## See xist/__init__.py for the license 
     10 
    1011 
    1112""" 
  • src/ll/xist/xnd.py

    r2662 r2789  
    88## 
    99## See xist/__init__.py for the license 
     10 
    1011 
    1112""" 
  • src/ll/xist/xsc.py

    r2784 r2789  
    1414exception and warning classes and a few helper classes and functions. 
    1515""" 
    16  
    1716 
    1817__version__ = "$Revision$".split()[1]