Python/XML

Update of /cvsroot/pyxml/xml/xml/dom
In directory usw-pr-cvs1:/tmp/cvs-serv1324

Modified Files:
	minidom.py 
Log Message:
Implement the encoding argument for toxml and toprettyxml.


Index: minidom.py
===================================================================
RCS file: /cvsroot/pyxml/xml/xml/dom/minidom.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** minidom.py	30 Jun 2002 07:30:20 -0000	1.41
--- minidom.py	30 Jun 2002 15:05:40 -0000	1.42
***************
*** 66,79 ****
          return 1
  
!     def toxml(self):
!         writer = _get_StringIO()
!         self.writexml(writer)
!         return writer.getvalue()
  
!     def toprettyxml(self, indent="\t", newl="\n"):
          # indent = the indentation string to prepend, per level
          # newl = the newline string to append
          writer = _get_StringIO()
!         self.writexml(writer, "", indent, newl)
          return writer.getvalue()
  
--- 66,85 ----
          return 1
  
!     def toxml(self, encoding = None):
!         return self.toprettyxml("", "", encoding)
  
!     def toprettyxml(self, indent="\t", newl="\n", encoding = None):
          # indent = the indentation string to prepend, per level
          # newl = the newline string to append
          writer = _get_StringIO()
!         if encoding is not None:
!             import codecs
!             # Can't use codecs.getwriter to preserve 2.0 compatibility
!             writer = codecs.lookup(encoding)[3](writer)
!         if self.nodeType == Node.DOCUMENT_NODE:
!             # Can pass encoding only to document, to put it into XML header
!             self.writexml(writer, "", indent, newl, encoding)
!         else:
!             self.writexml(writer, "", indent, newl)
          return writer.getvalue()
  
***************
*** 935,940 ****
                                               NodeList())
  
!     def writexml(self, writer, indent="", addindent="", newl=""):
!         writer.write('<?xml version="1.0" ?>\n')
          for node in self.childNodes:
              node.writexml(writer, indent, addindent, newl)
--- 941,950 ----
                                               NodeList())
  
!     def writexml(self, writer, indent="", addindent="", newl="",
!                  encoding = None):
!         if encoding is None:
!             writer.write('<?xml version="1.0" ?>\n')
!         else:
!             writer.write('<?xml version="1.0" encoding="%s"?>\n' % encoding)
          for node in self.childNodes:
              node.writexml(writer, indent, addindent, newl)

Update of /cvsroot/pyxml/xml/xml/sax
In directory usw-pr-cvs1:/tmp/cvs-serv8480

Modified Files:
	saxutils.py 
Log Message:
Align with Python: Use string methods, adjust imports.


Index: saxutils.py
===================================================================
RCS file: /cvsroot/pyxml/xml/xml/sax/saxutils.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** saxutils.py	15 May 2002 14:20:02 -0000	1.30
--- saxutils.py	30 Jun 2002 07:52:50 -0000	1.31
***************
*** 6,11 ****
  """
  
! import types, sys, urllib, urlparse, os, string
! import handler, _exceptions, xmlreader, saxlib
  
  try:
--- 6,13 ----
  """
  
! import os, urlparse, urllib, types
! import handler
! import xmlreader
! import sys, _exceptions, saxlib
  
  try:
***************
*** 14,17 ****
--- 16,20 ----
      _StringTypes = [types.StringType]
  
+ 
  def escape(data, entities={}):
      """Escape &, <, and > in a string of data.
***************
*** 21,29 ****
      strings; each key will be replaced with its corresponding value.
      """
!     data = string.replace(data, "&", "&amp;")
!     data = string.replace(data, "<", "&lt;")
!     data = string.replace(data, ">", "&gt;")
      for chars, entity in entities.items():
!         data = string.replace(data, chars, entity)
      return data
  
--- 24,32 ----
      strings; each key will be replaced with its corresponding value.
      """
!     data = data.replace("&", "&amp;")
!     data = data.replace("<", "&lt;")
!     data = data.replace(">", "&gt;")
      for chars, entity in entities.items():
!         data = data.replace(chars, entity)
      return data
  
***************
*** 42,46 ****
      if '"' in data:
          if "'" in data:
!             data = '"%s"' % string.replace(data, '"', "&quot;")
          else:
              data = "'%s'" % data
--- 45,49 ----
      if '"' in data:
          if "'" in data:
!             data = '"%s"' % data.replace('"', "&quot;")
          else:
              data = "'%s'" % data
***************
*** 262,266 ****
      def characters(self, content):
          if self._in_cdata:
!             self._out.write(string.replace(content, ']]>', ']]>]]&gt;<![CDATA['))
          else:
              self._out.write(escape(content))
--- 265,269 ----
      def characters(self, content):
          if self._in_cdata:
!             self._out.write(content.replace(']]>', ']]>]]&gt;<![CDATA['))
          else:
              self._out.write(escape(content))
***************
*** 620,630 ****
      def write_data(self,data):
          "Writes datachars to writer."
!         data=string.replace(data,"&","&amp;")
!         data=string.replace(data,"<","&lt;")
!         data=string.replace(data,"\"","&quot;")
!         data=string.replace(data,">","&gt;")
!         data=string.replace(data,chr(9),"&#9;")
!         data=string.replace(data,chr(10),"&#10;")
!         data=string.replace(data,chr(13),"&#13;")
          self.writer.write(data)
  
--- 623,633 ----
      def write_data(self,data):
          "Writes datachars to writer."
!         data=data.replace("&","&amp;")
!         data=data.replace("<","&lt;")
!         data=data.replace("\"","&quot;")
!         data=data.replace(">","&gt;")
!         data=data.replace(chr(9),"&#9;")
!         data=data.replace(chr(10),"&#10;")
!         data=data.replace(chr(13),"&#13;")
          self.writer.write(data)

Update of /cvsroot/pyxml/xml/xml/dom
In directory usw-pr-cvs1:/tmp/cvs-serv3274

Modified Files:
	minidom.py 
Log Message:
Use more string methods, remove import string (Python 1.46).


Index: minidom.py
===================================================================
RCS file: /cvsroot/pyxml/xml/xml/dom/minidom.py,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** minidom.py	15 Mar 2002 14:36:50 -0000	1.40
--- minidom.py	30 Jun 2002 07:30:20 -0000	1.41
***************
*** 15,22 ****
  """
  
- import string
- _string = string
- del string
- 
  from xml.dom import HierarchyRequestErr, EMPTY_NAMESPACE
  
--- 15,18 ----
***************
*** 285,293 ****
  def _write_data(writer, data):
      "Writes datachars to writer."
!     replace = _string.replace
!     data = replace(data, "&", "&")
!     data = replace(data, "<", "&lt;")
!     data = replace(data, "\"", "&quot;")
!     data = replace(data, ">", "&gt;")
      writer.write(data)
  
--- 281,288 ----
  def _write_data(writer, data):
      "Writes datachars to writer."
!     data = data.replace("&", "&amp;")
!     data = data.replace("<", "&lt;")
!     data = data.replace("\"", "&quot;")
!     data = data.replace(">", "&gt;")
      writer.write(data)
  
***************
*** 759,763 ****
  
  def _nssplit(qualifiedName):
!     fields = _string.split(qualifiedName, ':', 1)
      if len(fields) == 2:
          return fields
--- 754,758 ----
  
  def _nssplit(qualifiedName):
!     fields = qualifiedName.split(':', 1)
      if len(fields) == 2:
          return fields
***************
*** 788,792 ****
          if version not in ("1.0", "2.0"):
              return 0
!         feature = _string.lower(feature)
          return feature == "core"
  
--- 783,787 ----
          if version not in ("1.0", "2.0"):
              return 0
!         feature = feature.lower()
          return feature == "core"

Update of /cvsroot/pyxml/xml/xml/sax
In directory usw-pr-cvs1:/tmp/cvs-serv2550

Modified Files:
	expatreader.py 
Log Message:
Use more string methods, remove import string (PyXML 1.28).


Index: expatreader.py
===================================================================
RCS file: /cvsroot/pyxml/xml/xml/sax/expatreader.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** expatreader.py	9 May 2002 07:50:36 -0000	1.22
--- expatreader.py	30 Jun 2002 07:27:16 -0000	1.23
***************
*** 31,36 ****
  AttributesNSImpl = xmlreader.AttributesNSImpl
  
- import string
- 
  # If we're using a sufficiently recent version of Python, we can use
  # weak references to avoid cycles between the parser and content
--- 31,34 ----
***************
*** 282,286 ****
  
      def start_element_ns(self, name, attrs):
!         pair = string.split(name)
          if len(pair) == 1:
              pair = (None, name)
--- 280,284 ----
  
      def start_element_ns(self, name, attrs):
!         pair = name.split()
          if len(pair) == 1:
              pair = (None, name)
***************
*** 290,294 ****
          newattrs = {}
          for (aname, value) in attrs.items():
!             apair = string.split(aname)
              if len(apair) == 1:
                  apair = (None, aname)
--- 288,292 ----
          newattrs = {}
          for (aname, value) in attrs.items():
!             apair = aname.split()
              if len(apair) == 1:
                  apair = (None, aname)
***************
*** 302,306 ****
  
      def end_element_ns(self, name):
!         pair = string.split(name)
          if len(pair) == 1:
              pair = (None, name)
--- 300,304 ----
  
      def end_element_ns(self, name):
!         pair = name.split()
          if len(pair) == 1:
              pair = (None, name)

Update of /cvsroot/pyxml/xml/extensions
In directory usw-pr-cvs1:/tmp/cvs-serv23846

Modified Files:
	pyexpat.c 
Log Message:
Remove support for Python 1.5.


Index: pyexpat.c
===================================================================
RCS file: /cvsroot/pyxml/xml/extensions/pyexpat.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -r1.55 -r1.56
*** pyexpat.c	30 Jun 2002 06:24:17 -0000	1.55
--- pyexpat.c	30 Jun 2002 06:37:50 -0000	1.56
***************
*** 4,32 ****
   */
  #include "Python.h"
- #if PY_VERSION_HEX < 0x020000B1
- #include <assert.h>
- #endif
  #include <ctype.h>
  
- /* limits.h is included through Python.h in 2.x, but not in 1.5.2 */
- #include <limits.h>
- 
  #include "compile.h"
  #include "frameobject.h"
  #include "expat.h"
  
- #ifndef PyGC_HEAD_SIZE
- #define PyGC_HEAD_SIZE 0
- #define PyObject_GC_Init(x)
- #define PyObject_GC_Fini(m)
- #define Py_TPFLAGS_GC 0
- #endif
- 
  #ifndef PyDoc_STRVAR
  #define PyDoc_STRVAR(name,str) PyDoc_VAR(name) = PyDoc_STR(str)
  #endif
  
! #if (PY_MAJOR_VERSION == 1 && PY_MINOR_VERSION > 5) || (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION < 2)
! /* In Python 1.6, 2.0 and  2.1, disabling Unicode was not possible. */
  #define Py_USING_UNICODE
  #endif
--- 4,19 ----
   */
  #include "Python.h"
  #include <ctype.h>
  
  #include "compile.h"
  #include "frameobject.h"
  #include "expat.h"
  
  #ifndef PyDoc_STRVAR
  #define PyDoc_STRVAR(name,str) PyDoc_VAR(name) = PyDoc_STR(str)
  #endif
  
! #if (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION < 2)
! /* In Python 2.0 and  2.1, disabling Unicode was not possible. */
  #define Py_USING_UNICODE
  #endif
***************
*** 309,313 ****
  #define STRING_CONV_FUNC conv_string_to_utf8
  #else
! /* Python 1.6 and later versions */
  #define STRING_CONV_FUNC (self->returns_unicode \
                            ? conv_string_to_unicode : conv_string_to_utf8)
--- 296,300 ----
  #define STRING_CONV_FUNC conv_string_to_utf8
  #else
! /* Python 2.0 and later versions */
  #define STRING_CONV_FUNC (self->returns_unicode \
                            ? conv_string_to_unicode : conv_string_to_utf8)
***************
*** 970,978 ****
      }
  
- #if PY_MAJOR_VERSION == 1 && PY_MINOR_VERSION < 6
-     new_parser = PyObject_NEW(xmlparseobject, &Xmlparsetype);
- #else
  #ifndef Py_TPFLAGS_HAVE_GC
!     /* Python versions 1.6 to 2.1 */
      new_parser = PyObject_New(xmlparseobject, &Xmlparsetype);
  #else
--- 957,962 ----
      }
  
  #ifndef Py_TPFLAGS_HAVE_GC
!     /* Python versions 2.0 and 2.1 */
      new_parser = PyObject_New(xmlparseobject, &Xmlparsetype);
  #else
***************
*** 980,984 ****
      new_parser = PyObject_GC_New(xmlparseobject, &Xmlparsetype);
  #endif
- #endif
  
      if (new_parser == NULL)
--- 964,967 ----
***************
*** 1139,1150 ****
      xmlparseobject *self;
  
- #if PY_MAJOR_VERSION == 1 && PY_MINOR_VERSION < 6
-     self = PyObject_NEW(xmlparseobject, &Xmlparsetype);
-     if (self == NULL)
-         return NULL;
- 
-     self->returns_unicode = 0;
- #else
-     /* Code for versions 1.6 and later */
  #ifdef Py_TPFLAGS_HAVE_GC
      /* Code for versions 2.2 and later */
--- 1122,1125 ----
***************
*** 1156,1161 ****
--- 1131,1140 ----
          return NULL;
  
+ #ifdef Py_USING_UNICODE
      self->returns_unicode = 1;
+ #else
+     self->returns_unicode = 0;
  #endif
+ 
      self->buffer = NULL;
      self->buffer_size = CHARACTER_DATA_BUFFER_SIZE;
***************
*** 1231,1240 ****
      }
      Py_XDECREF(self->intern);
- #if PY_MAJOR_VERSION == 1 && PY_MINOR_VERSION < 6
-     /* Code for versions before 1.6 */
-     free(self);
- #else
  #ifndef Py_TPFLAGS_HAVE_GC
!     /* Code for versions 1.6 to 2.1 */
      PyObject_Del(self);
  #else
--- 1210,1215 ----
      }
      Py_XDECREF(self->intern);
  #ifndef Py_TPFLAGS_HAVE_GC
!     /* Code for versions 2.0 and 2.1 */
      PyObject_Del(self);
  #else
***************
*** 1242,1246 ****
      PyObject_GC_Del(self);
  #endif
- #endif
  }
  
--- 1217,1220 ----
***************
*** 1574,1610 ****
  PyDoc_STRVAR(pyexpat_module_documentation,
  "Python wrapper for Expat parser.");
- 
- #if PY_VERSION_HEX < 0x20000F0
- 
- /* 1.5 compatibility: PyModule_AddObject */
- static int
- PyModule_AddObject(PyObject *m, char *name, PyObject *o)
- {
-     PyObject *dict;
-     if (!PyModule_Check(m) || o == NULL)
-         return -1;
-     dict = PyModule_GetDict(m);
-     if (dict == NULL)
-         return -1;
-     if (PyDict_SetItemString(dict, name, o))
-         return -1;
-     Py_DECREF(o);
-     return 0;
- }
- 
- static int
- PyModule_AddIntConstant(PyObject *m, char *name, long value)
- {
-     return PyModule_AddObject(m, name, PyInt_FromLong(value));
- }
- 
- static int
- PyModule_AddStringConstant(PyObject *m, char *name, char *value)
- {
-     return PyModule_AddObject(m, name, PyString_FromString(value));
- }
- 
- #endif
- 
  
  /* Return a Python string that represents the version number without the
--- 1548,1551 ----

Update of /cvsroot/pyxml/xml
In directory usw-pr-cvs1:/tmp/cvs-serv23629

Modified Files:
	setup.py 
Log Message:
Always build pyexpat.


Index: setup.py
===================================================================
RCS file: /cvsroot/pyxml/xml/setup.py,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -r1.64 -r1.65
*** setup.py	16 Feb 2002 06:08:12 -0000	1.64
--- setup.py	30 Jun 2002 06:36:35 -0000	1.65
***************
*** 34,38 ****
  with_xpath = 1
  with_xslt = 1
- with_pyexpat = "<auto>"
  
  for arg in args:
--- 34,37 ----
***************
*** 55,64 ****
          with_xslt = 0
  	sys.argv.remove(arg)
-     elif arg == '--with-pyexpat':
-         with_pyexpat = 1
- 	sys.argv.remove(arg)
-     elif arg == '--without-pyexpat':
-         with_pyexpat = 0
-         sys.argv.remove(arg)
  
  if sys.platform[:6] == "darwin": # Mac OS X
--- 54,57 ----
***************
*** 71,102 ****
      extra_packages.append(xml('.xslt'))
  
- def should_build_pyexpat():
-     try:
-         import pyexpat
-         # The following features of are required by PyXML from pyexpat,
-         # which are not available in older versions:
-         # ExternalEntityParserCreate, available only from 2.25 on.
-         # ParseFile throws exception, not available up to 2.28.
-         # Memory leak fixes, merged into 2.33
-         # Wrong array boundaries fixed in 2.35
-         # UpdatePairedHandlers fixed in 2.54
-         if pyexpat.__version__ <= '2.53':
-             if 'pyexpat' in sys.builtin_module_names:
-                 print "Error: builtin expat library will conflict with ours"
-                 print "Re-build python without builtin expat module"
-                 raise SystemExit
-             return 1
-     except ImportError:
-         return 1
-     else:
-         try:
-             version = pyexpat.version_info
-         except AttributeError:
-             return 1
-         else:
-             if version < (1,95,2):
-                 return 1
-         return 0
- 
  def get_expat_prefix():
      if LIBEXPAT:
--- 64,67 ----
***************
*** 116,178 ****
  
  
! # Don't build pyexpat if the Python installation provides one.
! # FIXME: It should be built for binary distributions even if the core has it.
! if with_pyexpat == "<auto>":
!     with_pyexpat = should_build_pyexpat()
! 
! if with_pyexpat:
!     expat_prefix = get_expat_prefix()
! 
!     sources = ['extensions/pyexpat.c']
!     if expat_prefix:
!         define_macros = [('HAVE_EXPAT_H', None)]
!         include_dirs = [os.path.join(expat_prefix, "include")]
!         libraries = ['expat']
!         library_dirs = [os.path.join(expat_prefix, "lib")]
!     else:
!         # To build expat 1.95.2, we need to find out the byteorder
!         # Python 1.x doesn't provide sys.byteorder
          try:
!             byteorder = sys.byteorder
!         except AttributeError:
!             try:
!                 import struct
!             except ImportError:
!                 print "Need struct module to determine byteorder"
!                 raise SystemExit
!             if struct.pack("i",1) == '\x01\x00\x00\x00':
!                 byteorder = "little"
!             else:
!                 byteorder = "big"
!         if byteorder == "little":
!             xmlbo = "12"
          else:
!             xmlbo = "21"
!         define_macros = [
!             ('HAVE_EXPAT_H',None),
!             ('VERSION', '"1.95.2"'),
!             ('XML_NS', '1'),
!             ('XML_DTD', '1'),
!             ('XML_BYTE_ORDER', xmlbo),
!             ('XML_CONTEXT_BYTES','1024'),
!             ]
!         include_dirs = ['extensions/expat/lib']
!         sources.extend([
!             'extensions/expat/lib/xmlparse.c',
!             'extensions/expat/lib/xmlrole.c',
!             'extensions/expat/lib/xmltok.c',
!             ])
!         libraries = []
!         library_dirs = []
! 
!     ext_modules.append(
!         Extension(xml('.parsers.pyexpat'),
!                   define_macros=define_macros,
!                   include_dirs=include_dirs,
!                   library_dirs=library_dirs,
!                   libraries=libraries,
!                   extra_link_args=LDFLAGS,
!                   sources=sources
!                   ))
  
  # Build sgmlop
--- 81,137 ----
  
  
! expat_prefix = get_expat_prefix()
! 
! sources = ['extensions/pyexpat.c']
! if expat_prefix:
!     define_macros = [('HAVE_EXPAT_H', None)]
!     include_dirs = [os.path.join(expat_prefix, "include")]
!     libraries = ['expat']
!     library_dirs = [os.path.join(expat_prefix, "lib")]
! else:
!     # To build expat 1.95.2, we need to find out the byteorder
!     # Python 1.x doesn't provide sys.byteorder
!     try:
!         byteorder = sys.byteorder
!     except AttributeError:
          try:
!             import struct
!         except ImportError:
!             print "Need struct module to determine byteorder"
!             raise SystemExit
!         if struct.pack("i",1) == '\x01\x00\x00\x00':
!             byteorder = "little"
          else:
!             byteorder = "big"
!     if byteorder == "little":
!         xmlbo = "12"
!     else:
!         xmlbo = "21"
!     define_macros = [
!         ('HAVE_EXPAT_H',None),
!         ('VERSION', '"1.95.2"'),
!         ('XML_NS', '1'),
!         ('XML_DTD', '1'),
!         ('XML_BYTE_ORDER', xmlbo),
!         ('XML_CONTEXT_BYTES','1024'),
!         ]
!     include_dirs = ['extensions/expat/lib']
!     sources.extend([
!         'extensions/expat/lib/xmlparse.c',
!         'extensions/expat/lib/xmlrole.c',
!         'extensions/expat/lib/xmltok.c',
!         ])
!     libraries = []
!     library_dirs = []
!     
! ext_modules.append(
!     Extension(xml('.parsers.pyexpat'),
!               define_macros=define_macros,
!               include_dirs=include_dirs,
!               library_dirs=library_dirs,
!               libraries=libraries,
!               extra_link_args=LDFLAGS,
!               sources=sources
!               ))
  
  # Build sgmlop

Update of /cvsroot/pyxml/xml/extensions
In directory usw-pr-cvs1:/tmp/cvs-serv21085

Modified Files:
	pyexpat.c 
Log Message:
Define PyDoc_STRVAR if it is not available.


Index: pyexpat.c
===================================================================
RCS file: /cvsroot/pyxml/xml/extensions/pyexpat.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -r1.54 -r1.55
*** pyexpat.c	30 Jun 2002 06:20:06 -0000	1.54
--- pyexpat.c	30 Jun 2002 06:24:17 -0000	1.55
***************
*** 23,26 ****
--- 23,30 ----
  #endif
  
+ #ifndef PyDoc_STRVAR
+ #define PyDoc_STRVAR(name,str) PyDoc_VAR(name) = PyDoc_STR(str)
+ #endif
+ 
  #if (PY_MAJOR_VERSION == 1 && PY_MINOR_VERSION > 5) || (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION < 2)
  /* In Python 1.6, 2.0 and  2.1, disabling Unicode was not possible. */
***************
*** 1612,1616 ****
  get_version_string(void)
  {
!     static char *rcsid = "#Revision: 2.58 $";
      char *rev = rcsid;
      int i = 0;
--- 1616,1620 ----
  get_version_string(void)
  {
!     static char *rcsid = "#Revision: 2.64 $";
      char *rev = rcsid;
      int i = 0;

Update of /cvsroot/pyxml/xml/extensions
In directory usw-pr-cvs1:/tmp/cvs-serv20194

Modified Files:
	pyexpat.c 
Log Message:
Remove compiler warnings on Solaris 8 (Python's 2.59).


Index: pyexpat.c
===================================================================
RCS file: /cvsroot/pyxml/xml/extensions/pyexpat.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -r1.53 -r1.54
*** pyexpat.c	30 Jun 2002 06:15:21 -0000	1.53
--- pyexpat.c	30 Jun 2002 06:20:06 -0000	1.54
***************
*** 1616,1620 ****
      int i = 0;
  
!     while (!isdigit(*rev))
          ++rev;
      while (rev[i] != ' ' && rev[i] != '\0')
--- 1616,1620 ----
      int i = 0;
  
!     while (!isdigit((int)*rev))
          ++rev;
      while (rev[i] != ' ' && rev[i] != '\0')

Update of /cvsroot/pyxml/xml/extensions
In directory usw-pr-cvs1:/tmp/cvs-serv18847

Modified Files:
	pyexpat.c 
Log Message:
Integrate Python's 2.62 and 2.63:
[2.62]
pyexpat code cleanup and minor refactorings:

The handlers array on each parser now has the invariant that None will
never be set as a handler; it will always be NULL or a Python-level
value passed in for the specific handler.

have_handler():  Return true if there is a Python handler for a
    particular event.

get_handler_name():  Return a string object giving the name of a
    particular handler.  This caches the string object so it doesn't
    need to be created more than once.

get_parse_result():  Helper to allow the Parse() and ParseFile()
    methods to share the same logic for determining the return value
    or exception state.

PyUnknownEncodingHandler(), PyModule_AddIntConstant():
    Made these helpers static.  (The later is only defined for older
    versions of Python.)

pyxml_UpdatePairedHandlers(), pyxml_SetStartElementHandler(),
pyxml_SetEndElementHandler(), pyxml_SetStartNamespaceDeclHandler(),
pyxml_SetEndNamespaceDeclHandler(), pyxml_SetStartCdataSection(),
pyxml_SetEndCdataSection(), pyxml_SetStartDoctypeDeclHandler(),
pyxml_SetEndDoctypeDeclHandler():
    Removed.  These are no longer needed with Expat 1.95.x.

handler_info:
    Use the setter functions provided by Expat 1.95.x instead of the
    pyxml_Set*Handler() functions which have been removed.

Minor code formatting changes for consistency.
Trailing whitespace removed.
[2.63]
Added character data buffering to pyexpat parser objects.

Setting the buffer_text attribute to true causes the parser to collect
character data, waiting as long as possible to report it to the Python
callback.  This can save an enormous number of callbacks from C to
Python, which can be a substantial performance improvement.

buffer_text defaults to false.


Index: pyexpat.c
===================================================================
RCS file: /cvsroot/pyxml/xml/extensions/pyexpat.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -r1.52 -r1.53
*** pyexpat.c	30 Jun 2002 06:11:54 -0000	1.52
--- pyexpat.c	30 Jun 2002 06:15:21 -0000	1.53
***************
*** 68,75 ****
--- 68,81 ----
      int specified_attributes;   /* Report only specified attributes. */
      int in_callback;            /* Is a callback active? */
+     XML_Char *buffer;           /* Buffer used when accumulating characters */
+                                 /* NULL if not enabled */
+     int buffer_size;            /* Size of buffer, in XML_Char units */
+     int buffer_used;            /* Buffer units in use */
      PyObject *intern;           /* Dictionary to intern strings */
      PyObject **handlers;
  } xmlparseobject;
[...1250 lines suppressed...]
       (xmlhandlersetter)XML_SetExternalEntityRefHandler,
!      (xmlhandler)my_ExternalEntityRefHandler },
      {"StartDoctypeDeclHandler",
!      pyxml_SetStartDoctypeDeclHandler,
       (xmlhandler)my_StartDoctypeDeclHandler},
      {"EndDoctypeDeclHandler",
!      pyxml_SetEndDoctypeDeclHandler,
       (xmlhandler)my_EndDoctypeDeclHandler},
      {"EntityDeclHandler",
--- 1835,1844 ----
      {"ExternalEntityRefHandler",
       (xmlhandlersetter)XML_SetExternalEntityRefHandler,
!      (xmlhandler)my_ExternalEntityRefHandler},
      {"StartDoctypeDeclHandler",
!      (xmlhandlersetter)XML_SetStartDoctypeDeclHandler,
       (xmlhandler)my_StartDoctypeDeclHandler},
      {"EndDoctypeDeclHandler",
!      (xmlhandlersetter)XML_SetEndDoctypeDeclHandler,
       (xmlhandler)my_EndDoctypeDeclHandler},
      {"EntityDeclHandler",

Update of /cvsroot/pyxml/xml/extensions
In directory usw-pr-cvs1:/tmp/cvs-serv18068

Modified Files:
	pyexpat.c 
Log Message:
Add doc string macros (from Python 2.60).


Index: pyexpat.c
===================================================================
RCS file: /cvsroot/pyxml/xml/extensions/pyexpat.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -r1.51 -r1.52
*** pyexpat.c	17 Feb 2002 13:21:02 -0000	1.51
--- pyexpat.c	30 Jun 2002 06:11:54 -0000	1.52
***************
*** 657,663 ****
  /* ---------------------------------------------------------------- */
  
! static char xmlparse_Parse__doc__[] = 
  "Parse(data[, isfinal])\n\
! Parse XML data.  `isfinal' should be true at end of input.";
  
  static PyObject *
--- 657,663 ----
  /* ---------------------------------------------------------------- */
  
! PyDoc_STRVAR(xmlparse_Parse__doc__,
  "Parse(data[, isfinal])\n\
! Parse XML data.  `isfinal' should be true at end of input.");
  
  static PyObject *
***************
*** 727,733 ****
  }
  
! static char xmlparse_ParseFile__doc__[] = 
  "ParseFile(file)\n\
! Parse XML data from file-like object.";
  
  static PyObject *
--- 727,733 ----
  }
  
! PyDoc_STRVAR(xmlparse_ParseFile__doc__,
  "ParseFile(file)\n\
! Parse XML data from file-like object.");
  
  static PyObject *
***************
*** 786,792 ****
  }
  
! static char xmlparse_SetBase__doc__[] = 
  "SetBase(base_url)\n\
! Set the base URL for the parser.";
  
  static PyObject *
--- 786,792 ----
  }
  
! PyDoc_STRVAR(xmlparse_SetBase__doc__,
  "SetBase(base_url)\n\
! Set the base URL for the parser.");
  
  static PyObject *
***************
*** 804,810 ****
  }
  
! static char xmlparse_GetBase__doc__[] = 
  "GetBase() -> url\n\
! Return base URL string for the parser.";
  
  static PyObject *
--- 804,810 ----
  }
  
! PyDoc_STRVAR(xmlparse_GetBase__doc__,
  "GetBase() -> url\n\
! Return base URL string for the parser.");
  
  static PyObject *
***************
*** 817,825 ****
  }
  
! static char xmlparse_GetInputContext__doc__[] =
  "GetInputContext() -> string\n\
  Return the untranslated text of the input that caused the current event.\n\
  If the event was generated by a large amount of text (such as a start tag\n\
! for an element with many attributes), not all of the text may be available.";
  
  static PyObject *
--- 817,825 ----
  }
  
! PyDoc_STRVAR(xmlparse_GetInputContext__doc__,
  "GetInputContext() -> string\n\
  Return the untranslated text of the input that caused the current event.\n\
  If the event was generated by a large amount of text (such as a start tag\n\
! for an element with many attributes), not all of the text may be available.");
  
  static PyObject *
***************
*** 849,856 ****
  }
  
! static char xmlparse_ExternalEntityParserCreate__doc__[] = 
  "ExternalEntityParserCreate(context[, encoding])\n\
  Create a parser for parsing an external entity based on the\n\
! information passed to the ExternalEntityRefHandler.";
  
  static PyObject *
--- 849,856 ----
  }
  
! PyDoc_STRVAR(xmlparse_ExternalEntityParserCreate__doc__,
  "ExternalEntityParserCreate(context[, encoding])\n\
  Create a parser for parsing an external entity based on the\n\
! information passed to the ExternalEntityRefHandler.");
  
  static PyObject *
***************
*** 926,930 ****
  }
  
! static char xmlparse_SetParamEntityParsing__doc__[] =
  "SetParamEntityParsing(flag) -> success\n\
  Controls parsing of parameter entities (including the external DTD\n\
--- 926,930 ----
  }
  
! PyDoc_STRVAR(xmlparse_SetParamEntityParsing__doc__,
  "SetParamEntityParsing(flag) -> success\n\
  Controls parsing of parameter entities (including the external DTD\n\
***************
*** 932,936 ****
  XML_PARAM_ENTITY_PARSING_UNLESS_STANDALONE and\n\
  XML_PARAM_ENTITY_PARSING_ALWAYS. Returns true if setting the flag\n\
! was successful.";
  
  static PyObject*
--- 932,936 ----
  XML_PARAM_ENTITY_PARSING_UNLESS_STANDALONE and\n\
  XML_PARAM_ENTITY_PARSING_ALWAYS. Returns true if setting the flag\n\
! was successful.");
  
  static PyObject*
***************
*** 1275,1280 ****
  #endif
  
! static char Xmlparsetype__doc__[] = 
! "XML parser";
  
  static PyTypeObject Xmlparsetype = {
--- 1275,1279 ----
  #endif
  
! PyDoc_STRVAR(Xmlparsetype__doc__, "XML parser");
  
  static PyTypeObject Xmlparsetype = {
***************
*** 1317,1323 ****
  /* -------------------------------------------------------- */
  
! static char pyexpat_ParserCreate__doc__[] =
  "ParserCreate([encoding[, namespace_separator]]) -> parser\n\
! Return a new XML parser object.";
  
  static PyObject *
--- 1316,1322 ----
  /* -------------------------------------------------------- */
  
! PyDoc_STRVAR(pyexpat_ParserCreate__doc__,
  "ParserCreate([encoding[, namespace_separator]]) -> parser\n\
! Return a new XML parser object.");
  
  static PyObject *
***************
*** 1364,1370 ****
  }
  
! static char pyexpat_ErrorString__doc__[] =
  "ErrorString(errno) -> string\n\
! Returns string error for given number.";
  
  static PyObject *
--- 1363,1369 ----
  }
  
! PyDoc_STRVAR(pyexpat_ErrorString__doc__,
  "ErrorString(errno) -> string\n\
! Returns string error for given number.");
  
  static PyObject *
***************
*** 1391,1396 ****
  /* Module docstring */
  
! static char pyexpat_module_documentation[] = 
! "Python wrapper for Expat parser.";
  
  #if PY_VERSION_HEX < 0x20000F0
--- 1390,1395 ----
  /* Module docstring */
  
! PyDoc_STRVAR(pyexpat_module_documentation,
! "Python wrapper for Expat parser.");
  
  #if PY_VERSION_HEX < 0x20000F0