Upload file

lambda

' + doc + '

' + doc + '
$excname
$excname
$THIS_CLASS
$THIS_CLASS
%s
%s

'))
!         doc = doc and '%s' % doc
!         return '%s
%s' % (decl, self.small(doc))

      def docother(self, object, name=None):
--- 611,623 ----
                  argspec = argspec[1:-1] # remove parentheses

!         decl = title + argspec + (note and self.small(self.grey(note)))

!         if skipdocs:
!             return '%s' % decl
!         else:
!             doc = self.markup(
!                 getdoc(object), self.preformat, funcs, classes, methods)
!             doc = doc and '%s' % doc
!             return '%s
%s' % (decl, self.small(doc))

      def docother(self, object, name=None):
***************
*** 704,715 ****
          """Produce text documentation for a given module object."""
          name = object.__name__ # ignore the passed-in name
          lines = split(strip(getdoc(object)), '\n')
          if len(lines) == 1:
!             if lines[0]: name = name + ' - ' + lines[0]
              lines = []
          elif len(lines) >= 2 and not rstrip(lines[1]):
!             if lines[0]: name = name + ' - ' + lines[0]
              lines = lines[2:]
!         result = self.section('NAME', name)

          try:
--- 729,741 ----
          """Produce text documentation for a given module object."""
          name = object.__name__ # ignore the passed-in name
+         namesec = name
          lines = split(strip(getdoc(object)), '\n')
          if len(lines) == 1:
!             if lines[0]: namesec = namesec + ' - ' + lines[0]
              lines = []
          elif len(lines) >= 2 and not rstrip(lines[1]):
!             if lines[0]: namesec = namesec + ' - ' + lines[0]
              lines = lines[2:]
!         result = self.section('NAME', namesec)

          try:
***************
*** 792,802 ****
              title = self.bold(name) + ' = class ' + realname
          if bases:
!             parents = map(lambda c, m=object.__module__: classname(c, m), bases)
              title = title + '(%s)' % join(parents, ', ')

          doc = getdoc(object)
          contents = doc and doc + '\n'
!         for key, value in inspect.getmembers(object, inspect.ismethod):
!             contents = contents + '\n' + self.document(value, key, name)

          if not contents: return title + '\n'
--- 818,831 ----
              title = self.bold(name) + ' = class ' + realname
          if bases:
!             def makename(c, m=object.__module__): return classname(c, m)
!             parents = map(makename, bases)
              title = title + '(%s)' % join(parents, ', ')

          doc = getdoc(object)
          contents = doc and doc + '\n'
!         methods = allmethods(object).items()
!         methods.sort()
!         for key, value in methods:
!             contents = contents + '\n' + self.document(value, key, object)

          if not contents: return title + '\n'
***************
*** 807,817 ****
          return '=' + self.repr(object)

!     def docroutine(self, object, name=None, clname=None):
          """Produce text documentation for a function or method object."""
          realname = object.__name__
          name = name or realname
          note = ''
          if inspect.ismethod(object):
!             if not clname:
                  if object.im_self:
                      note = ' method of %s' % self.repr(object.im_self)
--- 836,855 ----
          return '=' + self.repr(object)

!     def docroutine(self, object, name=None, cl=None):
          """Produce text documentation for a function or method object."""
          realname = object.__name__
          name = name or realname
          note = ''
+         skipdocs = 0
          if inspect.ismethod(object):
!             if cl:
!                 if not cl.__dict__.has_key(name):
!                     base = object.im_class
!                     basename = base.__name__
!                     if base.__module__ != cl.__module__:
!                         basename = base.__module__ + '.' + basename
!                     note = ' from %s' % basename
!                     skipdocs = 1
!             else:
                  if object.im_self:
                      note = ' method of %s' % self.repr(object.im_self)
***************
*** 823,826 ****
--- 861,867 ----
              title = self.bold(realname)
          else:
+             if (cl and cl.__dict__.has_key(realname) and
+                 cl.__dict__[realname] is object):
+                 skipdocs = 1
              title = self.bold(name) + ' = ' + realname
          if inspect.isbuiltin(object):
***************
*** 835,843 ****
          decl = title + argspec + note

!         doc = getdoc(object)
!         if doc:
!             return decl + '\n' + rstrip(self.indent(doc)) + '\n'
!         else:
              return decl + '\n'

      def docother(self, object, name=None, maxlen=None):
--- 876,884 ----
          decl = title + argspec + note

!         if skipdocs:
              return decl + '\n'
+         else:
+             doc = getdoc(object) or ''
+             return decl + '\n' + (doc and rstrip(self.indent(doc)) + '\n')

      def docother(self, object, name=None, maxlen=None):
***************
*** 952,956 ****

  def describe(thing):
!     """Produce a short description of the given kind of thing."""
      if inspect.ismodule(thing):
          if thing.__name__ in sys.builtin_module_names:
--- 993,997 ----

  def describe(thing):
!     """Produce a short description of the given thing."""
      if inspect.ismodule(thing):
          if thing.__name__ in sys.builtin_module_names:
***************
*** 972,985 ****
      return type(thing).__name__

! def freshimp(path, cache={}):
      """Import a module, reloading it if the source file has changed."""
!     module = __import__(path)
!     if hasattr(module, '__file__'):
!         file = module.__file__
!         info = (file, os.path.getmtime(file), os.path.getsize(file))
!         if cache.has_key(path):
!             if cache[path] != info:
                  module = reload(module)
!         cache[path] = info
      return module

--- 1013,1037 ----
      return type(thing).__name__

! def freshimport(name, cache={}):
      """Import a module, reloading it if the source file has changed."""
!     topmodule = __import__(name)
!     module = None
!     for component in split(name, '.'):
!         if module == None:
!             module = topmodule
!             path = split(name, '.')[0]
!         else:
!             module = getattr(module, component)
!             path = path + '.' + component
!         if hasattr(module, '__file__'):
!             file = module.__file__
!             if os.path.exists(file):
!                 info = (file, os.path.getmtime(file), os.path.getsize(file))
!             if cache.has_key(path) and cache[path] != info:
                  module = reload(module)
!             file = module.__file__
!             if os.path.exists(file):
!                 info = (file, os.path.getmtime(file), os.path.getsize(file))
!             cache[path] = info
      return module

***************
*** 987,1021 ****
      """Locate an object by name (or dotted path), importing as necessary."""
      if not path: # special case: imp.find_module('') strangely succeeds
!         return None, None
      if type(path) is not types.StringType:
!         return None, path
      parts = split(path, '.')
!     n = 1
!     while n <= len(parts):
          path = join(parts[:n], '.')
          try:
!             module = freshimp(path)
          except:
!             # determine if error occurred before or after module was found
              if sys.modules.has_key(path):
!                 filename = sys.modules[path].__file__
!             elif sys.exc_type is SyntaxError:
!                 filename = sys.exc_value.filename
              else:
!                 # module not found, so stop looking
!                 break
!             # error occurred in the imported module, so report it
!             raise DocImportError(filename, sys.exc_info())
          try:
              x = module
!             for p in parts[1:]:
                  x = getattr(x, p)
!             return join(parts[:-1], '.'), x
          except AttributeError:
!             n = n + 1
              continue
      if hasattr(__builtins__, path):
!         return None, getattr(__builtins__, path)
!     return None, None

  # --------------------------------------- interactive interpreter interface
--- 1039,1079 ----
      """Locate an object by name (or dotted path), importing as necessary."""
      if not path: # special case: imp.find_module('') strangely succeeds
!         return None
      if type(path) is not types.StringType:
!         return path
      parts = split(path, '.')
!     n = len(parts)
!     while n > 0:
          path = join(parts[:n], '.')
          try:
!             module = freshimport(path)
          except:
!             # Did the error occur before or after the module was found?
!             (exc, value, tb) = info = sys.exc_info()
              if sys.modules.has_key(path):
!                 # An error occured while executing the imported module.
!                 raise ErrorDuringImport(sys.modules[path].__file__, info)
!             elif exc is SyntaxError:
!                 # A SyntaxError occurred before we could execute the module.
!                 raise ErrorDuringImport(value.filename, info)
!             elif exc is ImportError and \
!                  split(lower(str(value)))[:2] == ['no', 'module']:
!                 # The module was not found.
!                 n = n - 1
!                 continue
              else:
!                 # Some other error occurred before executing the module.
!                 raise DocImportError(filename, sys.exc_info())
          try:
              x = module
!             for p in parts[n:]:
                  x = getattr(x, p)
!             return x
          except AttributeError:
!             n = n - 1
              continue
      if hasattr(__builtins__, path):
!         return getattr(__builtins__, path)
!     return None

  # --------------------------------------- interactive interpreter interface
***************
*** 1028,1037 ****
      if type(thing) is type(""):
          try:
!             path, x = locate(thing)
!         except DocImportError, value:
              print value
              return
!         if x:
!             thing = x
          else:
              print 'no Python documentation found for %s' % repr(thing)
--- 1086,1095 ----
      if type(thing) is type(""):
          try:
!             object = locate(thing)
!         except ErrorDuringImport, value:
              print value
              return
!         if object:
!             thing = object
          else:
              print 'no Python documentation found for %s' % repr(thing)
***************
*** 1047,1052 ****
      """Write HTML documentation to a file in the current directory."""
      try:
!         path, object = locate(key)
!     except DocImportError, value:
          print value
      else:
--- 1105,1110 ----
      """Write HTML documentation to a file in the current directory."""
      try:
!         object = locate(key)
!     except ErrorDuringImport, value:
          print value
      else:
***************
*** 1091,1098 ****
  def man(key):
      """Display documentation on an object in a form similar to man(1)."""
!     path, object = locate(key)
      if object:
          title = 'Python Library Documentation: ' + describe(object)
!         if path: title = title + ' in ' + path
          pager('\n' + title + '\n\n' + text.document(object, key))
          found = 1
--- 1149,1157 ----
  def man(key):
      """Display documentation on an object in a form similar to man(1)."""
!     object = locate(key)
      if object:
          title = 'Python Library Documentation: ' + describe(object)
!         lastdot = rfind(key, '.')
!         if lastdot > 0: title = title + ' in ' + key[:lastdot]
          pager('\n' + title + '\n\n' + text.document(object, key))
          found = 1
***************
*** 1150,1154 ****
              if modname != '__main__':
                  seen[modname] = 1
!                 desc = split(freshimp(modname).__doc__ or '', '\n')[0]
                  if find(lower(modname + ' - ' + desc), lower(key)) >= 0:
                      callback(None, modname, desc)
--- 1209,1213 ----
              if modname != '__main__':
                  seen[modname] = 1
!                 desc = split(freshimport(modname).__doc__ or '', '\n')[0]
                  if find(lower(modname + ' - ' + desc), lower(key)) >= 0:
                      callback(None, modname, desc)
***************
*** 1206,1215 ****
              if path and path != '.':
                  try:
!                     p, x = locate(path)
!                 except DocImportError, value:
                      self.send_document(path, html.escape(str(value)))
                      return
!                 if x:
!                     self.send_document(describe(x), html.document(x, path))
                  else:
                      self.send_document(path,
--- 1265,1274 ----
              if path and path != '.':
                  try:
!                     obj = locate(path)
!                 except ErrorDuringImport, value:
                      self.send_document(path, html.escape(str(value)))
                      return
!                 if obj:
!                     self.send_document(describe(obj), html.document(obj, path))
                  else:
                      self.send_document(path,
***************
*** 1221,1231 ****
                  def bltinlink(name):
                      return '%s' % (name, name)
!                 names = filter(lambda x: x != '__main__', sys.builtin_module_names)
                  contents = html.multicolumn(names, bltinlink)
                  indices = ['' + html.bigsection(
                      'Built-in Modules', '#ffffff', '#ee77aa', contents)]

-                 # for skip in ['', '.', os.getcwd(), os.path.dirname(sys.argv[0])]:
-                 #     if skip in sys.path: sys.path.remove(skip)
                  seen = {}
                  for dir in pathdirs():
--- 1280,1289 ----
                  def bltinlink(name):
                      return '%s' % (name, name)
!                 names = filter(lambda x: x != '__main__',
!                                sys.builtin_module_names)
                  contents = html.multicolumn(names, bltinlink)
                  indices = ['
' + html.bigsection(
                      'Built-in Modules', '#ffffff', '#ee77aa', contents)]

                  seen = {}
                  for dir in pathdirs():
***************
*** 1454,1463 ****
      class BadUsage: pass

!     try:
!         if sys.platform in ['mac', 'win32'] and not sys.argv[1:]:
!             # graphical platforms with threading (and no CLI)
!             gui()
!             return

          opts, args = getopt.getopt(sys.argv[1:], 'gk:p:w')
          writing = 0
--- 1512,1519 ----
      class BadUsage: pass

!     # Scripts don't get the current directory in their path by default.
!     sys.path.insert(0, '.')

+     try:
          opts, args = getopt.getopt(sys.argv[1:], 'gk:p:w')
          writing = 0
***************
*** 1494,1498 ****
                  else:
                      man(arg)
!             except DocImportError, value:
                  print value

--- 1550,1554 ----
                  else:
                      man(arg)
!             except ErrorDuringImport, value:
                  print value

From ping@users.sourceforge.net  Fri Mar 23 13:35:47 2001
From: ping@users.sourceforge.net (Ka-Ping Yee)
Date: Fri, 23 Mar 2001 05:35:47 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib pydoc.py,1.18,1.19
Message-ID: 

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv7800

Modified Files:
	pydoc.py 
Log Message:
Small formatting improvements.

Index: pydoc.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/pydoc.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** pydoc.py	2001/03/23 13:17:50	1.18
--- pydoc.py	2001/03/23 13:35:45	1.19
***************
*** 270,276 ****

%s%s
      ''' % (bgcol, fgcol, title, fgcol, extras or ' ')

--- 270,276 ----

%s%s
      ''' % (bgcol, fgcol, title, fgcol, extras or ' ')

***************
*** 288,294 ****
          if prelude:
              result = result + '''
! %s
! %s''' % (bgcol, marginalia, prelude)
!         result = result + '''
  %s%s''' % (bgcol, marginalia, gap)

--- 288,296 ----
          if prelude:
              result = result + '''
! %s
! %s
! %s''' % (bgcol, marginalia, prelude, gap)
!         else:
!             result = result + '''
  %s%s''' % (bgcol, marginalia, gap)

***************
*** 557,561 ****
          doc = self.markup(
              getdoc(object), self.preformat, funcs, classes, mdict)
!         doc = self.small('%s
 ' % doc)
          return self.section(title, '#000000', '#ffc8d8', contents, 10, doc)

--- 559,563 ----
          doc = self.markup(
              getdoc(object), self.preformat, funcs, classes, mdict)
!         doc = self.small(doc and '%s
 ' % doc or ' ')
          return self.section(title, '#000000', '#ffc8d8', contents, 10, doc)

***************
*** 585,589 ****
              else:
                  note = (object.im_self and
!                         'method of ' + self.repr(object.im_self) or
                          ' unbound %s method' % object.im_class.__name__)
              object = object.im_func
--- 587,591 ----
              else:
                  note = (object.im_self and
!                         ' method of ' + self.repr(object.im_self) or
                          ' unbound %s method' % object.im_class.__name__)
              object = object.im_func
***************
*** 611,623 ****
                  argspec = argspec[1:-1] # remove parentheses

!         decl = title + argspec + (note and self.small(self.grey(note)))

          if skipdocs:
!             return '
%s' % decl
          else:
              doc = self.markup(
                  getdoc(object), self.preformat, funcs, classes, methods)
              doc = doc and '%s' % doc
!             return '%s
%s' % (decl, self.small(doc))

      def docother(self, object, name=None):
--- 613,626 ----
                  argspec = argspec[1:-1] # remove parentheses

!         decl = title + argspec + (note and self.small(self.grey(
!             '%s' % note)))

          if skipdocs:
!             return '%s\n' % decl
          else:
              doc = self.markup(
                  getdoc(object), self.preformat, funcs, classes, methods)
              doc = doc and '%s' % doc
!             return '%s
%s\n' % (decl, self.small(doc))

      def docother(self, object, name=None):

From jhylton@users.sourceforge.net  Fri Mar 23 14:05:18 2001
From: jhylton@users.sourceforge.net (Jeremy Hylton)
Date: Fri, 23 Mar 2001 06:05:18 -0800
Subject: [Python-checkins] CVS: python/dist/src/Doc/ref ref4.tex,1.25,1.26
Message-ID: 

Update of /cvsroot/python/python/dist/src/Doc/ref
In directory usw-pr-cvs1:/tmp/cvs-serv27243

Modified Files:
	ref4.tex 
Log Message:
Revert to ver 1.22, which was the version before the nested scopes
docs were introduced.  This loses a few small changes, but Fred says
that's okay.

Index: ref4.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/ref/ref4.tex,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** ref4.tex	2001/02/02 02:43:18	1.25
--- ref4.tex	2001/03/23 14:05:16	1.26
***************
*** 25,31 ****
  function \function{execfile()} is a code block.  The string argument
  passed to the built-in function \function{eval()} and to the
! \keyword{exec}\stindex{exec} statement is a code block.  And finally,
! the expression read and evaluated by the built-in function
! \function{input()} is a code block.

  A code block is executed in an execution frame.  An \dfn{execution
--- 25,31 ----
  function \function{execfile()} is a code block.  The string argument
  passed to the built-in function \function{eval()} and to the
! \keyword{exec} statement is a code block.  And finally, the expression
! read and evaluated by the built-in function \function{input()} is a
! code block.

  A code block is executed in an execution frame.  An \dfn{execution
***************
*** 33,143 ****
  information (used for debugging), determines where and how execution
  continues after the code block's execution has completed, and (perhaps
! most importantly) defines the environment in which names are resolved.

! A \dfn{namespace}\indexii{namespace} is a mapping from names
! (identifiers) to objects.  An \dfn{environment}\index{environment} is
! a hierarchical collection of the namespaces that are visible to a
! particular code block.  Python namespaces are statically scoped in the
! tradition of Algol, but also has \keyword{global} statement that can
! be used to access the top-level namespace on the environment.
! 
! Names refers to objects.  Names are introduced by name
! \dfn{binding}\indexii{binding}{name} operations.  Each occurrence of a name
! in the program text refers to the binding of that name established in
! the innermost function namespace containing the use.  Changing the
! mapping of a name to an object is called
! \dfn{rebinding}\indexii{rebinding}{name}; removing a name is 
  \dfn{unbinding}\indexii{unbinding}{name}.  Namespaces are functionally
  equivalent to dictionaries (and often implemented as dictionaries).

! When a name is bound, a mapping is created in the \dfn{local
! namespace}\indexii{local}{namespace} of the execution frame unless the
! name is declared global.  If a name binding operation occurs anywhere
! within a code block, all uses of the name within the block are treated
! as references to the local namespace.  (Note: This can lead to errors
! when a name is used within a block before it is bound.)
! 
! The \dfn{global namespace}\indexii{global}{namespace} determines the
! place where names listed in \keyword{global}\stindex{global}
! statements are defined and searched.  The global namespace of a block
! is the namespace of the module in which the block was defined.
! 
! If a name is used within a code block, but it is not bound there and
! is not declared global, it is a \dfn{free variable}
! \indexii{free}{variable}.  A free variable is resolved using the
! nearest enclosing function block that has a binding for the name.  If
! no such block exists, the name is resolved in the global namespace.

- When a name is not found at all, a
- \exception{NameError}\withsubitem{(built-in
- exception)}{\ttindex{NameError}} exception is raised.
- 
- The local namespace of a class definition becomes the attribute
- dictionary of the class. If a block is contained within a class
- definition, the name bindings that occur in the containing class block
- are not visible to enclosed blocks.
- 
- The following constructs bind names: formal parameters to functions,
- \keyword{import} statements, class and function definitions (these bind
- the class or function name in the defining block), and identifiers
- occurring as the target of an assignment, in a \keyword{for} loop header
- (including list comprehensions), or in the second position of an
- \keyword{except} clause.
- 
  Whether a name is local or global in a code block is determined by
  static inspection of the source text for the code block: in the
! absence of \keyword{global}\stindex{global} statements, a name that is
! bound anywhere in the code block is local in the entire code block;
! all other names are considered global.  The \keyword{global} statement
! forces global interpretation of selected names throughout the code
! block.
! 
! The following constructs bind names: formal parameters to functions,
  \keyword{import} statements, class and function definitions (these
  bind the class or function name in the defining block), and targets
  that are identifiers if occurring in an assignment, \keyword{for} loop
  header, or in the second position of an \keyword{except} clause
! header.  The \keyword{import} statement of the form ``\samp{from
! \ldots import *}''\stindex{from} binds all names defined in the
! imported module, except those beginning with an underscore.  This form
! may only be used at the module level.

  A target occurring in a \keyword{del} statement is also considered bound
! for this purpose (though the actual semantics are to unbind the
! name).  It is illegal to unbind a name that is referenced by an
! enclosing scope; the compiler will report a \exception{SyntaxError}.

  When a global name is not found in the global namespace, it is
  searched in the built-in namespace (which is actually the global
! namespace of the module \module{__builtin__}\refbimodindex{__builtin__}).  
! The built-in namespace associated with the execution of a code block
! is actually found by looking up the name \code{__builtins__} in its
! global namespace; this should be a dictionary or a module (in the
! latter case the module's dictionary is used).  Normally, the
! \code{__builtins__} namespace is the dictionary of the built-in module
! \module{__builtin__} (note: no `s').  If it isn't, restricted
! execution\indexii{restricted}{execution} mode is in effect.
! 
! The namespace for a module is automatically created the first time a
! module is imported.  The main module for a script is always called
! \module{__main__}\refbimodindex{__main__}.
! 
! The \function{eval()}, \function{execfile()}, and \function{input()}
! functions and the \keyword{exec} statement do not have access to the
! full environment for resolving names.  Names may be resolved in the
! local and global namespaces of the caller.  Free variables are not
! resolved in the nearest enclosing namespaces, but in the global
! namespace.\footnote{This limitation occurs because the code that is
!     executed by these operations is not available at the time the
!     module is compiled.}
! The \keyword{exec} statement and the \function{eval()} and
  \function{execfile()} functions have optional arguments to override
  the global and local namespace.  If only one namespace is specified,
  it is used for both.

! The built-in functions \function{globals()} and \function{locals()}
! each return a dictionary, representing the current global and local
! namespace respectively.  The effect of modifications to these
! dictionaries on the namespace are undefined.\footnote{
    The current implementations return the dictionary actually used to
    implement the namespace, \emph{except} for functions, where the
--- 33,158 ----
  information (used for debugging), determines where and how execution
  continues after the code block's execution has completed, and (perhaps
! most importantly) defines two namespaces, the local and the global
! namespace, that affect execution of the code block.

! A \dfn{namespace}\index{namespace} is a mapping from names
! (identifiers) to objects.  A particular namespace may be referenced by
! more than one execution frame, and from other places as well.  Adding
! a name to a namespace is called \dfn{binding}\indexii{binding}{name} a
! name (to an object); changing the mapping of a name is called
! \dfn{rebinding}\indexii{rebinding}{name}; removing a name is
  \dfn{unbinding}\indexii{unbinding}{name}.  Namespaces are functionally
  equivalent to dictionaries (and often implemented as dictionaries).

! The \dfn{local namespace}\indexii{local}{namespace} of an execution
! frame determines the default place where names are defined and
! searched.  The
! \dfn{global namespace}\indexii{global}{namespace} determines the place
! where names listed in \keyword{global}\stindex{global} statements are
! defined and searched, and where names that are not bound anywhere in
! the current code block are searched.

  Whether a name is local or global in a code block is determined by
  static inspection of the source text for the code block: in the
! absence of \keyword{global} statements, a name that is bound anywhere
! in the code block is local in the entire code block; all other names
! are considered global.  The \keyword{global} statement forces global
! interpretation of selected names throughout the code block.  The
! following constructs bind names: formal parameters to functions,
  \keyword{import} statements, class and function definitions (these
  bind the class or function name in the defining block), and targets
  that are identifiers if occurring in an assignment, \keyword{for} loop
  header, or in the second position of an \keyword{except} clause
! header.  Local names are searched only on the local namespace; global
! names are searched only in the global and built-in
! namespace.\footnote{
!   If the code block contains \keyword{exec} statements or the
!   construct ``\samp{from \ldots import *}'', the semantics of local
!   names change: local name lookup first searches the local namespace,
!   then the global namespace and the built-in namespace.}

  A target occurring in a \keyword{del} statement is also considered bound
! for this purpose (though the actual semantics are to ``unbind'' the
! name).

  When a global name is not found in the global namespace, it is
  searched in the built-in namespace (which is actually the global
! namespace of the module
! \module{__builtin__}\refbimodindex{__builtin__}).  The built-in
! namespace associated with the execution of a code block is actually
! found by looking up the name \code{__builtins__} is its global
! namespace; this should be a dictionary or a module (in the latter case
! its dictionary is used).  Normally, the \code{__builtins__} namespace
! is the dictionary of the built-in module \module{__builtin__} (note:
! no `s'); if it isn't, restricted
! execution\indexii{restricted}{execution} mode is in effect.  When a 
! name is not found at all, a
! \exception{NameError}\withsubitem{(built-in
! exception)}{\ttindex{NameError}} exception is raised.
! \stindex{from}
! \stindex{exec}
! \stindex{global}
! 
! The following table lists the meaning of the local and global
! namespace for various types of code blocks.  The namespace for a
! particular module is automatically created when the module is first
! imported (i.e., when it is loaded).  Note that in almost all cases,
! the global namespace is the namespace of the containing module ---
! scopes in Python do not nest!
! 
! \begin{tableiv}{l|l|l|l}{textrm}
!   {Code block type}{Global namespace}{Local namespace}{Notes}
!   \lineiv{Module}
!          {n.s. for this module}
!          {same as global}{}
!   \lineiv{Script (file or command)}
!          {n.s. for \module{__main__}\refbimodindex{__main__}}
!          {same as global}{(1)}
!   \lineiv{Interactive command}
!          {n.s. for \module{__main__}\refbimodindex{__main__}}
!          {same as global}{}
!   \lineiv{Class definition}
!          {global n.s. of containing block}
!          {new n.s.}{}
!   \lineiv{Function body}
!          {global n.s. of containing block}
!          {new n.s.}{(2)}
!   \lineiv{String passed to \keyword{exec} statement}
!          {global n.s. of containing block}
!          {local n.s. of containing block}{(2), (3)}
!   \lineiv{String passed to \function{eval()}}
!          {global n.s. of caller}
!          {local n.s. of caller}{(2), (3)}
!   \lineiv{File read by \function{execfile()}}
!          {global n.s. of caller}
!          {local n.s. of caller}{(2), (3)}
!   \lineiv{Expression read by \function{input()}}
!          {global n.s. of caller}
!          {local n.s. of caller}{}
! \end{tableiv}
! 
! Notes:
! 
! \begin{description}
! 
! \item[n.s.] means \emph{namespace}
! 
! \item[(1)] The main module for a script is always called
! \module{__main__}; ``the filename don't enter into it.''
! 
! \item[(2)] The global and local namespace for these can be
! overridden with optional extra arguments.
! 
! \item[(3)] The \keyword{exec} statement and the \function{eval()} and
  \function{execfile()} functions have optional arguments to override
  the global and local namespace.  If only one namespace is specified,
  it is used for both.
+ 
+ \end{description}

! The built-in functions \function{globals()} and \function{locals()} returns a
! dictionary representing the current global and local namespace,
! respectively.  The effect of modifications to this dictionary on the
! namespace are undefined.\footnote{
    The current implementations return the dictionary actually used to
    implement the namespace, \emph{except} for functions, where the

From ping@users.sourceforge.net  Fri Mar 23 14:05:55 2001
From: ping@users.sourceforge.net (Ka-Ping Yee)
Date: Fri, 23 Mar 2001 06:05:55 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib pydoc.py,1.19,1.20
Message-ID: 

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv27728

Modified Files:
	pydoc.py 
Log Message:
Browser compatibility fixes.
Show methods aliased into a class from other classes.

Index: pydoc.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/pydoc.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** pydoc.py	2001/03/23 13:35:45	1.19
--- pydoc.py	2001/03/23 14:05:53	1.20
***************
*** 259,264 ****

  Python: %s
! 
! 
  %s
  ''' % (title, contents)
--- 259,265 ----

  Python: %s
! 
  %s
  ''' % (title, contents)
***************
*** 441,445 ****
          modules = inspect.getmembers(object, inspect.ismodule)

!         if 0 and hasattr(object, '__all__'):
              visible = lambda key, all=object.__all__: key in all
          else:
--- 442,446 ----
          modules = inspect.getmembers(object, inspect.ismodule)

!         if 0 and hasattr(object, '__all__'): # disabled for now
              visible = lambda key, all=object.__all__: key in all
          else:
***************
*** 474,478 ****
          doc = self.markup(getdoc(object), self.preformat, fdict, cdict)
          doc = doc and '%s' % doc
!         result = result + '%s\n' % self.small(doc)

          if hasattr(object, '__path__'):
--- 475,479 ----
          doc = self.markup(getdoc(object), self.preformat, fdict, cdict)
          doc = doc and '%s' % doc
!         result = result + '
%s\n' % self.small(doc)

          if hasattr(object, '__path__'):
***************
*** 576,580 ****
          if inspect.ismethod(object):
              if cl:
!                 if not cl.__dict__.has_key(name):
                      base = object.im_class
                      url = '#%s-%s' % (base.__name__, name)
--- 577,581 ----
          if inspect.ismethod(object):
              if cl:
!                 if object.im_class is not cl:
                      base = object.im_class
                      url = '#%s-%s' % (base.__name__, name)
***************
*** 596,600 ****
              if (cl and cl.__dict__.has_key(realname) and
                  cl.__dict__[realname] is object):
!                 reallink = '%s' % (
                      cl.__name__ + '-' + realname, realname)
                  skipdocs = 1
--- 597,601 ----
              if (cl and cl.__dict__.has_key(realname) and
                  cl.__dict__[realname] is object):
!                 reallink = '%s' % (
                      cl.__name__ + '-' + realname, realname)
                  skipdocs = 1
***************
*** 847,851 ****
          if inspect.ismethod(object):
              if cl:
!                 if not cl.__dict__.has_key(name):
                      base = object.im_class
                      basename = base.__name__
--- 848,852 ----
          if inspect.ismethod(object):
              if cl:
!                 if object.im_class is not cl:
                      base = object.im_class
                      basename = base.__name__

From jhylton@users.sourceforge.net  Fri Mar 23 14:08:40 2001
From: jhylton@users.sourceforge.net (Jeremy Hylton)
Date: Fri, 23 Mar 2001 06:08:40 -0800
Subject: [Python-checkins] CVS: python/dist/src/Python compile.c,2.193,2.194
Message-ID: 

Update of /cvsroot/python/python/dist/src/Python
In directory usw-pr-cvs1:/tmp/cvs-serv28905/Python

Modified Files:
	compile.c 
Log Message:
Make it illegal to assign to __debug__ as per Guido's request.

Index: compile.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/compile.c,v
retrieving revision 2.193
retrieving revision 2.194
diff -C2 -r2.193 -r2.194
*** compile.c	2001/03/22 03:57:58	2.193
--- compile.c	2001/03/23 14:08:38	2.194
***************
*** 67,70 ****
--- 67,73 ----
  "from __future__ imports must occur at the beginning of the file"

+ #define ASSIGN_DEBUG \
+ "can not assign to __debug__"
+ 
  #define MANGLE_LEN 256

***************
*** 5182,5187 ****
  			n = CHILD(n, 1);
  			goto loop;
! 		} else if (TYPE(tmp) == NAME)
  			symtable_add_def(st, STR(tmp), DEF_LOCAL | flag);
  		return;
  	case dotted_as_name:
--- 5185,5198 ----
  			n = CHILD(n, 1);
  			goto loop;
! 		} else if (TYPE(tmp) == NAME) {
! 			if (strcmp(STR(tmp), "__debug__") == 0) {
! 				PyErr_SetString(PyExc_SyntaxError,
! 						ASSIGN_DEBUG);
!  				PyErr_SyntaxLocation(st->st_filename,
! 						   n->n_lineno);
! 				st->st_errors++;
! 			}
  			symtable_add_def(st, STR(tmp), DEF_LOCAL | flag);
+ 		}
  		return;
  	case dotted_as_name:

From ping@users.sourceforge.net  Fri Mar 23 14:10:41 2001
From: ping@users.sourceforge.net (Ka-Ping Yee)
Date: Fri, 23 Mar 2001 06:10:41 -0800
Subject: [Python-checkins] CVS: python/dist/src/Tools/scripts pydoc.pyw,NONE,1.1
Message-ID: 

Update of /cvsroot/python/python/dist/src/Tools/scripts
In directory usw-pr-cvs1:/tmp/cvs-serv28686

Added Files:
	pydoc.pyw 
Log Message:
Script for starting pydoc with a GUI in Windows.

--- NEW FILE: pydoc.pyw ---
import pydoc
pydoc.gui()

From jhylton@users.sourceforge.net  Fri Mar 23 14:18:29 2001
From: jhylton@users.sourceforge.net (Jeremy Hylton)
Date: Fri, 23 Mar 2001 06:18:29 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.138,1.139
Message-ID: 

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv31693

Modified Files:
	NEWS 
Log Message:
News items for my recent checkins

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.138
retrieving revision 1.139
diff -C2 -r1.138 -r1.139
*** NEWS	2001/03/22 18:26:47	1.138
--- NEWS	2001/03/23 14:18:27	1.139
***************
*** 25,28 ****
--- 25,34 ----
  - sgmllib.py now calls handle_decl() for simple  declarations.

+ - It is illegal to assign to the name __debug__, which is set when the
+   interpreter starts.  It is effectively a compile-time constant.
+ 
+ - A warning will be issued if a global statement for a variable
+   follows a use or assignment of that variable.
+ 
  Standard library

***************
*** 67,70 ****
--- 73,86 ----
    weakly referencable type in PyObject_INIT(), since most types are
    not weakly referencable.
+ 
+ - PyFrame_FastToLocals() and PyFrame_LocalsToFast() copy bindings for
+   free variables and cell variables to and from the frame's f_locals.
+ 
+ - Variants of several functions defined in pythonrun.h have been added
+   to support the nested_scopes future statement.  The variants all end
+   in Flags and take an extra argument, a PyCompilerFlags *; examples:
+   PyRun_AnyFileExFlags(), PyRun_InteractiveLoopFlags().  These
+   variants may be removed in Python 2.2, when nested scopes are
+   mandatory. 

  Distutils

From jhylton@users.sourceforge.net  Fri Mar 23 14:34:09 2001
From: jhylton@users.sourceforge.net (Jeremy Hylton)
Date: Fri, 23 Mar 2001 06:34:09 -0800
Subject: [Python-checkins] CVS: python/dist/src/Doc/ref ref6.tex,1.35,1.36
Message-ID: 

Update of /cvsroot/python/python/dist/src/Doc/ref
In directory usw-pr-cvs1:/tmp/cvs-serv3391

Modified Files:
	ref6.tex 
Log Message:
Note that assignments to __debug__ are illegal

Index: ref6.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/ref/ref6.tex,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** ref6.tex	2001/03/06 07:34:00	1.35
--- ref6.tex	2001/03/23 14:34:06	1.36
***************
*** 87,90 ****
--- 87,92 ----
  it will be displayed as part of the stack trace.

+ Assignments to \code{__debug__} are illegal.  The value for the
+ built-in variable is determined when the interpreter starts.

  \section{Assignment statements \label{assignment}}

From jhylton@users.sourceforge.net  Fri Mar 23 15:29:57 2001
From: jhylton@users.sourceforge.net (Jeremy Hylton)
Date: Fri, 23 Mar 2001 07:29:57 -0800
Subject: [Python-checkins] CVS: python/dist/src/Doc/ref refa1.tex,NONE,1.1
Message-ID: 

Update of /cvsroot/python/python/dist/src/Doc/ref
In directory usw-pr-cvs1:/tmp/cvs-serv13602

Added Files:
	refa1.tex 
Log Message:
Add some initial text for the appendix on future statements and nested scopes.

--- NEW FILE: refa1.tex ---
\chapter{Appendix: Future statements and nested scopes}

The semantics of Python's static scoping will change in version 2.2 to
support resolution of unbound local names in enclosing functions'
namespaces.  The new semantics will be available in Python 2.1 through
the use of a future statement.  This appendix documents these two
features for Python 2.1; it will be removed in Python 2.2 and the
features will be documented in the main sections of this manual.

\section{Future statements}
\indexii{future}{statement}

A \dfn{future statement} is a directive to the compiler that a
particular module should be compiled using syntax or semantics that
will be available in a specified future release of Python.  The future
statement is intended to ease migration to future versions of Python
that introduce incompatible changes to the language.  It allows use of
the new features on a per-module basis before the release in which the
feature becomes standard.

\begin{verbatim}
future_statement: "from" "__future__" "import" feature ["as" name]
                 ("," feature ["as" name])*

feature: identifier
name: identifier
\end{verbatim}

A future statement must appear near the top of the module.  The only
lines that can appear before a future statement are:

\begin{itemize}

\item the module docstring (if any),
\item comments,
\item blank lines, and
\item other future statements.

\end{itemize}

The only feature recognized by Python 2.1 is \samp{nested_scopes}.

A future statement is recognized and treated specially at compile time:
Changes to the semantics of core constructs are often implemented by
generating different code.  It may even be the case that a new feature
introduces new incompatible syntax (such as a new reserved word), in
which case the compiler may need to parse the module differently.  Such
decisions cannot be pushed off until runtime.

For any given release, the compiler knows which feature names have been
defined, and raises a compile-time error if a future statement contains
a feature not known to it.

The direct runtime semantics are the same as for any import statement:
there is a standard module \file{__future__.py}, described later, and
it will be imported in the usual way at the time the future statement
is executed.

The interesting runtime semantics depend on the specific feature
enabled by the future statement.

Note that there is nothing special about the statement:

\begin{verbatim}
import __future__ [as name]
\end{verbatim}

That is not a future statement; it's an ordinary import statement, with
no special semantics or syntax restrictions.

Code compiled by an exec statement or calls to the builtin functions
\function{compile} and \function{execfile} that occur in a module M
containing a future statement will use the new syntax or semantics
associated with the future statement.

A future statement typed at an interactive interpreter prompt will
take effect for the rest of the interpreter session.  If an
interpreter is started with the \emph{-i} option, is passed a
script name to execute, and the script includes a future statement, it
will be in effect in the interactive session started after the script
is executed.

\section{\module{__future__} ---
	 Future statement definitions}

\declaremodule{standard}{__future__}
\modulesynopsis{Future statement definitions}

\file{__future__.py} is a real module, and serves three purposes:

\begin{itemize}

\item To avoid confusing existing tools that analyze import statements
      and expect to find the modules they're importing.

\item To ensure that future_statements run under releases prior to 2.1
      at least yield runtime exceptions (the import of
      \code{__future__} will fail, because there was no module of
      that name prior to 2.1). 

\item To document when incompatible changes were introduced, and when they
      will be --- or were --- made mandatory.  This is a form of executable
      documentation, and can be inspected programatically via importing
      \code{__future__} and examining its contents.

\end{itemize}

Each statment in \file{__future__.py} is of the form:

\begin{verbatim}
FeatureName = "_Feature(" OptionalRelease "," MandatoryRelease ")"
\end{verbatim}

where, normally, OptionalRelease <  MandatoryRelease, and both are
5-tuples of the same form as \code{sys.version_info}:

\begin{verbatim}
    (PY_MAJOR_VERSION, # the 2 in 2.1.0a3; an int
     PY_MINOR_VERSION, # the 1; an int
     PY_MICRO_VERSION, # the 0; an int
     PY_RELEASE_LEVEL, # "alpha", "beta", "candidate" or "final"; string
     PY_RELEASE_SERIAL # the 3; an int
    )
\end{verbatim}

OptionalRelease records the first release in which the feature was
accepted. 

In the case of MandatoryReleases that have not yet occurred,
MandatoryRelease predicts the release in which the feature will become
part of the language.

Else MandatoryRelease records when the feature became part of the
language; in releases at or after that, modules no longer need a
future statement to use the feature in question, but may continue to
use such imports. 

MandatoryRelease may also be None, meaning that a planned feature got
dropped.

Instances of class \class{_Feature} have two corresponding methods,
\member{getOptionalRelease()} and \member{getMandatoryRelease()}.

No feature line will ever be deleted from \file{__future__.py}.

\section{Nested scopes}
\indexii{nested}{scopes}

Nested scopes are left as an exercise for the reader.

From ping@users.sourceforge.net  Fri Mar 23 15:30:01 2001
From: ping@users.sourceforge.net (Ka-Ping Yee)
Date: Fri, 23 Mar 2001 07:30:01 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib inspect.py,1.10,1.11
Message-ID: 

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv13652

Modified Files:
	inspect.py 
Log Message:
Extend isclass() to work for extension classes (by looking for __bases__).

Index: inspect.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/inspect.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** inspect.py	2001/03/23 05:14:09	1.10
--- inspect.py	2001/03/23 15:29:59	1.11
***************
*** 45,49 ****
          __doc__         documentation string
          __module__      name of module in which this class was defined"""
!     return type(object) is types.ClassType

  def ismethod(object):
--- 45,49 ----
          __doc__         documentation string
          __module__      name of module in which this class was defined"""
!     return type(object) is types.ClassType or hasattr(object, '__bases__')

  def ismethod(object):

From ping@users.sourceforge.net  Fri Mar 23 15:36:44 2001
From: ping@users.sourceforge.net (Ka-Ping Yee)
Date: Fri, 23 Mar 2001 07:36:44 -0800
Subject: [Python-checkins] CVS: python/dist/src/Python pythonrun.c,2.129,2.130
Message-ID: 

Update of /cvsroot/python/python/dist/src/Python
In directory usw-pr-cvs1:/tmp/cvs-serv14436

Modified Files:
	pythonrun.c 
Log Message:
Allow sys.excepthook and sys.exitfunc to quietly exit with a sys.exit().
sys.exitfunc gets the last word on the exit status of the program.

Index: pythonrun.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/pythonrun.c,v
retrieving revision 2.129
retrieving revision 2.130
diff -C2 -r2.129 -r2.130
*** pythonrun.c	2001/03/23 04:01:07	2.129
--- pythonrun.c	2001/03/23 15:36:41	2.130
***************
*** 800,803 ****
--- 800,832 ----

  void
+ PyRun_HandleSystemExit(PyObject* value)
+ {
+ 	if (Py_FlushLine())
+ 		PyErr_Clear();
+ 	fflush(stdout);
+ 	if (value == NULL || value == Py_None)
+ 		Py_Exit(0);
+ 	if (PyInstance_Check(value)) {
+ 		/* The error code should be in the `code' attribute. */
+ 		PyObject *code = PyObject_GetAttrString(value, "code");
+ 		if (code) {
+ 			Py_DECREF(value);
+ 			value = code;
+ 			if (value == Py_None)
+ 				Py_Exit(0);
+ 		}
+ 		/* If we failed to dig out the 'code' attribute,
+ 		   just let the else clause below print the error. */
+ 	}
+ 	if (PyInt_Check(value))
+ 		Py_Exit((int)PyInt_AsLong(value));
+ 	else {
+ 		PyObject_Print(value, stderr, Py_PRINT_RAW);
+ 		PySys_WriteStderr("\n");
+ 		Py_Exit(1);
+ 	}
+ }
+ 
+ void
  PyErr_PrintEx(int set_sys_last_vars)
  {
***************
*** 810,842 ****

  	if (PyErr_GivenExceptionMatches(exception, PyExc_SystemExit)) {
! 		if (Py_FlushLine())
! 			PyErr_Clear();
! 		fflush(stdout);
! 		if (v == NULL || v == Py_None)
! 			Py_Exit(0);
! 		if (PyInstance_Check(v)) {
! 			/* we expect the error code to be store in the
! 			   `code' attribute
! 			*/
! 			PyObject *code = PyObject_GetAttrString(v, "code");
! 			if (code) {
! 				Py_DECREF(v);
! 				v = code;
! 				if (v == Py_None)
! 					Py_Exit(0);
! 			}
! 			/* if we failed to dig out the "code" attribute,
! 			   then just let the else clause below print the
! 			   error
! 			*/
! 		}
! 		if (PyInt_Check(v))
! 			Py_Exit((int)PyInt_AsLong(v));
! 		else {
! 			/* OK to use real stderr here */
! 			PyObject_Print(v, stderr, Py_PRINT_RAW);
! 			fprintf(stderr, "\n");
! 			Py_Exit(1);
! 		}
  	}
  	if (set_sys_last_vars) {
--- 839,843 ----

  	if (PyErr_GivenExceptionMatches(exception, PyExc_SystemExit)) {
! 		PyRun_HandleSystemExit(v);
  	}
  	if (set_sys_last_vars) {
***************
*** 854,857 ****
--- 855,862 ----
  			PyErr_Fetch(&exception2, &v2, &tb2);
  			PyErr_NormalizeException(&exception2, &v2, &tb2);
+ 			if (PyErr_GivenExceptionMatches(
+ 				exception2, PyExc_SystemExit)) {
+ 				PyRun_HandleSystemExit(v2);
+ 			}
  			if (Py_FlushLine())
  				PyErr_Clear();
***************
*** 1255,1263 ****
  		Py_INCREF(exitfunc);
  		PySys_SetObject("exitfunc", (PyObject *)NULL);
- 		f = PySys_GetObject("stderr");
  		res = PyEval_CallObject(exitfunc, (PyObject *)NULL);
  		if (res == NULL) {
! 			if (f)
! 			    PyFile_WriteString("Error in sys.exitfunc:\n", f);
  			PyErr_Print();
  		}
--- 1260,1268 ----
  		Py_INCREF(exitfunc);
  		PySys_SetObject("exitfunc", (PyObject *)NULL);
  		res = PyEval_CallObject(exitfunc, (PyObject *)NULL);
  		if (res == NULL) {
! 			if (!PyErr_ExceptionMatches(PyExc_SystemExit)) {
! 				PySys_WriteStderr("Error in sys.exitfunc:\n");
! 			}
  			PyErr_Print();
  		}

From jhylton@users.sourceforge.net  Fri Mar 23 15:41:17 2001
From: jhylton@users.sourceforge.net (Jeremy Hylton)
Date: Fri, 23 Mar 2001 07:41:17 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib symtable.py,1.1,1.2
Message-ID: 

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv15065

Modified Files:
	symtable.py 
Log Message:
flesh out __all__

remove debugging code in if __debug__:

add get_children() method on SymbolTable

Index: symtable.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/symtable.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** symtable.py	2001/03/22 23:32:22	1.1
--- symtable.py	2001/03/23 15:41:14	1.2
***************
*** 9,13 ****
  import weakref

! __all__ = ["symtable", "SymbolTable", "newSymbolTable"]

  def symtable(code, filename, compile_type):
--- 9,14 ----
  import weakref

! __all__ = ["symtable", "SymbolTable", "newSymbolTable", "Class",
!            "Function", "Symbol"]

  def symtable(code, filename, compile_type):
***************
*** 118,121 ****
--- 119,126 ----
                  if st.name == name]

+     def get_children(self):
+         return [newSymbolTable(st, self._filename)
+                 for st in self._table.children]
+ 
  class Function(SymbolTable):

***************
*** 237,253 ****
          return self.__namespaces[0]

- if __debug__:
-     class Foo:
-         version = 1
- 
-     class Foo:
-         version = 2
- 
-     class Foo:
-         version = 3
- 
-     def execfunc(x):
-         exec x in y
-     
  if __name__ == "__main__":
      import os, sys
--- 242,245 ----

From bwarsaw@users.sourceforge.net  Fri Mar 23 16:13:32 2001
From: bwarsaw@users.sourceforge.net (Barry Warsaw)
Date: Fri, 23 Mar 2001 08:13:32 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib/test test_new.py,1.12,1.13
Message-ID: 

Update of /cvsroot/python/python/dist/src/Lib/test
In directory usw-pr-cvs1:/tmp/cvs-serv21571

Modified Files:
	test_new.py 
Log Message:
Several changes for Jython portability.  This closes SF patch
#403666.  Specifically,

In codestr, force `c' to be global.  It's unclear what the semantics
should be for a code object compiled at module scope, but bound and
run in a function.  In CPython, `c' is global (by accident?) while in
Jython, `c' is local.  The intent of the test clearly is to make `c'
global, so let's be explicit about it.

Jython also does not have a __builtins__ name in the module's
namespace, so we use a more portable alternative (though I'm not sure
why the test requires "__builtins__" in the g namespace).

Finally, skip the new.code() test if the new module doesn't have a
`code' attribute.  Jython will never have this.

Index: test_new.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_new.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** test_new.py	2001/02/09 20:17:14	1.12
--- test_new.py	2001/03/23 16:13:30	1.13
***************
*** 48,52 ****
--- 48,57 ----
         'Broken call of hand-crafted instance method')

+ # It's unclear what the semantics should be for a code object compiled at
+ # module scope, but bound and run in a function.  In CPython, `c' is global
+ # (by accident?) while in Jython, `c' is local.  The intent of the test
+ # clearly is to make `c' global, so let's be explicit about it.
  codestr = '''
+ global c
  a = 1
  b = 2
***************
*** 55,59 ****

  ccode = compile(codestr, '', 'exec')
! g = {'c': 0, '__builtins__': __builtins__}
  # this test could be more robust
  print 'new.function()'
--- 60,66 ----

  ccode = compile(codestr, '', 'exec')
! # Jython doesn't have a __builtins__, so use a portable alternative
! import __builtin__
! g = {'c': 0, '__builtins__': __builtin__}
  # this test could be more robust
  print 'new.function()'
***************
*** 66,75 ****

  # bogus test of new.code()
! print 'new.code()'
! d = new.code(3, 3, 3, 3, codestr, (), (), (),
!              "", "", 1, "", (), ())
! # test backwards-compatibility version with no freevars or cellvars
! d = new.code(3, 3, 3, 3, codestr, (), (), (),
!              "", "", 1, "")
! if verbose:
!     print d
--- 73,84 ----

  # bogus test of new.code()
! # Note: Jython will never have new.code()
! if hasattr(new, 'code'):
!     print 'new.code()'
!     d = new.code(3, 3, 3, 3, codestr, (), (), (),
!                  "", "", 1, "", (), ())
!     # test backwards-compatibility version with no freevars or cellvars
!     d = new.code(3, 3, 3, 3, codestr, (), (), (),
!                  "", "", 1, "")
!     if verbose:
!         print d

From fdrake@users.sourceforge.net  Fri Mar 23 16:20:49 2001
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Fri, 23 Mar 2001 08:20:49 -0800
Subject: [Python-checkins] CVS: python/dist/src/Doc/ref refa1.tex,1.1,1.2
Message-ID: 

Update of /cvsroot/python/python/dist/src/Doc/ref
In directory usw-pr-cvs1:/tmp/cvs-serv22735/ref

Modified Files:
	refa1.tex 
Log Message:

Revise the markup so that this formats and uses markup consistently with
the rest of the documentation.

Index: refa1.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/ref/refa1.tex,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** refa1.tex	2001/03/23 15:29:54	1.1
--- refa1.tex	2001/03/23 16:20:46	1.2
***************
*** 1,21 ****
! \chapter{Appendix: Future statements and nested scopes}

  The semantics of Python's static scoping will change in version 2.2 to
  support resolution of unbound local names in enclosing functions'
  namespaces.  The new semantics will be available in Python 2.1 through
! the use of a future statement.  This appendix documents these two
  features for Python 2.1; it will be removed in Python 2.2 and the
  features will be documented in the main sections of this manual.

! \section{Future statements}
! \indexii{future}{statement}

! A \dfn{future statement} is a directive to the compiler that a
! particular module should be compiled using syntax or semantics that
! will be available in a specified future release of Python.  The future
! statement is intended to ease migration to future versions of Python
! that introduce incompatible changes to the language.  It allows use of
! the new features on a per-module basis before the release in which the
! feature becomes standard.

  \begin{verbatim}
--- 1,23 ----
! \chapter{Future statements and nested scopes \label{futures}}
! \sectionauthor{Jeremy Hylton}{jeremy@alum.mit.edu}

+ 
  The semantics of Python's static scoping will change in version 2.2 to
  support resolution of unbound local names in enclosing functions'
  namespaces.  The new semantics will be available in Python 2.1 through
! the use of a ``future'' statement.  This appendix documents these two
  features for Python 2.1; it will be removed in Python 2.2 and the
  features will be documented in the main sections of this manual.
+ 

! \section{Future statements \label{future-statements}}

! A \dfn{future statement}\indexii{future}{statement} is a directive to
! the compiler that a particular module should be compiled using syntax
! or semantics that will be available in a specified future release of
! Python.  The future statement is intended to ease migration to future
! versions of Python that introduce incompatible changes to the
! language.  It allows use of the new features on a per-module basis
! before the release in which the feature becomes standard.

  \begin{verbatim}
***************
*** 53,57 ****

  The direct runtime semantics are the same as for any import statement:
! there is a standard module \file{__future__.py}, described later, and
  it will be imported in the usual way at the time the future statement
  is executed.
--- 55,59 ----

  The direct runtime semantics are the same as for any import statement:
! there is a standard module \module{__future__}, described later, and
  it will be imported in the usual way at the time the future statement
  is executed.
***************
*** 66,80 ****
  \end{verbatim}

! That is not a future statement; it's an ordinary import statement, with
  no special semantics or syntax restrictions.

  Code compiled by an exec statement or calls to the builtin functions
! \function{compile} and \function{execfile} that occur in a module M
! containing a future statement will use the new syntax or semantics
! associated with the future statement.

  A future statement typed at an interactive interpreter prompt will
  take effect for the rest of the interpreter session.  If an
! interpreter is started with the \emph{-i} option, is passed a
  script name to execute, and the script includes a future statement, it
  will be in effect in the interactive session started after the script
--- 68,82 ----
  \end{verbatim}

! That is not a future statement; it's an ordinary import statement with
  no special semantics or syntax restrictions.

  Code compiled by an exec statement or calls to the builtin functions
! \function{compile()} and \function{execfile()} that occur in a module
! \module{M} containing a future statement will use the new syntax or
! semantics associated with the future statement.

  A future statement typed at an interactive interpreter prompt will
  take effect for the rest of the interpreter session.  If an
! interpreter is started with the \programopt{-i} option, is passed a
  script name to execute, and the script includes a future statement, it
  will be in effect in the interactive session started after the script
***************
*** 84,91 ****
  	 Future statement definitions}

! \declaremodule{standard}{__future__}
  \modulesynopsis{Future statement definitions}

! \file{__future__.py} is a real module, and serves three purposes:

  \begin{itemize}
--- 86,93 ----
  	 Future statement definitions}

! \declaremodule[future]{standard}{__future__}
  \modulesynopsis{Future statement definitions}

! \module{__future__} is a real module, and serves three purposes:

  \begin{itemize}
***************
*** 96,100 ****
  \item To ensure that future_statements run under releases prior to 2.1
        at least yield runtime exceptions (the import of
!       \code{__future__} will fail, because there was no module of
        that name prior to 2.1). 

--- 98,102 ----
  \item To ensure that future_statements run under releases prior to 2.1
        at least yield runtime exceptions (the import of
!       \module{__future__} will fail, because there was no module of
        that name prior to 2.1). 

***************
*** 102,106 ****
        will be --- or were --- made mandatory.  This is a form of executable
        documentation, and can be inspected programatically via importing
!       \code{__future__} and examining its contents.

  \end{itemize}
--- 104,108 ----
        will be --- or were --- made mandatory.  This is a form of executable
        documentation, and can be inspected programatically via importing
!       \module{__future__} and examining its contents.

  \end{itemize}
***************
*** 112,117 ****
  \end{verbatim}

! where, normally, OptionalRelease <  MandatoryRelease, and both are
! 5-tuples of the same form as \code{sys.version_info}:

  \begin{verbatim}
--- 114,119 ----
  \end{verbatim}

! where, normally, OptionalRelease is less then MandatoryRelease, and
! both are 5-tuples of the same form as \code{sys.version_info}:

  \begin{verbatim}
***************
*** 136,148 ****
  use such imports. 

! MandatoryRelease may also be None, meaning that a planned feature got
! dropped.

  Instances of class \class{_Feature} have two corresponding methods,
! \member{getOptionalRelease()} and \member{getMandatoryRelease()}.

! No feature line will ever be deleted from \file{__future__.py}.

- \section{Nested scopes}
  \indexii{nested}{scopes}

--- 138,152 ----
  use such imports. 

! MandatoryRelease may also be \code{None}, meaning that a planned
! feature got dropped.

  Instances of class \class{_Feature} have two corresponding methods,
! \method{getOptionalRelease()} and \method{getMandatoryRelease()}.
! 
! No feature description will ever be deleted from \module{__future__}.
! 

! \section{Nested scopes \label{nested-scopes}}

  \indexii{nested}{scopes}

From fdrake@users.sourceforge.net  Fri Mar 23 16:21:18 2001
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Fri, 23 Mar 2001 08:21:18 -0800
Subject: [Python-checkins] CVS: python/dist/src/Doc/ref ref.tex,1.34,1.35
Message-ID: 

Update of /cvsroot/python/python/dist/src/Doc/ref
In directory usw-pr-cvs1:/tmp/cvs-serv22811/ref

Modified Files:
	ref.tex 
Log Message:

Include the futures appendix.

Index: ref.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/ref/ref.tex,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** ref.tex	1999/11/10 16:13:25	1.34
--- ref.tex	2001/03/23 16:21:15	1.35
***************
*** 59,62 ****
--- 59,65 ----
  \input{ref8}		% Top-level components

+ \appendix
+ \input{refa1}           % Future statements and nested scopes
+ 
  \input{ref.ind}

From fdrake@users.sourceforge.net  Fri Mar 23 16:23:23 2001
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Fri, 23 Mar 2001 08:23:23 -0800
Subject: [Python-checkins] CVS: python/dist/src/Doc Makefile.deps,1.61,1.62
Message-ID: 

Update of /cvsroot/python/python/dist/src/Doc
In directory usw-pr-cvs1:/tmp/cvs-serv23271

Modified Files:
	Makefile.deps 
Log Message:

Add entry for the futures appendix in the reference manual.

Correct the comment at the top of the file.

Index: Makefile.deps
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/Makefile.deps,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -r1.61 -r1.62
*** Makefile.deps	2001/03/01 19:54:29	1.61
--- Makefile.deps	2001/03/23 16:23:21	1.62
***************
*** 1,4 ****
! # LaTeX source dependencies; note that the files are named relative to a
! # child directory and not the directory this file is located in.

  COMMONSTYLES= texinputs/python.sty \
--- 1,3 ----
! # LaTeX source dependencies.

  COMMONSTYLES= texinputs/python.sty \
***************
*** 39,43 ****
  	ref/ref6.tex \
  	ref/ref7.tex \
! 	ref/ref8.tex

  # LaTeX source files for the Python Library Reference
--- 38,43 ----
  	ref/ref6.tex \
  	ref/ref7.tex \
! 	ref/ref8.tex \
! 	ref/refa1.tex

  # LaTeX source files for the Python Library Reference

From fdrake@users.sourceforge.net  Fri Mar 23 16:29:08 2001
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Fri, 23 Mar 2001 08:29:08 -0800
Subject: [Python-checkins] CVS: python/dist/src/Doc/tools/sgmlconv conversion.xml,1.10,1.11
Message-ID: 

Update of /cvsroot/python/python/dist/src/Doc/tools/sgmlconv
In directory usw-pr-cvs1:/tmp/cvs-serv24278

Modified Files:
	conversion.xml 
Log Message:

Add conversions for more of the markup -- not all of this was around when
this file was written!

Index: conversion.xml
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/tools/sgmlconv/conversion.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** conversion.xml	2000/11/22 16:45:19	1.10
--- conversion.xml	2001/03/23 16:29:06	1.11
***************
*** 42,49 ****

!   

--- 42,55 ----

!   

+   
+     
+     
+   
+     
+     

***************
*** 94,97 ****
--- 100,106 ----

+   
+     
+     

***************
*** 264,267 ****
--- 273,281 ----

+   
+     
+     
+     
+ 

+   
+   
+     
+     
+   
+     
+     
+   
+     
+     
+   
+     
+     
+ 

***************
*** 632,635 ****
--- 660,666 ----

+     
+     
+   

From fdrake@users.sourceforge.net  Fri Mar 23 16:38:14 2001
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Fri, 23 Mar 2001 08:38:14 -0800
Subject: [Python-checkins] CVS: python/dist/src/Doc/tools/sgmlconv esis2sgml.py,1.13,1.14
Message-ID: 

Update of /cvsroot/python/python/dist/src/Doc/tools/sgmlconv
In directory usw-pr-cvs1:/tmp/cvs-serv25685

Modified Files:
	esis2sgml.py 
Log Message:

Pick the "escape" function from the standard library instead of from PyXML.

Index: esis2sgml.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/tools/sgmlconv/esis2sgml.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** esis2sgml.py	1999/08/26 17:50:26	1.13
--- esis2sgml.py	2001/03/23 16:38:12	1.14
***************
*** 18,22 ****
  import string

! from xml.utils import escape

--- 18,22 ----
  import string

! from xml.sax.saxutils import escape

From fdrake@users.sourceforge.net  Fri Mar 23 16:42:11 2001
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Fri, 23 Mar 2001 08:42:11 -0800
Subject: [Python-checkins] CVS: python/dist/src/Doc/tools/sgmlconv esistools.py,1.4,1.5
Message-ID: 

Update of /cvsroot/python/python/dist/src/Doc/tools/sgmlconv
In directory usw-pr-cvs1:/tmp/cvs-serv26376

Modified Files:
	esistools.py 
Log Message:

Re-write to no longer depend on an old version of PyXML.  This now
implements a SAX XMLReader interface instead of the old Builder interface
used with PyDOM (now obsolete).

This only depends on the standard library, not PyXML.

Index: esistools.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/tools/sgmlconv/esistools.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** esistools.py	1999/08/26 18:04:32	1.4
--- esistools.py	2001/03/23 16:42:08	1.5
***************
*** 4,21 ****
  import re
  import string
- import sys
- import xml.dom.core
- import xml.dom.esis_builder

! _data_rx = re.compile(r"[^\\][^\\]*")

  def decode(s):
      r = ''
      while s:
!         m = _data_rx.match(s)
          if m:
              r = r + m.group()
!             s = s[len(m.group()):]
          elif s[1] == "\\":
              r = r + "\\"
--- 4,24 ----
  import re
  import string

+ import xml.dom.pulldom

! import xml.sax
! import xml.sax.handler
! import xml.sax.xmlreader

+ 
+ _data_match = re.compile(r"[^\\][^\\]*").match
+ 
  def decode(s):
      r = ''
      while s:
!         m = _data_match(s)
          if m:
              r = r + m.group()
!             s = s[m.end():]
          elif s[1] == "\\":
              r = r + "\\"
***************
*** 24,27 ****
--- 27,34 ----
              r = r + "\n"
              s = s[2:]
+         elif s[1] == "%":
+             s = s[2:]
+             n, s = s.split(";", 1)
+             r = r + unichr(int(n))
          else:
              raise ValueError, "can't handle " + `s`
***************
*** 36,83 ****
  del c

  def encode(s):
!     return string.join(map(_charmap.get, s), '')

! class ExtendedEsisBuilder(xml.dom.esis_builder.EsisBuilder):
!     def __init__(self, *args, **kw):
!         self.__empties = {}
!         self.__is_empty = 0
!         apply(xml.dom.esis_builder.EsisBuilder.__init__, (self,) + args, kw)
!         self.buildFragment()

!     def feed(self, data):
!         for line in string.split(data, '\n'):
!             if not line: 
!                 break
!             event = line[0]
!             text = line[1:]
!             if event == '(':
!                 element = self.document.createElement(text, self.attr_store)
!                 self.attr_store = {}
!                 self.push(element)
!                 if self.__is_empty:
!                     self.__empties[text] = text
!                     self.__is_empty = 0
!             elif event == ')':
!                 self.pop()
!             elif event == 'A':
!                 l = re.split(' ', text, 2)
!                 name = l[0]
!                 value = decode(l[2])
!                 self.attr_store[name] = value
!             elif event == '-':
!                 text = self.document.createText(decode(text))
!                 self.push(text)
!             elif event == 'C':
!                 return
!             elif event == 'e':
!                 self.__is_empty = 1
!             elif event == '&':
!                 eref = self.document.createEntityReference(text)
!                 self.push(eref)
!             else:
!                 sys.stderr.write('Unknown event: %s\n' % line)

      def get_empties(self):
!         return self.__empties.keys()
--- 43,310 ----
  del c

+ _null_join = ''.join
  def encode(s):
!     return _null_join(map(_charmap.get, s))

! class ESISReader(xml.sax.xmlreader.XMLReader):
!     """SAX Reader which reads from an ESIS stream.

!     No verification of the document structure is performed by the
!     reader; a general verifier could be used as the target
!     ContentHandler instance.
! 
!     """
!     _decl_handler = None
!     _lexical_handler = None

+     _public_id = None
+     _system_id = None
+ 
+     _buffer = ""
+     _is_empty = 0
+     _lineno = 0
+     _started = 0
+ 
+     def __init__(self, contentHandler=None, errorHandler=None):
+         xml.sax.xmlreader.XMLReader.__init__(self)
+         self._attrs = {}
+         self._attributes = Attributes(self._attrs)
+         self._locator = Locator()
+         self._empties = {}
+         if contentHandler:
+             self.setContentHandler(contentHandler)
+         if errorHandler:
+             self.setErrorHandler(errorHandler)
+ 
      def get_empties(self):
!         return self._empties.keys()
! 
!     #
!     #  XMLReader interface
!     #
! 
!     def parse(self, source):
!         raise RuntimeError
!         self._locator._public_id = source.getPublicId()
!         self._locator._system_id = source.getSystemId()
!         fp = source.getByteStream()
!         handler = self.getContentHandler()
!         if handler:
!             handler.startDocument()
!         lineno = 0
!         while 1:
!             token, data = self._get_token(fp)
!             if token is None:
!                 break
!             lineno = lineno + 1
!             self._locator._lineno = lineno
!             self._handle_token(token, data)
!         handler = self.getContentHandler()
!         if handler:
!             handler.startDocument()
! 
!     def feed(self, data):
!         if not self._started:
!             handler = self.getContentHandler()
!             if handler:
!                 handler.startDocument()
!             self._started = 1
!         data = self._buffer + data
!         self._buffer = None
!         lines = data.split("\n")
!         if lines:
!             for line in lines[:-1]:
!                 self._lineno = self._lineno + 1
!                 self._locator._lineno = self._lineno
!                 if not line:
!                     e = xml.sax.SAXParseException(
!                         "ESIS input line contains no token type mark",
!                         None, self._locator)
!                     self.getErrorHandler().error(e)
!                 else:
!                     self._handle_token(line[0], line[1:])
!             self._buffer = lines[-1]
!         else:
!             self._buffer = ""
! 
!     def close(self):
!         handler = self.getContentHandler()
!         if handler:
!             handler.endDocument()
!         self._buffer = ""
! 
!     def _get_token(self, fp):
!         try:
!             line = fp.readline()
!         except IOError, e:
!             e = SAXException("I/O error reading input stream", e)
!             self.getErrorHandler().fatalError(e)
!             return
!         if not line:
!             return None, None
!         if line[-1] == "\n":
!             line = line[:-1]
!         if not line:
!             e = xml.sax.SAXParseException(
!                 "ESIS input line contains no token type mark",
!                 None, self._locator)
!             self.getErrorHandler().error(e)
!             return
!         return line[0], line[1:]
! 
!     def _handle_token(self, token, data):
!         handler = self.getContentHandler()
!         if token == '-':
!             if data and handler:
!                 handler.characters(decode(data))
!         elif token == ')':
!             if handler:
!                 handler.endElement(decode(data))
!         elif token == '(':
!             if self._is_empty:
!                 self._empties[data] = 1
!             if handler:
!                 handler.startElement(data, self._attributes)
!             self._attrs.clear()
!             self._is_empty = 0
!         elif token == 'A':
!             name, value = data.split(' ', 1)
!             if value != "IMPLIED":
!                 type, value = value.split(' ', 1)
!                 self._attrs[name] = (decode(value), type)
!         elif token == '&':
!             # entity reference in SAX?
!             pass
!         elif token == '?':
!             if handler:
!                 if ' ' in data:
!                     target, data = string.split(data, None, 1)
!                 else:
!                     target, data = data, ""
!                 handler.processingInstruction(target, decode(data))
!         elif token == 'N':
!             handler = self.getDTDHandler()
!             if handler:
!                 handler.notationDecl(data, self._public_id, self._system_id)
!             self._public_id = None
!             self._system_id = None
!         elif token == 'p':
!             self._public_id = decode(data)
!         elif token == 's':
!             self._system_id = decode(data)
!         elif token == 'e':
!             self._is_empty = 1
!         elif token == 'C':
!             pass
!         else:
!             e = SAXParseException("unknown ESIS token in event stream",
!                                   None, self._locator)
!             self.getErrorHandler().error(e)
! 
!     def setContentHandler(self, handler):
!         old = self.getContentHandler()
!         if old:
!             old.setDocumentLocator(None)
!         if handler:
!             handler.setDocumentLocator(self._locator)
!         xml.sax.xmlreader.XMLReader.setContentHandler(self, handler)
! 
!     def getProperty(self, property):
!         if property == xml.sax.handler.property_lexical_handler:
!             return self._lexical_handler
! 
!         elif property == xml.sax.handler.property_declaration_handler:
!             return self._decl_handler
! 
!         else:
!             raise xml.sax.SAXNotRecognizedException("unknown property %s"
!                                                     % `property`)
! 
!     def setProperty(self, property, value):
!         if property == xml.sax.handler.property_lexical_handler:
!             if self._lexical_handler:
!                 self._lexical_handler.setDocumentLocator(None)
!             if value:
!                 value.setDocumentLocator(self._locator)
!             self._lexical_handler = value
! 
!         elif property == xml.sax.handler.property_declaration_handler:
!             if self._decl_handler:
!                 self._decl_handler.setDocumentLocator(None)
!             if value:
!                 value.setDocumentLocator(self._locator)
!             self._decl_handler = value
! 
!         else:
!             raise xml.sax.SAXNotRecognizedException()
! 
!     def getFeature(self, feature):
!         if feature == xml.sax.handler.feature_namespaces:
!             return 1
!         else:
!             return xml.sax.xmlreader.XMLReader.getFeature(self, feature)
! 
!     def setFeature(self, feature, enabled):
!         if feature == xml.sax.handler.feature_namespaces:
!             pass
!         else:
!             xml.sax.xmlreader.XMLReader.setFeature(self, feature, enabled)
! 
! 
! class Attributes(xml.sax.xmlreader.AttributesImpl):
!     # self._attrs has the form {name: (value, type)}
! 
!     def getType(self, name):
!         return self._attrs[name][1]
! 
!     def getValue(self, name):
!         return self._attrs[name][0]
! 
!     def getValueByQName(self, name):
!         return self._attrs[name][0]
! 
!     def __getitem__(self, name):
!         return self._attrs[name][0]
! 
!     def get(self, name, default=None):
!         if self._attrs.has_key(name):
!             return self._attrs[name][0]
!         return default
! 
!     def items(self):
!         L = []
!         for name, (value, type) in self._attrs.items():
!             L.append((name, value))
!         return L
! 
!     def values(self):
!         L = []
!         for value, type in self._attrs.values():
!             L.append(value)
!         return L
! 
! 
! class Locator(xml.sax.xmlreader.Locator):
!     _lineno = -1
!     _public_id = None
!     _system_id = None
! 
!     def getLineNumber(self):
!         return self._lineno
! 
!     def getPublicId(self):
!         return self._public_id
! 
!     def getSystemId(self):
!         return self._system_id
! 
! 
! def parse(stream_or_string, parser=None):
!     if type(stream_or_string) in [type(""), type(u"")]:
!         stream = open(stream_or_string)
!     else:
!         stream = stream_or_string
!     if not parser:
!         parser = ESISReader()
!     return xml.dom.pulldom.DOMEventStream(stream, parser, (2 ** 14) - 20)

From fdrake@users.sourceforge.net  Fri Mar 23 16:47:13 2001
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Fri, 23 Mar 2001 08:47:13 -0800
Subject: [Python-checkins] CVS: python/dist/src/Doc/ref refa1.tex,1.2,1.3
Message-ID: 

Update of /cvsroot/python/python/dist/src/Doc/ref
In directory usw-pr-cvs1:/tmp/cvs-serv27517/ref

Modified Files:
	refa1.tex 
Log Message:

No quotes around the "future" in the first use of the term "future
statement".

Index: refa1.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/ref/refa1.tex,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** refa1.tex	2001/03/23 16:20:46	1.2
--- refa1.tex	2001/03/23 16:47:11	1.3
***************
*** 6,10 ****
  support resolution of unbound local names in enclosing functions'
  namespaces.  The new semantics will be available in Python 2.1 through
! the use of a ``future'' statement.  This appendix documents these two
  features for Python 2.1; it will be removed in Python 2.2 and the
  features will be documented in the main sections of this manual.
--- 6,10 ----
  support resolution of unbound local names in enclosing functions'
  namespaces.  The new semantics will be available in Python 2.1 through
! the use of a future statement.  This appendix documents these two
  features for Python 2.1; it will be removed in Python 2.2 and the
  features will be documented in the main sections of this manual.

From fdrake@users.sourceforge.net  Fri Mar 23 16:53:36 2001
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Fri, 23 Mar 2001 08:53:36 -0800
Subject: [Python-checkins] CVS: python/dist/src/Doc/tools/sgmlconv latex2esis.py,1.22,1.23
Message-ID: 

Update of /cvsroot/python/python/dist/src/Doc/tools/sgmlconv
In directory usw-pr-cvs1:/tmp/cvs-serv28505

Modified Files:
	latex2esis.py 
Log Message:

Pick up the "encode" function from esistools instead of defining our own
(broken) version.

Remove Conversion.err_write() -- use dbgmsg() consistently.

Index: latex2esis.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/tools/sgmlconv/latex2esis.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** latex2esis.py	2000/11/22 17:59:32	1.22
--- latex2esis.py	2001/03/23 16:53:34	1.23
***************
*** 33,36 ****
--- 33,39 ----

+ from esistools import encode
+ 
+ 
  DEBUG = 0

***************
*** 48,55 ****
          LaTeXFormatError.__init__(self, msg)

- def encode(s):
-     s = xml.sax.saxutils.escape(s)
-     return s.replace("\n", "\\n\n-")
- 

  _begin_env_rx = re.compile(r"[\\]begin{([^}]*)}")
--- 51,54 ----
***************
*** 86,90 ****
              raise LaTeXFormatError("cannot push non-string on stack: "
                                     + `entry`)
!         sys.stderr.write("%s<%s>\n" % (" "*len(self.data), entry))
          self.data.append(entry)

--- 85,89 ----
              raise LaTeXFormatError("cannot push non-string on stack: "
                                     + `entry`)
!         #dbgmsg("%s<%s>" % (" "*len(self.data), entry))
          self.data.append(entry)

***************
*** 92,101 ****
          entry = self.data[index]
          del self.data[index]
!         sys.stderr.write("%s\n" % (" "*len(self.data), entry))

      def __delitem__(self, index):
          entry = self.data[index]
          del self.data[index]
!         sys.stderr.write("%s\n" % (" "*len(self.data), entry))

--- 91,100 ----
          entry = self.data[index]
          del self.data[index]
!         #dbgmsg("%s" % (" "*len(self.data), entry))

      def __delitem__(self, index):
          entry = self.data[index]
          del self.data[index]
!         #dbgmsg("%s" % (" "*len(self.data), entry))

***************
*** 114,121 ****
          self.preamble = 1

-     def err_write(self, msg):
-         if DEBUG:
-             sys.stderr.write(str(msg) + "\n")
- 
      def convert(self):
          self.subconvert()
--- 113,116 ----
***************
*** 272,276 ****
                              stack.append(entry.name)
                              self.write("(%s\n" % entry.outputname)
!                         self.err_write("--- text: %s\n" % `pentry.text`)
                          self.write("-%s\n" % encode(pentry.text))
                      elif pentry.type == "entityref":
--- 267,271 ----
                              stack.append(entry.name)
                              self.write("(%s\n" % entry.outputname)
!                         #dbgmsg("--- text: %s" % `pentry.text`)
                          self.write("-%s\n" % encode(pentry.text))
                      elif pentry.type == "entityref":
***************
*** 291,295 ****
                  macroname = stack[-1]
                  if macroname:
!                     conversion = self.table.get(macroname)
                      if conversion.outputname:
                          # otherwise, it was just a bare group
--- 286,290 ----
                  macroname = stack[-1]
                  if macroname:
!                     conversion = self.table[macroname]
                      if conversion.outputname:
                          # otherwise, it was just a bare group
***************
*** 374,379 ****
          entry = self.table.get(name)
          if entry is None:
!             self.err_write("get_entry(%s) failing; building default entry!"
!                            % `name`)
              # not defined; build a default entry:
              entry = TableEntry(name)
--- 369,373 ----
          entry = self.table.get(name)
          if entry is None:
!             dbgmsg("get_entry(%s) failing; building default entry!" % `name`)
              # not defined; build a default entry:
              entry = TableEntry(name)

From bwarsaw@users.sourceforge.net  Fri Mar 23 17:00:09 2001
From: bwarsaw@users.sourceforge.net (Barry Warsaw)
Date: Fri, 23 Mar 2001 09:00:09 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib locale.py,1.15,1.16
Message-ID: 

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv29802

Modified Files:
	locale.py 
Log Message:
setlocale(): In _locale-missing compatibility function, string
comparison should be done with != instead of "is not".

Index: locale.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/locale.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** locale.py	2001/02/09 10:48:30	1.15
--- locale.py	2001/03/23 17:00:07	1.16
***************
*** 70,75 ****
              Activates/queries locale processing.
          """
!         if value is not None and \
!            value is not 'C':
              raise Error, '_locale emulation only supports "C" locale'
          return 'C'
--- 70,74 ----
              Activates/queries locale processing.
          """
!         if value is not None and value != 'C':
              raise Error, '_locale emulation only supports "C" locale'
          return 'C'

From fdrake@users.sourceforge.net  Fri Mar 23 17:01:50 2001
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Fri, 23 Mar 2001 09:01:50 -0800
Subject: [Python-checkins] CVS: python/dist/src/Doc/tools/sgmlconv docfixer.py,1.25,1.26
Message-ID: 

Update of /cvsroot/python/python/dist/src/Doc/tools/sgmlconv
In directory usw-pr-cvs1:/tmp/cvs-serv30077

Modified Files:
	docfixer.py 
Log Message:

Lots of small changes to make this work with the Python DOM bindings
(minidom in particular); it was using PyDOM which is now obsolete.

Only write the output file on success -- this avoids updating the timestamp
on the file on failure, which confuses "make".

Index: docfixer.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/tools/sgmlconv/docfixer.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** docfixer.py	2000/05/24 14:33:26	1.25
--- docfixer.py	2001/03/23 17:01:47	1.26
***************
*** 12,21 ****
  import string
  import sys
! import xml.dom.core

! from xml.dom.core import \
!      ELEMENT, \
!      ENTITY_REFERENCE, \
!      TEXT

--- 12,21 ----
  import string
  import sys
! import xml.dom
! import xml.dom.minidom

! ELEMENT = xml.dom.Node.ELEMENT_NODE
! ENTITY_REFERENCE = xml.dom.Node.ENTITY_REFERENCE_NODE
! TEXT = xml.dom.Node.TEXT_NODE

***************
*** 50,79 ****

- # Workaround to deal with invalid documents (multiple root elements).  This
- # does not indicate a bug in the DOM implementation.
- #
- def get_documentElement(doc):
-     docelem = None
-     for n in doc.childNodes:
-         if n.nodeType == ELEMENT:
-             docelem = n
-     return docelem
- 
- xml.dom.core.Document.get_documentElement = get_documentElement
- 
- 
- # Replace get_childNodes for the Document class; without this, children
- # accessed from the Document object via .childNodes (no matter how many
- # levels of access are used) will be given an ownerDocument of None.
- #
- def get_childNodes(doc):
-     return xml.dom.core.NodeList(doc._node.children, doc._node)
- 
- xml.dom.core.Document.get_childNodes = get_childNodes
- 
- 
  def get_first_element(doc, gi):
      for n in doc.childNodes:
!         if n.get_nodeName() == gi:
              return n

--- 50,56 ----

  def get_first_element(doc, gi):
      for n in doc.childNodes:
!         if n.nodeName == gi:
              return n

***************
*** 85,95 ****

  def find_all_elements(doc, gi):
      nodes = []
!     if doc.get_nodeName() == gi:
          nodes.append(doc)
      for child in doc.childNodes:
          if child.nodeType == ELEMENT:
!             if child.get_tagName() == gi:
                  nodes.append(child)
              for node in child.getElementsByTagName(gi):
--- 62,84 ----

+ def get_documentElement(node):
+     result = None
+     for child in node.childNodes:
+         if child.nodeType == ELEMENT:
+             result = child
+     return result
+ 
+ 
+ def set_tagName(elem, gi):
+     elem.nodeName = elem.tagName = gi
+ 
+ 
  def find_all_elements(doc, gi):
      nodes = []
!     if doc.nodeName == gi:
          nodes.append(doc)
      for child in doc.childNodes:
          if child.nodeType == ELEMENT:
!             if child.tagName == gi:
                  nodes.append(child)
              for node in child.getElementsByTagName(gi):
***************
*** 100,115 ****
      nodes = []
      for child in doc.childNodes:
!         if child.get_nodeName() == gi:
              nodes.append(child)
      return nodes

  def find_all_elements_from_set(doc, gi_set):
      return __find_all_elements_from_set(doc, gi_set, [])

  def __find_all_elements_from_set(doc, gi_set, nodes):
!     if doc.get_nodeName() in gi_set:
          nodes.append(doc)
      for child in doc.childNodes:
!         if child.get_nodeType() == ELEMENT:
              __find_all_elements_from_set(child, gi_set, nodes)
      return nodes
--- 89,105 ----
      nodes = []
      for child in doc.childNodes:
!         if child.nodeName == gi:
              nodes.append(child)
      return nodes

+ 
  def find_all_elements_from_set(doc, gi_set):
      return __find_all_elements_from_set(doc, gi_set, [])

  def __find_all_elements_from_set(doc, gi_set, nodes):
!     if doc.nodeName in gi_set:
          nodes.append(doc)
      for child in doc.childNodes:
!         if child.nodeType == ELEMENT:
              __find_all_elements_from_set(child, gi_set, nodes)
      return nodes
***************
*** 130,134 ****
      node = get_first_element(fragment, "document")
      if node is not None:
!         node._node.name = documentclass
      while 1:
          node = extract_first_element(fragment, "input")
--- 120,124 ----
      node = get_first_element(fragment, "document")
      if node is not None:
!         set_tagName(node, documentclass)
      while 1:
          node = extract_first_element(fragment, "input")
***************
*** 144,148 ****
              docelem.insertBefore(node, text)
          docelem.insertBefore(doc.createTextNode("\n"), docelem.firstChild)
!     while fragment.firstChild and fragment.firstChild.get_nodeType() == TEXT:
          fragment.removeChild(fragment.firstChild)

--- 134,138 ----
              docelem.insertBefore(node, text)
          docelem.insertBefore(doc.createTextNode("\n"), docelem.firstChild)
!     while fragment.firstChild and fragment.firstChild.nodeType == TEXT:
          fragment.removeChild(fragment.firstChild)

***************
*** 154,160 ****
          prevskip = skip
          skip = 0
!         if n.get_nodeType() == TEXT and not prevskip:
              discards.append(n)
!         elif n.get_nodeName() == "COMMENT":
              skip = 1
      for node in discards:
--- 144,150 ----
          prevskip = skip
          skip = 0
!         if n.nodeType == TEXT and not prevskip:
              discards.append(n)
!         elif n.nodeName == "COMMENT":
              skip = 1
      for node in discards:
***************
*** 178,183 ****
      children = container.childNodes
      for child in children:
!         if child.get_nodeType() == ELEMENT:
!             tagName = child.get_tagName()
              if tagName in DESCRIPTOR_ELEMENTS:
                  rewrite_descriptor(doc, child)
--- 168,173 ----
      children = container.childNodes
      for child in children:
!         if child.nodeType == ELEMENT:
!             tagName = child.tagName
              if tagName in DESCRIPTOR_ELEMENTS:
                  rewrite_descriptor(doc, child)
***************
*** 201,210 ****
      #
      # 1.
!     descname = descriptor.get_tagName()
      index = 1
      if descname[-2:] == "ni":
          descname = descname[:-2]
          descriptor.setAttribute("index", "no")
!         descriptor._node.name = descname
          index = 0
      desctype = descname[:-4] # remove 'desc'
--- 191,200 ----
      #
      # 1.
!     descname = descriptor.tagName
      index = 1
      if descname[-2:] == "ni":
          descname = descname[:-2]
          descriptor.setAttribute("index", "no")
!         set_tagName(descriptor, descname)
          index = 0
      desctype = descname[:-4] # remove 'desc'
***************
*** 220,224 ****
      descriptor.removeAttribute("name")
      # 2a.
!     if descriptor.attributes.has_key("var"):
          if descname != "opcodedesc":
              raise RuntimeError, \
--- 210,214 ----
      descriptor.removeAttribute("name")
      # 2a.
!     if descriptor.hasAttribute("var"):
          if descname != "opcodedesc":
              raise RuntimeError, \
***************
*** 246,253 ****
      pos = skip_leading_nodes(children, pos)
      while pos < len(children) \
!           and children[pos].get_nodeName() in (linename, "versionadded"):
!         if children[pos].get_tagName() == linename:
              # this is really a supplemental signature, create 
!             sig = methodline_to_signature(doc, children[pos])
              newchildren.append(sig)
          else:
--- 236,248 ----
      pos = skip_leading_nodes(children, pos)
      while pos < len(children) \
!           and children[pos].nodeName in (linename, "versionadded"):
!         if children[pos].tagName == linename:
              # this is really a supplemental signature, create 
!             oldchild = children[pos].cloneNode(1)
!             try:
!                 sig = methodline_to_signature(doc, children[pos])
!             except KeyError:
!                 print oldchild.toxml()
!                 raise
              newchildren.append(sig)
          else:
***************
*** 302,306 ****
      # must be called after simplfy() if document is multi-rooted to begin with
      docelem = get_documentElement(fragment)
!     toplevel = docelem.get_tagName() == "manual" and "chapter" or "section"
      appendices = 0
      nodes = []
--- 297,301 ----
      # must be called after simplfy() if document is multi-rooted to begin with
      docelem = get_documentElement(fragment)
!     toplevel = docelem.tagName == "manual" and "chapter" or "section"
      appendices = 0
      nodes = []
***************
*** 334,338 ****
              continue
          parent = label.parentNode
!         parentTagName = parent.get_tagName()
          if parentTagName == "title":
              parent.parentNode.setAttribute("id", id)
--- 329,333 ----
              continue
          parent = label.parentNode
!         parentTagName = parent.tagName
          if parentTagName == "title":
              parent.parentNode.setAttribute("id", id)
***************
*** 353,358 ****
          node = queue[0]
          del queue[0]
!         if wsmap.has_key(node.get_nodeName()):
!             ws = wsmap[node.get_tagName()]
              children = node.childNodes
              children.reverse()
--- 348,353 ----
          node = queue[0]
          del queue[0]
!         if wsmap.has_key(node.nodeName):
!             ws = wsmap[node.tagName]
              children = node.childNodes
              children.reverse()
***************
*** 362,367 ****
              children.reverse()
              # hack to get the title in place:
!             if node.get_tagName() == "title" \
!                and node.parentNode.firstChild.get_nodeType() == ELEMENT:
                  node.parentNode.insertBefore(doc.createText("\n  "),
                                               node.parentNode.firstChild)
--- 357,362 ----
              children.reverse()
              # hack to get the title in place:
!             if node.tagName == "title" \
!                and node.parentNode.firstChild.nodeType == ELEMENT:
                  node.parentNode.insertBefore(doc.createText("\n  "),
                                               node.parentNode.firstChild)
***************
*** 389,393 ****
          node = queue[0]
          del queue[0]
!         if rewrite_element(node.get_tagName()):
              children = node.childNodes
              if len(children) == 1 \
--- 384,388 ----
          node = queue[0]
          del queue[0]
!         if rewrite_element(node.tagName):
              children = node.childNodes
              if len(children) == 1 \
***************
*** 412,416 ****
              return 0
          if nodeType == ELEMENT:
!             if l.get_tagName() != r.get_tagName():
                  return 0
              # should check attributes, but that's not a problem here
--- 407,411 ----
              return 0
          if nodeType == ELEMENT:
!             if l.tagName != r.tagName:
                  return 0
              # should check attributes, but that's not a problem here
***************
*** 431,435 ****
      if node is None:
          return
!     node._node.name = "synopsis"
      lastchild = node.childNodes[-1]
      if lastchild.nodeType == TEXT \
--- 426,430 ----
      if node is None:
          return
!     set_tagName(node, "synopsis")
      lastchild = node.childNodes[-1]
      if lastchild.nodeType == TEXT \
***************
*** 438,447 ****
      modauthor = extract_first_element(section, "moduleauthor")
      if modauthor:
!         modauthor._node.name = "author"
          modauthor.appendChild(doc.createTextNode(
              modauthor.getAttribute("name")))
          modauthor.removeAttribute("name")
      platform = extract_first_element(section, "platform")
!     if section.get_tagName() == "section":
          modinfo_pos = 2
          modinfo = doc.createElement("moduleinfo")
--- 433,442 ----
      modauthor = extract_first_element(section, "moduleauthor")
      if modauthor:
!         set_tagName(modauthor, "author")
          modauthor.appendChild(doc.createTextNode(
              modauthor.getAttribute("name")))
          modauthor.removeAttribute("name")
      platform = extract_first_element(section, "platform")
!     if section.tagName == "section":
          modinfo_pos = 2
          modinfo = doc.createElement("moduleinfo")
***************
*** 468,472 ****
              children = title.childNodes
              if len(children) >= 2 \
!                and children[0].get_nodeName() == "module" \
                 and children[0].childNodes[0].data == name:
                  # this is it; morph the  into <short-synopsis>
--- 463,467 ----
              children = title.childNodes
              if len(children) >= 2 \
!                and children[0].nodeName == "module" \
                 and children[0].childNodes[0].data == name:
                  # this is it; morph the <title> into <short-synopsis>
***************
*** 474,478 ****
                  if first_data.data[:4] == " ---":
                      first_data.data = string.lstrip(first_data.data[4:])
!                 title._node.name = "short-synopsis"
                  if children[-1].nodeType == TEXT \
                     and children[-1].data[-1:] == ".":
--- 469,473 ----
                  if first_data.data[:4] == " ---":
                      first_data.data = string.lstrip(first_data.data[4:])
!                 set_tagName(title, "short-synopsis")
                  if children[-1].nodeType == TEXT \
                     and children[-1].data[-1:] == ".":
***************
*** 512,516 ****
          for i in range(len(children)):
              node = children[i]
!             if node.get_nodeName() == "moduleinfo":
                  nextnode = children[i+1]
                  if nextnode.nodeType == TEXT:
--- 507,511 ----
          for i in range(len(children)):
              node = children[i]
!             if node.nodeName == "moduleinfo":
                  nextnode = children[i+1]
                  if nextnode.nodeType == TEXT:
***************
*** 545,549 ****
      for child in children:
          if child.nodeType == ELEMENT:
!             tagName = child.get_tagName()
              if tagName == "hline" and prev_row is not None:
                  prev_row.setAttribute("rowsep", "1")
--- 540,544 ----
      for child in children:
          if child.nodeType == ELEMENT:
!             tagName = child.tagName
              if tagName == "hline" and prev_row is not None:
                  prev_row.setAttribute("rowsep", "1")
***************
*** 559,569 ****
          if nodeType == TEXT:
              if string.strip(child.data):
!                 raise ConversionError("unexpected free data in table")
              table.removeChild(child)
              continue
          if nodeType == ELEMENT:
!             if child.get_tagName() != "hline":
                  raise ConversionError(
!                     "unexpected <%s> in table" % child.get_tagName())
              table.removeChild(child)
              continue
--- 554,565 ----
          if nodeType == TEXT:
              if string.strip(child.data):
!                 raise ConversionError("unexpected free data in <%s>: %r"
!                                       % (table.tagName, child.data))
              table.removeChild(child)
              continue
          if nodeType == ELEMENT:
!             if child.tagName != "hline":
                  raise ConversionError(
!                     "unexpected <%s> in table" % child.tagName)
              table.removeChild(child)
              continue
***************
*** 594,598 ****
      nodes = []
      for child in source.childNodes:
!         if child.get_nodeName() == name:
              nodes.append(child)
      for node in nodes:
--- 590,594 ----
      nodes = []
      for child in source.childNodes:
!         if child.nodeName == name:
              nodes.append(child)
      for node in nodes:
***************
*** 634,638 ****
  def fixup_paras(doc, fragment):
      for child in fragment.childNodes:
!         if child.get_nodeName() in RECURSE_INTO_PARA_CONTAINERS:
              fixup_paras_helper(doc, child)
      descriptions = find_all_elements(fragment, "description")
--- 630,634 ----
  def fixup_paras(doc, fragment):
      for child in fragment.childNodes:
!         if child.nodeName in RECURSE_INTO_PARA_CONTAINERS:
              fixup_paras_helper(doc, child)
      descriptions = find_all_elements(fragment, "description")
***************
*** 646,650 ****
      start = skip_leading_nodes(children)
      while len(children) > start:
!         if children[start].get_nodeName() in RECURSE_INTO_PARA_CONTAINERS:
              # Something to recurse into:
              fixup_paras_helper(doc, children[start])
--- 642,646 ----
      start = skip_leading_nodes(children)
      while len(children) > start:
!         if children[start].nodeName in RECURSE_INTO_PARA_CONTAINERS:
              # Something to recurse into:
              fixup_paras_helper(doc, children[start])
***************
*** 669,673 ****
          nodeType = child.nodeType
          if nodeType == ELEMENT:
!             if child.get_tagName() in BREAK_ELEMENTS:
                  after = j
                  break
--- 665,669 ----
          nodeType = child.nodeType
          if nodeType == ELEMENT:
!             if child.tagName in BREAK_ELEMENTS:
                  after = j
                  break
***************
*** 743,747 ****
              # all whitespace, just skip
          elif nodeType == ELEMENT:
!             tagName = child.get_tagName()
              if tagName in RECURSE_INTO_PARA_CONTAINERS:
                  return start
--- 739,743 ----
              # all whitespace, just skip
          elif nodeType == ELEMENT:
!             tagName = child.tagName
              if tagName in RECURSE_INTO_PARA_CONTAINERS:
                  return start
***************
*** 773,777 ****
  def fixup_args(doc, arglist):
      for child in arglist.childNodes:
!         if child.get_nodeName() == "optional":
              # found it; fix and return
              arglist.insertBefore(doc.createTextNode("["), child)
--- 769,773 ----
  def fixup_args(doc, arglist):
      for child in arglist.childNodes:
!         if child.nodeName == "optional":
              # found it; fix and return
              arglist.insertBefore(doc.createTextNode("["), child)
***************
*** 790,794 ****
          section = sectauth.parentNode
          section.removeChild(sectauth)
!         sectauth._node.name = "author"
          sectauth.appendChild(doc.createTextNode(
              sectauth.getAttribute("name")))
--- 786,790 ----
          section = sectauth.parentNode
          section.removeChild(sectauth)
!         set_tagName(sectauth, "author")
          sectauth.appendChild(doc.createTextNode(
              sectauth.getAttribute("name")))
***************
*** 796,800 ****
          after = section.childNodes[2]
          title = section.childNodes[1]
!         if title.get_nodeName() != "title":
              after = section.childNodes[0]
          section.insertBefore(doc.createTextNode("\n  "), after)
--- 792,796 ----
          after = section.childNodes[2]
          title = section.childNodes[1]
!         if title.nodeName != "title":
              after = section.childNodes[0]
          section.insertBefore(doc.createTextNode("\n  "), after)
***************
*** 807,815 ****
          if child.nodeType == TEXT \
             and string.lstrip(child.data)[:3] == ">>>":
!             verbatim._node.name = "interactive-session"

  def add_node_ids(fragment, counter=0):
!     fragment._node.node_id = counter
      for node in fragment.childNodes:
          counter = counter + 1
--- 803,811 ----
          if child.nodeType == TEXT \
             and string.lstrip(child.data)[:3] == ">>>":
!             set_tagName(verbatim, "interactive-session")

  def add_node_ids(fragment, counter=0):
!     fragment.node_id = counter
      for node in fragment.childNodes:
          counter = counter + 1
***************
*** 817,821 ****
              counter = add_node_ids(node, counter)
          else:
!             node._node.node_id = counter
      return counter + 1

--- 813,817 ----
              counter = add_node_ids(node, counter)
          else:
!             node.node_id = counter
      return counter + 1

***************
*** 832,836 ****
      for node in nodes:
          parent = node.parentNode
!         d[parent._node.node_id] = parent
      del nodes
      map(fixup_refmodindexes_chunk, d.values())
--- 828,832 ----
      for node in nodes:
          parent = node.parentNode
!         d[parent.node_id] = parent
      del nodes
      map(fixup_refmodindexes_chunk, d.values())
***************
*** 839,843 ****
  def fixup_refmodindexes_chunk(container):
      # node is probably a <para>; let's see how often it isn't:
!     if container.get_tagName() != PARA_ELEMENT:
          bwrite("--- fixup_refmodindexes_chunk(%s)\n" % container)
      module_entries = find_all_elements(container, "module")
--- 835,839 ----
  def fixup_refmodindexes_chunk(container):
      # node is probably a <para>; let's see how often it isn't:
!     if container.tagName != PARA_ELEMENT:
          bwrite("--- fixup_refmodindexes_chunk(%s)\n" % container)
      module_entries = find_all_elements(container, "module")
***************
*** 850,854 ****
          if len(children) != 0:
              bwrite("--- unexpected number of children for %s node:\n"
!                    % entry.get_tagName())
              ewrite(entry.toxml() + "\n")
              continue
--- 846,850 ----
          if len(children) != 0:
              bwrite("--- unexpected number of children for %s node:\n"
!                    % entry.tagName)
              ewrite(entry.toxml() + "\n")
              continue
***************
*** 874,878 ****
      for node in nodes:
          parent = node.parentNode
!         d[parent._node.node_id] = parent
      del nodes
      map(fixup_bifuncindexes_chunk, d.values())
--- 870,874 ----
      for node in nodes:
          parent = node.parentNode
!         d[parent.node_id] = parent
      del nodes
      map(fixup_bifuncindexes_chunk, d.values())
***************
*** 906,910 ****
          parent = queue.pop()
          i = 0
!         children = parent.get_childNodes()
          nchildren = len(children)
          while i < (nchildren - 1):
--- 902,906 ----
          parent = queue.pop()
          i = 0
!         children = parent.childNodes
          nchildren = len(children)
          while i < (nchildren - 1):
***************
*** 915,919 ****
                      child = children[i]
                      nextchild = children[i+1]
!                     nextchildren = nextchild.get_childNodes()
                      while len(nextchildren):
                          node = nextchildren[0]
--- 911,915 ----
                      child = children[i]
                      nextchild = children[i+1]
!                     nextchildren = nextchild.childNodes
                      while len(nextchildren):
                          node = nextchildren[0]
***************
*** 933,937 ****
          nodeType = node.nodeType
          if nodeType == ELEMENT:
!             gi = node.get_tagName()
              if knownempty(gi):
                  if node.hasChildNodes():
--- 929,933 ----
          nodeType = node.nodeType
          if nodeType == ELEMENT:
!             gi = node.tagName
              if knownempty(gi):
                  if node.hasChildNodes():
***************
*** 939,944 ****
                            "declared-empty node <%s> has children" % gi
                  ofp.write("e\n")
!             for k, v in node.attributes.items():
!                 value = v.value
                  if _token_rx.match(value):
                      dtype = "TOKEN"
--- 935,939 ----
                            "declared-empty node <%s> has children" % gi
                  ofp.write("e\n")
!             for k, value in node.attributes.items():
                  if _token_rx.match(value):
                      dtype = "TOKEN"
***************
*** 952,956 ****
              ofp.write("-%s\n" % esistools.encode(node.data))
          elif nodeType == ENTITY_REFERENCE:
!             ofp.write("&%s\n" % node.get_nodeName())
          else:
              raise RuntimeError, "unsupported node type: %s" % nodeType
--- 947,951 ----
              ofp.write("-%s\n" % esistools.encode(node.data))
          elif nodeType == ENTITY_REFERENCE:
!             ofp.write("&%s\n" % node.nodeName)
          else:
              raise RuntimeError, "unsupported node type: %s" % nodeType
***************
*** 958,965 ****

  def convert(ifp, ofp):
!     p = esistools.ExtendedEsisBuilder()
!     p.feed(ifp.read())
!     doc = p.document
!     fragment = p.fragment
      normalize(fragment)
      simplify(doc, fragment)
--- 953,961 ----

  def convert(ifp, ofp):
!     events = esistools.parse(ifp)
!     toktype, doc = events.getEvent()
!     fragment = doc.createDocumentFragment()
!     events.expandNode(fragment)
! 
      normalize(fragment)
      simplify(doc, fragment)
***************
*** 995,1000 ****
      #
      d = {}
!     for gi in p.get_empties():
          d[gi] = gi
      if d.has_key("rfc"):
          del d["rfc"]
--- 991,998 ----
      #
      d = {}
!     for gi in events.parser.get_empties():
          d[gi] = gi
+     if d.has_key("author"):
+         del d["author"]
      if d.has_key("rfc"):
          del d["rfc"]
***************
*** 1020,1028 ****
      elif len(sys.argv) == 3:
          ifp = open(sys.argv[1])
!         ofp = open(sys.argv[2], "w")
      else:
          usage()
          sys.exit(2)
      convert(ifp, ofp)

--- 1018,1032 ----
      elif len(sys.argv) == 3:
          ifp = open(sys.argv[1])
!         import StringIO
!         ofp = StringIO.StringIO()
      else:
          usage()
          sys.exit(2)
      convert(ifp, ofp)
+     if len(sys.argv) == 3:
+         fp = open(sys.argv[2], "w")
+         fp.write(ofp.getvalue())
+         fp.close()
+         ofp.close()

From fdrake@users.sourceforge.net  Fri Mar 23 17:09:04 2001
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Fri, 23 Mar 2001 09:09:04 -0800
Subject: [Python-checkins] CVS: python/dist/src/Doc/tools/sgmlconv docfixer.py,1.26,1.27 esis2sgml.py,1.14,1.15 esistools.py,1.5,1.6
Message-ID: <E14gV3g-00089g-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Doc/tools/sgmlconv
In directory usw-pr-cvs1:/tmp/cvs-serv31338

Modified Files:
	docfixer.py esis2sgml.py esistools.py 
Log Message:

Remove the annoying __version__ definitions.

Index: docfixer.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/tools/sgmlconv/docfixer.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** docfixer.py	2001/03/23 17:01:47	1.26
--- docfixer.py	2001/03/23 17:09:02	1.27
***************
*** 4,8 ****
  of the Python documentation, and dump the ESIS data for the transformed tree.
  """
- __version__ = '$Revision$'

--- 4,7 ----

Index: esis2sgml.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/tools/sgmlconv/esis2sgml.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** esis2sgml.py	2001/03/23 16:38:12	1.14
--- esis2sgml.py	2001/03/23 17:09:02	1.15
***************
*** 10,15 ****
  # generated from an SGML or an XML application.

- __version__ = '$Revision$'
- 
  import errno
  import esistools
--- 10,13 ----

Index: esistools.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/tools/sgmlconv/esistools.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** esistools.py	2001/03/23 16:42:08	1.5
--- esistools.py	2001/03/23 17:09:02	1.6
***************
*** 1,4 ****
  """Miscellaneous utility functions useful for dealing with ESIS streams."""
- __version__ = '$Revision$'

  import re
--- 1,3 ----

From jhylton@users.sourceforge.net  Fri Mar 23 17:23:52 2001
From: jhylton@users.sourceforge.net (Jeremy Hylton)
Date: Fri, 23 Mar 2001 09:23:52 -0800
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libdis.tex,1.30,1.31
Message-ID: <E14gVI0-0000Ui-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Doc/lib
In directory usw-pr-cvs1:/tmp/cvs-serv1640/lib

Modified Files:
	libdis.tex 
Log Message:
Add nested scopes spec to appendix.

Add new opcodes LOAD_CLOSURE, LOAD_DEREF, STORE_DEREF, MAKE_CLOSURE to
docs for dis module.

Add docs for new function and code members in Sec. 3 of ref manual.
They're present regardless of whether nested scopes are used.

Remove description of default argument hack from Sec. 7 of the ref
manual and refer the reader to the appendix.

Index: libdis.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/lib/libdis.tex,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** libdis.tex	2000/10/10 22:00:03	1.30
--- libdis.tex	2001/03/23 17:23:49	1.31
***************
*** 557,560 ****
--- 557,579 ----
  \end{opcodedesc}

+ \begin{opcodedesc}{LOAD_CLOSURE}{i}
+ Pushes a reference to the cell contained in slot \var{i} of the
+ cell and free variable storage.  The name of the variable is 
+ \code{co_cellvars[\var{i}]} if \var{i} is less than the length of
+ \var{co_cellvars}.  Otherwise it is 
+ \code{co_freevars[\var{i} - len(co_cellvars)]}.
+ \end{opcodedesc}
+ 
+ \begin{opcodedesc}{LOAD_DEREF}{i}
+ Loads the cell contained in slot \var{i} of the cell and free variable
+ storage.  Pushes a reference to the object the cell contains on the
+ stack. 
+ \end{opcodedesc}
+ 
+ \begin{opcodedesc}{STORE_DEREF}{i}
+ Stores TOS into the cell contained in slot \var{i} of the cell and
+ free variable storage.
+ \end{opcodedesc}
+ 
  \begin{opcodedesc}{SET_LINENO}{lineno}
  Sets the current line number to \var{lineno}.
***************
*** 582,585 ****
--- 601,612 ----
  with the function.  The function object is defined to have \var{argc}
  default parameters, which are found below TOS.
+ \end{opcodedesc}
+ 
+ \begin{opcodedesc}{MAKE_CLOSURE}{argc}
+ Creates a new function object, sets its \var{func_closure} slot, and
+ pushes it on the stack.  TOS is the code associated with the function.
+ If the code object has N free variables, the next N items on the stack
+ are the cells for these variables.  The function also has \var{argc}
+ default parameters, where are found before the cells.
  \end{opcodedesc}

From jhylton@users.sourceforge.net  Fri Mar 23 17:23:52 2001
From: jhylton@users.sourceforge.net (Jeremy Hylton)
Date: Fri, 23 Mar 2001 09:23:52 -0800
Subject: [Python-checkins] CVS: python/dist/src/Doc/ref ref3.tex,1.62,1.63 ref7.tex,1.23,1.24 refa1.tex,1.3,1.4
Message-ID: <E14gVI0-0000Us-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Doc/ref
In directory usw-pr-cvs1:/tmp/cvs-serv1640/ref

Modified Files:
	ref3.tex ref7.tex refa1.tex 
Log Message:
Add nested scopes spec to appendix.

Add new opcodes LOAD_CLOSURE, LOAD_DEREF, STORE_DEREF, MAKE_CLOSURE to
docs for dis module.

Add docs for new function and code members in Sec. 3 of ref manual.
They're present regardless of whether nested scopes are used.

Remove description of default argument hack from Sec. 7 of the ref
manual and refer the reader to the appendix.

Index: ref3.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/ref/ref3.tex,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -r1.62 -r1.63
*** ref3.tex	2001/02/27 03:36:30	1.62
--- ref3.tex	2001/03/23 17:23:50	1.63
***************
*** 417,429 ****
  defines the global namespace of the module in which the function was
  defined; \member{func_dict} or \member{__dict__} contains the
! namespace supporting arbitrary function attributes.

! Of these, \member{func_code}, \member{func_defaults},
  \member{func_doc}/\member{__doc__}, and
  \member{func_dict}/\member{__dict__} may be writable; the
! others can never be changed.
! Additional information about a function's definition can be
! retrieved from its code object; see the description of internal types
! below.
  \withsubitem{(function attribute)}{
    \ttindex{func_doc}
--- 417,434 ----
  defines the global namespace of the module in which the function was
  defined; \member{func_dict} or \member{__dict__} contains the
! namespace supporting arbitrary function attributes;
! \member{func_closure} is \code{None} or a tuple of cells that contain
! binding for the function's free variables.

! Of these, \member{func_code}, \member{func_defaults}, \member{func_closure},
  \member{func_doc}/\member{__doc__}, and
  \member{func_dict}/\member{__dict__} may be writable; the
! others can never be changed.  Additional information about a
! function's definition can be retrieved from its code object; see the
! description of internal types below.
! 
! In Python 2.1, the \member{func_closure} slot is always \code{None}
! unless nested scopes are enabled.  (See the appendix.)
! 
  \withsubitem{(function attribute)}{
    \ttindex{func_doc}
***************
*** 715,720 ****
  number of local variables used by the function (including arguments);
  \member{co_varnames} is a tuple containing the names of the local
! variables (starting with the argument names); \member{co_code} is a
! string representing the sequence of bytecode instructions;
  \member{co_consts} is a tuple containing the literals used by the
  bytecode; \member{co_names} is a tuple containing the names used by
--- 720,728 ----
  number of local variables used by the function (including arguments);
  \member{co_varnames} is a tuple containing the names of the local
! variables (starting with the argument names); \member{co_cellvars} is
! a tuple containing the names of local variables that are referenced by
! nested functions; \member{co_freevars} is a tuple containing the names
! of local variables that are neither local nor global; \member{co_code}
! is a string representing the sequence of bytecode instructions;
  \member{co_consts} is a tuple containing the literals used by the
  bytecode; \member{co_names} is a tuple containing the names used by
***************
*** 726,729 ****
--- 734,742 ----
  (including local variables); \member{co_flags} is an integer encoding
  a number of flags for the interpreter.
+ 
+ The \member{co_cellvars} and \member{co_freevars} are present in
+ Python 2.1 when nested scopes are not enabled, but the code itself
+ does not use or create cells.
+ 
  \withsubitem{(code object attribute)}{
    \ttindex{co_argcount}
***************
*** 738,742 ****
    \ttindex{co_nlocals}
    \ttindex{co_stacksize}
!   \ttindex{co_varnames}}

  The following flag bits are defined for \member{co_flags}: bit
--- 751,757 ----
    \ttindex{co_nlocals}
    \ttindex{co_stacksize}
!   \ttindex{co_varnames}
!   \ttindex{co_cellvars}
!   \ttindex{co_freevars}}

  The following flag bits are defined for \member{co_flags}: bit
***************
*** 745,751 ****
  \code{0x08} is set if the function uses the \samp{**keywords} syntax
  to accept arbitrary keyword arguments; other bits are used internally
! or reserved for future use.  If\index{documentation string} a code
! object represents a function, the first item in \member{co_consts} is
! the documentation string of the function, or \code{None} if undefined.

  \item[Frame objects]
--- 760,768 ----
  \code{0x08} is set if the function uses the \samp{**keywords} syntax
  to accept arbitrary keyword arguments; other bits are used internally
! or reserved for future use; bit \code{0x10} is set if the function was
! compiled with nested scopes enabled.  If\index{documentation string} a
! code object represents a function, the first item in
! \member{co_consts} is the documentation string of the function, or
! \code{None} if undefined.

  \item[Frame objects]

Index: ref7.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/ref/ref7.tex,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** ref7.tex	2001/02/01 22:48:12	1.23
--- ref7.tex	2001/03/23 17:23:50	1.24
***************
*** 365,385 ****
  \strong{Programmer's note:} a ``\code{def}'' form executed inside a
  function definition defines a local function that can be returned or
! passed around.  Because of Python's two-scope philosophy, a local
! function defined in this way does not have access to the local
! variables of the function that contains its definition; the same rule
! applies to functions defined by a lambda form.  A standard trick to
! pass selected local variables into a locally defined function is to
! use default argument values, like this:
! 
! \begin{verbatim}
! # Return a function that returns its argument incremented by 'n'
! def make_incrementer(n):
!     def increment(x, n=n):
!         return x+n
!     return increment
! 
! add1 = make_incrementer(1)
! print add1(3)  # This prints '4'
! \end{verbatim}

  \section{Class definitions\label{class}}
--- 365,371 ----
  \strong{Programmer's note:} a ``\code{def}'' form executed inside a
  function definition defines a local function that can be returned or
! passed around.  The semantics of name resolution in the nested
! function will change in Python 2.2.  See the appendix for a
! description of the new semantics.

  \section{Class definitions\label{class}}

Index: refa1.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/ref/refa1.tex,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** refa1.tex	2001/03/23 16:47:11	1.3
--- refa1.tex	2001/03/23 17:23:50	1.4
***************
*** 146,153 ****
  No feature description will ever be deleted from \module{__future__}.

- 
  \section{Nested scopes \label{nested-scopes}}
- 
  \indexii{nested}{scopes}

! Nested scopes are left as an exercise for the reader.
--- 146,252 ----
  No feature description will ever be deleted from \module{__future__}.

  \section{Nested scopes \label{nested-scopes}}
  \indexii{nested}{scopes}
+ 
+ This section defines the new scoping semantics that will be introduced
+ in Python 2.2.  They are available in Python 2.1 by using the future
+ statement \samp{nested_scopes}.  This section begins with a bit of
+ terminology. 
+ 
+ \subsection{Definitions and rules \label{defintions}}
+ 
+ \dfn{Names} refer to objects.  Names are introduced by name binding
+ operations.  Each occurrence of a name in the program text refers to
+ the binding of that name established in the innermost function block
+ containing the use.
+ 
+ A \dfn{block} is a pice of Python program text that can is executed as
+ a unit.  The following are blocks: a module, a function body, and a
+ class defintion.
+ 
+ A \dfn{scope} defines the visibility of a name within a block.  If a
+ local variable is defined in a block, it's scope includes that block.
+ If the definition occurs in a function block, the scope extends to any
+ blocks contained within the defining one, unless a contained block
+ introduces a different binding for the name.  The scope of names
+ defined in a class block is limited to the class block; it does not
+ extend to the code blocks of methods.
+ 
+ When a name is used in a code block, it is resolved using the nearest
+ enclosing scope.  The set of all such scopes visible to a code block
+ is called the block's \dfn{environment}.  
+ 
+ If a name is bound in a block, it is a local variable of that block.
+ If a name is bound at the module level, it is a global variable.  (The
+ ariables of the module code block are local and global.)  If a
+ variable is used in a code block but not defined there, it is a
+ \dfn{free variable}.
+ 
+ The name binding operations are assignment, class and function
+ definition, import statements, for statements, and except statements.
+ Each assignment or import statement occurs within a block defined by a
+ class or function definition or at the module level (the top-level
+ code block).
+ 
+ If a name binding operation occurs anywhere within a code block, all
+ uses of the name within the block are treated as references to the
+ current block.  This can lead to errors when a name is used within a
+ block before it is bound.
+ 
+ The previous rule is a subtle.  Python lacks declarations and allows
+ name binding operations to occur anywhere within a code block.  The
+ local variables of a code block can be determined by scanning the
+ entire text of the block for name binding operations.
+ 
+ If the global statement occurs within a block, all uses of the name
+ specified in the statement refer to the binding of that name in the
+ top-level namespace.  Names are resolved in the top-level namespace by
+ searching the global namespace, i.e. the namespace of the module
+ containing the code block, and the builtin namespace, the namespace of
+ the module \module{__builtin__}.  The global namespace is searched
+ first.  If the name is not found there, the builtin namespace is
+ searched.  The global statement must precede all uses of the name.
+ 
+ The global statement has the same scope as a name binding operation
+ in the same block.  If the nearest enclosing scope for a free variable
+ contains a global statement, the free variable is treated as a global.
+ 
+ A class definition is an executable statement that may use and define
+ names.  These references follow the normal rules for name resolution.
+ The namespace of the class definition becomes the attribute dictionary
+ of the class.  Names defined at the class scope are not visible in
+ methods. 
+ 
+ \subsection{Interaction with dynamic features \label{dynamic-features}}
+ 
+ There are several cases where Python statements are illegal when
+ used in conjunction with nested scopes that contain free
+ variables.
+ 
+ If a variable is referenced in an enclosing scope, it is illegal
+ to delete the name.  An error will be reported at compile time.
+ 
+ If the wild card form of import --- \samp{import *} --- is used in a
+ function and the function contains or is a nested block with free
+ variables, the compiler will raise a SyntaxError.
+ 
+ If exec is used in a function and the function contains or is a nested
+ block with free variables, the compiler will raise a SyntaxError
+ unless the exec explicitly specifies the local namespace for the exec.
+ (In other words, "exec obj" would be illegal, but "exec obj in ns"
+ would be legal.)
+ 
+ The builtin functions \function{eval()} and \function{input()} can not
+ access free variables unless the variables are also referenced by the
+ program text of the block that contains the call to \function{eval()}
+ or \function{input()}.

! \emph{Compatibility note}: The compiler for Python 2.1 will issue
! warnings for uses of nested functions that will behave differently
! with nested scopes.  The warnings will not be issued if nested scopes
! are enabled via a future statement.  If a name bound in a function
! scope and the function contains a nested function scope that uses the
! name, the compiler will issue a warning.  The name resolution rules
! will result in different bindings under Python 2.1 than under Python
! 2.2.  The warning indicates that the program may not run correctly
! with all versions of Python.

From akuchling@users.sourceforge.net  Fri Mar 23 17:30:28 2001
From: akuchling@users.sourceforge.net (A.M. Kuchling)
Date: Fri, 23 Mar 2001 09:30:28 -0800
Subject: [Python-checkins] CVS: distutils/distutils util.py,1.62,1.63
Message-ID: <E14gVOO-0000oq-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/distutils/distutils
In directory usw-pr-cvs1:/tmp/cvs-serv2735

Modified Files:
	util.py 
Log Message:
Change rfc822_escape() to ensure there's a consistent amount of whitespace
   after each newline, instead of just blindly inserting a space at
   the start of each line.  (Improvement suggested by Thomas Wouters)

Index: util.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/util.py,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -r1.62 -r1.63
*** util.py	2001/03/22 03:03:41	1.62
--- util.py	2001/03/23 17:30:26	1.63
***************
*** 447,454 ****
  def rfc822_escape (header):
      """Return a version of the string escaped for inclusion in an
!     RFC-822 header, by adding a space after each newline.
      """
!     header = string.rstrip(header)
!     header = string.replace(header, '\n', '\n ')
      return header

--- 447,455 ----
  def rfc822_escape (header):
      """Return a version of the string escaped for inclusion in an
!     RFC-822 header, by ensuring there are 8 spaces space after each newline.
      """
!     lines = string.split(header, '\n')
!     lines = map(string.strip, lines)
!     header = string.join(lines, '\n' + 8*' ')
      return header

From akuchling@users.sourceforge.net  Fri Mar 23 17:30:58 2001
From: akuchling@users.sourceforge.net (A.M. Kuchling)
Date: Fri, 23 Mar 2001 09:30:58 -0800
Subject: [Python-checkins] CVS: distutils setup.py,1.28,1.29
Message-ID: <E14gVOs-0000q2-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/distutils
In directory usw-pr-cvs1:/tmp/cvs-serv3211

Modified Files:
	setup.py 
Log Message:
Bow to the inevitable and add my name as maintainer

Index: setup.py
===================================================================
RCS file: /cvsroot/python/distutils/setup.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** setup.py	2001/03/16 21:00:18	1.28
--- setup.py	2001/03/23 17:30:56	1.29
***************
*** 16,19 ****
--- 16,21 ----
         author = "Greg Ward",
         author_email = "gward@python.net",
+        maintainer = "A.M. Kuchling",
+        maintainer_email = 'amk1@bigfoot.com',
         url = "http://www.python.org/sigs/distutils-sig/",
         licence = "Python",

From fdrake@users.sourceforge.net  Fri Mar 23 17:34:05 2001
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Fri, 23 Mar 2001 09:34:05 -0800
Subject: [Python-checkins] CVS: python/dist/src/Python pythonrun.c,2.130,2.131
Message-ID: <E14gVRt-00012j-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Python
In directory usw-pr-cvs1:/tmp/cvs-serv3995/Python

Modified Files:
	pythonrun.c 
Log Message:

call_sys_exitfunc():  Remove unused variable f.

Index: pythonrun.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/pythonrun.c,v
retrieving revision 2.130
retrieving revision 2.131
diff -C2 -r2.130 -r2.131
*** pythonrun.c	2001/03/23 15:36:41	2.130
--- pythonrun.c	2001/03/23 17:34:02	2.131
***************
*** 1257,1261 ****

  	if (exitfunc) {
! 		PyObject *res, *f;
  		Py_INCREF(exitfunc);
  		PySys_SetObject("exitfunc", (PyObject *)NULL);
--- 1257,1261 ----

  	if (exitfunc) {
! 		PyObject *res;
  		Py_INCREF(exitfunc);
  		PySys_SetObject("exitfunc", (PyObject *)NULL);

From bwarsaw@users.sourceforge.net  Fri Mar 23 17:40:18 2001
From: bwarsaw@users.sourceforge.net (Barry Warsaw)
Date: Fri, 23 Mar 2001 09:40:18 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib/test test_socket.py,1.18,1.19
Message-ID: <E14gVXu-0001WH-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Lib/test
In directory usw-pr-cvs1:/tmp/cvs-serv5833

Modified Files:
	test_socket.py 
Log Message:
Make socket.getservbyname test optional on socket module having that
attribute.  Jython does not have this function.

Closes SF patch #403667.

Index: test_socket.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_socket.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** test_socket.py	2001/02/09 11:57:20	1.18
--- test_socket.py	2001/03/23 17:40:16	1.19
***************
*** 84,92 ****
      print 'FQDN not found'

! print socket.getservbyname('telnet', 'tcp')
! try:
!     socket.getservbyname('telnet', 'udp')
! except socket.error:
!     pass

--- 84,93 ----
      print 'FQDN not found'

! if hasattr(socket, 'getservbyname'):
!     print socket.getservbyname('telnet', 'tcp')
!     try:
!         socket.getservbyname('telnet', 'udp')
!     except socket.error:
!         pass

From fdrake@users.sourceforge.net  Fri Mar 23 17:42:12 2001
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Fri, 23 Mar 2001 09:42:12 -0800
Subject: [Python-checkins] CVS: python/dist/src/Doc/api api.tex,1.111,1.112
Message-ID: <E14gVZk-0001ce-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Doc/api
In directory usw-pr-cvs1:/tmp/cvs-serv6173/api

Modified Files:
	api.tex 
Log Message:

Strengthen the constraints on calling PyObject_GC_Fini().

Index: api.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/api/api.tex,v
retrieving revision 1.111
retrieving revision 1.112
diff -C2 -r1.111 -r1.112
*** api.tex	2001/03/22 16:30:17	1.111
--- api.tex	2001/03/23 17:42:09	1.112
***************
*** 5030,5033 ****
--- 5030,5038 ----
    this for the object before any of the fields used by the
    \member{tp_traverse} handler become invalid.
+ 
+   \strong{Note:}  Any container which may be referenced from another
+   object reachable by the collector must itself be tracked by the
+   collector, so it is generally not safe to call this function
+   anywhere but in the object's deallocator.
  \end{cfuncdesc}

From fdrake@users.sourceforge.net  Fri Mar 23 17:51:40 2001
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Fri, 23 Mar 2001 09:51:40 -0800
Subject: [Python-checkins] CVS: python/dist/src README,1.117,1.118
Message-ID: <E14gViu-00029H-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv8211

Modified Files:
	README 
Log Message:

Update Mac OS X platform notes.

This closes SF bug #406191.

Index: README
===================================================================
RCS file: /cvsroot/python/python/dist/src/README,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -r1.117 -r1.118
*** README	2001/03/22 15:29:37	1.117
--- README	2001/03/23 17:51:37	1.118
***************
*** 389,398 ****
          future release.

! MacOS X:  You need to add the "-traditional-cpp" option to the
!         compiler command line for the MacOS X Public Beta.  This is
          appearantly a bug in the default pre-processor, and is
          expected not to be a problem with future versions.  Run
!         configure with "OPT=-traditional-cpp ./configure" to add this
!         option.

--- 389,402 ----
          future release.

! Mac OS X: You need to add the "-traditional-cpp" option to the
!         compiler command line for the Mac OS X Public Beta.  This is
          appearantly a bug in the default pre-processor, and is
          expected not to be a problem with future versions.  Run
!         configure with "OPT='-g -traditional-cpp' ./configure
!         --with-suffix=.exe --with-dyld" to add this
!         option.  One of the regular expression tests fails due to the
!         small stack size used by default (how to change this?), and
!         the test_largefile test is only expected to work on a Unix UFS
!         filesystem (how to check for this on Mac OS X?).

From bwarsaw@users.sourceforge.net  Fri Mar 23 17:53:51 2001
From: bwarsaw@users.sourceforge.net (Barry Warsaw)
Date: Fri, 23 Mar 2001 09:53:51 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib site.py,1.25,1.26
Message-ID: <E14gVl1-0002IE-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv8800

Modified Files:
	site.py 
Log Message:
Two minor changes for better Jython compatibility.  Finn Bock says:

    Change 1: Not all 'modules' in sys.modules have a 
    sensible __file__ attribute. Some of our java package 
    can have the __file__ attribute set to None. 

    Change 2: In jython we have the jython license file in 
    <root> and the CPython license file in <root>/Lib. By 
    reversing the search sequence jython will find and 
    show the jython license file before the CPython file.

Closes SF patch #405853.

Index: site.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/site.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** site.py	2001/03/02 06:43:49	1.25
--- site.py	2001/03/23 17:53:49	1.26
***************
*** 15,19 ****
  appends lib/python<version>/site-packages as well as lib/site-python.
  On other platforms (mainly Mac and Windows), it uses just sys.prefix
! (and sys.exec_prefix, if different, but this is unlikely).  The
  resulting directories, if they exist, are appended to sys.path, and
  also inspected for path configuration files.
--- 15,19 ----
  appends lib/python<version>/site-packages as well as lib/site-python.
  On other platforms (mainly Mac and Windows), it uses just sys.prefix
! \(and sys.exec_prefix, if different, but this is unlikely).  The
  resulting directories, if they exist, are appended to sys.path, and
  also inspected for path configuration files.
***************
*** 72,76 ****
  L = sys.modules.values()
  for m in L:
!     if hasattr(m, "__file__"):
          m.__file__ = makepath(m.__file__)
  del m, L
--- 72,76 ----
  L = sys.modules.values()
  for m in L:
!     if hasattr(m, "__file__") and m.__file__:
          m.__file__ = makepath(m.__file__)
  del m, L
***************
*** 234,238 ****
      "license", "See http://www.pythonlabs.com/products/python2.0/license.html",
      ["LICENSE.txt", "LICENSE"],
!     [here, os.path.join(here, os.pardir), os.curdir])

--- 234,238 ----
      "license", "See http://www.pythonlabs.com/products/python2.0/license.html",
      ["LICENSE.txt", "LICENSE"],
!     [os.path.join(here, os.pardir), here, os.curdir])

From gvanrossum@users.sourceforge.net  Fri Mar 23 17:54:45 2001
From: gvanrossum@users.sourceforge.net (Guido van Rossum)
Date: Fri, 23 Mar 2001 09:54:45 -0800
Subject: [Python-checkins] CVS: python/dist/src/Python pythonrun.c,2.131,2.132
Message-ID: <E14gVlt-0002NW-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Python
In directory usw-pr-cvs1:/tmp/cvs-serv9126

Modified Files:
	pythonrun.c 
Log Message:
Finishing touch to Ping's changes.  This is a patch that Ping sent me
but apparently he had to go to school, so I am checking it in for him.

This makes PyRun_HandleSystemExit() a static instead, called
handle_system_exit(), and let it use the current exception rather than
passing in an exception.  This slightly simplifies the code.

Index: pythonrun.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/pythonrun.c,v
retrieving revision 2.131
retrieving revision 2.132
diff -C2 -r2.131 -r2.132
*** pythonrun.c	2001/03/23 17:34:02	2.131
--- pythonrun.c	2001/03/23 17:54:43	2.132
***************
*** 799,805 ****
  }

! void
! PyRun_HandleSystemExit(PyObject* value)
  {
  	if (Py_FlushLine())
  		PyErr_Clear();
--- 799,807 ----
  }

! static void
! handle_system_exit(void)
  {
+         PyObject *exception, *value, *tb;
+ 	PyErr_Fetch(&exception, &value, &tb);
  	if (Py_FlushLine())
  		PyErr_Clear();
***************
*** 832,844 ****
  {
  	PyObject *exception, *v, *tb, *hook;
  	PyErr_Fetch(&exception, &v, &tb);
  	PyErr_NormalizeException(&exception, &v, &tb);
- 
  	if (exception == NULL)
  		return;
- 
- 	if (PyErr_GivenExceptionMatches(exception, PyExc_SystemExit)) {
- 		PyRun_HandleSystemExit(v);
- 	}
  	if (set_sys_last_vars) {
  		PySys_SetObject("last_type", exception);
--- 834,845 ----
  {
  	PyObject *exception, *v, *tb, *hook;
+ 
+ 	if (PyErr_ExceptionMatches(PyExc_SystemExit)) {
+ 		handle_system_exit();
+ 	}
  	PyErr_Fetch(&exception, &v, &tb);
  	PyErr_NormalizeException(&exception, &v, &tb);
  	if (exception == NULL)
  		return;
  	if (set_sys_last_vars) {
  		PySys_SetObject("last_type", exception);
***************
*** 853,862 ****
  		if (result == NULL) {
  			PyObject *exception2, *v2, *tb2;
  			PyErr_Fetch(&exception2, &v2, &tb2);
  			PyErr_NormalizeException(&exception2, &v2, &tb2);
- 			if (PyErr_GivenExceptionMatches(
- 				exception2, PyExc_SystemExit)) {
- 				PyRun_HandleSystemExit(v2);
- 			}
  			if (Py_FlushLine())
  				PyErr_Clear();
--- 854,862 ----
  		if (result == NULL) {
  			PyObject *exception2, *v2, *tb2;
+ 			if (PyErr_ExceptionMatches(PyExc_SystemExit)) {
+ 				handle_system_exit();
+ 			}
  			PyErr_Fetch(&exception2, &v2, &tb2);
  			PyErr_NormalizeException(&exception2, &v2, &tb2);
  			if (Py_FlushLine())
  				PyErr_Clear();

From bwarsaw@users.sourceforge.net  Fri Mar 23 18:04:05 2001
From: bwarsaw@users.sourceforge.net (Barry Warsaw)
Date: Fri, 23 Mar 2001 10:04:05 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib/test test_support.py,1.20,1.21
Message-ID: <E14gVuv-0002y6-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Lib/test
In directory usw-pr-cvs1:/tmp/cvs-serv11387

Modified Files:
	test_support.py 
Log Message:
In Jython, `@' is not allowed in module names.  Extend the TESTFN test
to use "$test" when in Jython.  Closes SF patch #403668.

Index: test_support.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_support.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** test_support.py	2001/03/23 04:21:17	1.20
--- test_support.py	2001/03/23 18:04:02	1.21
***************
*** 58,65 ****

  import os
! if os.name !='riscos':
!     TESTFN = '@test' # Filename used for testing
  else:
!     TESTFN = 'test' # Filename used for testing
  del os

--- 58,69 ----

  import os
! # Filename used for testing
! if os.name == 'java':
!     # Jython disallows @ in module names
!     TESTFN = '$test'
! elif os.name != 'riscos':
!     TESTFN = '@test'
  else:
!     TESTFN = 'test'
  del os

From gvanrossum@users.sourceforge.net  Fri Mar 23 18:30:21 2001
From: gvanrossum@users.sourceforge.net (Guido van Rossum)
Date: Fri, 23 Mar 2001 10:30:21 -0800
Subject: [Python-checkins] CVS: python/dist/src/Modules xreadlinesmodule.c,1.4,1.5
Message-ID: <E14gWKL-0004I5-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv16486

Modified Files:
	xreadlinesmodule.c 
Log Message:
Fix a memory leak -- there's no need to INCREF() the result of
newreadlinesobject() in xreadlines().

Index: xreadlinesmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/xreadlinesmodule.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** xreadlinesmodule.c	2001/01/19 00:29:06	1.4
--- xreadlinesmodule.c	2001/03/23 18:30:19	1.5
***************
*** 51,55 ****
  		return NULL;
  	ret = newreadlinesobject(file);
- 	Py_XINCREF(ret);
  	return (PyObject*)ret;
  }
--- 51,54 ----

From tim_one@users.sourceforge.net  Fri Mar 23 20:21:31 2001
From: tim_one@users.sourceforge.net (Tim Peters)
Date: Fri, 23 Mar 2001 12:21:31 -0800
Subject: [Python-checkins] CVS: python/dist/src/PCbuild python20.wse,1.35,1.36
Message-ID: <E14gY3v-00018G-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/PCbuild
In directory usw-pr-cvs1:/tmp/cvs-serv4178/python/dist/src/PCbuild

Modified Files:
	python20.wse 
Log Message:
pydoc changed overnight in such a way that it no longer worked from the
Windows start-menu item.  This recovers from that.

Index: python20.wse
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/python20.wse,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** python20.wse	2001/03/23 03:43:35	1.35
--- python20.wse	2001/03/23 20:21:29	1.36
***************
*** 958,963 ****
  end
  item: Install File
!   Source=%_SRC_%\Tools\scripts\pydoc
!   Destination=%MAINDIR%\pydoc.pyw
    Description=Utility Scripts
    Flags=0000000000000010
--- 958,963 ----
  end
  item: Install File
!   Source=%_SRC_%\Tools\scripts\*.pyw
!   Destination=%MAINDIR%\Tools\Scripts
    Description=Utility Scripts
    Flags=0000000000000010
***************
*** 1367,1371 ****
    Source=%MAINDIR%\pythonw.exe
    Destination=%GROUP%\Module Docs.lnk
!   Command Options=%MAINDIR%\pydoc.pyw
    Working Directory=%MAINDIR%
    Key Type=1536
--- 1367,1371 ----
    Source=%MAINDIR%\pythonw.exe
    Destination=%GROUP%\Module Docs.lnk
!   Command Options=%MAINDIR%\Tools\Scripts\pydoc.pyw
    Working Directory=%MAINDIR%
    Key Type=1536

From bwarsaw@users.sourceforge.net  Fri Mar 23 20:24:09 2001
From: bwarsaw@users.sourceforge.net (Barry Warsaw)
Date: Fri, 23 Mar 2001 12:24:09 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib/test test_strftime.py,1.24,1.25
Message-ID: <E14gY6T-0001Hw-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Lib/test
In directory usw-pr-cvs1:/tmp/cvs-serv4941

Modified Files:
	test_strftime.py 
Log Message:
main(): Application of SF patch #405851, which allows this test to be
used by Jython.  The tests in this module expect C locale, so be
explicit about setting that (for CPython).  However, in Jython, there
is no C locale, so instead be explicit about setting the US locale.
Closes the patch.

Index: test_strftime.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_strftime.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** test_strftime.py	2001/02/09 11:59:37	1.24
--- test_strftime.py	2001/03/23 20:24:07	1.25
***************
*** 8,11 ****
--- 8,23 ----
  def main():
      global verbose
+     # For C Python, these tests expect C locale, so we try to set that
+     # explicitly.  For Jython, Finn says we need to be in the US locale; my
+     # understanding is that this is the closest Java gets to C's "C" locale.
+     # Jython ought to supply an _locale module which Does The Right Thing, but
+     # this is the best we can do given today's state of affairs.
+     try:
+         import java
+         java.util.Locale.setDefault(java.util.Locale.US)
+     except ImportError:
+         # Can't do this first because it will succeed, even in Jython
+         import locale
+         locale.setlocale(locale.LC_TIME, 'C')
      now = time.time()
      strftest(now)

From gvanrossum@users.sourceforge.net  Sat Mar 24 19:17:38 2001
From: gvanrossum@users.sourceforge.net (Guido van Rossum)
Date: Sat, 24 Mar 2001 11:17:38 -0800
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libcmd.tex,1.6,1.7
Message-ID: <E14gtXe-0001bh-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Doc/lib
In directory usw-pr-cvs1:/tmp/cvs-serv6166

Modified Files:
	libcmd.tex 
Log Message:
Document use_rawinput.  (Although now that I think more about it, a
better solution would have been to factor out the raw_input() call and
make it into an overridable method.  Oh well, maybe later...)

Index: libcmd.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/lib/libcmd.tex,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** libcmd.tex	2000/10/10 17:03:45	1.6
--- libcmd.tex	2001/03/24 19:17:35	1.7
***************
*** 139,141 ****
  \end{memberdesc}

! 
--- 139,146 ----
  \end{memberdesc}

! \begin{memberdesc}{use_rawinput}
! A flag, defaulting to true.  If true, \method{cmdloop()} uses
! \function{raw_input()} to display a prompt and read the next command;
! if false, \function{sys.stdout.write()} and
! \function{sys.stdin.readline()} are used.
! \end{memberdesc}

From fdrake@users.sourceforge.net  Sat Mar 24 19:58:28 2001
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Sat, 24 Mar 2001 11:58:28 -0800
Subject: [Python-checkins] CVS: python/dist/src/Modules pyexpat.c,2.44,2.45
Message-ID: <E14guBA-00032w-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv11703

Modified Files:
	pyexpat.c 
Log Message:

get_version_string():  New function -- returns a Python string object that
    gives the CVS revision of this file even if it does not include the
    extra RCS "$Revision: " cruft.

initpyexpat():  Use get_version_string() instead of hard-coding magic
    indexes into the RCS string (which may be affected by export options).

Index: pyexpat.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/pyexpat.c,v
retrieving revision 2.44
retrieving revision 2.45
diff -C2 -r2.44 -r2.45
*** pyexpat.c	2001/03/13 01:58:22	2.44
--- pyexpat.c	2001/03/24 19:58:26	2.45
***************
*** 1,2 ****
--- 1,4 ----
+ #include <ctype.h>
+ 
  #include "Python.h"
  #include "compile.h"
***************
*** 1464,1472 ****
  #endif

  DL_EXPORT(void)
  initpyexpat(void)
  {
      PyObject *m, *d;
-     char *rev = "$Revision$";
      PyObject *errmod_name = PyString_FromString("pyexpat.errors");
      PyObject *errors_module;
--- 1466,1494 ----
  #endif

+ 
+ /* Return a Python string that represents the version number without the
+  * extra cruft added by revision control, even if the right options were
+  * given to the "cvs export" command to make it not include the extra
+  * cruft.
+  */
+ static PyObject *
+ get_version_string(void)
+ {
+     static char *rcsid = "$Revision$";
+     char *rev = rcsid;
+     int i = 0;
+ 
+     while (!isdigit(*rev))
+         ++rev;
+     while (rev[i] != ' ' && rev[i] != '\0')
+         ++i;
+ 
+     return PyString_FromStringAndSize(rev, i);
+ }
+ 
  DL_EXPORT(void)
  initpyexpat(void)
  {
      PyObject *m, *d;
      PyObject *errmod_name = PyString_FromString("pyexpat.errors");
      PyObject *errors_module;
***************
*** 1501,1506 ****
      PyModule_AddObject(m, "XMLParserType", (PyObject *) &Xmlparsetype);

!     PyModule_AddObject(m, "__version__",
!                        PyString_FromStringAndSize(rev+11, strlen(rev+11)-2));
  #if EXPAT_VERSION >= 0x015f02
      PyModule_AddStringConstant(m, "EXPAT_VERSION",
--- 1523,1527 ----
      PyModule_AddObject(m, "XMLParserType", (PyObject *) &Xmlparsetype);

!     PyModule_AddObject(m, "__version__", get_version_string());
  #if EXPAT_VERSION >= 0x015f02
      PyModule_AddStringConstant(m, "EXPAT_VERSION",

From tim_one@users.sourceforge.net  Sun Mar 25 05:54:10 2001
From: tim_one@users.sourceforge.net (Tim Peters)
Date: Sat, 24 Mar 2001 21:54:10 -0800
Subject: [Python-checkins] CVS: python/nondist/peps pep-0236.txt,1.5,1.6
Message-ID: <E14h3Te-0007if-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/nondist/peps
In directory usw-pr-cvs1:/tmp/cvs-serv29640

Modified Files:
	pep-0236.txt 
Log Message:
Update resolved, unresolved and partially resolved issues to reflect Jeremy's
2.1b2 work.

Index: pep-0236.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/pep-0236.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** pep-0236.txt	2001/03/02 03:11:53	1.5
--- pep-0236.txt	2001/03/25 05:54:08	1.6
***************
*** 215,219 ****

! Unresolved Problems:  Runtime Compilation

      Several Python features can compile code during a module's runtime:
--- 215,219 ----

! Paritally Resolved Problem:  Runtime Compilation

      Several Python features can compile code during a module's runtime:
***************
*** 229,243 ****
      with respect to F, any code compiled dynamically from text passed to
      one of these from within M should probably also use the new syntax or
!     semantics associated with F.

      This isn't always desired, though.  For example, doctest.testmod(M)
      compiles examples taken from strings in M, and those examples should
!     use M's choices, not necessarily doctest module's choices.

-     It's unclear what to do about this.  The initial release (2.1b1) is
-     likely to ignore these issues, saying that each dynamic compilation
-     starts over from scratch (i.e., as if no future_statements had been
-     specified).
- 
      In any case, a future_statement appearing "near the top" (see Syntax
      above) of text compiled dynamically by an exec, execfile() or compile()
--- 229,240 ----
      with respect to F, any code compiled dynamically from text passed to
      one of these from within M should probably also use the new syntax or
!     semantics associated with F.  The 2.1 release does behave this way.

      This isn't always desired, though.  For example, doctest.testmod(M)
      compiles examples taken from strings in M, and those examples should
!     use M's choices, not necessarily the doctest module's choices.  In the
!     2.1 release, this isn't possible, and no scheme has yet been suggested
!     for working around this.

      In any case, a future_statement appearing "near the top" (see Syntax
      above) of text compiled dynamically by an exec, execfile() or compile()
***************
*** 247,264 ****
      allow expression input, and a future_statement is not an expression.

! Unresolved Problems:  Interactive Shells

      An interactive shell can be seen as an extreme case of runtime
      compilation (see above):  in effect, each statement typed at an
      interactive shell prompt runs a new instance of exec, compile() or
!     execfile().  The initial release (2.1b1) is likely to be such that
!     future_statements typed at an interactive shell have no effect beyond
!     their runtime meaning as ordinary import statements.
! 
!     It would make more sense if a future_statement typed at an interactive
!     shell applied to the rest of the shell session's life, as if the
!     future_statement had appeared at the top of a module.  Again, it's
!     unclear what to do about this.

--- 244,272 ----
      allow expression input, and a future_statement is not an expression.

+ 
+ Resolved Problem:  Native Interactive Shells
+ 
+     There are two ways to get an interactive shell:

!     1. By invoking Python from a command line without a script argument.

+     2. By invoking Python from a command line with the -i switch and with a
+        script argument.
+ 
      An interactive shell can be seen as an extreme case of runtime
      compilation (see above):  in effect, each statement typed at an
      interactive shell prompt runs a new instance of exec, compile() or
!     execfile().  A future_statement typed at an interactive shell applies to
!     the rest of the shell session's life, as if the future_statement had
!     appeared at the top of a module.
! 
! 
! Unresolved Problem:  Simulated Interactive Shells
! 
!     Interactive shells "built by hand" (by tools such as IDLE and the Emacs
!     Python-mode) should behave like native interactive shells (see above).
!     However, the machinery used internally by native interactive shells has
!     not been exposed, and there isn't a clear way for tools building their
!     own interactive shells to achieve the desired behavior.

From lemburg@users.sourceforge.net  Sun Mar 25 19:16:16 2001
From: lemburg@users.sourceforge.net (M.-A. Lemburg)
Date: Sun, 25 Mar 2001 11:16:16 -0800
Subject: [Python-checkins] CVS: python/dist/src/Objects object.c,2.123,2.124
Message-ID: <E14hFzs-0002qM-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Objects
In directory usw-pr-cvs1:/tmp/cvs-serv10721

Modified Files:
	object.c 
Log Message:
Fixed ref count bug. Patch #411191. Found by Walter D�rwald.

Index: object.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/object.c,v
retrieving revision 2.123
retrieving revision 2.124
diff -C2 -r2.123 -r2.124
*** object.c	2001/02/27 04:45:05	2.123
--- object.c	2001/03/25 19:16:13	2.124
***************
*** 347,352 ****
  		return v;
  	}
! 	else if (PyString_Check(v))
  	    	res = v;
  	else if (v->ob_type->tp_str != NULL)
  		res = (*v->ob_type->tp_str)(v);
--- 347,354 ----
  		return v;
  	}
! 	else if (PyString_Check(v)) {
! 		Py_INCREF(v);
  	    	res = v;
+     	}
  	else if (v->ob_type->tp_str != NULL)
  		res = (*v->ob_type->tp_str)(v);

From fdrake@users.sourceforge.net  Mon Mar 26 15:06:17 2001
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Mon, 26 Mar 2001 07:06:17 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib webbrowser.py,1.15,1.16
Message-ID: <E14hYZV-0000mh-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv3001

Modified Files:
	webbrowser.py 
Log Message:

Update auto-detection for Konqueror to include KDE 2 -- the kfm command is
gone; "konqueror" is the new name, and the command-line args are different.
kfmclient has not changed, though.

Index: webbrowser.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/webbrowser.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** webbrowser.py	2001/03/02 02:01:40	1.15
--- webbrowser.py	2001/03/26 15:06:15	1.16
***************
*** 137,141 ****

          # Konqueror/kfm, the KDE browser.
!         if _iscommand("kfm"):
              class Konqueror:
                  """Controller for the KDE File Manager (kfm, or Konqueror).
--- 137,141 ----

          # Konqueror/kfm, the KDE browser.
!         if _iscommand("kfm") or _iscommand("konqueror"):
              class Konqueror:
                  """Controller for the KDE File Manager (kfm, or Konqueror).
***************
*** 150,154 ****
                      if rc:
                          import time
!                         os.system("kfm -d &")
                          time.sleep(PROCESS_CREATION_DELAY)
                          rc = os.system(cmd)
--- 150,157 ----
                      if rc:
                          import time
!                         if _iscommand("konqueror"):
!                             os.system("konqueror --silent &")
!                         else:
!                             os.system("kfm -d &")
                          time.sleep(PROCESS_CREATION_DELAY)
                          rc = os.system(cmd)

From fdrake@users.sourceforge.net  Mon Mar 26 15:49:26 2001
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Mon, 26 Mar 2001 07:49:26 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib zipfile.py,1.8,1.9
Message-ID: <E14hZFG-0002gm-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv10309

Modified Files:
	zipfile.py 
Log Message:

Itamar Shtull-Trauring <itamar@maxnm.com>:
Add support to zipfile to support opening an archive represented by an
open file rather than a file name.

Index: zipfile.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/zipfile.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** zipfile.py	2001/03/01 04:27:19	1.8
--- zipfile.py	2001/03/26 15:49:24	1.9
***************
*** 66,70 ****
--- 66,73 ----
  _FH_EXTRA_FIELD_LENGTH = 11

+ # Used to compare file passed to ZipFile
+ _STRING_TYPES = (type('s'), type(u's'))

+ 
  def is_zipfile(filename):
      """Quickly see if file is a ZIP file by checking the magic number.
***************
*** 129,137 ****

  class ZipFile:
!     """Class with methods to open, read, write, close, list zip files."""

      fp = None                   # Set here since __del__ checks it

!     def __init__(self, filename, mode="r", compression=ZIP_STORED):
          """Open the ZIP file with mode read "r", write "w" or append "a"."""
          if compression == ZIP_STORED:
--- 132,148 ----

  class ZipFile:
!     """ Class with methods to open, read, write, close, list zip files. 
!      
!     z = ZipFile(file, mode="r", compression=ZIP_STORED)
!      
!     file: Either the path to the file, or a file-like object.
!           If it is a path, the file will be opened and closed by ZipFile.
!     mode: The mode can be either read "r", write "w" or append "a".
!     compression: ZIP_STORED (no compression) or ZIP_DEFLATED (requires zlib).
!     """

      fp = None                   # Set here since __del__ checks it

!     def __init__(self, file, mode="r", compression=ZIP_STORED):
          """Open the ZIP file with mode read "r", write "w" or append "a"."""
          if compression == ZIP_STORED:
***************
*** 147,159 ****
          self.filelist = []      # List of ZipInfo instances for archive
          self.compression = compression  # Method of compression
-         self.filename = filename
          self.mode = key = mode[0]
          if key == 'r':
-             self.fp = open(filename, "rb")
              self._GetContents()
          elif key == 'w':
!             self.fp = open(filename, "wb")
          elif key == 'a':
!             fp = self.fp = open(filename, "r+b")
              fp.seek(-22, 2)             # Seek to end-of-file record
              endrec = fp.read()
--- 158,180 ----
          self.filelist = []      # List of ZipInfo instances for archive
          self.compression = compression  # Method of compression
          self.mode = key = mode[0]
+         
+         # Check if we were passed a file-like object
+         if type(file) in _STRING_TYPES:
+             self._filePassed = 0
+             self.filename = file
+             modeDict = {'r' : 'rb', 'w': 'wb', 'a' : 'r+b'}
+             self.fp = open(file, modeDict[mode])
+         else:
+             self._filePassed = 1
+             self.fp = file
+             self.filename = getattr(file, 'name', None)
+         
          if key == 'r':
              self._GetContents()
          elif key == 'w':
!             pass
          elif key == 'a':
!             fp = self.fp
              fp.seek(-22, 2)             # Seek to end-of-file record
              endrec = fp.read()
***************
*** 402,406 ****
      def __del__(self):
          """Call the "close()" method in case the user forgot."""
!         if self.fp:
              self.fp.close()
              self.fp = None
--- 423,427 ----
      def __del__(self):
          """Call the "close()" method in case the user forgot."""
!         if self.fp and not self._filePassed:
              self.fp.close()
              self.fp = None
***************
*** 434,438 ****
                       0, 0, count, count, pos2 - pos1, pos1, 0)
              self.fp.write(endrec)
!         self.fp.close()
          self.fp = None

--- 455,461 ----
                       0, 0, count, count, pos2 - pos1, pos1, 0)
              self.fp.write(endrec)
!         self.fp.flush()
!         if not self._filePassed:
!             self.fp.close()
          self.fp = None

From fdrake@users.sourceforge.net  Mon Mar 26 15:49:26 2001
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Mon, 26 Mar 2001 07:49:26 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib/test test_zipfile.py,1.3,1.4
Message-ID: <E14hZFG-0002gs-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Lib/test
In directory usw-pr-cvs1:/tmp/cvs-serv10309/test

Modified Files:
	test_zipfile.py 
Log Message:

Itamar Shtull-Trauring <itamar@maxnm.com>:
Add support to zipfile to support opening an archive represented by an
open file rather than a file name.

Index: test_zipfile.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_zipfile.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** test_zipfile.py	2001/02/28 05:34:16	1.3
--- test_zipfile.py	2001/03/26 15:49:24	1.4
***************
*** 1,3 ****
! import zipfile, os
  from test_support import TestFailed

--- 1,3 ----
! import zipfile, os, StringIO, tempfile
  from test_support import TestFailed

***************
*** 5,23 ****
  zipname = "junk9708.tmp"

  try:
!     fp = open(srcname, "w")               # Make a source file with some lines
      for i in range(0, 1000):
          fp.write("Test of zipfile line %d.\n" % i)
      fp.close()

!     zip = zipfile.ZipFile(zipname, "w")   # Create the ZIP archive
!     zip.write(srcname, srcname)
!     zip.write(srcname, "another.name")
!     zip.close()

-     zip = zipfile.ZipFile(zipname, "r")   # Read the ZIP archive
-     zip.read("another.name")
-     zip.read(srcname)
-     zip.close()
  finally:
      if os.path.isfile(srcname):           # Remove temporary files
--- 5,40 ----
  zipname = "junk9708.tmp"

+ 
+ def zipTest(f, compression, srccontents):
+     zip = zipfile.ZipFile(f, "w", compression)   # Create the ZIP archive
+     zip.write(srcname, "another.name")
+     zip.write(srcname, srcname)
+     zip.close()
+             
+     zip = zipfile.ZipFile(f, "r", compression)   # Read the ZIP archive
+     readData2 = zip.read(srcname)
+     readData1 = zip.read("another.name")
+     zip.close()
+     
+     if readData1 != srccontents or readData2 != srccontents:
+         raise TestFailed, "Written data doesn't equal read data."
+ 
+ 
  try:
!     fp = open(srcname, "wb")               # Make a source file with some lines
      for i in range(0, 1000):
          fp.write("Test of zipfile line %d.\n" % i)
      fp.close()
+     
+     fp = open(srcname, "rb")
+     writtenData = fp.read()
+     fp.close()
+     
+     for file in (zipname, tempfile.TemporaryFile(), StringIO.StringIO()):
+         zipTest(file, zipfile.ZIP_STORED, writtenData)

!     for file in (zipname, tempfile.TemporaryFile(), StringIO.StringIO()):
!         zipTest(file, zipfile.ZIP_DEFLATED, writtenData)

  finally:
      if os.path.isfile(srcname):           # Remove temporary files

From fdrake@users.sourceforge.net  Mon Mar 26 16:17:23 2001
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Mon, 26 Mar 2001 08:17:23 -0800
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libwebbrowser.tex,1.8,1.9
Message-ID: <E14hZgJ-00046q-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Doc/lib
In directory usw-pr-cvs1:/tmp/cvs-serv15787/lib

Modified Files:
	libwebbrowser.tex 
Log Message:

Add a note that the "kfm" controller supports "konqueror" as well as the
old KDE 1 "kfm" command.

Index: libwebbrowser.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/lib/libwebbrowser.tex,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** libwebbrowser.tex	2001/01/25 00:38:15	1.8
--- libwebbrowser.tex	2001/03/26 16:17:21	1.9
***************
*** 98,102 ****
  UNIX, and only makes sense to use if KDE is running.  Some way of
  reliably detecting KDE would be nice; the \envvar{KDEDIR} variable is
! not sufficient.

  \item[(2)]
--- 98,104 ----
  UNIX, and only makes sense to use if KDE is running.  Some way of
  reliably detecting KDE would be nice; the \envvar{KDEDIR} variable is
! not sufficient.  Note also that the name ``kfm'' is used even when
! using the \program{konqueror} command with KDE 2 --- the
! implementation selects the best strategy for running Konqueror.

  \item[(2)]

From fdrake@users.sourceforge.net  Mon Mar 26 17:14:04 2001
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Mon, 26 Mar 2001 09:14:04 -0800
Subject: [Python-checkins] CVS: python/dist/src/Modules termios.c,2.19,2.20
Message-ID: <E14haZA-0006Tt-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv24903

Modified Files:
	termios.c 
Log Message:

Michael Hudson <mwh21@cam.ac.uk>:
Add many more constants for some systems.

This closes SF patch #410267.

Index: termios.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/termios.c,v
retrieving revision 2.19
retrieving revision 2.20
diff -C2 -r2.19 -r2.20
*** termios.c	2001/03/03 18:08:52	2.19
--- termios.c	2001/03/26 17:14:02	2.20
***************
*** 528,531 ****
--- 528,860 ----
  	{"VEOL2", VEOL2},

+ 
+ #ifdef B460800
+ 	{"B460800", B460800},
+ #endif
+ #ifdef CBAUD
+ 	{"CBAUD", CBAUD},
+ #endif
+ #ifdef CDEL
+ 	{"CDEL", CDEL},
+ #endif
+ #ifdef CDSUSP
+ 	{"CDSUSP", CDSUSP},
+ #endif
+ #ifdef CEOF
+ 	{"CEOF", CEOF},
+ #endif
+ #ifdef CEOL
+ 	{"CEOL", CEOL},
+ #endif
+ #ifdef CEOL2
+ 	{"CEOL2", CEOL2},
+ #endif
+ #ifdef CEOT
+ 	{"CEOT", CEOT},
+ #endif
+ #ifdef CERASE
+ 	{"CERASE", CERASE},
+ #endif
+ #ifdef CESC
+ 	{"CESC", CESC},
+ #endif
+ #ifdef CFLUSH
+ 	{"CFLUSH", CFLUSH},
+ #endif
+ #ifdef CINTR
+ 	{"CINTR", CINTR},
+ #endif
+ #ifdef CKILL
+ 	{"CKILL", CKILL},
+ #endif
+ #ifdef CLNEXT
+ 	{"CLNEXT", CLNEXT},
+ #endif
+ #ifdef CNUL
+ 	{"CNUL", CNUL},
+ #endif
+ #ifdef COMMON
+ 	{"COMMON", COMMON},
+ #endif
+ #ifdef CQUIT
+ 	{"CQUIT", CQUIT},
+ #endif
+ #ifdef CRPRNT
+ 	{"CRPRNT", CRPRNT},
+ #endif
+ #ifdef CSTART
+ 	{"CSTART", CSTART},
+ #endif
+ #ifdef CSTOP
+ 	{"CSTOP", CSTOP},
+ #endif
+ #ifdef CSUSP
+ 	{"CSUSP", CSUSP},
+ #endif
+ #ifdef CSWTCH
+ 	{"CSWTCH", CSWTCH},
+ #endif
+ #ifdef CWERASE
+ 	{"CWERASE", CWERASE},
+ #endif
+ #ifdef EXTA
+ 	{"EXTA", EXTA},
+ #endif
+ #ifdef EXTB
+ 	{"EXTB", EXTB},
+ #endif
+ #ifdef FIOASYNC
+ 	{"FIOASYNC", FIOASYNC},
+ #endif
+ #ifdef FIOCLEX
+ 	{"FIOCLEX", FIOCLEX},
+ #endif
+ #ifdef FIONBIO
+ 	{"FIONBIO", FIONBIO},
+ #endif
+ #ifdef FIONCLEX
+ 	{"FIONCLEX", FIONCLEX},
+ #endif
+ #ifdef FIONREAD
+ 	{"FIONREAD", FIONREAD},
+ #endif
+ #ifdef IBSHIFT
+ 	{"IBSHIFT", IBSHIFT},
+ #endif
+ #ifdef INIT_C_CC
+ 	{"INIT_C_CC", INIT_C_CC},
+ #endif
+ #ifdef IOCSIZE_MASK
+ 	{"IOCSIZE_MASK", IOCSIZE_MASK},
+ #endif
+ #ifdef IOCSIZE_SHIFT
+ 	{"IOCSIZE_SHIFT", IOCSIZE_SHIFT},
+ #endif
+ #ifdef NCC
+ 	{"NCC", NCC},
+ #endif
+ #ifdef NCCS
+ 	{"NCCS", NCCS},
+ #endif
+ #ifdef NSWTCH
+ 	{"NSWTCH", NSWTCH},
+ #endif
+ #ifdef N_MOUSE
+ 	{"N_MOUSE", N_MOUSE},
+ #endif
+ #ifdef N_PPP
+ 	{"N_PPP", N_PPP},
+ #endif
+ #ifdef N_SLIP
+ 	{"N_SLIP", N_SLIP},
+ #endif
+ #ifdef N_STRIP
+ 	{"N_STRIP", N_STRIP},
+ #endif
+ #ifdef N_TTY
+ 	{"N_TTY", N_TTY},
+ #endif
+ #ifdef TCFLSH
+ 	{"TCFLSH", TCFLSH},
+ #endif
+ #ifdef TCGETA
+ 	{"TCGETA", TCGETA},
+ #endif
+ #ifdef TCGETS
+ 	{"TCGETS", TCGETS},
+ #endif
+ #ifdef TCSBRK
+ 	{"TCSBRK", TCSBRK},
+ #endif
+ #ifdef TCSBRKP
+ 	{"TCSBRKP", TCSBRKP},
+ #endif
+ #ifdef TCSETA
+ 	{"TCSETA", TCSETA},
+ #endif
+ #ifdef TCSETAF
+ 	{"TCSETAF", TCSETAF},
+ #endif
+ #ifdef TCSETAW
+ 	{"TCSETAW", TCSETAW},
+ #endif
+ #ifdef TCSETS
+ 	{"TCSETS", TCSETS},
+ #endif
+ #ifdef TCSETSF
+ 	{"TCSETSF", TCSETSF},
+ #endif
+ #ifdef TCSETSW
+ 	{"TCSETSW", TCSETSW},
+ #endif
+ #ifdef TCXONC
+ 	{"TCXONC", TCXONC},
+ #endif
+ #ifdef TIOCCONS
+ 	{"TIOCCONS", TIOCCONS},
+ #endif
+ #ifdef TIOCEXCL
+ 	{"TIOCEXCL", TIOCEXCL},
+ #endif
+ #ifdef TIOCGETD
+ 	{"TIOCGETD", TIOCGETD},
+ #endif
+ #ifdef TIOCGICOUNT
+ 	{"TIOCGICOUNT", TIOCGICOUNT},
+ #endif
+ #ifdef TIOCGLCKTRMIOS
+ 	{"TIOCGLCKTRMIOS", TIOCGLCKTRMIOS},
+ #endif
+ #ifdef TIOCGPGRP
+ 	{"TIOCGPGRP", TIOCGPGRP},
+ #endif
+ #ifdef TIOCGSERIAL
+ 	{"TIOCGSERIAL", TIOCGSERIAL},
+ #endif
+ #ifdef TIOCGSOFTCAR
+ 	{"TIOCGSOFTCAR", TIOCGSOFTCAR},
+ #endif
+ #ifdef TIOCGWINSZ
+ 	{"TIOCGWINSZ", TIOCGWINSZ},
+ #endif
+ #ifdef TIOCINQ
+ 	{"TIOCINQ", TIOCINQ},
+ #endif
+ #ifdef TIOCLINUX
+ 	{"TIOCLINUX", TIOCLINUX},
+ #endif
+ #ifdef TIOCMBIC
+ 	{"TIOCMBIC", TIOCMBIC},
+ #endif
+ #ifdef TIOCMBIS
+ 	{"TIOCMBIS", TIOCMBIS},
+ #endif
+ #ifdef TIOCMGET
+ 	{"TIOCMGET", TIOCMGET},
+ #endif
+ #ifdef TIOCMIWAIT
+ 	{"TIOCMIWAIT", TIOCMIWAIT},
+ #endif
+ #ifdef TIOCMSET
+ 	{"TIOCMSET", TIOCMSET},
+ #endif
+ #ifdef TIOCM_CAR
+ 	{"TIOCM_CAR", TIOCM_CAR},
+ #endif
+ #ifdef TIOCM_CD
+ 	{"TIOCM_CD", TIOCM_CD},
+ #endif
+ #ifdef TIOCM_CTS
+ 	{"TIOCM_CTS", TIOCM_CTS},
+ #endif
+ #ifdef TIOCM_DSR
+ 	{"TIOCM_DSR", TIOCM_DSR},
+ #endif
+ #ifdef TIOCM_DTR
+ 	{"TIOCM_DTR", TIOCM_DTR},
+ #endif
+ #ifdef TIOCM_LE
+ 	{"TIOCM_LE", TIOCM_LE},
+ #endif
+ #ifdef TIOCM_RI
+ 	{"TIOCM_RI", TIOCM_RI},
+ #endif
+ #ifdef TIOCM_RNG
+ 	{"TIOCM_RNG", TIOCM_RNG},
+ #endif
+ #ifdef TIOCM_RTS
+ 	{"TIOCM_RTS", TIOCM_RTS},
+ #endif
+ #ifdef TIOCM_SR
+ 	{"TIOCM_SR", TIOCM_SR},
+ #endif
+ #ifdef TIOCM_ST
+ 	{"TIOCM_ST", TIOCM_ST},
+ #endif
+ #ifdef TIOCNOTTY
+ 	{"TIOCNOTTY", TIOCNOTTY},
+ #endif
+ #ifdef TIOCNXCL
+ 	{"TIOCNXCL", TIOCNXCL},
+ #endif
+ #ifdef TIOCOUTQ
+ 	{"TIOCOUTQ", TIOCOUTQ},
+ #endif
+ #ifdef TIOCPKT
+ 	{"TIOCPKT", TIOCPKT},
+ #endif
+ #ifdef TIOCPKT_DATA
+ 	{"TIOCPKT_DATA", TIOCPKT_DATA},
+ #endif
+ #ifdef TIOCPKT_DOSTOP
+ 	{"TIOCPKT_DOSTOP", TIOCPKT_DOSTOP},
+ #endif
+ #ifdef TIOCPKT_FLUSHREAD
+ 	{"TIOCPKT_FLUSHREAD", TIOCPKT_FLUSHREAD},
+ #endif
+ #ifdef TIOCPKT_FLUSHWRITE
+ 	{"TIOCPKT_FLUSHWRITE", TIOCPKT_FLUSHWRITE},
+ #endif
+ #ifdef TIOCPKT_NOSTOP
+ 	{"TIOCPKT_NOSTOP", TIOCPKT_NOSTOP},
+ #endif
+ #ifdef TIOCPKT_START
+ 	{"TIOCPKT_START", TIOCPKT_START},
+ #endif
+ #ifdef TIOCPKT_STOP
+ 	{"TIOCPKT_STOP", TIOCPKT_STOP},
+ #endif
+ #ifdef TIOCSCTTY
+ 	{"TIOCSCTTY", TIOCSCTTY},
+ #endif
+ #ifdef TIOCSERCONFIG
+ 	{"TIOCSERCONFIG", TIOCSERCONFIG},
+ #endif
+ #ifdef TIOCSERGETLSR
+ 	{"TIOCSERGETLSR", TIOCSERGETLSR},
+ #endif
+ #ifdef TIOCSERGETMULTI
+ 	{"TIOCSERGETMULTI", TIOCSERGETMULTI},
+ #endif
+ #ifdef TIOCSERGSTRUCT
+ 	{"TIOCSERGSTRUCT", TIOCSERGSTRUCT},
+ #endif
+ #ifdef TIOCSERGWILD
+ 	{"TIOCSERGWILD", TIOCSERGWILD},
+ #endif
+ #ifdef TIOCSERSETMULTI
+ 	{"TIOCSERSETMULTI", TIOCSERSETMULTI},
+ #endif
+ #ifdef TIOCSERSWILD
+ 	{"TIOCSERSWILD", TIOCSERSWILD},
+ #endif
+ #ifdef TIOCSER_TEMT
+ 	{"TIOCSER_TEMT", TIOCSER_TEMT},
+ #endif
+ #ifdef TIOCSETD
+ 	{"TIOCSETD", TIOCSETD},
+ #endif
+ #ifdef TIOCSLCKTRMIOS
+ 	{"TIOCSLCKTRMIOS", TIOCSLCKTRMIOS},
+ #endif
+ #ifdef TIOCSPGRP
+ 	{"TIOCSPGRP", TIOCSPGRP},
+ #endif
+ #ifdef TIOCSSERIAL
+ 	{"TIOCSSERIAL", TIOCSSERIAL},
+ #endif
+ #ifdef TIOCSSOFTCAR
+ 	{"TIOCSSOFTCAR", TIOCSSOFTCAR},
+ #endif
+ #ifdef TIOCSTI
+ 	{"TIOCSTI", TIOCSTI},
+ #endif
+ #ifdef TIOCSWINSZ
+ 	{"TIOCSWINSZ", TIOCSWINSZ},
+ #endif
+ #ifdef TIOCTTYGSTRUCT
+ 	{"TIOCTTYGSTRUCT", TIOCTTYGSTRUCT},
+ #endif
+ 
  	/* sentinel */
  	{NULL, 0}

From gvanrossum@users.sourceforge.net  Mon Mar 26 17:41:38 2001
From: gvanrossum@users.sourceforge.net (Guido van Rossum)
Date: Mon, 26 Mar 2001 09:41:38 -0800
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle PyShell.py,1.31,1.32
Message-ID: <E14hazq-0007zu-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Tools/idle
In directory usw-pr-cvs1:/tmp/cvs-serv30691

Modified Files:
	PyShell.py 
Log Message:
Turn SyntasWarning into SyntaxError for all code entered
interactively.

Index: PyShell.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/idle/PyShell.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** PyShell.py	2001/01/17 08:48:39	1.31
--- PyShell.py	2001/03/26 17:41:35	1.32
***************
*** 6,9 ****
--- 6,10 ----
  import getopt
  import re
+ import warnings

  import linecache
***************
*** 181,185 ****
          filename = self.stuffsource(source)
          self.more = 0
!         return InteractiveInterpreter.runsource(self, source, filename)

      def stuffsource(self, source):
--- 182,193 ----
          filename = self.stuffsource(source)
          self.more = 0
!         self.save_warnings_filters = warnings.filters[:]
!         warnings.filterwarnings(action="error", category=SyntaxWarning)
!         try:
!             return InteractiveInterpreter.runsource(self, source, filename)
!         finally:
!             if self.save_warnings_filters is not None:
!                 warnings.filters[:] = self.save_warnings_filters
!                 self.save_warnings_filters = None

      def stuffsource(self, source):
***************
*** 250,253 ****
--- 258,264 ----
      def runcode(self, code):
          # Override base class method
+         if self.save_warnings_filters is not None:
+             warnings.filters[:] = self.save_warnings_filters
+             self.save_warnings_filters = None
          debugger = self.debugger
          try:

From jhylton@users.sourceforge.net  Mon Mar 26 19:53:40 2001
From: jhylton@users.sourceforge.net (Jeremy Hylton)
Date: Mon, 26 Mar 2001 11:53:40 -0800
Subject: [Python-checkins] CVS: python/dist/src/Python pythonrun.c,2.132,2.133
Message-ID: <E14hd3c-0006jG-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Python
In directory usw-pr-cvs1:/tmp/cvs-serv25664

Modified Files:
	pythonrun.c 
Log Message:
Bug fix: compile() called from a nested-scopes-enable Python was not
using nested scopes to compile its argument.  Pass compiler flags
through to underlying compile call. 

Index: pythonrun.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/pythonrun.c,v
retrieving revision 2.132
retrieving revision 2.133
diff -C2 -r2.132 -r2.133
*** pythonrun.c	2001/03/23 17:54:43	2.132
--- pythonrun.c	2001/03/26 19:53:38	2.133
***************
*** 1099,1103 ****
  	if (n == NULL)
  		return NULL;
! 	co = PyNode_Compile(n, filename);
  	PyNode_Free(n);
  	return (PyObject *)co;
--- 1099,1103 ----
  	if (n == NULL)
  		return NULL;
! 	co = PyNode_CompileFlags(n, filename, flags);
  	PyNode_Free(n);
  	return (PyObject *)co;

From bwarsaw@users.sourceforge.net  Tue Mar 27 07:51:35 2001
From: bwarsaw@users.sourceforge.net (Barry Warsaw)
Date: Mon, 26 Mar 2001 23:51:35 -0800
Subject: [Python-checkins] CVS: python/nondist/peps pep-0243.txt,1.2,1.3
Message-ID: <E14hoGN-0004yB-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/nondist/peps
In directory usw-pr-cvs1:/tmp/cvs-serv19096

Modified Files:
	pep-0243.txt 
Log Message:
Sean's revision of 24-Mar-2001 (with minor editing by Barry).

Index: pep-0243.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/pep-0243.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** pep-0243.txt	2001/03/21 17:36:34	1.2
--- pep-0243.txt	2001/03/27 07:51:33	1.3
***************
*** 8,12 ****
  Created: 18-Mar-2001
  Python-Version: 2.1
! Post-History: 20-Mar-2001

--- 8,12 ----
  Created: 18-Mar-2001
  Python-Version: 2.1
! Post-History: 20-Mar-2001, 24-Mar-2001

***************
*** 35,42 ****
      will be uploaded as a multi-part form encoded the same as a
      regular HTML file upload request.  This form is posted using
!     ENCTYPE="multipart/form-data" encoding.

      The upload will be made to the host "modules.python.org" on port
!     80/tcp.  The form will consist of the following fields:

          distribution -- The file containing the module software (for
--- 35,43 ----
      will be uploaded as a multi-part form encoded the same as a
      regular HTML file upload request.  This form is posted using
!     ENCTYPE="multipart/form-data" encoding [2].

      The upload will be made to the host "modules.python.org" on port
!     80/tcp (POST http://modules.python.org:80/swalowpost.cgi).  The form
!     will consist of the following fields:

          distribution -- The file containing the module software (for
***************
*** 48,72 ****
          ord(byte))").

!         pkginfo -- The file containing the distribution meta-data (as
!         specified in PEP-241 [1]).

-         infomd5sum -- The MD5 hash of the uploaded meta-data, encoded
-         in ASCII representing the hexadecimal representation of the
-         digest ("for byte in digest: s = s + ('%02x' % ord(byte))").
- 
          platform (optional) -- A string representing the target
          platform for this distribution.  This is only for binary
          distributions.  It is encoded as
!         "<os_name>-<os_version>-<platform architecture>".

!         signature (optional) -- A GPG signature of the uploaded
!         distribution as signed by the author.  This may be used by the
!         cataloging system to automate acceptance of uploads.

  Return Data

!     The upload will report the status of the upload by sending the
!     string "Upload status:" followed by one of the following:

          SUCCESS -- Indicates that the upload has succeeded.
--- 49,84 ----
          ord(byte))").

!         pkginfo (optional) -- The file containing the distribution
!         meta-data (as specified in PEP-241 [1]).  Note that if this is
!         not included, the distribution file is expected to be in .tar
!         format (gzipped and bzipped compreesed are allowed) or .zip
!         format, with a "PKG-INFO" file in the top-level directory it
!         extracts ("package-1.00/PKG-INFO").
! 
!         infomd5sum (required if pkginfo field is present) -- The MD5 hash
!         of the uploaded meta-data, encoded in ASCII representing the
!         hexadecimal representation of the digest ("for byte in digest:
!         s = s + ('%02x' % ord(byte))").

          platform (optional) -- A string representing the target
          platform for this distribution.  This is only for binary
          distributions.  It is encoded as
!         "<os_name>-<os_version>-<platform architecture>-<python
!         version>".
! 
!         signature (optional) -- A OpenPGP-compatible signature [3] of
!         the uploaded distribution as signed by the author.  This may
!         be used by the cataloging system to automate acceptance of
!         uploads.

!         protocol_version -- A string indicating the protocol version that
!         the client supports.  This document describes protocol version "1".

  Return Data

!     The status of the upload will be reported using HTTP non-standard
!     ("X-*)" headers.  The "X-Swalow-Status" header may have the following
!     values:

          SUCCESS -- Indicates that the upload has succeeded.
***************
*** 79,89 ****
          Potential causes of this are resource shortages on the server,
          administrative down-time, etc...
- 
-     Following the above string may be a human-readable string
-     providing further information.  This message continues to the end
-     of the returned data-stream.

!     Returned data which does not fit the above format should be
!     treated as a temporary failure.

--- 91,109 ----
          Potential causes of this are resource shortages on the server,
          administrative down-time, etc...

!     Optionally, there may be a "X-Swalow-Reason" header which includes a
!     human-readable string which provides more detailed information about
!     the "X-Swalow-Status".
! 
!     If there is no "X-Swalow-Status" header, or it does not contain one of
!     the three strings above, it should be treated as a temporary failure.
! 
!     Example:
! 
!         >>> f = urllib.urlopen('http://modules.python.org:80/swalowpost.cgi')
!         >>> s = f.headers['x-swalow-status']
!         >>> s = s + ': ' + f.headers.get('x-swalow-reason', '<None>')
!         >>> print s
!         FAILURE: Required field "distribution" missing.

***************
*** 103,106 ****
--- 123,127 ----
          <INPUT TYPE="text" NAME="platform"><BR>
          <INPUT TYPE="text" NAME="signature"><BR>
+         <INPUT TYPE="hidden" NAME="protocol_version" VALUE="1"><BR>
          <INPUT TYPE="SUBMIT" VALUE="Upload">
          </FORM>
***************
*** 111,122 ****
      The following are valid os names:

!         debian
!         hpux
!         mandrake
!         redhat
!         solaris
!         suse
!         windows
!         yellowdog

      The above include a number of different types of distributions of
--- 132,137 ----
      The following are valid os names:

!         aix beos debian dos freebsd hpux mac macos mandrake netbsd
!         openbsd qnx redhat solaris suse windows yellowdog

      The above include a number of different types of distributions of
***************
*** 127,141 ****

      Version is the official version string specified by the vendor for
!     the particular release.  For example, "nt" (Windows), "9.04"
!     (HP-UX), "7.0" (RedHat, Mandrake).

      The following are valid architectures:

!         alpha
!         hppa
!         ix86
!         powerpc
!         sparc
!         ultrasparc

--- 142,151 ----

      Version is the official version string specified by the vendor for
!     the particular release.  For example, "2000" and "nt" (Windows),
!     "9.04" (HP-UX), "7.0" (RedHat, Mandrake).

      The following are valid architectures:

!         alpha hppa ix86 powerpc sparc ultrasparc

***************
*** 154,157 ****
--- 164,173 ----
      [1] Metadata for Python Software Package, Kuchling,
          http://python.sourceforge.net/peps/pep-0241.html
+ 
+     [2] RFC 1867, Form-based File Upload in HTML
+         http://www.faqs.org/rfcs/rfc1867.html
+ 
+     [3] RFC 2440, OpenPGP Message Format
+         http://www.faqs.org/rfcs/rfc2440.html

From ping@users.sourceforge.net  Tue Mar 27 08:13:45 2001
From: ping@users.sourceforge.net (Ka-Ping Yee)
Date: Tue, 27 Mar 2001 00:13:45 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib pydoc.py,1.20,1.21
Message-ID: <E14hobp-0005ca-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv20585/Lib

Modified Files:
	pydoc.py 
Log Message:
Fix some reloading problems (still more work needed).
Add hyperlinks to PEPs at http://www.python.org/peps/pep-%04d.html
Remove script directory (dirname of sys.argv[0]) from sys.path.

Index: pydoc.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/pydoc.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** pydoc.py	2001/03/23 14:05:53	1.20
--- pydoc.py	2001/03/27 08:13:42	1.21
***************
*** 367,370 ****
--- 367,371 ----
          pattern = re.compile(r'\b((http|ftp)://\S+[\w/]|'
                                  r'RFC[- ]?(\d+)|'
+                                 r'PEP[- ]?(\d+)|'
                                  r'(self\.)?(\w+))\b')
          while 1:
***************
*** 374,383 ****
              results.append(escape(text[here:start]))

!             all, scheme, rfc, selfdot, name = match.groups()
              if scheme:
                  results.append('<a href="%s">%s</a>' % (all, escape(all)))
              elif rfc:
!                 url = 'http://www.rfc-editor.org/rfc/rfc%s.txt' % rfc
                  results.append('<a href="%s">%s</a>' % (url, escape(all)))
              elif text[end:end+1] == '(':
                  results.append(self.namelink(name, methods, funcs, classes))
--- 375,387 ----
              results.append(escape(text[here:start]))

!             all, scheme, rfc, pep, selfdot, name = match.groups()
              if scheme:
                  results.append('<a href="%s">%s</a>' % (all, escape(all)))
              elif rfc:
!                 url = 'http://www.rfc-editor.org/rfc/rfc%d.txt' % int(rfc)
                  results.append('<a href="%s">%s</a>' % (url, escape(all)))
+             elif pep:
+                 url = 'http://www.python.org/peps/pep-%04d.html' % int(pep)
+                 results.append('<a href="%s">%s</a>' % (url, escape(all)))
              elif text[end:end+1] == '(':
                  results.append(self.namelink(name, methods, funcs, classes))
***************
*** 1032,1037 ****
              if os.path.exists(file):
                  info = (file, os.path.getmtime(file), os.path.getsize(file))
!             if cache.has_key(path) and cache[path] != info:
!                 module = reload(module)
              file = module.__file__
              if os.path.exists(file):
--- 1036,1042 ----
              if os.path.exists(file):
                  info = (file, os.path.getmtime(file), os.path.getsize(file))
!                 if cache.get(path) == info:
!                     continue
!             module = reload(module)
              file = module.__file__
              if os.path.exists(file):
***************
*** 1139,1145 ****
  class Helper:
      def __repr__(self):
!         return '''To get help on a Python object, call help(object).
  To get help on a module or package, either import it before calling
! help(module) or call help('modulename').'''

      def __call__(self, *args):
--- 1144,1152 ----
  class Helper:
      def __repr__(self):
!         return '''Welcome to Python %s!
! 
! To get help on a Python object, call help(object).
  To get help on a module or package, either import it before calling
! help(module) or call help('modulename').''' % sys.version[:3]

      def __call__(self, *args):
***************
*** 1517,1520 ****
--- 1524,1530 ----

      # Scripts don't get the current directory in their path by default.
+     scriptdir = os.path.dirname(sys.argv[0])
+     if scriptdir in sys.path:
+         sys.path.remove(scriptdir)
      sys.path.insert(0, '.')

From loewis@users.sourceforge.net  Tue Mar 27 08:42:14 2001
From: loewis@users.sourceforge.net (Martin v. L?wis)
Date: Tue, 27 Mar 2001 00:42:14 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib/xml __init__.py,1.9,1.10
Message-ID: <E14hp3O-0006cz-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Lib/xml
In directory usw-pr-cvs1:/tmp/cvs-serv25373

Modified Files:
	__init__.py 
Log Message:
Use Guido's trick for always extracting the version number from a
CVS Revision string correctly, even under -kv.

Index: __init__.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/xml/__init__.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** __init__.py	2001/02/09 12:03:45	1.9
--- __init__.py	2001/03/27 08:42:12	1.10
***************
*** 16,20 ****
  __all__ = ["dom", "parsers", "sax"]

! __version__ = "$Revision$".split()[1]

--- 16,23 ----
  __all__ = ["dom", "parsers", "sax"]

! # When being checked-out without options, this has the form
! # "<dollar>Revision: x.y </dollar>"
! # When exported using -kv, it is "x.y".
! __version__ = "$Revision$".split()[-2][0]

From moshez@users.sourceforge.net  Tue Mar 27 16:47:30 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Tue, 27 Mar 2001 08:47:30 -0800
Subject: [Python-checkins] CVS: python/nondist/sandbox/rational - New directory
Message-ID: <E14hwd0-0000gT-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/nondist/sandbox/rational
In directory usw-pr-cvs1:/tmp/cvs-serv2622/rational

Log Message:
Directory /cvsroot/python/python/nondist/sandbox/rational added to the repository

From moshez@users.sourceforge.net  Tue Mar 27 16:50:12 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Tue, 27 Mar 2001 08:50:12 -0800
Subject: [Python-checkins] CVS: python/nondist/sandbox/rational Rational.py,NONE,1.1
Message-ID: <E14hwfc-0000pH-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/nondist/sandbox/rational
In directory usw-pr-cvs1:/tmp/cvs-serv2713

Added Files:
	Rational.py 
Log Message:
First CVS'ed version of Rational.py, prototype for PEP-0239.

--- NEW FILE: Rational.py ---
'''
Rational numbers are a representation of the mathematical field of rational
numbers. They have unlimited precision, but many algorithms with rationals
use unbounded space and large amounts of time -- so be careful.

Rationals can be created easily:

>>> a=rational(1)
>>> a
rational(1L)

And are printed in friendly (though misleading ways)

>>> print a
1
>>> a/2
rational(1L, 2L)
>>> print a/2
1/2

There are many ways to build rationals:

>From integers:
>>> print rational(1)
1

>From nominators and denuminators:

>>> print rational(1,2)
1/2

>From floats:

>>> print rational(1.3)
5854679515581645/4503599627370496
>>> print float(rational(1.3))
1.3

Not from complex numbers, even if they have 0 imaginary part:

>>> rational(1j)
Traceback (most recent call last):
  File "<stdin>", line 1, in ?
  File "Rational.py", line 418, in rational
    raise TypeError('cannot convert arguments')
TypeError: cannot convert arguments

But there is no problem with using floating point literals -- just
protect them by quotes.

>>> print rational("1.3")
13/10
>>> print rational("1.2e-3")
3/2500

>From ``rational'' literals
>>> print rational("1/2")
1/2

Or even mix the two
>>> print rational("1.5/2.3")
15/23

Or give them as seperate arguments:
>>> print rational("1.5", "2.3")
15/23

*Note*: The following calculation takes some time

>>> p=0
>>> for i in range(1,1000):
...     p += rational(1)/i
... 

And p is *very* large. Rationals explode quickly in term of space
and (as you have noticed if you tried the above calculation) time.

>>> p
rational(53355784417020119952537879239887266136731803921522374204060897246465114565409520646006621457833121819822177013733448523121929191853817388455050878455561717371027592157489651884795570078464505321798967754860322188969172665004633935471096455470633645094270513262722579396248817332458071400971347691033193734596623333937737766140820373673275246317859525956885804716570122271771159715339438239613795876131660183846149167740477557199918997L, 7128865274665093053166384155714272920668358861885893040452001991154324087581111499476444151913871586911717817019575256512980264067621009251465871004305131072686268143200196609974862745937188343705015434452523739745298963145674982128236956232823794011068809262317708861979540791247754558049326475737829923352751796735248042463638051137034331214781746850878453485678021888075373249921995672056932029099390891687487672697950931603520000L)

printing p is not that user friendly, either.

>>> print p
53355784417020119952537879239887266136731803921522374204060897246465114565409520646006621457833121819822177013733448523121929191853817388455050878455561717371027592157489651884795570078464505321798967754860322188969172665004633935471096455470633645094270513262722579396248817332458071400971347691033193734596623333937737766140820373673275246317859525956885804716570122271771159715339438239613795876131660183846149167740477557199918997/7128865274665093053166384155714272920668358861885893040452001991154324087581111499476444151913871586911717817019575256512980264067621009251465871004305131072686268143200196609974862745937188343705015434452523739745298963145674982128236956232823794011068809262317708861979540791247754558049326475737829923352751796735248042463638051137034331214781746850878453485678021888075373249921995672056932029099390891687487672697950931603520000

We can convert p to float. Float conversion always works:

>>> float(p)
7.4844708605503447

even though naive conversion wouldn't:

>>> float(p.n)/float(p.d)
nan

To conserve time, we can trim p: find the closest rational with 
a bounded denominator
>>> p.trim(1L<<32)
rational(12377570989L, 1653767009L)

Subtracting them gives unhelpful results :(

>>> p.trim(1L<<32)-p
rational(-872119393953314540036963267350639988172842400460951889331776938576194338908055712270088035774611947221522363468929809379656051539773356282463641470813867367248573361743120219423901587966011300322682776045585594990374963929108968282002031347349387213913263250396231429588965548616844893074283339877989693620079553025660145795725133735701645191166053131402530951317054053830892681481265653921747553420724047240884052429689973L, 11789482202846854415241649104540583386623406115959677432802223340973331003735668809384664111066145039897075121304472266413879140983139770215358042356369522737429331262552172835890068328534070869038707353333385737580077488092224146480342885552420913445717377586934653792408698993535292433431351520245462060493779590806227120058195691087482315063384946077372429043555366594878942786082108265888537359480000638667859451202061272586716844271680000L)

But we can measure the error as a floating point number to get a rough
estimate:
>>> float(p.trim(1L<<32)-p)
-7.3974359428840768e-20

We can also approximate p: find the closest rational which is closer then
the bound (shifting rationals is the same as multiplying by 2 to the correct
power. Right shifting means negative powers, of course...)

>>> p.approximate(rational(1L)>>32)
rational(860063L, 114913L)
>>> float(p.approximate(rational(1L)>>32))
7.4844708605640786
>>> float(p.approximate(rational(1L)>>32))-p
1.3733902903823036e-11

How many bits is that?

>>> import math
>>> math.log(float(p.approximate(rational(1L)>>32))-p)/math.log(2)
-36.083467374587123

Less then -32, or in other words, the rational number we found is about
2.0**-36 further apart, closer then the bound (2.0**-32).
'''

def _gcd(a, b):
	if a>b:
		b, a = a, b
	if a == 0:
		return b
	while 1:
		c = b % a
		if c == 0:
			return a
		b = a
		a = c 

def _trim(n, d, max_d):
	if max_d == 1:
		return n/d, 1
	last_n, last_d = 0, 1
	current_n, current_d = 1, 0
	while 1:
		div, mod = divmod(n, d)
		n, d = d, mod
		before_last_n, before_last_d = last_n, last_d
		next_n = last_n + current_n*div
		next_d = last_d + current_d*div
		last_n, last_d = current_n, current_d
		current_n, current_d = next_n, next_d
		if mod == 0 or current_d>=max_d:
			break
	if current_d == max_d:
		return current_n, current_d
	i = (max_d-before_last_d)/last_d
	alternative_n = before_last_n + i*last_n
	alternative_d = before_last_d + i*last_d
        alternative = _Rational(alternative_n, alternative_d)
        last = _Rational(last_n, last_d)
	num = _Rational(n, d)
	if abs(alternative-num)<abs(last-num):
		return alternative_n, alternative_d 
	else:
		return last_n, last_d 

def _approximate(n, d, err):
	r = _Rational(n, d)
	last_n, last_d = 0, 1
	current_n, current_d = 1, 0
	while 1:
		div, mod = divmod(n, d)
		n, d = d, mod
		next_n = last_n + current_n*div
		next_d = last_d + current_d*div
		last_n, last_d = current_n, current_d
		current_n, current_d = next_n, next_d
		app = _Rational(current_n, current_d)
		if mod == 0 or abs(app-r)<err:
			break
	return app

import math as _math

def _float_to_ratio(x):
	"""\
	x -> (top, bot), a pair of co-prime longs s.t. x = top/bot.

	The conversion is done exactly, without rounding.
	bot > 0 guaranteed.
	Some form of binary fp is assumed.
	Pass NaNs or infinities at your own risk.

	>>> rational(10.0)
	rational(10L, 1L)
	>>> rational(0.0)
	rational(0L)
	>>> rational(-.25)
	rational(-1L, 4L)
	"""

	if x == 0:
		return 0L, 1L
	signbit = 0
	if x < 0:
		x = -x
		signbit = 1
	f, e = _math.frexp(x)
	assert 0.5 <= f < 1.0
	# x = f * 2**e exactly

	# Suck up CHUNK bits at a time; 28 is enough so that we suck
	# up all bits in 2 iterations for all known binary double-
	# precision formats, and small enough to fit in an int.
	CHUNK = 28
	top = 0L
	# invariant: x = (top + f) * 2**e exactly
	while f:
		f = _math.ldexp(f, CHUNK)
		digit = int(f)
		assert digit >> CHUNK == 0
		top = (top << CHUNK) | digit
		f = f - digit
		assert 0.0 <= f < 1.0
		e = e - CHUNK
	assert top

	# now x = top * 2**e exactly; fold in 2**e
	r = _Rational(top, 1)
	if e>0:
		r = r << e
	else:
		r = r >> -e
	if signbit:
		return -r
	else:
		return r

class _Rational:

	def __init__(self, n, d):
		if d == 0:
			return n/d
		n, d = map(long, (n, d))
		if d < 0:
			n *= -1
			d *= -1
		f = _gcd(abs(n), d)
		self.n = n/f
		self.d = d/f

	def __repr__(self):
		if self.d == 1:
			return 'rational(%r)' % self.n
		return 'rational(%(n)r, %(d)r)' % self.__dict__

	def __str__(self):
		if self.d == 1:
			return str(self.n)
		return '%(n)s/%(d)s' % self.__dict__

	def __coerce__(self, other):
		for int in (type(1), type(1L)):
			if isinstance(other, int):
				return self, rational(other)
		if type(other) == type(1.0):
			return float(self), other
		return NotImplemented

	def __rcoerce__(self, other):
		return coerce(self, other)

	def __add__(self, other):
		return _Rational(self.n*other.d + other.n*self.d, 
		                 self.d*other.d)

	def __radd__(self, other):
		return self+other

	def __mul__(self, other):
		return _Rational(self.n*other.n, self.d*other.d)

	def __rmul__(self, other):
		return self*other

	def inv(self):
		return _Rational(self.d, self.n)

	def __div__(self, other):
		return self*other.inv()

	def __rdiv__(self, other):
		return self.inv()*other

	def __neg__(self):
		return _Rational(-self.n, self.d)

	def __sub__(self, other):
		return self+(-other)

	def __rsub__(self, other):
		return (-self)+other

	def __long__(self):
		if self.d != 1:
			raise ValueError('cannot convert non-integer')
		return self.n

	def __int__(self):
		return int(long(self))

	def __float__(self):
		# Avoid NaNs like the plague
		if self.d > 1L<<1023:
			self = self.trim(1L<<1023)
		return float(self.n)/float(self.d)

	def __pow__(self, exp, z=None):
		if z is not None:
			raise TypeError('pow with 3 args unsupported')
		if isinstance(exp, _Rational):
			if exp.d == 1:
				exp = exp.n
		if isinstance(exp, type(1)) or isinstance(exp, type(1L)):
			if exp < 0:
				return _Rational(self.d**-exp, self.n**-exp)
			return _Rational(self.n**exp, self.d**exp)
		return float(self)**exp

	def __cmp__(self, other):
		return cmp(self.n*other.d, self.d*other.n)

	def __hash__(self):
		return hash(self.n)^hash(self.d)

	def __abs__(self):
		return _Rational(abs(self.n), self.d)

	def __complex__(self):
		return complex(float(self))

	def __nonzero__(self):
		return self.n != 0

	def __pos__(self):
		return self

	def __oct__(self):
		return '%s/%s' % (oct(self.n), oct(self.d))

	def __hex__(self):
		return '%s/%s' % (hex(self.n), hex(self.d))

	def __lshift__(self, other):
		if other.d != 1:
			raise TypeError('cannot shift by non-integer')
		return _Rational(self.n<<other.n, self.d)	

	def __rshift__(self, other):
		if other.d != 1:
			raise TypeError('cannot shift by non-integer')
		return _Rational(self.n, self.d<<other.n)	

	def trim(self, max_d):
		n, d = self.n, self.d
		if n < 0:
			n *= -1
		n, d = _trim(n, d, max_d)
		if self.n < 0:
			n *= -1
		r = _Rational(n, d)
		upwards = self < r
		if upwards:
			alternate_n = n-1
		else:
			alternate_n = n+1
		if self == _Rational(alternate_n+n, d*2):
			new_n = min(alternate_n, n)
			return _Rational(new_n, d)
		return r

	def approximate(self, err):
		n, d = self.n, self.d
		if n < 0:
			n *= -1
		app = _approximate(n, d, err)
		if self.n < 0:
			app *= -1
		return app

def _parse_number(num):
	if '/' in num:
		n, d = num.split('/', 1)
		return _parse_number(n)/_parse_number(d)
	if 'e' in num:
		mant, exp = num.split('e', 1)
		mant = _parse_number(mant)
		exp = long(exp)
		return mant*(rational(10)**rational(exp))
	if '.' in num:
		i, f = num.split('.', 1)
		i = long(i)
		f = rational(long(f), 10L**len(f))
		return i+f
	return rational(long(num))

def rational(n, d=1L):
	if type(n) in (type(''), type(u'')) :
		n = _parse_number(n)
	if type(d) in (type(''), type(u'')) :
		d = _parse_number(d)
	if isinstance(n, type(1.0)):
		n = _float_to_ratio(n)
	if isinstance(n, type(1.0)):
		d = _float_to_ratio(d)
	for arg in (n, d):
		if isinstance(arg, type(1j)):
			raise TypeError('cannot convert arguments')
	if isinstance(n, _Rational):
		return rational(n.n, n.d*d)
	if isinstance(d, _Rational):
		return rational(n*d.d, d.n)
	return _Rational(n, d)

import __builtin__
__builtin__.rational = rational

def _test():
	import doctest, Rational
	doctest.testmod(Rational)

if __name__ == '__main__':
	_test()

From gvanrossum@users.sourceforge.net  Tue Mar 27 17:04:39 2001
From: gvanrossum@users.sourceforge.net (Guido van Rossum)
Date: Tue, 27 Mar 2001 09:04:39 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc ACKS,1.87,1.88
Message-ID: <E14hwtb-0001aU-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv6094

Modified Files:
	ACKS 
Log Message:
Add Robin Thomas (author of the slice() comparability hack).

Index: ACKS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/ACKS,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -r1.87 -r1.88
*** ACKS	2001/03/22 13:43:25	1.87
--- ACKS	2001/03/27 17:04:37	1.88
***************
*** 376,379 ****
--- 376,380 ----
  Amy Taylor
  Tobias Thelen
+ Robin Thomas
  Eric Tiedemann
  Tracy Tims

From akuchling@users.sourceforge.net  Tue Mar 27 17:43:02 2001
From: akuchling@users.sourceforge.net (A.M. Kuchling)
Date: Tue, 27 Mar 2001 09:43:02 -0800
Subject: [Python-checkins] CVS: python/nondist/peps pep-0247.txt,NONE,1.1
Message-ID: <E14hxUk-0003tN-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/nondist/peps
In directory usw-pr-cvs1:/tmp/cvs-serv14907

Added Files:
	pep-0247.txt 
Log Message:
Initial checkin of hashing API draft

--- NEW FILE: pep-0247.txt ---
PEP: 247
Title: API for Cryptographic Hash Functions
Status: Draft
Version: $Revision: 1.1 $
Author: A.M. Kuchling <amk1@bigfoot.com>
Type: Informational
Created: 23-Mar-2001
Post-History:

Abstract

   There are several different modules available that implement 
   cryptographic hashing algorithms such as MD5 or SHA.  This document 
   specifies a standard API for such algorithms, to make it easier to 
   switch between different implementations.

Specification

   All hashing modules should present the same interface.  Additional
   methods or variables can be added, but those described in this
   document should always be present.  

   Hash function modules define one function:

   new([string], [key])

      Create a new hashing object and return it.  You can now feed
      arbitrary strings into the object using its update() method, and
      can ask for the hash value at any time by calling its digest()
      method.

      The 'string' parameter, if supplied, will be immediately hashed
      into the object's starting state.  For keyed hashes such as
      HMAC, 'key' is a string containing the starting key.

   Hash function modules define one variable:

   digest_size

      An integer value; the size of the digest produced by the hashing
      objects, measured in bytes. You could also obtain this value by
      creating a sample object, and taking the length of the digest
      string it returns, but using digest_size is faster.

   The methods for hashing objects are always the following:

   clear()

      Reset this hashing object to its initial state, as if the object
      was created from new(key=<initially specified key>) 
      (XXX what should this do for a keyed hash?  A proposed semantic follows:)
      There is no way to supply a starting string as there is for the
      new() function, and there's no way to change the key specified
      for a keyed hash.

   copy()

      Return a separate copy of this hashing object. An update to this
      copy won't affect the original object.

   digest()

      Return the hash value of this hashing object, as a string
      containing 8-bit data. The object is not altered in any way by
      this function; you can continue updating the object after
      calling this function.

   update(arg)

      Update this hashing object with the string arg.

   For convenience, hashing objects also have a digest_size attribute,
   measuring the size of the resulting digest in bytes.  This is
   identical to the module-level digest_size variable.

   Here's an example, using a module named 'MD5':

       >>> from Crypto.Hash import MD5
       >>> m = MD5.new()
       >>> m.update('abc')
       >>> m.digest()
       '\220\001P\230<\322O\260\326\226?@}(\341\177r'

   Or, more compactly:

       >>> MD5.new('abc').digest()
       '\220\001P\230<\322O\260\326\226?@}(\341\177r'

Copyright

    This document has been placed in the public domain.

Local Variables:
mode: indented-text
indent-tabs-mode: nil
End:

From moshez@zadka.site.co.il  Tue Mar 27 19:50:08 2001
From: moshez@zadka.site.co.il (Moshe Zadka)
Date: Tue, 27 Mar 2001 21:50:08 +0200
Subject: [Python-checkins] CVS: python/nondist/peps pep-0247.txt,NONE,1.1
In-Reply-To: <E14hxUk-0003tN-00@usw-pr-cvs1.sourceforge.net>
References: <E14hxUk-0003tN-00@usw-pr-cvs1.sourceforge.net>
Message-ID: <E14hzTk-00076h-00@darjeeling>

Cool!

On Tue, 27 Mar 2001, "A.M. Kuchling" <akuchling@users.sourceforge.net> wrote:

>    new([string], [key])

What happens if I supply a key to an unkeyed hash?
Is it silently ignored?

>    clear()
> 
>       (XXX what should this do for a keyed hash?  

Your solution seems fine.

>    digest()
> 
>       Return the hash value of this hashing object, as a string
>       containing 8-bit data. The object is not altered in any way by
>       this function;

Why this constrain? I can imagine algorithms for which this will create
an artificial inefficiency. It's not such a common need, and if someone
really needs it, she can just take hash.copy().digest()

Also, the PEP needs to spell out the existence of a Crypto.Hash package
more clearly, and I think even an API for a factory function would be
very useful.

>>> import Crypto.Hash
>>> md5 = Crypto.Hash.factory('md5')
>>> md5.update("dddd")
>>> print >>open("file", 'w'), binascii.hexlify(md5.digest())

Oh, and I think that Mixed Case Is Evil(tm), and that crypto.hash
would be just fine. But I don't care really.
-- 
"I'll be ex-DPL soon anyway so I'm        |LUKE: Is Perl better than Python?
looking for someplace else to grab power."|YODA: No...no... no. Quicker,
   -- Wichert Akkerman (on debian-private)|      easier, more seductive.
For public key, finger moshez@debian.org  |http://www.{python,debian,gnu}.org

From loewis@users.sourceforge.net  Tue Mar 27 21:38:17 2001
From: loewis@users.sourceforge.net (Martin v. L?wis)
Date: Tue, 27 Mar 2001 13:38:17 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib/xml __init__.py,1.10,1.11
Message-ID: <E14i1AP-00016D-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Lib/xml
In directory usw-pr-cvs1:/tmp/cvs-serv4186

Modified Files:
	__init__.py 
Log Message:
Arghh. Fix typo.

Index: __init__.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/xml/__init__.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** __init__.py	2001/03/27 08:42:12	1.10
--- __init__.py	2001/03/27 21:38:15	1.11
***************
*** 19,23 ****
  # "<dollar>Revision: x.y </dollar>"
  # When exported using -kv, it is "x.y".
! __version__ = "$Revision$".split()[-2][0]

--- 19,23 ----
  # "<dollar>Revision: x.y </dollar>"
  # When exported using -kv, it is "x.y".
! __version__ = "$Revision$".split()[-2:][0]

From gvanrossum@users.sourceforge.net  Wed Mar 28 01:14:58 2001
From: gvanrossum@users.sourceforge.net (Guido van Rossum)
Date: Tue, 27 Mar 2001 17:14:58 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib/test test_fcntl.py,1.15,1.16
Message-ID: <E14i4Y6-0007fl-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Lib/test
In directory usw-pr-cvs1:/tmp/cvs-serv29483

Modified Files:
	test_fcntl.py 
Log Message:
Based on info from Jens@digicool.com, add 'darwin1' to the list of
BSD-style OS'es.  Makes sense, really.

Index: test_fcntl.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_fcntl.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** test_fcntl.py	2001/01/17 21:51:35	1.15
--- test_fcntl.py	2001/03/28 01:14:56	1.16
***************
*** 17,21 ****
      print 'Status from fnctl with O_NONBLOCK: ', rv

! if sys.platform in ('netbsd1', 'Darwin1.2',
                      'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
                      'bsdos2', 'bsdos3', 'bsdos4',
--- 17,21 ----
      print 'Status from fnctl with O_NONBLOCK: ', rv

! if sys.platform in ('netbsd1', 'Darwin1.2', 'darwin1',
                      'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
                      'bsdos2', 'bsdos3', 'bsdos4',

From fdrake@users.sourceforge.net  Wed Mar 28 16:51:25 2001
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Wed, 28 Mar 2001 08:51:25 -0800
Subject: [Python-checkins] CVS: python/dist/src/Doc/doc doc.tex,1.37,1.38
Message-ID: <E14iJAL-0007CE-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Doc/doc
In directory usw-pr-cvs1:/tmp/cvs-serv27633/doc

Modified Files:
	doc.tex 
Log Message:

Fix a number of small issues; this closes SF bug #411063.

Index: doc.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/doc/doc.tex,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** doc.tex	2000/11/27 20:10:18	1.37
--- doc.tex	2001/03/28 16:51:20	1.38
***************
*** 197,202 ****
    \subsection{Syntax}

!     There are only a things that an author of Python documentation
!     needs to know about \LaTeX{} syntax.

      A \dfn{comment} is started by the ``percent'' character
--- 197,202 ----
    \subsection{Syntax}

!     There are a things that an author of Python documentation needs to
!     know about \LaTeX{} syntax.

      A \dfn{comment} is started by the ``percent'' character
***************
*** 236,240 ****
  \end{verbatim}

!     An alternate syntax for a group using brackets (\code{\{...\}}) is
      used by macros and environment constructors which take optional
      parameters; brackets do not normally hold syntactic significance.
--- 236,240 ----
  \end{verbatim}

!     An alternate syntax for a group using brackets (\code{[...]}) is
      used by macros and environment constructors which take optional
      parameters; brackets do not normally hold syntactic significance.
***************
*** 327,331 ****

  \begin{verbatim}
! \begin{datadesc}{datadesc}{controlnames}
    A 33-element string array that contains the \ASCII{} mnemonics for
    the thirty-two \ASCII{} control characters from 0 (NUL) to 0x1f
--- 327,331 ----

  \begin{verbatim}
! \begin{datadesc}{controlnames}
    A 33-element string array that contains the \ASCII{} mnemonics for
    the thirty-two \ASCII{} control characters from 0 (NUL) to 0x1f

From fdrake@users.sourceforge.net  Wed Mar 28 16:55:55 2001
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Wed, 28 Mar 2001 08:55:55 -0800
Subject: [Python-checkins] CVS: python/dist/src/Doc/ref refa1.tex,1.4,1.5
Message-ID: <E14iJEh-0007Zc-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Doc/ref
In directory usw-pr-cvs1:/tmp/cvs-serv29094/ref

Modified Files:
	refa1.tex 
Log Message:

Typo:  "ariables" --> "variables"
This fixes SF bug #411118.

Index: refa1.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/ref/refa1.tex,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** refa1.tex	2001/03/23 17:23:50	1.4
--- refa1.tex	2001/03/28 16:55:53	1.5
***************
*** 179,183 ****
  If a name is bound in a block, it is a local variable of that block.
  If a name is bound at the module level, it is a global variable.  (The
! ariables of the module code block are local and global.)  If a
  variable is used in a code block but not defined there, it is a
  \dfn{free variable}.
--- 179,183 ----
  If a name is bound in a block, it is a local variable of that block.
  If a name is bound at the module level, it is a global variable.  (The
! variables of the module code block are local and global.)  If a
  variable is used in a code block but not defined there, it is a
  \dfn{free variable}.

From bwarsaw@users.sourceforge.net  Wed Mar 28 19:52:15 2001
From: bwarsaw@users.sourceforge.net (Barry Warsaw)
Date: Wed, 28 Mar 2001 11:52:15 -0800
Subject: [Python-checkins] CVS: python/nondist/peps pep-0001.txt,1.17,1.18
Message-ID: <E14iLzL-0000Ii-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/nondist/peps
In directory usw-pr-cvs1:/tmp/cvs-serv1144

Modified Files:
	pep-0001.txt 
Log Message:
Add a note that titles should be limited to 38 characters.

Index: pep-0001.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/pep-0001.txt,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** pep-0001.txt	2001/03/21 21:52:08	1.17
--- pep-0001.txt	2001/03/28 19:52:13	1.18
***************
*** 129,134 ****

      1. Preamble -- RFC822 style headers containing meta-data about the
!        PEP, including the PEP number, a short descriptive title, the
!        names contact info for each author, etc.

      2. Abstract -- a short (~200 word) description of the technical
--- 129,135 ----

      1. Preamble -- RFC822 style headers containing meta-data about the
!        PEP, including the PEP number, a short descriptive title
!        (limited to a maximum of 38 characters), the names contact info
!        for each author, etc.

      2. Abstract -- a short (~200 word) description of the technical

From bwarsaw@users.sourceforge.net  Wed Mar 28 19:55:48 2001
From: bwarsaw@users.sourceforge.net (Barry Warsaw)
Date: Wed, 28 Mar 2001 11:55:48 -0800
Subject: [Python-checkins] CVS: python/nondist/peps pep-0000.txt,1.80,1.81
Message-ID: <E14iM2m-0000Y4-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/nondist/peps
In directory usw-pr-cvs1:/tmp/cvs-serv2093

Modified Files:
	pep-0000.txt 
Log Message:
PEP 247, API for Cryptographic Hash Algorithms, Andrew Kuchling

(note: 246 is reserved)

Index: pep-0000.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/pep-0000.txt,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -r1.80 -r1.81
*** pep-0000.txt	2001/03/21 18:59:54	1.80
--- pep-0000.txt	2001/03/28 19:55:46	1.81
***************
*** 30,33 ****
--- 30,37 ----
   I     6  pep-0006.txt  Patch and Bug Fix Releases             Aahz

+  Other Informational PEPs
+ 
+  I   247  pep-0247.txt  API for Cryptographic Hash Algorithms  Kuchling
+ 
   Active PEPs (under serious consideration for Python 2.1 - even if empty)

***************
*** 159,162 ****
--- 163,167 ----
   S   244  pep-0244.txt  The `directive' Statement              von Loewis
   S   245  pep-0245.txt  Python Interfaces                      Pelletier
+  I   247  pep-0247.txt  API for Cryptographic Hash Algorithms  Kuchling

From bwarsaw@users.sourceforge.net  Wed Mar 28 19:57:11 2001
From: bwarsaw@users.sourceforge.net (Barry Warsaw)
Date: Wed, 28 Mar 2001 11:57:11 -0800
Subject: [Python-checkins] CVS: python/nondist/peps pep-0000.txt,1.81,1.82
Message-ID: <E14iM47-0000dh-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/nondist/peps
In directory usw-pr-cvs1:/tmp/cvs-serv2443

Modified Files:
	pep-0000.txt 
Log Message:
Oops, it should be "Functions" not "Algorithms"

Index: pep-0000.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/pep-0000.txt,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -r1.81 -r1.82
*** pep-0000.txt	2001/03/28 19:55:46	1.81
--- pep-0000.txt	2001/03/28 19:57:09	1.82
***************
*** 32,36 ****
   Other Informational PEPs

!  I   247  pep-0247.txt  API for Cryptographic Hash Algorithms  Kuchling

   Active PEPs (under serious consideration for Python 2.1 - even if empty)
--- 32,36 ----
   Other Informational PEPs

!  I   247  pep-0247.txt  API for Cryptographic Hash Functions   Kuchling

   Active PEPs (under serious consideration for Python 2.1 - even if empty)
***************
*** 163,167 ****
   S   244  pep-0244.txt  The `directive' Statement              von Loewis
   S   245  pep-0245.txt  Python Interfaces                      Pelletier
!  I   247  pep-0247.txt  API for Cryptographic Hash Algorithms  Kuchling

--- 163,167 ----
   S   244  pep-0244.txt  The `directive' Statement              von Loewis
   S   245  pep-0245.txt  Python Interfaces                      Pelletier
!  I   247  pep-0247.txt  API for Cryptographic Hash Functions   Kuchling

From bwarsaw@users.sourceforge.net  Wed Mar 28 20:06:13 2001
From: bwarsaw@users.sourceforge.net (Barry Warsaw)
Date: Wed, 28 Mar 2001 12:06:13 -0800
Subject: [Python-checkins] CVS: python/nondist/peps pep-0001.txt,1.18,1.19
Message-ID: <E14iMCr-0001Eu-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/nondist/peps
In directory usw-pr-cvs1:/tmp/cvs-serv4743

Modified Files:
	pep-0001.txt 
Log Message:
Added Requires: header.

Index: pep-0001.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/pep-0001.txt,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** pep-0001.txt	2001/03/28 19:52:13	1.18
--- pep-0001.txt	2001/03/28 20:06:10	1.19
***************
*** 185,188 ****
--- 185,189 ----
          Status: <Draft | Active | Accepted | Deferred | Final | Replaced>
          Type: <Informational | Standards Track>
+       * Requires: <pep numbers>
          Created: <date created on, in dd-mmm-yyyy format>
        * Python-Version: <version number>
***************
*** 201,204 ****
--- 202,208 ----
      the author, or on the python-list or python-dev email mailing
      lists.
+ 
+     PEPs may have a Requires: header, indicating the PEP numbers that
+     this PEP depends on.

      PEPs may also have a Replaced-By: header indicating that a PEP has

From bwarsaw@users.sourceforge.net  Wed Mar 28 20:18:06 2001
From: bwarsaw@users.sourceforge.net (Barry Warsaw)
Date: Wed, 28 Mar 2001 12:18:06 -0800
Subject: [Python-checkins] CVS: python/nondist/peps pep-0247.txt,1.1,1.2
Message-ID: <E14iMOM-0001hg-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/nondist/peps
In directory usw-pr-cvs1:/tmp/cvs-serv6541

Modified Files:
	pep-0247.txt 
Log Message:
Minor style updates.

Index: pep-0247.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/pep-0247.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** pep-0247.txt	2001/03/27 17:42:59	1.1
--- pep-0247.txt	2001/03/28 20:18:03	1.2
***************
*** 1,7 ****
  PEP: 247
  Title: API for Cryptographic Hash Functions
- Status: Draft
  Version: $Revision$
! Author: A.M. Kuchling <amk1@bigfoot.com>
  Type: Informational
  Created: 23-Mar-2001
--- 1,7 ----
  PEP: 247
  Title: API for Cryptographic Hash Functions
  Version: $Revision$
! Author: amk1@bigfoot.com (A.M. Kuchling)
! Status: Draft
  Type: Informational
  Created: 23-Mar-2001
***************
*** 10,96 ****
  Abstract

!    There are several different modules available that implement 
!    cryptographic hashing algorithms such as MD5 or SHA.  This document 
!    specifies a standard API for such algorithms, to make it easier to 
!    switch between different implementations.

  Specification

!    All hashing modules should present the same interface.  Additional
!    methods or variables can be added, but those described in this
!    document should always be present.  

!    Hash function modules define one function:

!    new([string], [key])
!    
!       Create a new hashing object and return it.  You can now feed
!       arbitrary strings into the object using its update() method, and
!       can ask for the hash value at any time by calling its digest()
!       method.

!       The 'string' parameter, if supplied, will be immediately hashed
!       into the object's starting state.  For keyed hashes such as
!       HMAC, 'key' is a string containing the starting key.

!    Hash function modules define one variable:

!    digest_size

!       An integer value; the size of the digest produced by the hashing
!       objects, measured in bytes. You could also obtain this value by
!       creating a sample object, and taking the length of the digest
!       string it returns, but using digest_size is faster.

!    The methods for hashing objects are always the following:

!    clear()

!       Reset this hashing object to its initial state, as if the object
!       was created from new(key=<initially specified key>) 
!       (XXX what should this do for a keyed hash?  A proposed semantic follows:)
!       There is no way to supply a starting string as there is for the
!       new() function, and there's no way to change the key specified
!       for a keyed hash.

!    copy()

!       Return a separate copy of this hashing object. An update to this
!       copy won't affect the original object.

!    digest()

!       Return the hash value of this hashing object, as a string
!       containing 8-bit data. The object is not altered in any way by
!       this function; you can continue updating the object after
!       calling this function.

!    update(arg)

!       Update this hashing object with the string arg.

!    For convenience, hashing objects also have a digest_size attribute,
!    measuring the size of the resulting digest in bytes.  This is
!    identical to the module-level digest_size variable.

!    Here's an example, using a module named 'MD5':

!        >>> from Crypto.Hash import MD5
!        >>> m = MD5.new()
!        >>> m.update('abc')
!        >>> m.digest()
!        '\220\001P\230<\322O\260\326\226?@}(\341\177r'

!    Or, more compactly:

!        >>> MD5.new('abc').digest()
!        '\220\001P\230<\322O\260\326\226?@}(\341\177r'

  Copyright

      This document has been placed in the public domain.
- 

--- 10,96 ----
  Abstract

!     There are several different modules available that implement
!     cryptographic hashing algorithms such as MD5 or SHA.  This
!     document specifies a standard API for such algorithms, to make it
!     easier to switch between different implementations.

  Specification

!     All hashing modules should present the same interface.  Additional
!     methods or variables can be added, but those described in this
!     document should always be present.

!     Hash function modules define one function:

!     new([string], [key])

!         Create a new hashing object and return it.  You can now feed
!         arbitrary strings into the object using its update() method,
!         and can ask for the hash value at any time by calling its
!         digest() method.

!         The 'string' parameter, if supplied, will be immediately hashed
!         into the object's starting state.  For keyed hashes such as
!         HMAC, 'key' is a string containing the starting key.

!     Hash function modules define one variable:

!     digest_size

!         An integer value; the size of the digest produced by the
!         hashing objects, measured in bytes.  You could also obtain
!         this value by creating a sample object, and taking the length
!         of the digest string it returns, but using digest_size is
!         faster.

!     The methods for hashing objects are always the following:

!     clear()

!         Reset this hashing object to its initial state, as if the
!         object was created from new(key=<initially specified key>)
!         (XXX what should this do for a keyed hash?  A proposed
!         semantic follows:).  There is no way to supply a starting
!         string as there is for the new() function, and there's no way
!         to change the key specified for a keyed hash.

!     copy()

!         Return a separate copy of this hashing object.  An update to
!         this copy won't affect the original object.

!     digest()

!         Return the hash value of this hashing object, as a string
!         containing 8-bit data.  The object is not altered in any way
!         by this function; you can continue updating the object after
!         calling this function.

!     update(arg)

!         Update this hashing object with the string arg.

!     For convenience, hashing objects also have a digest_size
!     attribute, measuring the size of the resulting digest in bytes.
!     This is identical to the module-level digest_size variable.

!     Here's an example, using a module named 'MD5':

!         >>> from Crypto.Hash import MD5
!         >>> m = MD5.new()
!         >>> m.update('abc')
!         >>> m.digest()
!         '\220\001P\230<\322O\260\326\226?@}(\341\177r'

!     Or, more compactly:

+         >>> MD5.new('abc').digest()
+         '\220\001P\230<\322O\260\326\226?@}(\341\177r'

+ 
  Copyright

      This document has been placed in the public domain.

From bwarsaw@users.sourceforge.net  Wed Mar 28 20:24:36 2001
From: bwarsaw@users.sourceforge.net (Barry Warsaw)
Date: Wed, 28 Mar 2001 12:24:36 -0800
Subject: [Python-checkins] CVS: python/nondist/peps pep-0232.txt,1.9,1.10
Message-ID: <E14iMUe-0001yU-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/nondist/peps
In directory usw-pr-cvs1:/tmp/cvs-serv7576

Modified Files:
	pep-0232.txt 
Log Message:
Mark this PEP as Final, as it is now in Python 2.1.  Any future
elaborations (e.g. as described in the retained "Future Directions"
section), must be proposed in a new PEP.

Index: pep-0232.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/pep-0232.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** pep-0232.txt	2001/02/26 18:13:05	1.9
--- pep-0232.txt	2001/03/28 20:24:34	1.10
***************
*** 3,10 ****
  Version: $Revision$
  Author: barry@digicool.com (Barry A. Warsaw)
! Status: Draft
  Type: Standards Track
  Created: 02-Dec-2000
! Python-Version: 2.1 / 2.2
  Post-History: 20-Feb-2001

--- 3,10 ----
  Version: $Revision$
  Author: barry@digicool.com (Barry A. Warsaw)
! Status: Final
  Type: Standards Track
  Created: 02-Dec-2000
! Python-Version: 2.1
  Post-History: 20-Feb-2001

***************
*** 97,104 ****
  Future Directions

!     - A previous version of this PEP (and the accompanying
!       implementation) allowed for both setter and getter of attributes
!       on unbound methods, and only getter on bound methods.  A number
!       of problems were discovered with this policy.

        Because method attributes were stored in the underlying
--- 97,109 ----
  Future Directions

!     Here are a number of future directions to consider.  Any adoption
!     of these ideas would require a new PEP, which referenced this one,
!     and would have to be targeted at a Python version subsequent to
!     the 2.1 release.
! 
!     - A previous version of this PEP allowed for both setter and
!       getter of attributes on unbound methods, and only getter on
!       bound methods.  A number of problems were discovered with this
!       policy.

        Because method attributes were stored in the underlying
***************
*** 129,133 ****
        underlying function object.

!       The proposal for Python 2.2 is to implement setting (bound or
        unbound) method attributes by setting attributes on the instance
        or class, using special naming conventions.  I.e.
--- 134,138 ----
        underlying function object.

!       A future PEP might propose to implement setting (bound or
        unbound) method attributes by setting attributes on the instance
        or class, using special naming conventions.  I.e.
***************
*** 181,185 ****

        The BDFL is currently against any such special syntactic support
!       for setting arbitrary function attributes.

--- 186,191 ----

        The BDFL is currently against any such special syntactic support
!       for setting arbitrary function attributes.  Any syntax proposals
!       would have to be outlined in new PEPs.

***************
*** 218,229 ****
  Reference Implementation

!     The reference implementation is available on SourceForge as a
!     patch against the Python CVS tree (patch #103123).  This patch
!     doesn't include the regrtest module and output file.  Those are
!     available upon request.
! 
!    http://sourceforge.net/patch/?func=detailpatch&patch_id=103123&group_id=5470
! 
!     This patch has been applied and will become part of Python 2.1.

--- 224,229 ----
  Reference Implementation

!     This PEP has been accepted and the implementation has been
!     integrated into Python 2.1.

From bwarsaw@users.sourceforge.net  Wed Mar 28 20:25:42 2001
From: bwarsaw@users.sourceforge.net (Barry Warsaw)
Date: Wed, 28 Mar 2001 12:25:42 -0800
Subject: [Python-checkins] CVS: python/nondist/peps pep-0000.txt,1.82,1.83
Message-ID: <E14iMVi-00021u-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/nondist/peps
In directory usw-pr-cvs1:/tmp/cvs-serv7790

Modified Files:
	pep-0000.txt 
Log Message:
PEP 232 is Final.

Index: pep-0000.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/pep-0000.txt,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -r1.82 -r1.83
*** pep-0000.txt	2001/03/28 19:57:09	1.82
--- pep-0000.txt	2001/03/28 20:25:39	1.83
***************
*** 49,53 ****

   S   234  pep-0234.txt  Iterators                              Yee
-  S   232  pep-0232.txt  Function Attributes                    Warsaw
   S   237  pep-0237.txt  Unifying Long Integers and Integers    Zadka
   S   238  pep-0238.txt  Non-integer Division                   Zadka
--- 49,52 ----
***************
*** 88,91 ****
--- 87,91 ----
   SF  223  pep-0223.txt  Change the Meaning of \x Escapes       Peters
   SF  230  pep-0230.txt  Warning Framework                      van Rossum
+  SF  232  pep-0232.txt  Function Attributes                    Warsaw

   Empty PEPs (or containing only an abstract)

From bwarsaw@users.sourceforge.net  Wed Mar 28 20:27:04 2001
From: bwarsaw@users.sourceforge.net (Barry Warsaw)
Date: Wed, 28 Mar 2001 12:27:04 -0800
Subject: [Python-checkins] CVS: python/nondist/peps pep-0000.txt,1.83,1.84
Message-ID: <E14iMX2-00025i-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/nondist/peps
In directory usw-pr-cvs1:/tmp/cvs-serv8027

Modified Files:
	pep-0000.txt 
Log Message:
Oops, forgot to mark the other instance of 232 as final.

Index: pep-0000.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/pep-0000.txt,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -r1.83 -r1.84
*** pep-0000.txt	2001/03/28 20:25:39	1.83
--- pep-0000.txt	2001/03/28 20:27:02	1.84
***************
*** 149,153 ****
   S   230  pep-0230.txt  Warning Framework                      van Rossum
   SR  231  pep-0231.txt  __findattr__()                         Warsaw
!  S   232  pep-0232.txt  Function Attributes                    Warsaw
   S   233  pep-0233.txt  Python Online Help                     Prescod
   S   234  pep-0234.txt  Iterators                              Yee
--- 149,153 ----
   S   230  pep-0230.txt  Warning Framework                      van Rossum
   SR  231  pep-0231.txt  __findattr__()                         Warsaw
!  SF  232  pep-0232.txt  Function Attributes                    Warsaw
   S   233  pep-0233.txt  Python Online Help                     Prescod
   S   234  pep-0234.txt  Iterators                              Yee

From bwarsaw@users.sourceforge.net  Wed Mar 28 20:45:37 2001
From: bwarsaw@users.sourceforge.net (Barry Warsaw)
Date: Wed, 28 Mar 2001 12:45:37 -0800
Subject: [Python-checkins] CVS: python/nondist/peps pep-0245.txt,1.3,1.4
Message-ID: <E14iMoz-0002zm-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/nondist/peps
In directory usw-pr-cvs1:/tmp/cvs-serv11506

Modified Files:
	pep-0245.txt 
Log Message:
Michel's latest draft.  The original PEP is being split into at least
two separate PEPs.  This one describes only the syntax proposal.

Index: pep-0245.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/pep-0245.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pep-0245.txt	2001/03/21 23:21:49	1.3
--- pep-0245.txt	2001/03/28 20:45:35	1.4
***************
*** 1,4 ****
  PEP: 245
! Title: Python Interfaces
  Version: $Revision$
  Author: michel@digicool.com (Michel Pelletier)
--- 1,4 ----
  PEP: 245
! Title: Python Interface Syntax
  Version: $Revision$
  Author: michel@digicool.com (Michel Pelletier)
***************
[...1089 lines suppressed...]

  Risks
***************
*** 1044,1052 ****
          http://python.sourceforge.net/peps/pep-0236.html

-     [8] http://www.zope.org/Wikis/Interfaces

-     [9] http://www.zope.org/Wikis/Interfaces/InterfacesUseCases
- 
- 
  Copyright

--- 482,486 ----
***************
*** 1059,1060 ****
--- 493,495 ----
  indent-tabs-mode: nil
  End:
+ 

From fdrake@users.sourceforge.net  Wed Mar 28 21:14:35 2001
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Wed, 28 Mar 2001 13:14:35 -0800
Subject: [Python-checkins] CVS: python/dist/src/Doc/api api.tex,1.112,1.113
Message-ID: <E14iNH1-0004EU-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Doc/api
In directory usw-pr-cvs1:/tmp/cvs-serv16227/api

Modified Files:
	api.tex 
Log Message:

Added documentation for PyObject_IsInstance() and PyObject_IsSubclass().

Index: api.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/api/api.tex,v
retrieving revision 1.112
retrieving revision 1.113
diff -C2 -r1.112 -r1.113
*** api.tex	2001/03/23 17:42:09	1.112
--- api.tex	2001/03/28 21:14:32	1.113
***************
*** 1494,1497 ****
--- 1494,1533 ----
  \end{cfuncdesc}

+ \begin{cfuncdesc}{int}{PyObject_IsInstance}{PyObject *inst, PyObject *cls}
+ Return \code{1} if \var{inst} is an instance of the class \var{cls} or
+ a subclass of \var{cls}.  If \var{cls} is a type object rather than a
+ class object, \cfunction{PyObject_IsInstance()} returns \code{1} if
+ \var{inst} is of type \var{cls}.  If \var{inst} is not a class
+ instance and \var{cls} is neither a type object or class object,
+ \var{inst} must have a \member{__class__} attribute --- the class
+ relationship of the value of that attribute with \var{cls} will be
+ used to determine the result of this function.
+ \versionadded{2.1}
+ \end{cfuncdesc}
+ 
+ Subclass determination is done in a fairly straightforward way, but
+ includes a wrinkle that implementors of extensions to the class system
+ may want to be aware of.  If \class{A} and \class{B} are class
+ objects, \class{B} is a subclass of \class{A} if it inherits from
+ \class{A} either directly or indirectly.  If either is not a class
+ object, a more general mechanism is used to determine the class
+ relationship of the two objects.  When testing if \var{B} is a
+ subclass of \var{A}, if \var{A} is \var{B},
+ \cfunction{PyObject_IsSubclass()} returns true.  If \var{A} and
+ \var{B} are different objects, \var{B}'s \member{__bases__} attribute
+ is searched in a depth-first fashion for \var{A} --- the presence of
+ the \member{__bases__} attribute is considered sufficient for this
+ determination.
+ 
+ \begin{cfuncdesc}{int}{PyObject_IsSubclass}{PyObject *derived,
+                                             PyObject *cls}
+ Returns \code{1} if the class \var{derived} is identical to or derived
+ from the class \var{cls}, otherwise returns \code{0}.  In case of an
+ error, returns \code{-1}.  If either \var{derived} or \var{cls} is not
+ an actual class object, this function uses the generic algorithm
+ described above.
+ \versionadded{2.1}
+ \end{cfuncdesc}
+ 

  \begin{cfuncdesc}{int}{PyCallable_Check}{PyObject *o}

From fdrake@users.sourceforge.net  Wed Mar 28 21:15:44 2001
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Wed, 28 Mar 2001 13:15:44 -0800
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libweakref.tex,1.4,1.5
Message-ID: <E14iNI8-0004I5-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Doc/lib
In directory usw-pr-cvs1:/tmp/cvs-serv16482/lib

Modified Files:
	libweakref.tex 
Log Message:

Added example use of weak references, contributed by Tim Peters.

Index: libweakref.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/lib/libweakref.tex,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** libweakref.tex	2001/03/23 04:36:02	1.4
--- libweakref.tex	2001/03/28 21:15:41	1.5
***************
*** 182,185 ****
--- 182,207 ----

+ \subsection{Example \label{weakref-example}}
+ 
+ This simple example shows how an application can use objects IDs to
+ retrieve objects that it has seen before.  The IDs of the objects can
+ then be used in other data structures without forcing the objects to
+ remain alive, but the objects can still be retrieved by ID if they
+ do.
+ 
+ % Example contributed by Tim Peters <tim_one@msn.com>.
+ \begin{verbatim}
+ import weakref
+ 
+ _id2obj_dict = weakref.mapping()
+ 
+ def remember(obj):
+     _id2obj_dict[id(obj)] = obj
+ 
+ def id2obj(id):
+     return _id2obj_dict.get(id)
+ \end{verbatim}
+ 
+ 
  \subsection{Weak References in Extension Types
              \label{weakref-extension}}

From bwarsaw@users.sourceforge.net  Thu Mar 29 03:12:50 2001
From: bwarsaw@users.sourceforge.net (Barry Warsaw)
Date: Wed, 28 Mar 2001 19:12:50 -0800
Subject: [Python-checkins] CVS: python/nondist/peps pep-0246.txt,NONE,1.1
Message-ID: <E14iSri-0003mg-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/nondist/peps
In directory usw-pr-cvs1:/tmp/cvs-serv14537

Added Files:
	pep-0246.txt 
Log Message:
PEP 246, Object Adaptation, Clark C. Evans

(with editing for style, spell-checking, etc. by Barry)

--- NEW FILE: pep-0246.txt ---
PEP: 246
Title: Object Adaptation
Version: $Revision: 1.1 $
Author: cce@clarkevans.com (Clark C. Evans)
Status: Draft
Type: Standards Track
Created: 21-Mar-2001
Python-Version: 2.2

Abstract

    This proposal puts forth an extensible mechanism for the
    adaptation of an object to a context where a specific type, class,
    interface, or other protocol is expected.

    This proposal provides a built-in "adapt" function that, for any
    object X and protocol Y, can be used to ask the Python environment
    for a version of X complaint with Y.  Behind the scenes, the
    mechanism asks the object X: "Are you now, or do you know how to
    wrap yourself to provide, a supporter of protocol Y?".  And, if
    this request fails, the function then asks the protocol Y: "Does
    object X support you, or do you know how to wrap it to obtain such
    a supporter?"  This duality is important, because protocols can be
    developed after objects are, or vice-versa, and this PEP lets
    either case be supported non-invasively with regard to the
    pre-existing component[s].

    This proposal does not limit what a protocol is, what compliance
    to the protocol means, nor what a wrapper constitutes.  This
    mechanism leverages existing protocol categories such as the type
    system and class hierarchy and can be expanded to support future
    protocol categories such as the pending interface proposal [1] and
    signature based type-checking system [2].

Motivation

    Currently there is no standardized mechanism in Python for asking
    if an object supports a particular protocol.  Typically, existence
    of particular methods, particularly those that are built-in such
    as __getitem__, is used as an indicator of support for a
    particular protocol.  This technique works for protocols blessed
    by the BDFL (Benevolent Dictator for Life), such as the new
    enumerator proposal identified by a new built-in __iter__[9].
    However, this technique does not admit an infallible way to
    identify interfaces lacking a unique, built-in signature method.

    More so, there is no standardized way to obtain an adapter for an
    object.  Typically, with objects passed to a context expecting a
    particular protocol, either the object knows about the context and
    provides its own wrapper or the context knows about the object and
    wraps it appropriately.  The difficulty with these approaches is
    that such adaptations are one-offs, are not centralized in a
    single place of the users code, and are not executed with a common
    technique, etc.  This lack of standardization increases code
    duplication with the same adapter occurring in more than one place
    or it encourages classes to be re-written instead of adapted.  In
    either case, maintainability suffers.

    It would be very nice to have a standard function that can be
    called upon to verify an object's compliance with a particular
    protocol and provide for a wrapper if one is readily available --
    all without having to hunt through a library's documentation for
    the appropriate incantation.

Requirements

    When considering an objects compliance with a protocol, there are
    several cases to be examined:

    a) When the protocol is a type or class, and the object has
       exactly that type or is a member of the class.  In this case
       compliance is automatic.

    b) When the object knows about the protocol and either considers
       itself compliant or knows how to wrap itself appropriately.

    c) When the protocol knows about the object and either the object
       already complies or can be wrapped accordingly.

    d) When the protocol is a class, and the object is a member of a
       subclass.  This is distinct from the first case (a) above,
       since inheritance does not necessarily imply substitutability
       and must be handled carefully.

    e) When the context knows about the object and the protocol and
       knows how to adapt the object so that the required protocol is
       satisfied.  This could use an adapter registry or similar
       method.

    For this proposal's requirements, the first case should be come
    for free and the next three cases should be relatively relatively
    easy to accomplish.  This proposal does not address the last case,
    however it provides a base mechanism upon which such an approach
    could be developed.  Further, with only minor implementation
    changes, this proposal should be able to incorporate a new
    interface type or type checking system.

    The fourth case above is subtle.  A lack of substitutability can
    occur when a method restricts an argument's domain or raises an
    exception which a base class does not or extends the co-domain to
    include return values which the base class may never produce.
    While compliance based on class inheritance should be automatic,
    this proposal should allow an object to signal that it is not
    compliant with a base class protocol.

Specification

    This proposal introduces a new built-in function, adapt(), which
    is the basis for supporting these requirements.

    The adapt() function has three parameters:

    - `obj', the object to be adapted

    - `protocol', the protocol requested of the object

    - `alternate', an optional object to return if the object could
      not be adapted

    A successful result of the adapt() function returns either the
    object passed `obj' if the object is already compliant with the
    protocol, or a secondary object `wrapper', which provides a view
    of the object compliant with the protocol.  The definition of
    wrapper is explicitly vague and a wrapper is allowed to be a full
    object with its own state if necessary.  A failure to adapt the
    object to the protocol will raise a TypeError unless the alternate
    parameter is used, in this case the alternate argument is
    returned.

    To enable the first case listed in the requirements, the adapt()
    function first checks to see if the object's type or the object's
    class are identical to the protocol.  If so, then the adapt()
    function returns the object directly without further ado.

    To enable the second case, when the object knows about the
    protocol, the object must have a __conform__() method.  This
    optional method takes two arguments:

    - `self', the object being conformed

    - `protocol, the protocol requested

    The object may return itself through this method to indicate
    compliance.  Alternatively, the object also has the option of
    returning a wrapper object compliant with the protocol.  Finally,
    if the object cannot determine its compliance, it should either
    return None or raise a TypeError to enable the remaining
    mechanisms.

    To enable the third case, when the protocol knows about the
    object, the protocol must have an __adapt__() method.  This
    optional method takes two arguments:

    - `self', the protocol requested

    - `obj', the object being adapted

    If the protocol finds the object to be compliant, it can return
    obj directly.  Alternatively, the method may return a wrapper
    compliant with the protocol.  Finally, compliance cannot be
    determined, this method should either return None or raise a
    TypeError so other mechanisms can be tried.

    The fourth case, when the object's class is a sub-class of the
    protocol, is handled by the built-in adapt() function.  Under
    normal circumstances, if "isinstance(object, protocol)" then
    adapt() returns the object directly.  However, if the object is
    not substitutable, either the __conform__() or __adapt__() methods
    above may raise an adaptForceFailException to prevent this default
    behavior.

    Please note two important things.  First, this proposal does not
    preclude the addition of other protocols.  Second, this proposal
    does not preclude other possible cases where adapter pattern may
    hold, such as the context knowing the object and the protocol (the
    last case in the requirements).  In fact, this proposal opens the
    gate for these other mechanisms to be added.

Reference Implementation and Test Cases

    -----------------------------------------------------------------
    adapt.py
    -----------------------------------------------------------------
    import types

    adaptRaiseTypeException = "(raise a type exception on failure)"
    adaptForceFailException = "(forced failure of adapt)"

    # look to see if the object passes other protocols
    def _check(obj,protocol,default):
            return default

    def adapt(obj, protocol, alternate = adaptRaiseTypeException):

        # first check to see if object has the exact protocol
        if type(obj) is types.InstanceType and \
           obj.__class__ is protocol: return obj
        if type(obj) is protocol: return obj

        # next check other protocols for exact conformance
        # before calling __conform__ or __adapt__
        if _check(obj,protocol,0):
            return obj

        # procedure to execute on success
        def succeed(obj,retval,protocol,alternate):
            if _check(retval,protocol,1):
                return retval
            else:
                return fail(obj,alternate)

        # procedure to execute on failure
        def fail(obj,protocol,alternate):
            if alternate is adaptRaiseTypeException:
                raise TypeError("%s cannot be adapted to %s" \
                                 % (obj,protocol))
            return alternate

        # try to use the object's adapting mechanism
        conform = getattr(obj, '__conform__',None)
        if conform:
            try:
                retval = conform(protocol)
                if retval:
                    return succeed(obj,retval,protocol,alternate)
            except adaptForceFailException:
                return fail(obj,protocol,alternate)
            except TypeError: pass

        # try to use the protocol's adapting mechanism
        adapt = getattr(protocol, '__adapt__',None)
        if adapt:
            try:
                retval = adapt(obj)
                if retval:
                    return succeed(obj,retval,protocol,alternate)
            except adaptForceFailException:
                return fail(obj,protocol,alternate)
            except TypeError: pass

        # check to see if the object is an instance
        try:
            if isinstance(obj,protocol):
                return obj
        except TypeError: pass

        # no-adaptation-possible case
        return fail(obj,protocol,alternate)

    -----------------------------------------------------------------
    test.py
    -----------------------------------------------------------------
    import types
    from adapt import adaptForceFailException
    from adapt import adapt

    class KnightsWhoSayNi: pass

    class Eggs:  # an unrelated class/interface
        def eggs(self): print "eggs!"
        word = "Nee-womm"

    class Ham:  # used as an interface, no inhertance
        def ham(self): pass
        word = "Ping"

    class Spam: # a base class, inheritance used
        def spam(self): print "spam!"

    class EggsSpamAndHam (Spam,KnightsWhoSayNi):
        def ham(self): print "ham!"
        def __conform__(self,protocol):
            if protocol is Ham:
                # implements Ham's ham, but does not have a word
                return self
            if protocol is KnightsWhoSayNi:
                # we are no longer the Knights who say Ni!
                raise adaptForceFailException
            if protocol is Eggs:
                # Knows how to create the eggs!
                return Eggs()

    class SacredWord:
        class HasSecredWord:
            def __call__(self, obj):
                if getattr(obj,'word',None): return obj
        __adapt__= HasSecredWord()

    class Bing (Ham):
        def __conform__(self,protocol):
            raise adaptForceFailException

    def test():
        x = EggsSpamAndHam()
        adapt(x,Spam).spam()
        adapt(x,Eggs).eggs()
        adapt(x,Ham).ham()
        adapt(x,EggsSpamAndHam).ham()
        print adapt(Eggs(),SacredWord).word
        print adapt(Ham(),SacredWord).word
        pass
        if adapt(x,KnightsWhoSayNi,None): raise "IckyIcky"
        if not adapt(x,Spam,None): raise "Spam"
        if not adapt(x,Eggs,None): raise "Eggs"
        if not adapt(x,Ham,None): raise "Ham"
        if not adapt(x,EggsSpamAndHam,None): raise "EggsAndSpam"
        if     adapt(x,KnightsWhoSayNi,None): raise "NightsWhoSayNi"
        if     adapt(x,SacredWord,None): raise "SacredWord"
        try:
            adapt(x,SacredWord)
        except TypeError: pass
        else: raise "SacredWord"
        try:
            adapt(x,KnightsWhoSayNi)
        except TypeError: print "Ekky-ekky-ekky-ekky-z'Bang, " \
                                + "zoom-Boing, z'nourrrwringmm"
        else: raise "NightsWhoSayNi"
        pass
        b = Bing()
        if not adapt(b,Bing,None): raise "Not a Bing"
        if adapt(b,Ham,None): raise "Not a Ham!"
        if adapt(1,types.FloatType,None): raise "Not a float!"
        if adapt(b,types.FloatType,None): raise "Not a float!"
        if adapt(1,Ham,None):             raise "Not a Ham!"
        if not adapt(1,types.IntType,None): raise "Is an Int!"

    -----------------------------------------------------------------
    Expected Output
    -----------------------------------------------------------------
    >>> import test
    >>> test.test()
    spam!
    eggs!
    ham!
    ham!
    Nee-womm
    Ping
    Ekky-ekky-ekky-ekky-z'Bang, zoom-Boing, z'nourrrwringmm
    >>>

Relationship To Paul Prescod and Tim Hochberg's Type Assertion method

    Paul and Tim had proposed a type checking mechanism, where the
    Interface is passed an object to verify.  The example syntax Paul
    put forth recently [2] was:

        interface Interface
            def __check__(self,obj)

    For discussion purposes, here would be a protocol with __check__:

        class Interface:
            class Checker:
                def __call__(self, obj): pass  #check the object
            __check__= Checker()

    The built-in adapt() function could be augmented to use this
    checking mechanism updating the _check method as follows:

    # look to see if the object passes other protocols
    def _check(obj,protocol,default):
        check = getattr(protocol, '__check__',None)
        if check:
            try:
               if check(obj): return 1
            except TypeError: pass
            return 0
        else:
            return default

    In short, the work put forth by Paul and company is great, and
    there should be no problem preventing these two proposals from
    working together in harmony, if not be completely complementary.

Relationship to Python Interfaces [1] by Michel Pelletier

    The relationship to this proposal to Michel's proposal could also
    be complementary.  Following is how the _check method would be
    updated for this mechanism:

    # look to see if the object passes other protocols
    def _check(obj,protocol,default):
        if type(protocol) is types.InterfaceType:
            return implements(obj,protocol)
        return default

Relationship to Carlos Ribeiro's proxy technique [7] and [8]

    Carlos presented a technique where this method could return a
    proxy instead of self or a wrapper.  The advantage of this
    approach is that the internal details of the object are protected.
    This is very neat.  No changes are necessary to this proposal to
    support this usage as a standardized mechanism to obtain named
    proxies.

Relationship To Microsoft's Query Interface

    Although this proposal may sounds similar to Microsoft's
    QueryInterface, it differs by a number of aspects.

    First, it is bi-directional allowing the interface to be queried
    as well giving more dynamic abilities (more Pythonic).  Second,
    there is not a special "IUnknown" interface which can be used for
    object identity, although this could be proposed as one of those
    "special" blessed interface protocol identifiers.  Third, with
    QueryInterface, once an object supports a particular interface it
    must always there after support this interface; this proposal
    makes no such guarantee, although this may be added at a later
    time.  Fourth, implementations of Microsoft's QueryInterface must
    support a kind of equivalence relation.

    By reflexive they mean the querying an interface for itself must
    always succeed.  By symmetrical they mean that if one can
    successfully query an interface IA for a second interface IB, then
    one must also be able to successfully query the interface IB for
    IA.  And finally, by transitive they mean if one can successfully
    query IA for IB and one can successfully query IB for IC, then one
    must be able to successfully query IA for IC.  Ability to support
    this type of equivalence relation should be encouraged, but may
    not be possible.  Further research on this topic (by someone
    familiar with Microsoft COM) would be helpful in further
    determining how compatible this proposal is.

Question and Answer

    Q:  What benefit does this provide?

        The typical Python programmer is an integrator, someone who is
        connecting components from various vendors.  Often times the
        interfaces between these components require an intermediate
        adapter.  Usually the burden falls upon the programmer to
        study the interface exposed by one component and required by
        another, determine if they are directly compatible, or develop
        an adapter.  Sometimes a vendor may even include the
        appropriate adapter, but then searching for the adapter and
        figuring out how to deploy the adapter takes time.

        This technique enables vendors to work with each other
        directly by implementing __conform__ or __adapt__ as
        necessary.  This frees the integrator from making their own
        adapters.  In essence, this allows the components to have a
        simple dialogue among themselves.  The integrator simply
        connects one component to another, and if the types don't
        automatically match an adapting mechanism is built-in.

        For example, consider SAX1 and SAX2 interfaces, there is an
        adapter required to switch between them.  Normally the
        programmer must be aware of this; however, with this
        adaptation framework this is no longer the case.

    Q:  Why does this have to be built-in, can't it be standalone?

        Yes, it does work standalone.  However, if it is built-in, it
        has a greater chance of usage.  The value of this proposal is
        primarily in standardization.  Furthermore:

        0.  The mechanism is by its very nature a singleton.

        1.  If used frequently, it will be much faster as a built-in

        2.  It is extensible and unassuming.

        3.  A whole-program optimizing compiler could optimize it out
            in particular cases (ok, this one is far fetched)

    Q:  Why the verbs __conform__ and __adapt__?

        conform, verb intransitive
            1. To correspond in form or character; be similar. 
            2. To act or be in accord or agreement; comply.  
            3. To act in accordance with current customs or modes.

        adapt, verb transitive
            1. To make suitable to or fit for a specific use or
               situation.

        Source:  The American Heritage Dictionary of the English
                 Language, Third Edition 

Backwards Compatibility

    There should be no problem with backwards compatibility unless
    someone had used __conform__ or __adapt__, but this seems
    unlikely.  Indeed this proposal, save an built-in adapt()
    function, could be tested without changes to the interpreter.

Credits

    This proposal was created in large part by the feedback of the
    talented individuals on both the main mailing list and also the
    type-sig list.  Specific contributors include (sorry if I missed
    someone).

    This proposal is based largely off the suggestions from Alex
    Martelli and Paul Prescod with significant feedback from Robin
    Thomas and borrowing ideas from Marcin 'Qrczak' Kowalczyk and
    Carlos Ribeiro.  Other contributors (via comments) include Michel
    Pelletier, Jeremy Hylton, Aahz Maruch, Fredrik Lundh, Rainer
    Deyke, Timothy Delaney, and Huaiyu Zhu

References and Footnotes

    [1] PEP 245, Python Interface Syntax, Pelletier
        http://www.python.org/peps/pep-0245.html

    [2] http://mail.python.org/pipermail/types-sig/2001-March/001223.html

    [3] http://www.zope.org/Members/michel/types-sig/TreasureTrove

    [4] http://mail.python.org/pipermail/types-sig/2001-March/001105.html

    [5] http://mail.python.org/pipermail/types-sig/2001-March/001206.html

    [6] http://mail.python.org/pipermail/types-sig/2001-March/001223.html

    [7] http://mail.python.org/pipermail/python-list/2001-March/035136.html

    [8] http://mail.python.org/pipermail/python-list/2001-March/035197.html

    [9] PEP 234, Iterators, Yee
        http://www.python.org/peps/pep-0234.txt

Copyright

    This document has been placed in the public domain.

Local Variables:
mode: indented-text
indent-tabs-mode: nil
End:

From bwarsaw@users.sourceforge.net  Thu Mar 29 03:13:51 2001
From: bwarsaw@users.sourceforge.net (Barry Warsaw)
Date: Wed, 28 Mar 2001 19:13:51 -0800
Subject: [Python-checkins] CVS: python/nondist/peps pep-0000.txt,1.84,1.85
Message-ID: <E14iSsh-0003oe-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/nondist/peps
In directory usw-pr-cvs1:/tmp/cvs-serv14663

Modified Files:
	pep-0000.txt 
Log Message:
PEP 246, Object Adaptation, Clark C. Evans

Index: pep-0000.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/pep-0000.txt,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -r1.84 -r1.85
*** pep-0000.txt	2001/03/28 20:27:02	1.84
--- pep-0000.txt	2001/03/29 03:13:49	1.85
***************
*** 56,60 ****
   S   242  pep-0242.txt  Numeric Kinds                          Dubois
   S   244  pep-0244.txt  The `directive' Statement              von Loewis
!  S   245  pep-0245.txt  Python Interfaces                      Pelletier

   Py-in-the-sky PEPs (not ready; may become active yet)
--- 56,61 ----
   S   242  pep-0242.txt  Numeric Kinds                          Dubois
   S   244  pep-0244.txt  The `directive' Statement              von Loewis
!  S   245  pep-0245.txt  Python Interface Syntax                Pelletier
!  S   246  pep-0246.txt  Object Adaptation                      Evans

   Py-in-the-sky PEPs (not ready; may become active yet)
***************
*** 162,166 ****
   S   243  pep-0243.txt  Module Repository Upload Mechanism     Reifschneider
   S   244  pep-0244.txt  The `directive' Statement              von Loewis
!  S   245  pep-0245.txt  Python Interfaces                      Pelletier
   I   247  pep-0247.txt  API for Cryptographic Hash Functions   Kuchling

--- 163,168 ----
   S   243  pep-0243.txt  Module Repository Upload Mechanism     Reifschneider
   S   244  pep-0244.txt  The `directive' Statement              von Loewis
!  S   245  pep-0245.txt  Python Interface Syntax                Pelletier
!  S   246  pep-0246.txt  Object Adaptation                      Evans
   I   247  pep-0247.txt  API for Cryptographic Hash Functions   Kuchling

***************
*** 185,188 ****
--- 187,191 ----
      Drake, Fred              fdrake@acm.org
      Dubois, Paul F.          paul@pfdubois.com
+     Evans, Clark C.          cce@clarkevans.com
      Hylton, Jeremy           jeremy@digicool.com
      Kuchling, Andrew         akuchlin@mems-exchange.org

From tim_one@users.sourceforge.net  Thu Mar 29 03:34:45 2001
From: tim_one@users.sourceforge.net (Tim Peters)
Date: Wed, 28 Mar 2001 19:34:45 -0800
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle PyShell.py,1.32,1.33
Message-ID: <E14iTCv-0004Ku-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Tools/idle
In directory usw-pr-cvs1:/tmp/cvs-serv16407/python/dist/src/tools/idle

Modified Files:
	PyShell.py 
Log Message:
Initialize new save_warnings_filters data member in ModifiedInterpreter.__init__.
Was getting mystery
    ModifiedInterpreter instance has no attribute 'save_warnings_filters'
errors at odd times (for sure in a fresh IDLE, fresh file, then Run Script).

Index: PyShell.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/idle/PyShell.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** PyShell.py	2001/03/26 17:41:35	1.32
--- PyShell.py	2001/03/29 03:34:43	1.33
***************
*** 158,161 ****
--- 158,162 ----
          locals = sys.modules['__main__'].__dict__
          InteractiveInterpreter.__init__(self, locals=locals)
+         self.save_warnings_filters = None

      gid = 0

From tim_one@users.sourceforge.net  Thu Mar 29 04:36:11 2001
From: tim_one@users.sourceforge.net (Tim Peters)
Date: Wed, 28 Mar 2001 20:36:11 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib/test test_pty.py,1.11,1.12 test_zipfile.py,1.4,1.5
Message-ID: <E14iUAN-00060S-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Lib/test
In directory usw-pr-cvs1:/tmp/cvs-serv23058/python/dist/src/Lib/test

Modified Files:
	test_pty.py test_zipfile.py 
Log Message:
Whitespace normalization.

Index: test_pty.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_pty.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** test_pty.py	2001/03/22 14:50:24	1.11
--- test_pty.py	2001/03/29 04:36:09	1.12
***************
*** 61,65 ****

      # After pty.fork(), the child should already be a session leader.
!     # (on those systems that have that concept.) 
      debug("In child, calling os.setsid()")
      try:
--- 61,65 ----

      # After pty.fork(), the child should already be a session leader.
!     # (on those systems that have that concept.)
      debug("In child, calling os.setsid()")
      try:

Index: test_zipfile.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_zipfile.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** test_zipfile.py	2001/03/26 15:49:24	1.4
--- test_zipfile.py	2001/03/29 04:36:09	1.5
***************
*** 11,20 ****
      zip.write(srcname, srcname)
      zip.close()
!             
      zip = zipfile.ZipFile(f, "r", compression)   # Read the ZIP archive
      readData2 = zip.read(srcname)
      readData1 = zip.read("another.name")
      zip.close()
!     
      if readData1 != srccontents or readData2 != srccontents:
          raise TestFailed, "Written data doesn't equal read data."
--- 11,20 ----
      zip.write(srcname, srcname)
      zip.close()
! 
      zip = zipfile.ZipFile(f, "r", compression)   # Read the ZIP archive
      readData2 = zip.read(srcname)
      readData1 = zip.read("another.name")
      zip.close()
! 
      if readData1 != srccontents or readData2 != srccontents:
          raise TestFailed, "Written data doesn't equal read data."
***************
*** 26,34 ****
          fp.write("Test of zipfile line %d.\n" % i)
      fp.close()
!     
      fp = open(srcname, "rb")
      writtenData = fp.read()
      fp.close()
!     
      for file in (zipname, tempfile.TemporaryFile(), StringIO.StringIO()):
          zipTest(file, zipfile.ZIP_STORED, writtenData)
--- 26,34 ----
          fp.write("Test of zipfile line %d.\n" % i)
      fp.close()
! 
      fp = open(srcname, "rb")
      writtenData = fp.read()
      fp.close()
! 
      for file in (zipname, tempfile.TemporaryFile(), StringIO.StringIO()):
          zipTest(file, zipfile.ZIP_STORED, writtenData)

From tim_one@users.sourceforge.net  Thu Mar 29 04:36:11 2001
From: tim_one@users.sourceforge.net (Tim Peters)
Date: Wed, 28 Mar 2001 20:36:11 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib socket.py,1.10,1.11 symtable.py,1.2,1.3 traceback.py,1.24,1.25 unittest.py,1.2,1.3 zipfile.py,1.9,1.10
Message-ID: <E14iUAN-00060O-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv23058/python/dist/src/Lib

Modified Files:
	socket.py symtable.py traceback.py unittest.py zipfile.py 
Log Message:
Whitespace normalization.

Index: socket.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/socket.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** socket.py	2001/03/22 22:12:17	1.10
--- socket.py	2001/03/29 04:36:08	1.11
***************
*** 64,68 ****
              if hasattr(sock, "_sock"):
                  sock = sock._sock
!             return _realsslcall(sock, keyfile, certfile)    

--- 64,68 ----
              if hasattr(sock, "_sock"):
                  sock = sock._sock
!             return _realsslcall(sock, keyfile, certfile)

Index: symtable.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/symtable.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** symtable.py	2001/03/23 15:41:14	1.2
--- symtable.py	2001/03/29 04:36:08	1.3
***************
*** 35,39 ****

  newSymbolTable = SymbolTableFactory()
!     
  def bool(x):
      """Helper to force boolean result to 1 or 0"""
--- 35,39 ----

  newSymbolTable = SymbolTableFactory()
! 
  def bool(x):
      """Helper to force boolean result to 1 or 0"""
***************
*** 61,65 ****
          else:
              kind = "%s " % self.__class__.__name__
!         
          if self._table.name == "global":
              return "<%sSymbolTable for module %s>" % (kind, self._filename)
--- 61,65 ----
          else:
              kind = "%s " % self.__class__.__name__
! 
          if self._table.name == "global":
              return "<%sSymbolTable for module %s>" % (kind, self._filename)
***************
*** 144,148 ****
              self.__locals = self.__idents_matching(lambda x:x & DEF_BOUND)
          return self.__locals
!         
      def get_globals(self):
          if self.__globals is None:
--- 144,148 ----
              self.__locals = self.__idents_matching(lambda x:x & DEF_BOUND)
          return self.__locals
! 
      def get_globals(self):
          if self.__globals is None:
***************
*** 187,191 ****

      def is_global(self):
!         return bool((self.__flags & DEF_GLOBAL) 
                      or (self.__flags & DEF_FREE_GLOBAL))

--- 187,191 ----

      def is_global(self):
!         return bool((self.__flags & DEF_GLOBAL)
                      or (self.__flags & DEF_FREE_GLOBAL))

Index: traceback.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/traceback.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** traceback.py	2001/03/21 20:29:18	1.24
--- traceback.py	2001/03/29 04:36:08	1.25
***************
*** 222,226 ****
  def print_stack(f=None, limit=None, file=None):
      """Print a stack trace from its invocation point.
!     
      The optional 'f' argument can be used to specify an alternate
      stack frame at which to start. The optional 'limit' and 'file'
--- 222,226 ----
  def print_stack(f=None, limit=None, file=None):
      """Print a stack trace from its invocation point.
! 
      The optional 'f' argument can be used to specify an alternate
      stack frame at which to start. The optional 'limit' and 'file'

Index: unittest.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/unittest.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unittest.py	2001/03/22 08:45:36	1.2
--- unittest.py	2001/03/29 04:36:08	1.3
***************
*** 104,108 ****
          "Indicates that the tests should be aborted"
          self.shouldStop = 1
!     
      def __repr__(self):
          return "<%s run=%i errors=%i failures=%i>" % \
--- 104,108 ----
          "Indicates that the tests should be aborted"
          self.shouldStop = 1
! 
      def __repr__(self):
          return "<%s run=%i errors=%i failures=%i>" % \
***************
*** 117,126 ****
      'runTest'.

!     If the fixture may be used for many test cases, create as 
      many test methods as are needed. When instantiating such a TestCase
      subclass, specify in the constructor arguments the name of the test method
      that the instance is to execute.

!     Test authors should subclass TestCase for their own tests. Construction 
      and deconstruction of the test's environment ('fixture') can be
      implemented by overriding the 'setUp' and 'tearDown' methods respectively.
--- 117,126 ----
      'runTest'.

!     If the fixture may be used for many test cases, create as
      many test methods as are needed. When instantiating such a TestCase
      subclass, specify in the constructor arguments the name of the test method
      that the instance is to execute.

!     Test authors should subclass TestCase for their own tests. Construction
      and deconstruction of the test's environment ('fixture') can be
      implemented by overriding the 'setUp' and 'tearDown' methods respectively.
***************
*** 481,485 ****
          if args: apply(self.write, args)
          self.write('\n') # text-mode streams translate to \r\n if needed
!  

  class _TextTestResult(TestResult):
--- 481,485 ----
          if args: apply(self.write, args)
          self.write('\n') # text-mode streams translate to \r\n if needed
! 

  class _TextTestResult(TestResult):
***************
*** 551,555 ****
  class TextTestRunner:
      """A test runner class that displays results in textual form.
!     
      It prints out the names of tests as they are run, errors as they
      occur, and a summary of the results at the end of the test run.
--- 551,555 ----
  class TextTestRunner:
      """A test runner class that displays results in textual form.
! 
      It prints out the names of tests as they are run, errors as they
      occur, and a summary of the results at the end of the test run.
***************
*** 588,592 ****
              self.stream.writeln("OK")
          return result
!         

--- 588,592 ----
              self.stream.writeln("OK")
          return result
! 

***************
*** 669,673 ****
              self.testRunner = TextTestRunner(verbosity=self.verbosity)
          result = self.testRunner.run(self.test)
!         sys.exit(not result.wasSuccessful())    

  main = TestProgram
--- 669,673 ----
              self.testRunner = TextTestRunner(verbosity=self.verbosity)
          result = self.testRunner.run(self.test)
!         sys.exit(not result.wasSuccessful())

  main = TestProgram

Index: zipfile.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/zipfile.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** zipfile.py	2001/03/26 15:49:24	1.9
--- zipfile.py	2001/03/29 04:36:08	1.10
***************
*** 132,139 ****

  class ZipFile:
!     """ Class with methods to open, read, write, close, list zip files. 
!      
      z = ZipFile(file, mode="r", compression=ZIP_STORED)
!      
      file: Either the path to the file, or a file-like object.
            If it is a path, the file will be opened and closed by ZipFile.
--- 132,139 ----

  class ZipFile:
!     """ Class with methods to open, read, write, close, list zip files.
! 
      z = ZipFile(file, mode="r", compression=ZIP_STORED)
! 
      file: Either the path to the file, or a file-like object.
            If it is a path, the file will be opened and closed by ZipFile.
***************
*** 159,163 ****
          self.compression = compression  # Method of compression
          self.mode = key = mode[0]
!         
          # Check if we were passed a file-like object
          if type(file) in _STRING_TYPES:
--- 159,163 ----
          self.compression = compression  # Method of compression
          self.mode = key = mode[0]
! 
          # Check if we were passed a file-like object
          if type(file) in _STRING_TYPES:
***************
*** 170,174 ****
              self.fp = file
              self.filename = getattr(file, 'name', None)
!         
          if key == 'r':
              self._GetContents()
--- 170,174 ----
              self.fp = file
              self.filename = getattr(file, 'name', None)
! 
          if key == 'r':
              self._GetContents()

From bwarsaw@users.sourceforge.net  Thu Mar 29 14:43:13 2001
From: bwarsaw@users.sourceforge.net (Barry Warsaw)
Date: Thu, 29 Mar 2001 06:43:13 -0800
Subject: [Python-checkins] CVS: python/nondist/peps pep-0246.txt,1.1,1.2
Message-ID: <E14iddp-0003FA-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/nondist/peps
In directory usw-pr-cvs1:/tmp/cvs-serv12458

Modified Files:
	pep-0246.txt 
Log Message:
Updated Post-History:

Index: pep-0246.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/pep-0246.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** pep-0246.txt	2001/03/29 03:12:47	1.1
--- pep-0246.txt	2001/03/29 14:43:11	1.2
***************
*** 7,10 ****
--- 7,11 ----
  Created: 21-Mar-2001
  Python-Version: 2.2
+ Post-History: 29-Mar-2001

From lemburg@users.sourceforge.net  Thu Mar 29 17:00:17 2001
From: lemburg@users.sourceforge.net (M.-A. Lemburg)
Date: Thu, 29 Mar 2001 09:00:17 -0800
Subject: [Python-checkins] CVS: python/nondist/peps pep-0248.txt,NONE,1.1 pep-0249.txt,NONE,1.1
Message-ID: <E14ifmT-0001BV-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/nondist/peps
In directory usw-pr-cvs1:/tmp/cvs-serv4288

Added Files:
	pep-0248.txt pep-0249.txt 
Log Message:
Added PEP 248 and 249 which define the Python Database API Specifications
version 1.0 and 2.0 resp.

--- NEW FILE: pep-0248.txt ---
PEP: 248
Title: Python Database API Specification v1.0
Version: $Revision: 1.1 $
Author: db-sig@python.org (Python Database SIG)
Editor: mal@lemburg.com (Marc-Andre Lemburg)
Status: Draft
Type: Informational

Introduction

    This API has been defined to encourage similarity between the
    Python modules that are used to access databases.  By doing this,
    we hope to achieve a consistency leading to more easily understood
    modules, code that is generally more portable across databases,
    and a broader reach of database connectivity from Python.

    This interface specification consists of several items:

        * Module Interface
        * Connection Objects
        * Cursor Objects
        * DBI Helper Objects

    Comments and questions about this specification may be directed to
    the SIG on Tabular Databases in Python
    (http://www.python.org/sigs/db-sig).

    This specification document was last updated on: April 9, 1996.
    It will be known as Version 1.0 of this specification.

Module Interface

    The database interface modules should typically be named with
    something terminated by 'db'.  Existing examples are: 'oracledb',
    'informixdb', and 'pg95db'.  These modules should export several
    names:

        modulename(connection_string)

            Constructor for creating a connection to the database.
            Returns a Connection Object.

        error

            Exception raise for errors from the database module.

Connection Objects

    Connection Objects should respond to the following methods:

        close()

            Close the connection now (rather than whenever __del__ is
            called).  The connection will be unusable from this point
            forward; an exception will be raised if any operation is
            attempted with the connection.

        commit()

            Commit any pending transaction to the database.

        rollback()

            Roll the database back to the start of any pending
            transaction.

        cursor()

            Return a new Cursor Object.  An exception may be thrown if
            the database does not support a cursor concept.

        callproc([params])

            (Note: this method is not well-defined yet.)  Call a
            stored database procedure with the given (optional)
            parameters.  Returns the result of the stored procedure.

        (all Cursor Object attributes and methods)

            For databases that do not have cursors and for simple
            applications that do not require the complexity of a
            cursor, a Connection Object should respond to each of the
            attributes and methods of the Cursor Object.  Databases
            that have cursor can implement this by using an implicit,
            internal cursor.

Cursor Objects

    These objects represent a database cursor, which is used to manage
    the context of a fetch operation.

    Cursor Objects should respond to the following methods and
    attributes:

        arraysize

            This read/write attribute specifies the number of rows to
            fetch at a time with fetchmany().  This value is also used
            when inserting multiple rows at a time (passing a
            tuple/list of tuples/lists as the params value to
            execute()).  This attribute will default to a single row.

            Note that the arraysize is optional and is merely provided
            for higher performance database interactions.
            Implementations should observe it with respect to the
            fetchmany() method, but are free to interact with the
            database a single row at a time.

        description

            This read-only attribute is a tuple of 7-tuples.  Each
            7-tuple contains information describing each result
            column: (name, type_code, display_size, internal_size,
            precision, scale, null_ok). This attribute will be None
            for operations that do not return rows or if the cursor
            has not had an operation invoked via the execute() method
            yet.

            The 'type_code' is one of the 'dbi' values specified in
            the section below.

            Note: this is a bit in flux. Generally, the first two
            items of the 7-tuple will always be present; the others
            may be database specific.

        close()

            Close the cursor now (rather than whenever __del__ is
            called).  The cursor will be unusable from this point
            forward; an exception will be raised if any operation is
            attempted with the cursor.

        execute(operation [,params])

            Execute (prepare) a database operation (query or command).
            Parameters may be provided (as a sequence
            (e.g. tuple/list)) and will be bound to variables in the
            operation.  Variables are specified in a database-specific
            notation that is based on the index in the parameter tuple
            (position-based rather than name-based).

            The parameters may also be specified as a sequence of
            sequences (e.g. a list of tuples) to insert multiple rows
            in a single operation.

            A reference to the operation will be retained by the
            cursor.  If the same operation object is passed in again,
            then the cursor can optimize its behavior.  This is most
            effective for algorithms where the same operation is used,
            but different parameters are bound to it (many times).

            For maximum efficiency when reusing an operation, it is
            best to use the setinputsizes() method to specify the
            parameter types and sizes ahead of time.  It is legal for
            a parameter to not match the predefined information; the
            implementation should compensate, possibly with a loss of
            efficiency.

            Using SQL terminology, these are the possible result
            values from the execute() method:

                If the statement is DDL (e.g. CREATE TABLE), then 1 is
                returned.

                If the statement is DML (e.g. UPDATE or INSERT), then the
                number of rows affected is returned (0 or a positive
                integer).

                If the statement is DQL (e.g. SELECT), None is returned,
                indicating that the statement is not really complete until
                you use one of the  'fetch' methods.

        fetchone()

            Fetch the next row of a query result, returning a single
            tuple.

        fetchmany([size])

            Fetch the next set of rows of a query result, returning as
            a list of tuples. An empty list is returned when no more
            rows are available. The number of rows to fetch is
            specified by the parameter.  If it is None, then the
            cursor's arraysize determines the number of rows to be
            fetched.

            Note there are performance considerations involved with
            the size parameter.  For optimal performance, it is
            usually best to use the arraysize attribute.  If the size
            parameter is used, then it is best for it to retain the
            same value from one fetchmany() call to the next.

        fetchall()

            Fetch all rows of a query result, returning as a list of
            tuples.  Note that the cursor's arraysize attribute can
            affect the performance of this operation.

        setinputsizes(sizes)

            (Note: this method is not well-defined yet.)  This can be
            used before a call to 'execute()' to predefine memory
            areas for the operation's parameters.  sizes is specified
            as a tuple -- one item for each input parameter.  The item
            should be a Type object that corresponds to the input that
            will be used, or it should be an integer specifying the
            maximum length of a string parameter.  If the item is
            'None', then no predefined memory area will be reserved
            for that column (this is useful to avoid predefined areas
            for large inputs).

            This method would be used before the execute() method is
            invoked.

            Note that this method is optional and is merely provided
            for higher performance database interaction.
            Implementations are free to do nothing and users are free
            to not use it.

        setoutputsize(size [,col])

            (Note: this method is not well-defined yet.)

            Set a column buffer size for fetches of large columns
            (e.g. LONG).  The column is specified as an index into the
            result tuple.  Using a column of None will set the default
            size for all large columns in the cursor.

            This method would be used before the 'execute()' method is
            invoked.

            Note that this method is optional and is merely provided
            for higher performance database interaction.
            Implementations are free to do nothing and users are free
            to not use it.

DBI Helper Objects

    Many databases need to have the input in a particular format for
    binding to an operation's input parameters.  For example, if an
    input is destined for a DATE column, then it must be bound to the
    database in a particular string format.  Similar problems exist
    for "Row ID" columns or large binary items (e.g. blobs or RAW
    columns).  This presents problems for Python since the parameters
    to the 'execute()' method are untyped.  When the database module
    sees a Python string object, it doesn't know if it should be bound
    as a simple CHAR column, as a raw binary item, or as a DATE.

    To overcome this problem, the 'dbi' module was created.  This
    module specifies some basic database interface types for working
    with databases.  There are two classes: 'dbiDate' and 'dbiRaw'.
    These are simple container classes that wrap up a value.  When
    passed to the database modules, the module can then detect that
    the input parameter is intended as a DATE or a RAW.  For symmetry,
    the database modules will return DATE and RAW columns as instances
    of these classes.

    A Cursor Object's 'description' attribute returns information
    about each of the result columns of a query.  The 'type_code is
    defined to be one of five types exported by this module: 'STRING',
    'RAW', 'NUMBER', 'DATE', or 'ROWID'.

    The module exports the following names:

        dbiDate(value)

            This function constructs a 'dbiDate' instance that holds a
            date value.  The value should be specified as an integer
            number of seconds since the "epoch" (e.g. time.time()).

        dbiRaw(value)

            This function constructs a 'dbiRaw' instance that holds a
            raw (binary) value.  The value should be specified as a
            Python string.

        STRING

            This object is used to describe columns in a database that
            are string-based (e.g. CHAR).

        RAW

            This object is used to describe (large) binary columns in
            a database (e.g. LONG RAW, blobs).

        NUMBER

            This object is used to describe numeric columns in a
            database.

        DATE

            This object is used to describe date columns in a
            database.

        ROWID

            This object is used to describe the "Row ID" column in a
            database.

Acknowledgements

    Many thanks go to Andrew Kuchling who converted the Python
    Database API Specification 1.0 from the original HTML format into
    the PEP format.

Copyright

    This document has been placed in the Public Domain.

Local Variables:
mode: indented-text
indent-tabs-mode: nil
End:

--- NEW FILE: pep-0249.txt ---
PEP: 249
Title: Python Database API Specification v2.0
Version: $Revision: 1.1 $
Author: db-sig@python.org (Python Database SIG)
Editor: mal@lemburg.com (Marc-Andre Lemburg)
Status: Draft
Type: Informational

Introduction

    This API has been defined to encourage similarity between the
    Python modules that are used to access databases.  By doing this,
    we hope to achieve a consistency leading to more easily understood
    modules, code that is generally more portable across databases,
    and a broader reach of database connectivity from Python.

    The interface specification consists of several sections:

        * Module Interface
        * Connection Objects
        * Cursor Objects
        * DBI Helper Objects
        * Type Objects and Constructors
        * Implementation Hints
        * Major Changes from 1.0 to 2.0

    Comments and questions about this specification may be directed
    to the SIG for Database Interfacing with Python
    (db-sig@python.org).

    For more information on database interfacing with Python and
    available packages see the Database Topic
    Guide at http://www.python.org/topics/database/.

    This document describes the Python Database API Specification
    2.0.  The previous version 1.0 version is still available as
    reference, in PEP XXX. Package writers are encouraged to use
    this version of the specification as basis for new interfaces.

Module Interface

    Access to the database is made available through connection
    objects. The module must provide the following constructor for
    these:

        connect(parameters...)

            Constructor for creating a connection to the database.
            Returns a Connection Object. It takes a number of
            parameters which are database dependent. [1]

    These module globals must be defined:

        apilevel

            String constant stating the supported DB API level.
            Currently only the strings '1.0' and '2.0' are allowed.

            If not given, a DB-API 1.0 level interface should be
            assumed.

        threadsafety

            Integer constant stating the level of thread safety the
            interface supports. Possible values are:

                0     Threads may not share the module.
                1     Threads may share the module, but not connections.
                2     Threads may share the module and connections.
                3     Threads may share the module, connections and
                      cursors.

            Sharing in the above context means that two threads may
            use a resource without wrapping it using a mutex semaphore
            to implement resource locking. Note that you cannot always
            make external resources thread safe by managing access
            using a mutex: the resource may rely on global variables
            or other external sources that are beyond your control.

        paramstyle

            String constant stating the type of parameter marker
            formatting expected by the interface. Possible values are
            [2]:

                'qmark'         Question mark style, 
                                e.g. '...WHERE name=?'
                'numeric'       Numeric, positional style, 
                                e.g. '...WHERE name=:1'
                'named'         Named style, 
                                e.g. '...WHERE name=:name'
                'format'        ANSI C printf format codes, 
                                e.g. '...WHERE name=%s'
                'pyformat'      Python extended format codes, 
                                e.g. '...WHERE name=%(name)s'

    The module should make all error information available through
    these exceptions or subclasses thereof:

        Warning 

            Exception raised for important warnings like data
            truncations while inserting, etc. It must be a subclass of
            the Python StandardError (defined in the module
            exceptions).

        Error 

            Exception that is the base class of all other error
            exceptions. You can use this to catch all errors with one
            single 'except' statement. Warnings are not considered
            errors and thus should not use this class as base. It must
            be a subclass of the Python StandardError (defined in the
            module exceptions).

        InterfaceError

            Exception raised for errors that are related to the
            database interface rather than the database itself.  It
            must be a subclass of Error.

        DatabaseError

            Exception raised for errors that are related to the
            database.  It must be a subclass of Error.

        DataError

            Exception raised for errors that are due to problems with
            the processed data like division by zero, numeric value
            out of range, etc. It must be a subclass of DatabaseError.

        OperationalError

            Exception raised for errors that are related to the
            database's operation and not necessarily under the control
            of the programmer, e.g. an unexpected disconnect occurs,
            the data source name is not found, a transaction could not
            be processed, a memory allocation error occurred during
            processing, etc.  It must be a subclass of DatabaseError.

        IntegrityError             

            Exception raised when the relational integrity of the
            database is affected, e.g. a foreign key check fails.  It
            must be a subclass of DatabaseError.

        InternalError 

            Exception raised when the database encounters an internal
            error, e.g. the cursor is not valid anymore, the
            transaction is out of sync, etc.  It must be a subclass of
            DatabaseError.

        ProgrammingError

            Exception raised for programming errors, e.g. table not
            found or already exists, syntax error in the SQL
            statement, wrong number of parameters specified, etc.  It
            must be a subclass of DatabaseError.

        NotSupportedError

            Exception raised in case a method or database API was used
            which is not supported by the database, e.g. requesting a
            .rollback() on a connection that does not support
            transaction or has transactions turned off.  It must be a
            subclass of DatabaseError.

    This is the exception inheritance layout:

        StandardError
        |__Warning
        |__Error
           |__InterfaceError
              |__DatabaseError
                 |__DataError
                 |__OperationalError
                 |__IntegrityError
                 |__InternalError
                 |__ProgrammingError
                 |__NotSupportedError

    Note: The values of these exceptions are not defined. They should
    give the user a fairly good idea of what went wrong, though.

Connection Objects

    Connection Objects should respond to the following methods:

        close() 

            Close the connection now (rather than whenever __del__ is
            called).  The connection will be unusable from this point
            forward; an Error (or subclass) exception will be raised
            if any operation is attempted with the connection. The
            same applies to all cursor objects trying to use the
            connection.

        commit()

            Commit any pending transaction to the database. Note that
            if the database supports an auto-commit feature, this must
            be initially off. An interface method may be provided to
            turn it back on.

            Database modules that do not support transactions should
            implement this method with void functionality.

        rollback() 

            This method is optional since not all databases provide
            transaction support. [3]

            In case a database does provide transactions this method
            causes the the database to roll back to the start of any
            pending transaction.  Closing a connection without
            committing the changes first will cause an implicit
            rollback to be performed.

        cursor()

            Return a new Cursor Object using the connection.  If the
            database does not provide a direct cursor concept, the
            module will have to emulate cursors using other means to
            the extent needed by this specification.  [4]

Cursor Objects

    These objects represent a database cursor, which is used to
    manage the context of a fetch operation.

    Cursor Objects should respond to the following methods and
    attributes:

        description 

            This read-only attribute is a sequence of 7-item
            sequences.  Each of these sequences contains information
            describing one result column: (name, type_code,
            display_size, internal_size, precision, scale,
            null_ok). This attribute will be None for operations that
            do not return rows or if the cursor has not had an
            operation invoked via the executeXXX() method yet.

            The type_code can be interpreted by comparing it to the
            Type Objects specified in the section below.

        rowcount 

            This read-only attribute specifies the number of rows that
            the last executeXXX() produced (for DQL statements like
            'select') or affected (for DML statements like 'update' or
            'insert').

            The attribute is -1 in case no executeXXX() has been
            performed on the cursor or the rowcount of the last
            operation is not determinable by the interface. [7]

        callproc(procname[,parameters])

            (This method is optional since not all databases provide
            stored procedures. [3])

            Call a stored database procedure with the given name. The
            sequence of parameters must contain one entry for each
            argument that the procedure expects. The result of the
            call is returned as modified copy of the input
            sequence. Input parameters are left untouched, output and
            input/output parameters replaced with possibly new values.

            The procedure may also provide a result set as
            output. This must then be made available through the
            standard fetchXXX() methods.

        close()

            Close the cursor now (rather than whenever __del__ is
            called).  The cursor will be unusable from this point
            forward; an Error (or subclass) exception will be raised
            if any operation is attempted with the cursor.

        execute(operation[,parameters]) 

            Prepare and execute a database operation (query or
            command).  Parameters may be provided as sequence or
            mapping and will be bound to variables in the operation.
            Variables are specified in a database-specific notation
            (see the module's paramstyle attribute for details). [5]

            A reference to the operation will be retained by the
            cursor.  If the same operation object is passed in again,
            then the cursor can optimize its behavior.  This is most
            effective for algorithms where the same operation is used,
            but different parameters are bound to it (many times).

            For maximum efficiency when reusing an operation, it is
            best to use the setinputsizes() method to specify the
            parameter types and sizes ahead of time.  It is legal for
            a parameter to not match the predefined information; the
            implementation should compensate, possibly with a loss of
            efficiency.

            The parameters may also be specified as list of tuples to
            e.g. insert multiple rows in a single operation, but this
            kind of usage is depreciated: executemany() should be used
            instead.

            Return values are not defined.

        executemany(operation,seq_of_parameters) 

            Prepare a database operation (query or command) and then
            execute it against all parameter sequences or mappings
            found in the sequence seq_of_parameters.

            Modules are free to implement this method using multiple
            calls to the execute() method or by using array operations
            to have the database process the sequence as a whole in
            one call.

            The same comments as for execute() also apply accordingly
            to this method.

            Return values are not defined.

        fetchone() 

            Fetch the next row of a query result set, returning a
            single sequence, or None when no more data is
            available. [6]

            An Error (or subclass) exception is raised if the previous
            call to executeXXX() did not produce any result set or no
            call was issued yet.

        fetchmany([size=cursor.arraysize])

            Fetch the next set of rows of a query result, returning a
            sequence of sequences (e.g. a list of tuples). An empty
            sequence is returned when no more rows are available.

            The number of rows to fetch per call is specified by the
            parameter.  If it is not given, the cursor's arraysize
            determines the number of rows to be fetched. The method
            should try to fetch as many rows as indicated by the size
            parameter. If this is not possible due to the specified
            number of rows not being available, fewer rows may be
            returned.

            An Error (or subclass) exception is raised if the previous
            call to executeXXX() did not produce any result set or no
            call was issued yet.

            Note there are performance considerations involved with
            the size parameter.  For optimal performance, it is
            usually best to use the arraysize attribute.  If the size
            parameter is used, then it is best for it to retain the
            same value from one fetchmany() call to the next.

        fetchall() 

            Fetch all (remaining) rows of a query result, returning
            them as a sequence of sequences (e.g. a list of tuples).
            Note that the cursor's arraysize attribute can affect the
            performance of this operation.

            An Error (or subclass) exception is raised if the previous
            call to executeXXX() did not produce any result set or no
            call was issued yet.

          nextset() 

            (This method is optional since not all databases support
            multiple result sets. [3])

            This method will make the cursor skip to the next
            available set, discarding any remaining rows from the
            current set.

            If there are no more sets, the method returns
            None. Otherwise, it returns a true value and subsequent
            calls to the fetch methods will return rows from the next
            result set.

            An Error (or subclass) exception is raised if the previous
            call to executeXXX() did not produce any result set or no
            call was issued yet.

        arraysize

            This read/write attribute specifies the number of rows to
            fetch at a time with fetchmany(). It defaults to 1 meaning
            to fetch a single row at a time.

            Implementations must observe this value with respect to
            the fetchmany() method, but are free to interact with the
            database a single row at a time. It may also be used in
            the implementation of executemany().

        setinputsizes(sizes)

            This can be used before a call to executeXXX() to
            predefine memory areas for the operation's parameters.

            sizes is specified as a sequence -- one item for each
            input parameter.  The item should be a Type Object that
            corresponds to the input that will be used, or it should
            be an integer specifying the maximum length of a string
            parameter.  If the item is None, then no predefined memory
            area will be reserved for that column (this is useful to
            avoid predefined areas for large inputs).

            This method would be used before the executeXXX() method
            is invoked.

            Implementations are free to have this method do nothing
            and users are free to not use it.

        setoutputsize(size[,column])

            Set a column buffer size for fetches of large columns
            (e.g. LONGs, BLOBs, etc.).  The column is specified as an
            index into the result sequence.  Not specifying the column
            will set the default size for all large columns in the
            cursor.

            This method would be used before the executeXXX() method
            is invoked.

            Implementations are free to have this method do nothing
            and users are free to not use it.

Type Objects and Constructors

    Many databases need to have the input in a particular format for
    binding to an operation's input parameters.  For example, if an
    input is destined for a DATE column, then it must be bound to the
    database in a particular string format.  Similar problems exist
    for "Row ID" columns or large binary items (e.g. blobs or RAW
    columns).  This presents problems for Python since the parameters
    to the executeXXX() method are untyped.  When the database module
    sees a Python string object, it doesn't know if it should be bound
    as a simple CHAR column, as a raw BINARY item, or as a DATE.

    To overcome this problem, a module must provide the constructors
    defined below to create objects that can hold special values.
    When passed to the cursor methods, the module can then detect the
    proper type of the input parameter and bind it accordingly.

    A Cursor Object's description attribute returns information about
    each of the result columns of a query.  The type_code must compare
    equal to one of Type Objects defined below. Type Objects may be
    equal to more than one type code (e.g. DATETIME could be equal to
    the type codes for date, time and timestamp columns; see the
    Implementation Hints below for details).

    The module exports the following constructors and singletons:

        Date(year,month,day)

            This function constructs an object holding a date value.

        Time(hour,minute,second)

            This function constructs an object holding a time value.

        Timestamp(year,month,day,hour,minute,second)

            This function constructs an object holding a time stamp
            value.

        DateFromTicks(ticks)

            This function constructs an object holding a date value
            from the given ticks value (number of seconds since the
            epoch; see the documentation of the standard Python time
            module for details).

        TimeFromTicks(ticks)

            This function constructs an object holding a time value
            from the given ticks value (number of seconds since the
            epoch; see the documentation of the standard Python time
            module for details).

        TimestampFromTicks(ticks)

            This function constructs an object holding a time stamp
            value from the given ticks value (number of seconds since
            the epoch; see the documentation of the standard Python
            time module for details).

        Binary(string)

            This function constructs an object capable of holding a
            binary (long) string value.

        STRING

            This type object is used to describe columns in a database
            that are string-based (e.g. CHAR).

        BINARY

            This type object is used to describe (long) binary columns
            in a database (e.g. LONG, RAW, BLOBs).

        NUMBER

            This type object is used to describe numeric columns in a
            database.

        DATETIME

            This type object is used to describe date/time columns in
            a database.

        ROWID

            This type object is used to describe the "Row ID" column
            in a database.

    SQL NULL values are represented by the Python None singleton on
    input and output.

    Note: Usage of Unix ticks for database interfacing can cause
    troubles because of the limited date range they cover.

Implementation Hints

    * The preferred object types for the date/time objects are those
      defined in the mxDateTime package. It provides all necessary
      constructors and methods both at Python and C level.

    * The preferred object type for Binary objects are the
      buffer types available in standard Python starting with
      version 1.5.2. Please see the Python documentation for
      details. For information about the the C interface have a
      look at Include/bufferobject.h and
      Objects/bufferobject.c in the Python source
      distribution.

    * Here is a sample implementation of the Unix ticks based
      constructors for date/time delegating work to the generic
      constructors:

        import time

        def DateFromTicks(ticks):
            return apply(Date,time.localtime(ticks)[:3])

        def TimeFromTicks(ticks):
            return apply(Time,time.localtime(ticks)[3:6])

        def TimestampFromTicks(ticks):
            return apply(Timestamp,time.localtime(ticks)[:6])

    * This Python class allows implementing the above type
      objects even though the description type code field yields
      multiple values for on type object:

        class DBAPITypeObject:
            def __init__(self,*values):
                self.values = values
            def __cmp__(self,other):
                if other in self.values:
                    return 0
                if other < self.values:
                    return 1
                else:
                    return -1

      The resulting type object compares equal to all values
      passed to the constructor.

    * Here is a snippet of Python code that implements the exception
      hierarchy defined above:

        import exceptions

        class Error(exceptions.StandardError):
            pass

        class Warning(exceptions.StandardError):
            pass

        class InterfaceError(Error):
            pass

        class DatabaseError(Error):
            pass

        class InternalError(DatabaseError):
            pass

        class OperationalError(DatabaseError):
            pass

        class ProgrammingError(DatabaseError):
            pass

        class IntegrityError(DatabaseError):
            pass

        class DataError(DatabaseError):
            pass

        class NotSupportedError(DatabaseError):
            pass

      In C you can use the PyErr_NewException(fullname,
      base, NULL) API to create the exception objects.

Major Changes from Version 1.0 to Version 2.0

    The Python Database API 2.0 introduces a few major changes
    compared to the 1.0 version. Because some of these changes will
    cause existing DB API 1.0 based scripts to break, the major
    version number was adjusted to reflect this change.

    These are the most important changes from 1.0 to 2.0:

        * The need for a separate dbi module was dropped and the
          functionality merged into the module interface itself.

        * New constructors and Type Objects were added for date/time
          values, the RAW Type Object was renamed to BINARY. The
          resulting set should cover all basic data types commonly
          found in modern SQL databases.

        * New constants (apilevel, threadlevel, paramstyle) and
          methods (executemany, nextset) were added to provide better
          database bindings.

        * The semantics of .callproc() needed to call stored
          procedures are now clearly defined.

        * The definition of the .execute() return value changed.
          Previously, the return value was based on the SQL statement
          type (which was hard to implement right) -- it is undefined
          now; use the more flexible .rowcount attribute
          instead. Modules are free to return the old style return
          values, but these are no longer mandated by the
          specification and should be considered database interface
          dependent.

        * Class based exceptions were incorporated into the
          specification.  Module implementors are free to extend the
          exception layout defined in this specification by
          subclassing the defined exception classes.

Open Issues

    Although the version 2.0 specification clarifies a lot of
    questions that were left open in the 1.0 version, there are still
    some remaining issues:

        * Define a useful return value for .nextset() for the case where
          a new result set is available.

        * Create a fixed point numeric type for use as loss-less
          monetary and decimal interchange format.

Footnotes

    [1] As a guideline the connection constructor parameters should be
        implemented as keyword parameters for more intuitive use and
        follow this order of parameters:

        dsn         Data source name as string
        user        User name as string (optional)
        password    Password as string (optional)
        host        Hostname (optional)
        database    Database name (optional)

        E.g. a connect could look like this:

        connect(dsn='myhost:MYDB',user='guido',password='234$')

    [2] Module implementors should prefer 'numeric', 'named' or
        'pyformat' over the other formats because these offer more
        clarity and flexibility.

    [3] If the database does not support the functionality required
        by the method, the interface should throw an exception in
        case the method is used.

        The preferred approach is to not implement the method and
        thus have Python generate an AttributeError in
        case the method is requested. This allows the programmer to
        check for database capabilities using the standard
        hasattr() function.

        For some dynamically configured interfaces it may not be
        appropriate to require dynamically making the method
        available. These interfaces should then raise a
        NotSupportedError to indicate the non-ability
        to perform the roll back when the method is invoked.

    [4] a database interface may choose to support named cursors by
        allowing a string argument to the method. This feature is
        not part of the specification, since it complicates
        semantics of the .fetchXXX() methods.

    [5] The module will use the __getitem__ method of the parameters
        object to map either positions (integers) or names (strings)
        to parameter values. This allows for both sequences and
        mappings to be used as input.

        The term "bound" refers to the process of binding an input
        value to a database execution buffer. In practical terms,
        this means that the input value is directly used as a value
        in the operation.  The client should not be required to
        "escape" the value so that it can be used -- the value
        should be equal to the actual database value.

    [6] Note that the interface may implement row fetching using
        arrays and other optimizations. It is not
        guaranteed that a call to this method will only move the
        associated cursor forward by one row.

    [7] The rowcount attribute may be coded in a way that updates
        its value dynamically. This can be useful for databases that
        return usable rowcount values only after the first call to
        a .fetchXXX() method.

Acknowledgements

    Many thanks go to Andrew Kuchling who converted the Python
    Database API Specification 2.0 from the original HTML format into
    the PEP format.

Copyright

    This document has been placed in the Public Domain.

Local Variables:
mode: indented-text
indent-tabs-mode: nil
End:

From fdrake@users.sourceforge.net  Thu Mar 29 18:24:10 2001
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Thu, 29 Mar 2001 10:24:10 -0800
Subject: [Python-checkins] CVS: python/dist/src/Doc/perl python.perl,1.95,1.96
Message-ID: <E14ih5e-0005Q3-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Doc/perl
In directory usw-pr-cvs1:/tmp/cvs-serv20821/perl

Modified Files:
	python.perl 
Log Message:

Remove the spurious space of uncertain origin from the output for function,
method and constructor signatures.  Suggested by Peter Funk on the Doc-SIG
mailing list.

Index: python.perl
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/perl/python.perl,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -r1.95 -r1.96
*** python.perl	2001/03/02 18:57:05	1.95
--- python.perl	2001/03/29 18:24:08	1.96
***************
*** 731,735 ****
                     . "\n</div>");
      }
!     return "<dl><dt>$return_type <b>$idx</b> (<var>$arg_list</var>)\n<dd>"
             . $rcinfo
             . $_
--- 731,735 ----
                     . "\n</div>");
      }
!     return "<dl><dt>$return_type <b>$idx</b>(<var>$arg_list</var>)\n<dd>"
             . $rcinfo
             . $_
***************
*** 786,790 ****
      $idx =~ s/ \(.*\)//;
      $idx =~ s/\(\)<\/tt>/<\/tt>/;
!     return "<dl><dt><b>$idx</b> (<var>$arg_list</var>)\n<dd>" . $_ . '</dl>';
  }

--- 786,790 ----
      $idx =~ s/ \(.*\)//;
      $idx =~ s/\(\)<\/tt>/<\/tt>/;
!     return "<dl><dt><b>$idx</b>(<var>$arg_list</var>)\n<dd>" . $_ . '</dl>';
  }

***************
*** 794,798 ****
      my $arg_list = convert_args(next_argument());
      return "<dl><dt><b><tt class='function'>$function_name</tt></b>"
!       . " (<var>$arg_list</var>)\n"
        . '<dd>'
        . $_
--- 794,798 ----
      my $arg_list = convert_args(next_argument());
      return "<dl><dt><b><tt class='function'>$function_name</tt></b>"
!       . "(<var>$arg_list</var>)\n"
        . '<dd>'
        . $_
***************
*** 808,812 ****
      $prefix =~ s/\(\)//;

!     return "<dt><b>$prefix</b> (<var>$arg_list</var>)\n<dd>" . $_;
  }

--- 808,812 ----
      $prefix =~ s/\(\)//;

!     return "<dt><b>$prefix</b>(<var>$arg_list</var>)\n<dd>" . $_;
  }

***************
*** 817,821 ****
      my $prefix = "<tt class='function'>$function_name</tt>";

!     return "<dt><b>$prefix</b> (<var>$arg_list</var>)\n<dd>" . $_;
  }

--- 817,821 ----
      my $prefix = "<tt class='function'>$function_name</tt>";

!     return "<dt><b>$prefix</b>(<var>$arg_list</var>)\n<dd>" . $_;
  }

***************
*** 896,900 ****
  		"<tt class='$what'>$THIS_CLASS</tt> ($what in $THIS_MODULE)" );
      $idx =~ s/ \(.*\)//;
!     return ("<dl><dt><b>$what $idx</b> (<var>$arg_list</var>)\n<dd>"
              . $_
              . '</dl>');
--- 896,900 ----
  		"<tt class='$what'>$THIS_CLASS</tt> ($what in $THIS_MODULE)" );
      $idx =~ s/ \(.*\)//;
!     return ("<dl><dt><b>$what $idx</b>(<var>$arg_list</var>)\n<dd>"
              . $_
              . '</dl>');
***************
*** 924,928 ****
      $idx =~ s/ \(.*\)//;
      $idx =~ s/\(\)//;
!     return "<dl><dt><b>$idx</b> (<var>$arg_list</var>)\n<dd>" . $_ . '</dl>';
  }

--- 924,928 ----
      $idx =~ s/ \(.*\)//;
      $idx =~ s/\(\)//;
!     return "<dl><dt><b>$idx</b>(<var>$arg_list</var>)\n<dd>" . $_ . '</dl>';
  }

***************
*** 942,946 ****
      $idx =~ s/ \(.*\)//;
      $idx =~ s/\(\)//;
!     return "<dt><b>$idx</b> (<var>$arg_list</var>)\n<dd>"
             . $_;
  }
--- 942,946 ----
      $idx =~ s/ \(.*\)//;
      $idx =~ s/\(\)//;
!     return "<dt><b>$idx</b>(<var>$arg_list</var>)\n<dd>"
             . $_;
  }
***************
*** 952,956 ****
      my $method = next_argument();
      my $arg_list = convert_args(next_argument());
!     return "<dt><b>$method</b> (<var>$arg_list</var>)\n<dd>"
             . $_;
  }
--- 952,956 ----
      my $method = next_argument();
      my $arg_list = convert_args(next_argument());
!     return "<dt><b>$method</b>(<var>$arg_list</var>)\n<dd>"
             . $_;
  }
***************
*** 961,965 ****
      my $method = next_argument();
      my $arg_list = convert_args(next_argument());
!     return "<dl><dt><b>$method</b> (<var>$arg_list</var>)\n<dd>"
             . $_
  	   . '</dl>';
--- 961,965 ----
      my $method = next_argument();
      my $arg_list = convert_args(next_argument());
!     return "<dl><dt><b>$method</b>(<var>$arg_list</var>)\n<dd>"
             . $_
  	   . '</dl>';

From moshez@users.sourceforge.net  Thu Mar 29 19:27:31 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Thu, 29 Mar 2001 11:27:31 -0800
Subject: [Python-checkins] CVS: python/dist/src/Modules _cursesmodule.c,2.39,2.39.2.1
Message-ID: <E14ii4x-0000T0-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv29130

Modified Files:
      Tag: release20-maint
	_cursesmodule.c 
Log Message:
Yay! First fix I'm commiting on the way to 2.0.1
This is supposed to fix compilation problems of the curses
module on SGI, and is based on the patch from 2.39 to 2.40
This should fix bug #116172

>From the 2.39->2.40 log:
* Check for 'sgi' preprocessor symbol, not '__sgi__'
* Surround individual character macros with #ifdef's, instead of making them
  all rely on STRICT_SYSV_CURSES

Metacomment: this is as much to test procedures as it is
to actually fix the bug. If you're a CVS wizard please look
at the checkin message to see I'm commiting correctly,
and e-mail me if not, and I'll do my best to back it out and
reread the docos.

Good luck to me.

Index: _cursesmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_cursesmodule.c,v
retrieving revision 2.39
retrieving revision 2.39.2.1
diff -C2 -r2.39 -r2.39.2.1
*** _cursesmodule.c	2000/09/01 03:46:16	2.39
--- _cursesmodule.c	2001/03/29 19:27:29	2.39.2.1
***************
*** 79,83 ****
  #endif

! #if defined(__sgi__) || defined(__sun__)
  #define STRICT_SYSV_CURSES       /* Don't use ncurses extensions */
  typedef chtype attr_t;           /* No attr_t type is available */
--- 79,91 ----
  #endif

! #ifdef sgi
! /*  This prototype is in <term.h>, but including this header #defines
!     many common symbols (such as "lines") which breaks the curses
!     module in other ways.  So the code will just specify an explicit
!     prototype here. */
! extern char *tigetstr(char *);
! #endif
! 
! #if defined(sgi) || defined(__sun__)
  #define STRICT_SYSV_CURSES       /* Don't use ncurses extensions */
  typedef chtype attr_t;           /* No attr_t type is available */
***************
*** 1740,1750 ****
  	SetDictInt("ACS_SBSB",          (ACS_VLINE));
  	SetDictInt("ACS_SSSS",          (ACS_PLUS));
! #ifndef STRICT_SYSV_CURSES
!   /* The following are never available with strict SYSV curses */
  	SetDictInt("ACS_S3",            (ACS_S3));
  	SetDictInt("ACS_LEQUAL",        (ACS_LEQUAL));
  	SetDictInt("ACS_GEQUAL",        (ACS_GEQUAL));
  	SetDictInt("ACS_PI",            (ACS_PI));
  	SetDictInt("ACS_NEQUAL",        (ACS_NEQUAL));
  	SetDictInt("ACS_STERLING",      (ACS_STERLING));
  #endif
--- 1748,1772 ----
  	SetDictInt("ACS_SBSB",          (ACS_VLINE));
  	SetDictInt("ACS_SSSS",          (ACS_PLUS));
! 
! 	/* The following are never available with strict SYSV curses */
! #ifdef ACS_S3
  	SetDictInt("ACS_S3",            (ACS_S3));
+ #endif
+ #ifdef ACS_S7
+ 	SetDictInt("ACS_S7",            (ACS_S7));
+ #endif
+ #ifdef ACS_LEQUAL
  	SetDictInt("ACS_LEQUAL",        (ACS_LEQUAL));
+ #endif
+ #ifdef ACS_GEQUAL
  	SetDictInt("ACS_GEQUAL",        (ACS_GEQUAL));
+ #endif
+ #ifdef ACS_PI
  	SetDictInt("ACS_PI",            (ACS_PI));
+ #endif
+ #ifdef ACS_NEQUAL
  	SetDictInt("ACS_NEQUAL",        (ACS_NEQUAL));
+ #endif
+ #ifdef ACS_STERLING
  	SetDictInt("ACS_STERLING",      (ACS_STERLING));
  #endif
***************
*** 2271,2280 ****
  	SetDictInt("A_CHARTEXT",        A_CHARTEXT);
  	SetDictInt("A_COLOR",           A_COLOR);
! #ifndef STRICT_SYSV_CURSES
  	SetDictInt("A_HORIZONTAL",      A_HORIZONTAL);
  	SetDictInt("A_LEFT",            A_LEFT);
  	SetDictInt("A_LOW",             A_LOW);
  	SetDictInt("A_RIGHT",           A_RIGHT);
  	SetDictInt("A_TOP",             A_TOP);
  	SetDictInt("A_VERTICAL",        A_VERTICAL);
  #endif
--- 2293,2314 ----
  	SetDictInt("A_CHARTEXT",        A_CHARTEXT);
  	SetDictInt("A_COLOR",           A_COLOR);
! 
! 	/* The following are never available with strict SYSV curses */
! #ifdef A_HORIZONTAL
  	SetDictInt("A_HORIZONTAL",      A_HORIZONTAL);
+ #endif
+ #ifdef A_LEFT
  	SetDictInt("A_LEFT",            A_LEFT);
+ #endif
+ #ifdef A_LOW
  	SetDictInt("A_LOW",             A_LOW);
+ #endif
+ #ifdef A_RIGHT
  	SetDictInt("A_RIGHT",           A_RIGHT);
+ #endif
+ #ifdef A_TOP
  	SetDictInt("A_TOP",             A_TOP);
+ #endif
+ #ifdef A_VERTICAL
  	SetDictInt("A_VERTICAL",        A_VERTICAL);
  #endif

From larsga@users.sourceforge.net  Thu Mar 29 22:02:46 2001
From: larsga@users.sourceforge.net (Lars Marius Garshol)
Date: Thu, 29 Mar 2001 14:02:46 -0800
Subject: [Python-checkins] CVS: test - Imported sources
Message-ID: <E14ikVC-0000jB-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/test
In directory usw-pr-cvs1:/tmp/cvs-serv993

Log Message:
Importing xmlproc test suite.

Status:

Vendor Tag:	LMG
Release Tags:	initial

N test/api/run-test.py
N test/api/unittest.py
N test/api/xptest.py
N test/api/base/nvp-extdtd.txt
N test/api/base/nvp-no-extdtd.txt
N test/api/base/validating.txt
N test/api/docs/ext-pe.dtd
N test/api/docs/doc.dtd
N test/api/docs/doc.xml
N test/api/docs/ext-pe2.dtd
N test/cmd-line/run-test.py
N test/cmd-line/baseline/test1.txt
N test/cmd-line/baseline/test10.txt
N test/cmd-line/baseline/test11.txt
N test/cmd-line/baseline/test12.txt
N test/cmd-line/baseline/test13.txt
N test/cmd-line/baseline/test14.txt
N test/cmd-line/baseline/test15.txt
N test/cmd-line/baseline/test16.txt
N test/cmd-line/baseline/test17.txt
N test/cmd-line/baseline/test18.txt
N test/cmd-line/baseline/test19.txt
N test/cmd-line/baseline/test2.txt
N test/cmd-line/baseline/test20.txt
N test/cmd-line/baseline/test21.txt
N test/cmd-line/baseline/test22.txt
N test/cmd-line/baseline/test23.txt
N test/cmd-line/baseline/test24.txt
N test/cmd-line/baseline/test25.txt
N test/cmd-line/baseline/test26.txt
N test/cmd-line/baseline/test27.txt
N test/cmd-line/baseline/test28.txt
N test/cmd-line/baseline/test29.txt
N test/cmd-line/baseline/test3.txt
N test/cmd-line/baseline/test30.txt
N test/cmd-line/baseline/test31.txt
N test/cmd-line/baseline/test32.txt
N test/cmd-line/baseline/test33.txt
N test/cmd-line/baseline/test34.txt
N test/cmd-line/baseline/test35.txt
N test/cmd-line/baseline/test36.txt
N test/cmd-line/baseline/test37.txt
N test/cmd-line/baseline/test38.txt
N test/cmd-line/baseline/test39.txt
N test/cmd-line/baseline/test4.txt
N test/cmd-line/baseline/test40.txt
N test/cmd-line/baseline/test41.txt
N test/cmd-line/baseline/test42.txt
N test/cmd-line/baseline/test43.txt
N test/cmd-line/baseline/test44.txt
N test/cmd-line/baseline/test45.txt
N test/cmd-line/baseline/test46.txt
N test/cmd-line/baseline/test47.txt
N test/cmd-line/baseline/test48.txt
N test/cmd-line/baseline/test49.txt
N test/cmd-line/baseline/test5.txt
N test/cmd-line/baseline/test50.txt
N test/cmd-line/baseline/test6.txt
N test/cmd-line/baseline/test7.txt
N test/cmd-line/baseline/test8.txt
N test/cmd-line/baseline/test9.txt
N test/cmd-line/in/catalog.soc
N test/cmd-line/in/catalog.xml
N test/cmd-line/in/catalog2.soc
N test/cmd-line/in/catalog2.xml
N test/cmd-line/in/catalog3.soc
N test/cmd-line/in/catalog4.soc
N test/cmd-line/in/doc.xml
N test/cmd-line/in/doc2.xml
N test/cmd-line/in/doc3.xml
N test/cmd-line/in/doc4.xml
N test/cmd-line/in/doc5.xml
N test/cmd-line/in/doc6.xml
N test/cmd-line/in/doc7.dtd
N test/cmd-line/in/doc7.xml
N test/cmd-line/in/nstest2.xml
N test/cmd-line/in/nstest4.xml
N test/oasis/xmlconf.xml
N test/oasis/testcases.dtd
N test/oasis/xmlconformance.xsl
N test/oasis/xmlconf.htm
N test/oasis/xmlconformance.msxsl
N test/oasis/xmlconf-19990712.xml
N test/oasis/xmlconf-19990712.htm
N test/oasis/runtests.py
N test/oasis/sun/cxml.html
N test/oasis/sun/not-wf/attlist01.xml
N test/oasis/sun/not-wf/attlist02.xml
N test/oasis/sun/not-wf/attlist03.xml
N test/oasis/sun/not-wf/attlist04.xml
N test/oasis/sun/not-wf/attlist05.xml
N test/oasis/sun/not-wf/attlist06.xml
N test/oasis/sun/not-wf/attlist07.xml
N test/oasis/sun/not-wf/attlist08.xml
N test/oasis/sun/not-wf/attlist09.xml
N test/oasis/sun/not-wf/attlist10.xml
N test/oasis/sun/not-wf/attlist11.xml
N test/oasis/sun/not-wf/cond.dtd
N test/oasis/sun/not-wf/cond01.xml
N test/oasis/sun/not-wf/cond02.xml
N test/oasis/sun/not-wf/content01.xml
N test/oasis/sun/not-wf/content02.xml
N test/oasis/sun/not-wf/content03.xml
N test/oasis/sun/not-wf/decl01.ent
N test/oasis/sun/not-wf/decl01.xml
N test/oasis/sun/not-wf/dtd00.xml
N test/oasis/sun/not-wf/dtd01.xml
N test/oasis/sun/not-wf/dtd02.xml
N test/oasis/sun/not-wf/dtd03.xml
N test/oasis/sun/not-wf/dtd04.xml
N test/oasis/sun/not-wf/dtd05.xml
N test/oasis/sun/not-wf/dtd07.dtd
N test/oasis/sun/not-wf/dtd07.xml
N test/oasis/sun/not-wf/element00.xml
N test/oasis/sun/not-wf/element01.xml
N test/oasis/sun/not-wf/element02.xml
N test/oasis/sun/not-wf/element03.xml
N test/oasis/sun/not-wf/element04.xml
N test/oasis/sun/not-wf/encoding01.xml
N test/oasis/sun/not-wf/encoding02.xml
N test/oasis/sun/not-wf/encoding03.xml
N test/oasis/sun/not-wf/encoding04.xml
N test/oasis/sun/not-wf/encoding05.xml
N test/oasis/sun/not-wf/encoding06.xml
N test/oasis/sun/not-wf/encoding07.xml
N test/oasis/sun/not-wf/lang01.xml
N test/oasis/sun/not-wf/lang02.xml
N test/oasis/sun/not-wf/lang03.xml
N test/oasis/sun/not-wf/lang04.xml
N test/oasis/sun/not-wf/lang05.xml
N test/oasis/sun/not-wf/lang06.xml
N test/oasis/sun/not-wf/pi.xml
N test/oasis/sun/not-wf/pubid01.xml
N test/oasis/sun/not-wf/pubid02.xml
N test/oasis/sun/not-wf/pubid03.xml
N test/oasis/sun/not-wf/pubid04.xml
N test/oasis/sun/not-wf/pubid05.xml
N test/oasis/sun/not-wf/sgml01.xml
N test/oasis/sun/not-wf/sgml02.xml
N test/oasis/sun/not-wf/sgml03.xml
N test/oasis/sun/not-wf/sgml04.xml
N test/oasis/sun/not-wf/sgml05.xml
N test/oasis/sun/not-wf/sgml06.xml
N test/oasis/sun/not-wf/sgml07.xml
N test/oasis/sun/not-wf/sgml08.xml
N test/oasis/sun/not-wf/sgml09.xml
N test/oasis/sun/not-wf/sgml10.xml
N test/oasis/sun/not-wf/sgml11.xml
N test/oasis/sun/not-wf/sgml12.xml
N test/oasis/sun/not-wf/sgml13.xml
N test/oasis/sun/not-wf/uri01.xml
N test/oasis/sun/not-wf/sun-not-wf.xml
N test/oasis/sun/valid/dtd00.xml
N test/oasis/sun/valid/dtd01.xml
N test/oasis/sun/valid/dtdtest.dtd
N test/oasis/sun/valid/element.xml
N test/oasis/sun/valid/empty.xml
N test/oasis/sun/valid/ext01.ent
N test/oasis/sun/valid/ext01.xml
N test/oasis/sun/valid/ext02.xml
N test/oasis/sun/valid/not-sa01.xml
N test/oasis/sun/valid/not-sa02.xml
N test/oasis/sun/valid/not-sa03.xml
N test/oasis/sun/valid/not-sa04.xml
N test/oasis/sun/valid/notation01.dtd
N test/oasis/sun/valid/notation01.xml
N test/oasis/sun/valid/null.ent
N test/oasis/sun/valid/optional.xml
N test/oasis/sun/valid/pe00.dtd
N test/oasis/sun/valid/pe00.xml
N test/oasis/sun/valid/pe01.xml
N test/oasis/sun/valid/pe02.xml
N test/oasis/sun/valid/required00.xml
N test/oasis/sun/valid/sa.dtd
N test/oasis/sun/valid/sa01.xml
N test/oasis/sun/valid/sa02.xml
N test/oasis/sun/valid/sa03.xml
N test/oasis/sun/valid/sa04.xml
N test/oasis/sun/valid/sa05.xml
N test/oasis/sun/valid/sgml01.xml
N test/oasis/sun/valid/v-lang01.xml
N test/oasis/sun/valid/v-lang02.xml
N test/oasis/sun/valid/v-lang03.xml
N test/oasis/sun/valid/v-lang04.xml
N test/oasis/sun/valid/v-lang05.xml
N test/oasis/sun/valid/v-lang06.xml
N test/oasis/sun/valid/sun-valid.xml
N test/oasis/sun/valid/out/dtd00.xml
N test/oasis/sun/valid/out/dtd01.xml
N test/oasis/sun/valid/out/element.xml
N test/oasis/sun/valid/out/empty.xml
N test/oasis/sun/valid/out/ext01.xml
N test/oasis/sun/valid/out/ext02.xml
N test/oasis/sun/valid/out/not-sa01.xml
N test/oasis/sun/valid/out/not-sa02.xml
N test/oasis/sun/valid/out/not-sa03.xml
N test/oasis/sun/valid/out/not-sa04.xml
N test/oasis/sun/valid/out/notation01.xml
N test/oasis/sun/valid/out/optional.xml
N test/oasis/sun/valid/out/pe00.xml
N test/oasis/sun/valid/out/pe01.xml
N test/oasis/sun/valid/out/pe02.xml
N test/oasis/sun/valid/out/required00.xml
N test/oasis/sun/valid/out/sa01.xml
N test/oasis/sun/valid/out/sa02.xml
N test/oasis/sun/valid/out/sa03.xml
N test/oasis/sun/valid/out/sa04.xml
N test/oasis/sun/valid/out/sa05.xml
N test/oasis/sun/valid/out/sgml01.xml
N test/oasis/sun/valid/out/v-lang01.xml
N test/oasis/sun/valid/out/v-lang02.xml
N test/oasis/sun/valid/out/v-lang03.xml
N test/oasis/sun/valid/out/v-lang04.xml
N test/oasis/sun/valid/out/v-lang05.xml
N test/oasis/sun/valid/out/v-lang06.xml
N test/oasis/sun/invalid/attr01.xml
N test/oasis/sun/invalid/attr02.xml
N test/oasis/sun/invalid/attr03.xml
N test/oasis/sun/invalid/attr04.xml
N test/oasis/sun/invalid/attr05.xml
N test/oasis/sun/invalid/attr06.xml
N test/oasis/sun/invalid/attr07.xml
N test/oasis/sun/invalid/attr08.xml
N test/oasis/sun/invalid/attr09.xml
N test/oasis/sun/invalid/attr10.xml
N test/oasis/sun/invalid/attr11.xml
N test/oasis/sun/invalid/attr12.xml
N test/oasis/sun/invalid/attr13.xml
N test/oasis/sun/invalid/attr14.xml
N test/oasis/sun/invalid/attr15.xml
N test/oasis/sun/invalid/attr16.xml
N test/oasis/sun/invalid/dtd01.xml
N test/oasis/sun/invalid/dtd02.xml
N test/oasis/sun/invalid/dtd03.xml
N test/oasis/sun/invalid/dtd06.xml
N test/oasis/sun/invalid/el01.xml
N test/oasis/sun/invalid/el02.xml
N test/oasis/sun/invalid/el03.xml
N test/oasis/sun/invalid/el04.xml
N test/oasis/sun/invalid/el05.xml
N test/oasis/sun/invalid/el06.xml
N test/oasis/sun/invalid/id01.xml
N test/oasis/sun/invalid/id02.xml
N test/oasis/sun/invalid/id03.xml
N test/oasis/sun/invalid/id04.xml
N test/oasis/sun/invalid/id05.xml
N test/oasis/sun/invalid/id06.xml
N test/oasis/sun/invalid/id07.xml
N test/oasis/sun/invalid/id08.xml
N test/oasis/sun/invalid/id09.xml
N test/oasis/sun/invalid/not-sa01.xml
N test/oasis/sun/invalid/not-sa02.xml
N test/oasis/sun/invalid/not-sa03.xml
N test/oasis/sun/invalid/not-sa04.xml
N test/oasis/sun/invalid/not-sa05.xml
N test/oasis/sun/invalid/not-sa06.xml
N test/oasis/sun/invalid/not-sa07.xml
N test/oasis/sun/invalid/not-sa08.xml
N test/oasis/sun/invalid/not-sa09.xml
N test/oasis/sun/invalid/not-sa10.xml
N test/oasis/sun/invalid/not-sa11.xml
N test/oasis/sun/invalid/not-sa12.xml
N test/oasis/sun/invalid/not-sa13.xml
N test/oasis/sun/invalid/not-sa14.xml
N test/oasis/sun/invalid/optional01.xml
N test/oasis/sun/invalid/optional02.xml
N test/oasis/sun/invalid/optional03.xml
N test/oasis/sun/invalid/optional04.xml
N test/oasis/sun/invalid/optional05.xml
N test/oasis/sun/invalid/optional06.xml
N test/oasis/sun/invalid/optional07.xml
N test/oasis/sun/invalid/optional08.xml
N test/oasis/sun/invalid/optional09.xml
N test/oasis/sun/invalid/optional10.xml
N test/oasis/sun/invalid/optional11.xml
N test/oasis/sun/invalid/optional12.xml
N test/oasis/sun/invalid/optional13.xml
N test/oasis/sun/invalid/optional14.xml
N test/oasis/sun/invalid/optional15.xml
N test/oasis/sun/invalid/optional16.xml
N test/oasis/sun/invalid/optional17.xml
N test/oasis/sun/invalid/optional18.xml
N test/oasis/sun/invalid/optional19.xml
N test/oasis/sun/invalid/optional20.xml
N test/oasis/sun/invalid/optional21.xml
N test/oasis/sun/invalid/optional22.xml
N test/oasis/sun/invalid/optional23.xml
N test/oasis/sun/invalid/optional24.xml
N test/oasis/sun/invalid/optional25.xml
N test/oasis/sun/invalid/pe01.dtd
N test/oasis/sun/invalid/pe01.ent
N test/oasis/sun/invalid/pe01.xml
N test/oasis/sun/invalid/required00.xml
N test/oasis/sun/invalid/required01.xml
N test/oasis/sun/invalid/required02.xml
N test/oasis/sun/invalid/root.xml
N test/oasis/sun/invalid/utf16b.xml
N test/oasis/sun/invalid/utf16l.xml
N test/oasis/sun/invalid/sun-invalid.xml
N test/oasis/sun/error/sun-error.xml
N test/oasis/oasis/p01fail1.xml
N test/oasis/oasis/p01fail2.xml
N test/oasis/oasis/p01fail3.xml
N test/oasis/oasis/p01fail4.xml
N test/oasis/oasis/p01pass1.xml
N test/oasis/oasis/p01pass2.xml
N test/oasis/oasis/p01pass3.xml
N test/oasis/oasis/p02fail1.xml
N test/oasis/oasis/p02fail10.xml
N test/oasis/oasis/p02fail11.xml
N test/oasis/oasis/p02fail12.xml
N test/oasis/oasis/p02fail13.xml
N test/oasis/oasis/p02fail14.xml
N test/oasis/oasis/p02fail15.xml
N test/oasis/oasis/p02fail16.xml
N test/oasis/oasis/p02fail17.xml
N test/oasis/oasis/p02fail18.xml
N test/oasis/oasis/p02fail19.xml
N test/oasis/oasis/p02fail2.xml
N test/oasis/oasis/p02fail20.xml
N test/oasis/oasis/p02fail21.xml
N test/oasis/oasis/p02fail22.xml
N test/oasis/oasis/p02fail23.xml
N test/oasis/oasis/p02fail24.xml
N test/oasis/oasis/p02fail25.xml
N test/oasis/oasis/p02fail26.xml
N test/oasis/oasis/p02fail27.xml
N test/oasis/oasis/p02fail28.xml
N test/oasis/oasis/p02fail29.xml
N test/oasis/oasis/p02fail3.xml
N test/oasis/oasis/p02fail30.xml
N test/oasis/oasis/p02fail31.xml
N test/oasis/oasis/p02fail4.xml
N test/oasis/oasis/p02fail5.xml
N test/oasis/oasis/p02fail6.xml
N test/oasis/oasis/p02fail7.xml
N test/oasis/oasis/p02fail8.xml
N test/oasis/oasis/p02fail9.xml
N test/oasis/oasis/p02pass1.xml
N test/oasis/oasis/p03fail1.xml
N test/oasis/oasis/p03fail10.xml
N test/oasis/oasis/p03fail11.xml
N test/oasis/oasis/p03fail12.xml
N test/oasis/oasis/p03fail13.xml
N test/oasis/oasis/p03fail14.xml
N test/oasis/oasis/p03fail15.xml
N test/oasis/oasis/p03fail16.xml
N test/oasis/oasis/p03fail17.xml
N test/oasis/oasis/p03fail18.xml
N test/oasis/oasis/p03fail19.xml
N test/oasis/oasis/p03fail2.xml
N test/oasis/oasis/p03fail20.xml
N test/oasis/oasis/p03fail21.xml
N test/oasis/oasis/p03fail22.xml
N test/oasis/oasis/p03fail23.xml
N test/oasis/oasis/p03fail24.xml
N test/oasis/oasis/p03fail25.xml
N test/oasis/oasis/p03fail26.xml
N test/oasis/oasis/p03fail27.xml
N test/oasis/oasis/p03fail28.xml
N test/oasis/oasis/p03fail29.xml
N test/oasis/oasis/p03fail3.xml
N test/oasis/oasis/p03fail4.xml
N test/oasis/oasis/p03fail5.xml
N test/oasis/oasis/p03fail7.xml
N test/oasis/oasis/p03fail8.xml
N test/oasis/oasis/p03fail9.xml
N test/oasis/oasis/p03pass1.xml
N test/oasis/oasis/p04fail1.xml
N test/oasis/oasis/p04fail2.xml
N test/oasis/oasis/p04fail3.xml
N test/oasis/oasis/p04pass1.xml
N test/oasis/oasis/p05fail1.xml
N test/oasis/oasis/p05fail2.xml
N test/oasis/oasis/p05fail3.xml
N test/oasis/oasis/p05fail4.xml
N test/oasis/oasis/p05fail5.xml
N test/oasis/oasis/p05pass1.xml
N test/oasis/oasis/p06fail1.xml
N test/oasis/oasis/p06pass1.xml
N test/oasis/oasis/p07pass1.xml
N test/oasis/oasis/p08fail1.xml
N test/oasis/oasis/p08fail2.xml
N test/oasis/oasis/p08pass1.xml
N test/oasis/oasis/p09fail1.dtd
N test/oasis/oasis/p09fail1.xml
N test/oasis/oasis/p09fail2.dtd
N test/oasis/oasis/p09fail2.xml
N test/oasis/oasis/p09fail3.xml
N test/oasis/oasis/p09fail4.xml
N test/oasis/oasis/p09fail5.xml
N test/oasis/oasis/p09pass1.dtd
N test/oasis/oasis/p09pass1.xml
N test/oasis/oasis/p10fail1.xml
N test/oasis/oasis/p10fail2.xml
N test/oasis/oasis/p10fail3.xml
N test/oasis/oasis/p10pass1.xml
N test/oasis/oasis/p11fail1.xml
N test/oasis/oasis/p11fail2.xml
N test/oasis/oasis/p11pass1.xml
N test/oasis/oasis/p12fail1.xml
N test/oasis/oasis/p12fail2.xml
N test/oasis/oasis/p12fail3.xml
N test/oasis/oasis/p12fail4.xml
N test/oasis/oasis/p12fail5.xml
N test/oasis/oasis/p12fail6.xml
N test/oasis/oasis/p12fail7.xml
N test/oasis/oasis/p12pass1.xml
N test/oasis/oasis/p14fail1.xml
N test/oasis/oasis/p14fail2.xml
N test/oasis/oasis/p14fail3.xml
N test/oasis/oasis/p14pass1.xml
N test/oasis/oasis/p15fail1.xml
N test/oasis/oasis/p15fail2.xml
N test/oasis/oasis/p15fail3.xml
N test/oasis/oasis/p15pass1.xml
N test/oasis/oasis/p16fail1.xml
N test/oasis/oasis/p16fail2.xml
N test/oasis/oasis/p16fail3.xml
N test/oasis/oasis/p16pass1.xml
N test/oasis/oasis/p16pass2.xml
N test/oasis/oasis/p16pass3.xml
N test/oasis/oasis/p18fail1.xml
N test/oasis/oasis/p18fail2.xml
N test/oasis/oasis/p18fail3.xml
N test/oasis/oasis/p18pass1.xml
N test/oasis/oasis/p22fail1.xml
N test/oasis/oasis/p22fail2.xml
N test/oasis/oasis/p22pass1.xml
N test/oasis/oasis/p22pass2.xml
N test/oasis/oasis/p22pass3.xml
N test/oasis/oasis/p22pass4.xml
N test/oasis/oasis/p22pass5.xml
N test/oasis/oasis/p22pass6.xml
N test/oasis/oasis/p23fail1.xml
N test/oasis/oasis/p23fail2.xml
N test/oasis/oasis/p23fail3.xml
N test/oasis/oasis/p23fail4.xml
N test/oasis/oasis/p23fail5.xml
N test/oasis/oasis/p23pass1.xml
N test/oasis/oasis/p23pass2.xml
N test/oasis/oasis/p23pass3.xml
N test/oasis/oasis/p23pass4.xml
N test/oasis/oasis/p24fail1.xml
N test/oasis/oasis/p24fail2.xml
N test/oasis/oasis/p24pass1.xml
N test/oasis/oasis/p24pass2.xml
N test/oasis/oasis/p24pass3.xml
N test/oasis/oasis/p24pass4.xml
N test/oasis/oasis/p25fail1.xml
N test/oasis/oasis/p25pass1.xml
N test/oasis/oasis/p25pass2.xml
N test/oasis/oasis/p26fail1.xml
N test/oasis/oasis/p26fail2.xml
N test/oasis/oasis/p26pass1.xml
N test/oasis/oasis/p27fail1.xml
N test/oasis/oasis/p27pass1.xml
N test/oasis/oasis/p27pass2.xml
N test/oasis/oasis/p27pass3.xml
N test/oasis/oasis/p27pass4.xml
N test/oasis/oasis/p28fail1.xml
N test/oasis/oasis/p28pass1.xml
N test/oasis/oasis/p28pass2.xml
N test/oasis/oasis/p28pass3.xml
N test/oasis/oasis/p28pass4.dtd
N test/oasis/oasis/p28pass4.xml
N test/oasis/oasis/p28pass5.dtd
N test/oasis/oasis/p28pass5.xml
N test/oasis/oasis/p29fail1.xml
N test/oasis/oasis/p29pass1.xml
N test/oasis/oasis/p30fail1.dtd
N test/oasis/oasis/p30fail1.xml
N test/oasis/oasis/p30pass1.dtd
N test/oasis/oasis/p30pass1.xml
N test/oasis/oasis/p30pass2.dtd
N test/oasis/oasis/p30pass2.xml
N test/oasis/oasis/p31fail1.dtd
N test/oasis/oasis/p31fail1.xml
N test/oasis/oasis/p31pass1.dtd
N test/oasis/oasis/p31pass1.xml
N test/oasis/oasis/p31pass2.dtd
N test/oasis/oasis/p31pass2.xml
N test/oasis/oasis/p32fail1.xml
N test/oasis/oasis/p32fail2.xml
N test/oasis/oasis/p32fail3.xml
N test/oasis/oasis/p32fail4.xml
N test/oasis/oasis/p32fail5.xml
N test/oasis/oasis/p32pass1.xml
N test/oasis/oasis/p32pass2.xml
N test/oasis/oasis/p39fail1.xml
N test/oasis/oasis/p39fail2.xml
N test/oasis/oasis/p39fail3.xml
N test/oasis/oasis/p39fail4.xml
N test/oasis/oasis/p39fail5.xml
N test/oasis/oasis/p39pass1.xml
N test/oasis/oasis/p39pass2.xml
N test/oasis/oasis/p40fail1.xml
N test/oasis/oasis/p40fail2.xml
N test/oasis/oasis/p40fail3.xml
N test/oasis/oasis/p40fail4.xml
N test/oasis/oasis/p40pass1.xml
N test/oasis/oasis/p40pass2.xml
N test/oasis/oasis/p40pass3.xml
N test/oasis/oasis/p40pass4.xml
N test/oasis/oasis/p41fail1.xml
N test/oasis/oasis/p41fail2.xml
N test/oasis/oasis/p41fail3.xml
N test/oasis/oasis/p41pass1.xml
N test/oasis/oasis/p41pass2.xml
N test/oasis/oasis/p42fail1.xml
N test/oasis/oasis/p42fail2.xml
N test/oasis/oasis/p42fail3.xml
N test/oasis/oasis/p42pass1.xml
N test/oasis/oasis/p42pass2.xml
N test/oasis/oasis/p43fail1.xml
N test/oasis/oasis/p43fail2.xml
N test/oasis/oasis/p43fail3.xml
N test/oasis/oasis/p43pass1.xml
N test/oasis/oasis/p44fail1.xml
N test/oasis/oasis/p44fail2.xml
N test/oasis/oasis/p44fail3.xml
N test/oasis/oasis/p44fail4.xml
N test/oasis/oasis/p44fail5.xml
N test/oasis/oasis/p44pass1.xml
N test/oasis/oasis/p44pass2.xml
N test/oasis/oasis/p44pass3.xml
N test/oasis/oasis/p44pass4.xml
N test/oasis/oasis/p44pass5.xml
N test/oasis/oasis/p45fail1.xml
N test/oasis/oasis/p45fail2.xml
N test/oasis/oasis/p45fail3.xml
N test/oasis/oasis/p45fail4.xml
N test/oasis/oasis/p45pass1.xml
N test/oasis/oasis/p46fail1.xml
N test/oasis/oasis/p46fail2.xml
N test/oasis/oasis/p46fail3.xml
N test/oasis/oasis/p46fail4.xml
N test/oasis/oasis/p46fail5.xml
N test/oasis/oasis/p46fail6.xml
N test/oasis/oasis/p46pass1.xml
N test/oasis/oasis/p47fail1.xml
N test/oasis/oasis/p47fail2.xml
N test/oasis/oasis/p47fail3.xml
N test/oasis/oasis/p47fail4.xml
N test/oasis/oasis/p47pass1.xml
N test/oasis/oasis/p48fail1.xml
N test/oasis/oasis/p48fail2.xml
N test/oasis/oasis/p48pass1.xml
N test/oasis/oasis/p49fail1.xml
N test/oasis/oasis/p49pass1.xml
N test/oasis/oasis/p50fail1.xml
N test/oasis/oasis/p50pass1.xml
N test/oasis/oasis/p51fail1.xml
N test/oasis/oasis/p51fail2.xml
N test/oasis/oasis/p51fail3.xml
N test/oasis/oasis/p51fail4.xml
N test/oasis/oasis/p51fail5.xml
N test/oasis/oasis/p51fail6.xml
N test/oasis/oasis/p51fail7.xml
N test/oasis/oasis/p51pass1.xml
N test/oasis/oasis/p52fail1.xml
N test/oasis/oasis/p52fail2.xml
N test/oasis/oasis/p52pass1.xml
N test/oasis/oasis/p53fail1.xml
N test/oasis/oasis/p53fail2.xml
N test/oasis/oasis/p53fail3.xml
N test/oasis/oasis/p53fail4.xml
N test/oasis/oasis/p53fail5.xml
N test/oasis/oasis/p53pass1.xml
N test/oasis/oasis/p54fail1.xml
N test/oasis/oasis/p54pass1.xml
N test/oasis/oasis/p55fail1.xml
N test/oasis/oasis/p55pass1.xml
N test/oasis/oasis/p56fail1.xml
N test/oasis/oasis/p56fail2.xml
N test/oasis/oasis/p56fail3.xml
N test/oasis/oasis/p56fail4.xml
N test/oasis/oasis/p56fail5.xml
N test/oasis/oasis/p56pass1.xml
N test/oasis/oasis/p57fail1.xml
N test/oasis/oasis/p57pass1.xml
N test/oasis/oasis/p58fail1.xml
N test/oasis/oasis/p58fail2.xml
N test/oasis/oasis/p58fail3.xml
N test/oasis/oasis/p58fail4.xml
N test/oasis/oasis/p58fail5.xml
N test/oasis/oasis/p58fail6.xml
N test/oasis/oasis/p58fail7.xml
N test/oasis/oasis/p58fail8.xml
N test/oasis/oasis/p58pass1.xml
N test/oasis/oasis/p59fail1.xml
N test/oasis/oasis/p59fail2.xml
N test/oasis/oasis/p59fail3.xml
N test/oasis/oasis/p59pass1.xml
N test/oasis/oasis/p60fail1.xml
N test/oasis/oasis/p60fail2.xml
N test/oasis/oasis/p60fail3.xml
N test/oasis/oasis/p60fail4.xml
N test/oasis/oasis/p60fail5.xml
N test/oasis/oasis/p60pass1.xml
N test/oasis/oasis/p61fail1.dtd
N test/oasis/oasis/p61fail1.xml
N test/oasis/oasis/p61pass1.dtd
N test/oasis/oasis/p61pass1.xml
N test/oasis/oasis/p62fail1.dtd
N test/oasis/oasis/p62fail1.xml
N test/oasis/oasis/p62fail2.dtd
N test/oasis/oasis/p62fail2.xml
N test/oasis/oasis/p62pass1.dtd
N test/oasis/oasis/p62pass1.xml
N test/oasis/oasis/p63fail1.dtd
N test/oasis/oasis/p63fail1.xml
N test/oasis/oasis/p63fail2.dtd
N test/oasis/oasis/p63fail2.xml
N test/oasis/oasis/p63pass1.dtd
N test/oasis/oasis/p63pass1.xml
N test/oasis/oasis/p64fail1.dtd
N test/oasis/oasis/p64fail1.xml
N test/oasis/oasis/p64fail2.dtd
N test/oasis/oasis/p64fail2.xml
N test/oasis/oasis/p64pass1.dtd
N test/oasis/oasis/p64pass1.xml
N test/oasis/oasis/p66fail1.xml
N test/oasis/oasis/p66fail2.xml
N test/oasis/oasis/p66fail3.xml
N test/oasis/oasis/p66fail4.xml
N test/oasis/oasis/p66fail5.xml
N test/oasis/oasis/p66fail6.xml
N test/oasis/oasis/p66pass1.xml
N test/oasis/oasis/p68fail1.xml
N test/oasis/oasis/p68fail2.xml
N test/oasis/oasis/p68fail3.xml
N test/oasis/oasis/p68pass1.xml
N test/oasis/oasis/p69fail1.xml
N test/oasis/oasis/p69fail2.xml
N test/oasis/oasis/p69fail3.xml
N test/oasis/oasis/p69pass1.xml
N test/oasis/oasis/p70fail1.xml
N test/oasis/oasis/p70pass1.xml
N test/oasis/oasis/p71fail1.xml
N test/oasis/oasis/p71fail2.xml
N test/oasis/oasis/p71fail3.xml
N test/oasis/oasis/p71fail4.xml
N test/oasis/oasis/p71pass1.xml
N test/oasis/oasis/p72fail1.xml
N test/oasis/oasis/p72fail2.xml
N test/oasis/oasis/p72fail3.xml
N test/oasis/oasis/p72fail4.xml
N test/oasis/oasis/p72pass1.xml
N test/oasis/oasis/p73fail1.xml
N test/oasis/oasis/p73fail2.xml
N test/oasis/oasis/p73fail3.xml
N test/oasis/oasis/p73fail4.xml
N test/oasis/oasis/p73fail5.xml
N test/oasis/oasis/p73pass1.xml
N test/oasis/oasis/p74fail1.xml
N test/oasis/oasis/p74fail2.xml
N test/oasis/oasis/p74fail3.xml
N test/oasis/oasis/p74pass1.xml
N test/oasis/oasis/p75fail1.xml
N test/oasis/oasis/p75fail2.xml
N test/oasis/oasis/p75fail3.xml
N test/oasis/oasis/p75fail4.xml
N test/oasis/oasis/p75fail5.xml
N test/oasis/oasis/p75fail6.xml
N test/oasis/oasis/p75pass1.xml
N test/oasis/oasis/p76fail1.xml
N test/oasis/oasis/p76fail2.xml
N test/oasis/oasis/p76fail3.xml
N test/oasis/oasis/p76fail4.xml
N test/oasis/oasis/p76pass1.xml
N test/oasis/oasis/oasis.xml
N test/oasis/japanese/pr-xml-euc-jp.xml
N test/oasis/japanese/pr-xml-iso-2022-jp.xml
N test/oasis/japanese/pr-xml-little-endian.xml
N test/oasis/japanese/pr-xml-shift_jis.xml
N test/oasis/japanese/pr-xml-utf-16.xml
N test/oasis/japanese/pr-xml-utf-8.xml
N test/oasis/japanese/weekly-euc-jp.dtd
N test/oasis/japanese/weekly-euc-jp.xml
N test/oasis/japanese/weekly-iso-2022-jp.dtd
N test/oasis/japanese/weekly-iso-2022-jp.xml
N test/oasis/japanese/weekly-little-endian.xml
N test/oasis/japanese/weekly-shift_jis.dtd
N test/oasis/japanese/weekly-shift_jis.xml
N test/oasis/japanese/weekly-utf-16.dtd
N test/oasis/japanese/weekly-utf-16.xml
N test/oasis/japanese/weekly-utf-8.dtd
N test/oasis/japanese/weekly-utf-8.xml
N test/oasis/japanese/japanese.xml
N test/oasis/xmltest/readme.html
N test/oasis/xmltest/canonxml.html
N test/oasis/xmltest/xmltest.xml
N test/oasis/xmltest/invalid/001.xml
N test/oasis/xmltest/invalid/002.xml
N test/oasis/xmltest/invalid/003.xml
N test/oasis/xmltest/invalid/004.xml
N test/oasis/xmltest/invalid/005.xml
N test/oasis/xmltest/invalid/006.xml
N test/oasis/xmltest/invalid/001.ent
N test/oasis/xmltest/invalid/002.ent
N test/oasis/xmltest/invalid/003.ent
N test/oasis/xmltest/invalid/004.ent
N test/oasis/xmltest/invalid/005.ent
N test/oasis/xmltest/invalid/006.ent
N test/oasis/xmltest/valid/not-sa/001.xml
N test/oasis/xmltest/valid/not-sa/002.xml
N test/oasis/xmltest/valid/not-sa/003.xml
N test/oasis/xmltest/valid/not-sa/004.xml
N test/oasis/xmltest/valid/not-sa/005.xml
N test/oasis/xmltest/valid/not-sa/006.xml
N test/oasis/xmltest/valid/not-sa/007.xml
N test/oasis/xmltest/valid/not-sa/008.xml
N test/oasis/xmltest/valid/not-sa/009.xml
N test/oasis/xmltest/valid/not-sa/010.xml
N test/oasis/xmltest/valid/not-sa/011.xml
N test/oasis/xmltest/valid/not-sa/012.xml
N test/oasis/xmltest/valid/not-sa/013.xml
N test/oasis/xmltest/valid/not-sa/014.xml
N test/oasis/xmltest/valid/not-sa/015.xml
N test/oasis/xmltest/valid/not-sa/016.xml
N test/oasis/xmltest/valid/not-sa/017.xml
N test/oasis/xmltest/valid/not-sa/018.xml
N test/oasis/xmltest/valid/not-sa/019.xml
N test/oasis/xmltest/valid/not-sa/020.xml
N test/oasis/xmltest/valid/not-sa/021.xml
N test/oasis/xmltest/valid/not-sa/022.xml
N test/oasis/xmltest/valid/not-sa/023.xml
N test/oasis/xmltest/valid/not-sa/024.xml
N test/oasis/xmltest/valid/not-sa/025.xml
N test/oasis/xmltest/valid/not-sa/026.xml
N test/oasis/xmltest/valid/not-sa/027.xml
N test/oasis/xmltest/valid/not-sa/028.xml
N test/oasis/xmltest/valid/not-sa/029.xml
N test/oasis/xmltest/valid/not-sa/030.xml
N test/oasis/xmltest/valid/not-sa/031.xml
N test/oasis/xmltest/valid/not-sa/001.ent
N test/oasis/xmltest/valid/not-sa/002.ent
N test/oasis/xmltest/valid/not-sa/003-1.ent
N test/oasis/xmltest/valid/not-sa/003-2.ent
N test/oasis/xmltest/valid/not-sa/004-1.ent
N test/oasis/xmltest/valid/not-sa/004-2.ent
N test/oasis/xmltest/valid/not-sa/005-1.ent
N test/oasis/xmltest/valid/not-sa/005-2.ent
N test/oasis/xmltest/valid/not-sa/006.ent
N test/oasis/xmltest/valid/not-sa/007.ent
N test/oasis/xmltest/valid/not-sa/008.ent
N test/oasis/xmltest/valid/not-sa/009.ent
N test/oasis/xmltest/valid/not-sa/010.ent
N test/oasis/xmltest/valid/not-sa/011.ent
N test/oasis/xmltest/valid/not-sa/012.ent
N test/oasis/xmltest/valid/not-sa/013.ent
N test/oasis/xmltest/valid/not-sa/014.ent
N test/oasis/xmltest/valid/not-sa/015.ent
N test/oasis/xmltest/valid/not-sa/016.ent
N test/oasis/xmltest/valid/not-sa/017.ent
N test/oasis/xmltest/valid/not-sa/018.ent
N test/oasis/xmltest/valid/not-sa/019.ent
N test/oasis/xmltest/valid/not-sa/020.ent
N test/oasis/xmltest/valid/not-sa/021.ent
N test/oasis/xmltest/valid/not-sa/022.ent
N test/oasis/xmltest/valid/not-sa/023.ent
N test/oasis/xmltest/valid/not-sa/024.ent
N test/oasis/xmltest/valid/not-sa/025.ent
N test/oasis/xmltest/valid/not-sa/026.ent
N test/oasis/xmltest/valid/not-sa/027.ent
N test/oasis/xmltest/valid/not-sa/028.ent
N test/oasis/xmltest/valid/not-sa/029.ent
N test/oasis/xmltest/valid/not-sa/030.ent
N test/oasis/xmltest/valid/not-sa/031-1.ent
N test/oasis/xmltest/valid/not-sa/031-2.ent
N test/oasis/xmltest/valid/not-sa/out/001.xml
N test/oasis/xmltest/valid/not-sa/out/002.xml
N test/oasis/xmltest/valid/not-sa/out/003.xml
N test/oasis/xmltest/valid/not-sa/out/004.xml
N test/oasis/xmltest/valid/not-sa/out/005.xml
N test/oasis/xmltest/valid/not-sa/out/006.xml
N test/oasis/xmltest/valid/not-sa/out/007.xml
N test/oasis/xmltest/valid/not-sa/out/008.xml
N test/oasis/xmltest/valid/not-sa/out/009.xml
N test/oasis/xmltest/valid/not-sa/out/010.xml
N test/oasis/xmltest/valid/not-sa/out/011.xml
N test/oasis/xmltest/valid/not-sa/out/012.xml
N test/oasis/xmltest/valid/not-sa/out/013.xml
N test/oasis/xmltest/valid/not-sa/out/014.xml
N test/oasis/xmltest/valid/not-sa/out/015.xml
N test/oasis/xmltest/valid/not-sa/out/016.xml
N test/oasis/xmltest/valid/not-sa/out/017.xml
N test/oasis/xmltest/valid/not-sa/out/018.xml
N test/oasis/xmltest/valid/not-sa/out/019.xml
N test/oasis/xmltest/valid/not-sa/out/020.xml
N test/oasis/xmltest/valid/not-sa/out/021.xml
N test/oasis/xmltest/valid/not-sa/out/022.xml
N test/oasis/xmltest/valid/not-sa/out/023.xml
N test/oasis/xmltest/valid/not-sa/out/024.xml
N test/oasis/xmltest/valid/not-sa/out/025.xml
N test/oasis/xmltest/valid/not-sa/out/026.xml
N test/oasis/xmltest/valid/not-sa/out/027.xml
N test/oasis/xmltest/valid/not-sa/out/028.xml
N test/oasis/xmltest/valid/not-sa/out/029.xml
N test/oasis/xmltest/valid/not-sa/out/030.xml
N test/oasis/xmltest/valid/not-sa/out/031.xml
N test/oasis/xmltest/valid/ext-sa/001.xml
N test/oasis/xmltest/valid/ext-sa/002.xml
N test/oasis/xmltest/valid/ext-sa/003.xml
N test/oasis/xmltest/valid/ext-sa/004.xml
N test/oasis/xmltest/valid/ext-sa/005.xml
N test/oasis/xmltest/valid/ext-sa/006.xml
N test/oasis/xmltest/valid/ext-sa/007.xml
N test/oasis/xmltest/valid/ext-sa/008.xml
N test/oasis/xmltest/valid/ext-sa/009.xml
N test/oasis/xmltest/valid/ext-sa/010.xml
N test/oasis/xmltest/valid/ext-sa/011.xml
N test/oasis/xmltest/valid/ext-sa/012.xml
N test/oasis/xmltest/valid/ext-sa/013.xml
N test/oasis/xmltest/valid/ext-sa/014.xml
N test/oasis/xmltest/valid/ext-sa/001.ent
N test/oasis/xmltest/valid/ext-sa/002.ent
N test/oasis/xmltest/valid/ext-sa/003.ent
N test/oasis/xmltest/valid/ext-sa/004.ent
N test/oasis/xmltest/valid/ext-sa/005.ent
N test/oasis/xmltest/valid/ext-sa/006.ent
N test/oasis/xmltest/valid/ext-sa/007.ent
N test/oasis/xmltest/valid/ext-sa/008.ent
N test/oasis/xmltest/valid/ext-sa/009.ent
N test/oasis/xmltest/valid/ext-sa/010.ent
N test/oasis/xmltest/valid/ext-sa/011.ent
N test/oasis/xmltest/valid/ext-sa/012.ent
N test/oasis/xmltest/valid/ext-sa/013.ent
N test/oasis/xmltest/valid/ext-sa/014.ent
N test/oasis/xmltest/valid/ext-sa/out/001.xml
N test/oasis/xmltest/valid/ext-sa/out/002.xml
N test/oasis/xmltest/valid/ext-sa/out/003.xml
N test/oasis/xmltest/valid/ext-sa/out/004.xml
N test/oasis/xmltest/valid/ext-sa/out/005.xml
N test/oasis/xmltest/valid/ext-sa/out/006.xml
N test/oasis/xmltest/valid/ext-sa/out/007.xml
N test/oasis/xmltest/valid/ext-sa/out/008.xml
N test/oasis/xmltest/valid/ext-sa/out/009.xml
N test/oasis/xmltest/valid/ext-sa/out/010.xml
N test/oasis/xmltest/valid/ext-sa/out/011.xml
N test/oasis/xmltest/valid/ext-sa/out/012.xml
N test/oasis/xmltest/valid/ext-sa/out/013.xml
N test/oasis/xmltest/valid/ext-sa/out/014.xml
N test/oasis/xmltest/valid/sa/001.xml
N test/oasis/xmltest/valid/sa/002.xml
N test/oasis/xmltest/valid/sa/003.xml
N test/oasis/xmltest/valid/sa/004.xml
N test/oasis/xmltest/valid/sa/005.xml
N test/oasis/xmltest/valid/sa/006.xml
N test/oasis/xmltest/valid/sa/007.xml
N test/oasis/xmltest/valid/sa/008.xml
N test/oasis/xmltest/valid/sa/009.xml
N test/oasis/xmltest/valid/sa/010.xml
N test/oasis/xmltest/valid/sa/011.xml
N test/oasis/xmltest/valid/sa/012.xml
N test/oasis/xmltest/valid/sa/013.xml
N test/oasis/xmltest/valid/sa/014.xml
N test/oasis/xmltest/valid/sa/015.xml
N test/oasis/xmltest/valid/sa/016.xml
N test/oasis/xmltest/valid/sa/017.xml
N test/oasis/xmltest/valid/sa/018.xml
N test/oasis/xmltest/valid/sa/019.xml
N test/oasis/xmltest/valid/sa/020.xml
N test/oasis/xmltest/valid/sa/021.xml
N test/oasis/xmltest/valid/sa/022.xml
N test/oasis/xmltest/valid/sa/023.xml
N test/oasis/xmltest/valid/sa/024.xml
N test/oasis/xmltest/valid/sa/025.xml
N test/oasis/xmltest/valid/sa/026.xml
N test/oasis/xmltest/valid/sa/027.xml
N test/oasis/xmltest/valid/sa/028.xml
N test/oasis/xmltest/valid/sa/029.xml
N test/oasis/xmltest/valid/sa/030.xml
N test/oasis/xmltest/valid/sa/031.xml
N test/oasis/xmltest/valid/sa/032.xml
N test/oasis/xmltest/valid/sa/033.xml
N test/oasis/xmltest/valid/sa/034.xml
N test/oasis/xmltest/valid/sa/035.xml
N test/oasis/xmltest/valid/sa/036.xml
N test/oasis/xmltest/valid/sa/037.xml
N test/oasis/xmltest/valid/sa/038.xml
N test/oasis/xmltest/valid/sa/039.xml
N test/oasis/xmltest/valid/sa/040.xml
N test/oasis/xmltest/valid/sa/041.xml
N test/oasis/xmltest/valid/sa/042.xml
N test/oasis/xmltest/valid/sa/043.xml
N test/oasis/xmltest/valid/sa/044.xml
N test/oasis/xmltest/valid/sa/045.xml
N test/oasis/xmltest/valid/sa/046.xml
N test/oasis/xmltest/valid/sa/047.xml
N test/oasis/xmltest/valid/sa/048.xml
N test/oasis/xmltest/valid/sa/049.xml
N test/oasis/xmltest/valid/sa/050.xml
N test/oasis/xmltest/valid/sa/051.xml
N test/oasis/xmltest/valid/sa/052.xml
N test/oasis/xmltest/valid/sa/053.xml
N test/oasis/xmltest/valid/sa/054.xml
N test/oasis/xmltest/valid/sa/055.xml
N test/oasis/xmltest/valid/sa/056.xml
N test/oasis/xmltest/valid/sa/057.xml
N test/oasis/xmltest/valid/sa/058.xml
N test/oasis/xmltest/valid/sa/059.xml
N test/oasis/xmltest/valid/sa/060.xml
N test/oasis/xmltest/valid/sa/061.xml
N test/oasis/xmltest/valid/sa/062.xml
N test/oasis/xmltest/valid/sa/063.xml
N test/oasis/xmltest/valid/sa/064.xml
N test/oasis/xmltest/valid/sa/065.xml
N test/oasis/xmltest/valid/sa/066.xml
N test/oasis/xmltest/valid/sa/067.xml
N test/oasis/xmltest/valid/sa/068.xml
N test/oasis/xmltest/valid/sa/069.xml
N test/oasis/xmltest/valid/sa/070.xml
N test/oasis/xmltest/valid/sa/071.xml
N test/oasis/xmltest/valid/sa/072.xml
N test/oasis/xmltest/valid/sa/073.xml
N test/oasis/xmltest/valid/sa/074.xml
N test/oasis/xmltest/valid/sa/075.xml
N test/oasis/xmltest/valid/sa/076.xml
N test/oasis/xmltest/valid/sa/077.xml
N test/oasis/xmltest/valid/sa/078.xml
N test/oasis/xmltest/valid/sa/079.xml
N test/oasis/xmltest/valid/sa/080.xml
N test/oasis/xmltest/valid/sa/081.xml
N test/oasis/xmltest/valid/sa/082.xml
N test/oasis/xmltest/valid/sa/083.xml
N test/oasis/xmltest/valid/sa/084.xml
N test/oasis/xmltest/valid/sa/085.xml
N test/oasis/xmltest/valid/sa/086.xml
N test/oasis/xmltest/valid/sa/087.xml
N test/oasis/xmltest/valid/sa/088.xml
N test/oasis/xmltest/valid/sa/089.xml
N test/oasis/xmltest/valid/sa/090.xml
N test/oasis/xmltest/valid/sa/091.xml
N test/oasis/xmltest/valid/sa/092.xml
N test/oasis/xmltest/valid/sa/093.xml
N test/oasis/xmltest/valid/sa/094.xml
N test/oasis/xmltest/valid/sa/095.xml
N test/oasis/xmltest/valid/sa/096.xml
N test/oasis/xmltest/valid/sa/097.xml
N test/oasis/xmltest/valid/sa/098.xml
N test/oasis/xmltest/valid/sa/099.xml
N test/oasis/xmltest/valid/sa/100.xml
N test/oasis/xmltest/valid/sa/101.xml
N test/oasis/xmltest/valid/sa/102.xml
N test/oasis/xmltest/valid/sa/103.xml
N test/oasis/xmltest/valid/sa/104.xml
N test/oasis/xmltest/valid/sa/105.xml
N test/oasis/xmltest/valid/sa/106.xml
N test/oasis/xmltest/valid/sa/107.xml
N test/oasis/xmltest/valid/sa/108.xml
N test/oasis/xmltest/valid/sa/109.xml
N test/oasis/xmltest/valid/sa/110.xml
N test/oasis/xmltest/valid/sa/111.xml
N test/oasis/xmltest/valid/sa/112.xml
N test/oasis/xmltest/valid/sa/113.xml
N test/oasis/xmltest/valid/sa/114.xml
N test/oasis/xmltest/valid/sa/115.xml
N test/oasis/xmltest/valid/sa/116.xml
N test/oasis/xmltest/valid/sa/117.xml
N test/oasis/xmltest/valid/sa/118.xml
N test/oasis/xmltest/valid/sa/119.xml
N test/oasis/xmltest/valid/sa/097.ent
N test/oasis/xmltest/valid/sa/out/001.xml
N test/oasis/xmltest/valid/sa/out/002.xml
N test/oasis/xmltest/valid/sa/out/003.xml
N test/oasis/xmltest/valid/sa/out/004.xml
N test/oasis/xmltest/valid/sa/out/005.xml
N test/oasis/xmltest/valid/sa/out/006.xml
N test/oasis/xmltest/valid/sa/out/007.xml
N test/oasis/xmltest/valid/sa/out/008.xml
N test/oasis/xmltest/valid/sa/out/009.xml
N test/oasis/xmltest/valid/sa/out/010.xml
N test/oasis/xmltest/valid/sa/out/011.xml
N test/oasis/xmltest/valid/sa/out/012.xml
N test/oasis/xmltest/valid/sa/out/013.xml
N test/oasis/xmltest/valid/sa/out/014.xml
N test/oasis/xmltest/valid/sa/out/015.xml
N test/oasis/xmltest/valid/sa/out/016.xml
N test/oasis/xmltest/valid/sa/out/017.xml
N test/oasis/xmltest/valid/sa/out/018.xml
N test/oasis/xmltest/valid/sa/out/019.xml
N test/oasis/xmltest/valid/sa/out/020.xml
N test/oasis/xmltest/valid/sa/out/021.xml
N test/oasis/xmltest/valid/sa/out/022.xml
N test/oasis/xmltest/valid/sa/out/023.xml
N test/oasis/xmltest/valid/sa/out/024.xml
N test/oasis/xmltest/valid/sa/out/025.xml
N test/oasis/xmltest/valid/sa/out/026.xml
N test/oasis/xmltest/valid/sa/out/027.xml
N test/oasis/xmltest/valid/sa/out/028.xml
N test/oasis/xmltest/valid/sa/out/029.xml
N test/oasis/xmltest/valid/sa/out/030.xml
N test/oasis/xmltest/valid/sa/out/031.xml
N test/oasis/xmltest/valid/sa/out/032.xml
N test/oasis/xmltest/valid/sa/out/033.xml
N test/oasis/xmltest/valid/sa/out/034.xml
N test/oasis/xmltest/valid/sa/out/035.xml
N test/oasis/xmltest/valid/sa/out/036.xml
N test/oasis/xmltest/valid/sa/out/037.xml
N test/oasis/xmltest/valid/sa/out/038.xml
N test/oasis/xmltest/valid/sa/out/039.xml
N test/oasis/xmltest/valid/sa/out/040.xml
N test/oasis/xmltest/valid/sa/out/041.xml
N test/oasis/xmltest/valid/sa/out/042.xml
N test/oasis/xmltest/valid/sa/out/043.xml
N test/oasis/xmltest/valid/sa/out/044.xml
N test/oasis/xmltest/valid/sa/out/045.xml
N test/oasis/xmltest/valid/sa/out/046.xml
N test/oasis/xmltest/valid/sa/out/047.xml
N test/oasis/xmltest/valid/sa/out/048.xml
N test/oasis/xmltest/valid/sa/out/049.xml
N test/oasis/xmltest/valid/sa/out/050.xml
N test/oasis/xmltest/valid/sa/out/051.xml
N test/oasis/xmltest/valid/sa/out/052.xml
N test/oasis/xmltest/valid/sa/out/053.xml
N test/oasis/xmltest/valid/sa/out/054.xml
N test/oasis/xmltest/valid/sa/out/055.xml
N test/oasis/xmltest/valid/sa/out/056.xml
N test/oasis/xmltest/valid/sa/out/057.xml
N test/oasis/xmltest/valid/sa/out/058.xml
N test/oasis/xmltest/valid/sa/out/059.xml
N test/oasis/xmltest/valid/sa/out/060.xml
N test/oasis/xmltest/valid/sa/out/061.xml
N test/oasis/xmltest/valid/sa/out/062.xml
N test/oasis/xmltest/valid/sa/out/063.xml
N test/oasis/xmltest/valid/sa/out/064.xml
N test/oasis/xmltest/valid/sa/out/065.xml
N test/oasis/xmltest/valid/sa/out/066.xml
N test/oasis/xmltest/valid/sa/out/067.xml
N test/oasis/xmltest/valid/sa/out/068.xml
N test/oasis/xmltest/valid/sa/out/069.xml
N test/oasis/xmltest/valid/sa/out/070.xml
N test/oasis/xmltest/valid/sa/out/071.xml
N test/oasis/xmltest/valid/sa/out/072.xml
N test/oasis/xmltest/valid/sa/out/073.xml
N test/oasis/xmltest/valid/sa/out/074.xml
N test/oasis/xmltest/valid/sa/out/075.xml
N test/oasis/xmltest/valid/sa/out/076.xml
N test/oasis/xmltest/valid/sa/out/077.xml
N test/oasis/xmltest/valid/sa/out/078.xml
N test/oasis/xmltest/valid/sa/out/079.xml
N test/oasis/xmltest/valid/sa/out/080.xml
N test/oasis/xmltest/valid/sa/out/081.xml
N test/oasis/xmltest/valid/sa/out/082.xml
N test/oasis/xmltest/valid/sa/out/083.xml
N test/oasis/xmltest/valid/sa/out/084.xml
N test/oasis/xmltest/valid/sa/out/085.xml
N test/oasis/xmltest/valid/sa/out/086.xml
N test/oasis/xmltest/valid/sa/out/087.xml
N test/oasis/xmltest/valid/sa/out/088.xml
N test/oasis/xmltest/valid/sa/out/089.xml
N test/oasis/xmltest/valid/sa/out/090.xml
N test/oasis/xmltest/valid/sa/out/091.xml
N test/oasis/xmltest/valid/sa/out/092.xml
N test/oasis/xmltest/valid/sa/out/093.xml
N test/oasis/xmltest/valid/sa/out/094.xml
N test/oasis/xmltest/valid/sa/out/095.xml
N test/oasis/xmltest/valid/sa/out/096.xml
N test/oasis/xmltest/valid/sa/out/097.xml
N test/oasis/xmltest/valid/sa/out/098.xml
N test/oasis/xmltest/valid/sa/out/099.xml
N test/oasis/xmltest/valid/sa/out/100.xml
N test/oasis/xmltest/valid/sa/out/101.xml
N test/oasis/xmltest/valid/sa/out/102.xml
N test/oasis/xmltest/valid/sa/out/103.xml
N test/oasis/xmltest/valid/sa/out/104.xml
N test/oasis/xmltest/valid/sa/out/105.xml
N test/oasis/xmltest/valid/sa/out/106.xml
N test/oasis/xmltest/valid/sa/out/107.xml
N test/oasis/xmltest/valid/sa/out/108.xml
N test/oasis/xmltest/valid/sa/out/109.xml
N test/oasis/xmltest/valid/sa/out/110.xml
N test/oasis/xmltest/valid/sa/out/111.xml
N test/oasis/xmltest/valid/sa/out/112.xml
N test/oasis/xmltest/valid/sa/out/113.xml
N test/oasis/xmltest/valid/sa/out/114.xml
N test/oasis/xmltest/valid/sa/out/115.xml
N test/oasis/xmltest/valid/sa/out/116.xml
N test/oasis/xmltest/valid/sa/out/117.xml
N test/oasis/xmltest/valid/sa/out/118.xml
N test/oasis/xmltest/valid/sa/out/119.xml
N test/oasis/xmltest/not-wf/not-sa/001.xml
N test/oasis/xmltest/not-wf/not-sa/002.xml
N test/oasis/xmltest/not-wf/not-sa/003.xml
N test/oasis/xmltest/not-wf/not-sa/004.xml
N test/oasis/xmltest/not-wf/not-sa/005.xml
N test/oasis/xmltest/not-wf/not-sa/006.xml
N test/oasis/xmltest/not-wf/not-sa/007.xml
N test/oasis/xmltest/not-wf/not-sa/008.xml
N test/oasis/xmltest/not-wf/not-sa/001.ent
N test/oasis/xmltest/not-wf/not-sa/003.ent
N test/oasis/xmltest/not-wf/not-sa/004.ent
N test/oasis/xmltest/not-wf/not-sa/005.ent
N test/oasis/xmltest/not-wf/not-sa/006.ent
N test/oasis/xmltest/not-wf/not-sa/007.ent
N test/oasis/xmltest/not-wf/not-sa/008.ent
N test/oasis/xmltest/not-wf/ext-sa/001.xml
N test/oasis/xmltest/not-wf/ext-sa/002.xml
N test/oasis/xmltest/not-wf/ext-sa/003.xml
N test/oasis/xmltest/not-wf/ext-sa/001.ent
N test/oasis/xmltest/not-wf/ext-sa/002.ent
N test/oasis/xmltest/not-wf/ext-sa/003.ent
N test/oasis/xmltest/not-wf/sa/001.xml
N test/oasis/xmltest/not-wf/sa/002.xml
N test/oasis/xmltest/not-wf/sa/003.xml
N test/oasis/xmltest/not-wf/sa/004.xml
N test/oasis/xmltest/not-wf/sa/005.xml
N test/oasis/xmltest/not-wf/sa/006.xml
N test/oasis/xmltest/not-wf/sa/007.xml
N test/oasis/xmltest/not-wf/sa/008.xml
N test/oasis/xmltest/not-wf/sa/009.xml
N test/oasis/xmltest/not-wf/sa/010.xml
N test/oasis/xmltest/not-wf/sa/011.xml
N test/oasis/xmltest/not-wf/sa/012.xml
N test/oasis/xmltest/not-wf/sa/013.xml
N test/oasis/xmltest/not-wf/sa/014.xml
N test/oasis/xmltest/not-wf/sa/015.xml
N test/oasis/xmltest/not-wf/sa/016.xml
N test/oasis/xmltest/not-wf/sa/017.xml
N test/oasis/xmltest/not-wf/sa/018.xml
N test/oasis/xmltest/not-wf/sa/019.xml
N test/oasis/xmltest/not-wf/sa/020.xml
N test/oasis/xmltest/not-wf/sa/021.xml
N test/oasis/xmltest/not-wf/sa/022.xml
N test/oasis/xmltest/not-wf/sa/023.xml
N test/oasis/xmltest/not-wf/sa/024.xml
N test/oasis/xmltest/not-wf/sa/025.xml
N test/oasis/xmltest/not-wf/sa/026.xml
N test/oasis/xmltest/not-wf/sa/027.xml
N test/oasis/xmltest/not-wf/sa/028.xml
N test/oasis/xmltest/not-wf/sa/029.xml
N test/oasis/xmltest/not-wf/sa/030.xml
N test/oasis/xmltest/not-wf/sa/031.xml
N test/oasis/xmltest/not-wf/sa/032.xml
N test/oasis/xmltest/not-wf/sa/033.xml
N test/oasis/xmltest/not-wf/sa/034.xml
N test/oasis/xmltest/not-wf/sa/035.xml
N test/oasis/xmltest/not-wf/sa/036.xml
N test/oasis/xmltest/not-wf/sa/037.xml
N test/oasis/xmltest/not-wf/sa/038.xml
N test/oasis/xmltest/not-wf/sa/039.xml
N test/oasis/xmltest/not-wf/sa/040.xml
N test/oasis/xmltest/not-wf/sa/041.xml
N test/oasis/xmltest/not-wf/sa/042.xml
N test/oasis/xmltest/not-wf/sa/043.xml
N test/oasis/xmltest/not-wf/sa/044.xml
N test/oasis/xmltest/not-wf/sa/045.xml
N test/oasis/xmltest/not-wf/sa/046.xml
N test/oasis/xmltest/not-wf/sa/047.xml
N test/oasis/xmltest/not-wf/sa/048.xml
N test/oasis/xmltest/not-wf/sa/049.xml
N test/oasis/xmltest/not-wf/sa/050.xml
N test/oasis/xmltest/not-wf/sa/051.xml
N test/oasis/xmltest/not-wf/sa/052.xml
N test/oasis/xmltest/not-wf/sa/053.xml
N test/oasis/xmltest/not-wf/sa/054.xml
N test/oasis/xmltest/not-wf/sa/055.xml
N test/oasis/xmltest/not-wf/sa/056.xml
N test/oasis/xmltest/not-wf/sa/057.xml
N test/oasis/xmltest/not-wf/sa/058.xml
N test/oasis/xmltest/not-wf/sa/059.xml
N test/oasis/xmltest/not-wf/sa/060.xml
N test/oasis/xmltest/not-wf/sa/061.xml
N test/oasis/xmltest/not-wf/sa/062.xml
N test/oasis/xmltest/not-wf/sa/063.xml
N test/oasis/xmltest/not-wf/sa/064.xml
N test/oasis/xmltest/not-wf/sa/065.xml
N test/oasis/xmltest/not-wf/sa/066.xml
N test/oasis/xmltest/not-wf/sa/067.xml
N test/oasis/xmltest/not-wf/sa/068.xml
N test/oasis/xmltest/not-wf/sa/069.xml
N test/oasis/xmltest/not-wf/sa/070.xml
N test/oasis/xmltest/not-wf/sa/071.xml
N test/oasis/xmltest/not-wf/sa/072.xml
N test/oasis/xmltest/not-wf/sa/073.xml
N test/oasis/xmltest/not-wf/sa/074.xml
N test/oasis/xmltest/not-wf/sa/075.xml
N test/oasis/xmltest/not-wf/sa/076.xml
N test/oasis/xmltest/not-wf/sa/077.xml
N test/oasis/xmltest/not-wf/sa/078.xml
N test/oasis/xmltest/not-wf/sa/079.xml
N test/oasis/xmltest/not-wf/sa/080.xml
N test/oasis/xmltest/not-wf/sa/081.xml
N test/oasis/xmltest/not-wf/sa/082.xml
N test/oasis/xmltest/not-wf/sa/083.xml
N test/oasis/xmltest/not-wf/sa/084.xml
N test/oasis/xmltest/not-wf/sa/085.xml
N test/oasis/xmltest/not-wf/sa/086.xml
N test/oasis/xmltest/not-wf/sa/087.xml
N test/oasis/xmltest/not-wf/sa/088.xml
N test/oasis/xmltest/not-wf/sa/089.xml
N test/oasis/xmltest/not-wf/sa/090.xml
N test/oasis/xmltest/not-wf/sa/091.xml
N test/oasis/xmltest/not-wf/sa/092.xml
N test/oasis/xmltest/not-wf/sa/093.xml
N test/oasis/xmltest/not-wf/sa/094.xml
N test/oasis/xmltest/not-wf/sa/095.xml
N test/oasis/xmltest/not-wf/sa/096.xml
N test/oasis/xmltest/not-wf/sa/097.xml
N test/oasis/xmltest/not-wf/sa/098.xml
N test/oasis/xmltest/not-wf/sa/099.xml
N test/oasis/xmltest/not-wf/sa/100.xml
N test/oasis/xmltest/not-wf/sa/101.xml
N test/oasis/xmltest/not-wf/sa/102.xml
N test/oasis/xmltest/not-wf/sa/103.xml
N test/oasis/xmltest/not-wf/sa/104.xml
N test/oasis/xmltest/not-wf/sa/105.xml
N test/oasis/xmltest/not-wf/sa/106.xml
N test/oasis/xmltest/not-wf/sa/107.xml
N test/oasis/xmltest/not-wf/sa/108.xml
N test/oasis/xmltest/not-wf/sa/109.xml
N test/oasis/xmltest/not-wf/sa/110.xml
N test/oasis/xmltest/not-wf/sa/111.xml
N test/oasis/xmltest/not-wf/sa/112.xml
N test/oasis/xmltest/not-wf/sa/113.xml
N test/oasis/xmltest/not-wf/sa/114.xml
N test/oasis/xmltest/not-wf/sa/115.xml
N test/oasis/xmltest/not-wf/sa/116.xml
N test/oasis/xmltest/not-wf/sa/117.xml
N test/oasis/xmltest/not-wf/sa/118.xml
N test/oasis/xmltest/not-wf/sa/119.xml
N test/oasis/xmltest/not-wf/sa/120.xml
N test/oasis/xmltest/not-wf/sa/121.xml
N test/oasis/xmltest/not-wf/sa/122.xml
N test/oasis/xmltest/not-wf/sa/123.xml
N test/oasis/xmltest/not-wf/sa/124.xml
N test/oasis/xmltest/not-wf/sa/125.xml
N test/oasis/xmltest/not-wf/sa/126.xml
N test/oasis/xmltest/not-wf/sa/127.xml
N test/oasis/xmltest/not-wf/sa/128.xml
N test/oasis/xmltest/not-wf/sa/129.xml
N test/oasis/xmltest/not-wf/sa/130.xml
N test/oasis/xmltest/not-wf/sa/131.xml
N test/oasis/xmltest/not-wf/sa/132.xml
N test/oasis/xmltest/not-wf/sa/133.xml
N test/oasis/xmltest/not-wf/sa/134.xml
N test/oasis/xmltest/not-wf/sa/135.xml
N test/oasis/xmltest/not-wf/sa/136.xml
N test/oasis/xmltest/not-wf/sa/137.xml
N test/oasis/xmltest/not-wf/sa/138.xml
N test/oasis/xmltest/not-wf/sa/139.xml
N test/oasis/xmltest/not-wf/sa/140.xml
N test/oasis/xmltest/not-wf/sa/141.xml
N test/oasis/xmltest/not-wf/sa/142.xml
N test/oasis/xmltest/not-wf/sa/143.xml
N test/oasis/xmltest/not-wf/sa/144.xml
N test/oasis/xmltest/not-wf/sa/145.xml
N test/oasis/xmltest/not-wf/sa/146.xml
N test/oasis/xmltest/not-wf/sa/147.xml
N test/oasis/xmltest/not-wf/sa/148.xml
N test/oasis/xmltest/not-wf/sa/149.xml
N test/oasis/xmltest/not-wf/sa/150.xml
N test/oasis/xmltest/not-wf/sa/151.xml
N test/oasis/xmltest/not-wf/sa/152.xml
N test/oasis/xmltest/not-wf/sa/153.xml
N test/oasis/xmltest/not-wf/sa/154.xml
N test/oasis/xmltest/not-wf/sa/155.xml
N test/oasis/xmltest/not-wf/sa/156.xml
N test/oasis/xmltest/not-wf/sa/157.xml
N test/oasis/xmltest/not-wf/sa/158.xml
N test/oasis/xmltest/not-wf/sa/159.xml
N test/oasis/xmltest/not-wf/sa/160.xml
N test/oasis/xmltest/not-wf/sa/161.xml
N test/oasis/xmltest/not-wf/sa/162.xml
N test/oasis/xmltest/not-wf/sa/163.xml
N test/oasis/xmltest/not-wf/sa/164.xml
N test/oasis/xmltest/not-wf/sa/165.xml
N test/oasis/xmltest/not-wf/sa/166.xml
N test/oasis/xmltest/not-wf/sa/167.xml
N test/oasis/xmltest/not-wf/sa/168.xml
N test/oasis/xmltest/not-wf/sa/169.xml
N test/oasis/xmltest/not-wf/sa/170.xml
N test/oasis/xmltest/not-wf/sa/171.xml
N test/oasis/xmltest/not-wf/sa/172.xml
N test/oasis/xmltest/not-wf/sa/173.xml
N test/oasis/xmltest/not-wf/sa/174.xml
N test/oasis/xmltest/not-wf/sa/175.xml
N test/oasis/xmltest/not-wf/sa/176.xml
N test/oasis/xmltest/not-wf/sa/177.xml
N test/oasis/xmltest/not-wf/sa/178.xml
N test/oasis/xmltest/not-wf/sa/179.xml
N test/oasis/xmltest/not-wf/sa/180.xml
N test/oasis/xmltest/not-wf/sa/181.xml
N test/oasis/xmltest/not-wf/sa/182.xml
N test/oasis/xmltest/not-wf/sa/183.xml
N test/oasis/xmltest/not-wf/sa/184.xml
N test/oasis/xmltest/not-wf/sa/185.xml
N test/oasis/xmltest/not-wf/sa/186.xml
N test/oasis/xmltest/not-wf/sa/185.ent
N test/oasis/xmltest/not-wf/sa/null.ent
N test/oasis/files/committee.css
N test/oasis/files/a_oasis-logo.gif
N test/oasis/myown/long-comment.xml
N test/oasis/baseline/invalid/dtd01.xml
N test/oasis/baseline/invalid/dtd02.xml
N test/oasis/baseline/invalid/dtd03.xml
N test/oasis/baseline/invalid/dtd06.xml
N test/oasis/baseline/invalid/el01.xml
N test/oasis/baseline/invalid/el02.xml
N test/oasis/baseline/invalid/el03.xml
N test/oasis/baseline/invalid/el04.xml
N test/oasis/baseline/invalid/el05.xml
N test/oasis/baseline/invalid/el06.xml
N test/oasis/baseline/invalid/id01.xml
N test/oasis/baseline/invalid/id02.xml
N test/oasis/baseline/invalid/id03.xml
N test/oasis/baseline/invalid/id04.xml
N test/oasis/baseline/invalid/id05.xml
N test/oasis/baseline/invalid/id06.xml
N test/oasis/baseline/invalid/id07.xml
N test/oasis/baseline/invalid/id08.xml
N test/oasis/baseline/invalid/id09.xml
N test/oasis/baseline/invalid/not-sa01.xml
N test/oasis/baseline/invalid/not-sa02.xml
N test/oasis/baseline/invalid/not-sa03.xml
N test/oasis/baseline/invalid/not-sa04.xml
N test/oasis/baseline/invalid/not-sa05.xml
N test/oasis/baseline/invalid/not-sa06.xml
N test/oasis/baseline/invalid/not-sa07.xml
N test/oasis/baseline/invalid/not-sa08.xml
N test/oasis/baseline/invalid/not-sa09.xml
N test/oasis/baseline/invalid/not-sa10.xml
N test/oasis/baseline/invalid/not-sa11.xml
N test/oasis/baseline/invalid/not-sa12.xml
N test/oasis/baseline/invalid/not-sa13.xml
N test/oasis/baseline/invalid/not-sa14.xml
N test/oasis/baseline/invalid/optional01.xml
N test/oasis/baseline/invalid/optional02.xml
N test/oasis/baseline/invalid/optional03.xml
N test/oasis/baseline/invalid/optional04.xml
N test/oasis/baseline/invalid/optional05.xml
N test/oasis/baseline/invalid/optional06.xml
N test/oasis/baseline/invalid/optional07.xml
N test/oasis/baseline/invalid/optional08.xml
N test/oasis/baseline/invalid/optional09.xml
N test/oasis/baseline/invalid/optional10.xml
N test/oasis/baseline/invalid/optional11.xml
N test/oasis/baseline/invalid/optional12.xml
N test/oasis/baseline/invalid/optional13.xml
N test/oasis/baseline/invalid/optional14.xml
N test/oasis/baseline/invalid/optional15.xml
N test/oasis/baseline/invalid/optional16.xml
N test/oasis/baseline/invalid/optional17.xml
N test/oasis/baseline/invalid/optional18.xml
N test/oasis/baseline/invalid/optional19.xml
N test/oasis/baseline/invalid/optional20.xml
N test/oasis/baseline/invalid/optional21.xml
N test/oasis/baseline/invalid/optional22.xml
N test/oasis/baseline/invalid/optional23.xml
N test/oasis/baseline/invalid/optional24.xml
N test/oasis/baseline/invalid/optional25.xml
N test/oasis/baseline/invalid/required00.xml
N test/oasis/baseline/invalid/required01.xml
N test/oasis/baseline/invalid/required02.xml
N test/oasis/baseline/invalid/root.xml
N test/oasis/baseline/invalid/attr01.xml
N test/oasis/baseline/invalid/attr02.xml
N test/oasis/baseline/invalid/attr03.xml
N test/oasis/baseline/invalid/attr04.xml
N test/oasis/baseline/invalid/attr05.xml
N test/oasis/baseline/invalid/attr06.xml
N test/oasis/baseline/invalid/attr07.xml
N test/oasis/baseline/invalid/attr08.xml
N test/oasis/baseline/invalid/attr09.xml
N test/oasis/baseline/invalid/attr10.xml
N test/oasis/baseline/invalid/attr11.xml
N test/oasis/baseline/invalid/attr12.xml
N test/oasis/baseline/invalid/attr13.xml
N test/oasis/baseline/invalid/attr14.xml
N test/oasis/baseline/invalid/attr15.xml
N test/oasis/baseline/invalid/attr16.xml
N test/oasis/baseline/invalid/utf16b.xml
N test/oasis/baseline/invalid/utf16l.xml
N test/oasis/baseline/invalid/pe01.xml
N test/oasis/baseline/japanese/pr-xml-euc-jp.xml
N test/oasis/baseline/japanese/pr-xml-iso-2022-jp.xml
N test/oasis/baseline/japanese/pr-xml-little-endian.xml
N test/oasis/baseline/japanese/pr-xml-shift_jis.xml
N test/oasis/baseline/japanese/pr-xml-utf-16.xml
N test/oasis/baseline/japanese/pr-xml-utf-8.xml
N test/oasis/baseline/japanese/weekly-euc-jp.xml
N test/oasis/baseline/japanese/weekly-iso-2022-jp.xml
N test/oasis/baseline/japanese/weekly-little-endian.xml
N test/oasis/baseline/japanese/weekly-shift_jis.xml
N test/oasis/baseline/japanese/weekly-utf-16.xml
N test/oasis/baseline/japanese/weekly-utf-8.xml
N test/oasis/baseline/not-wf/attlist01.xml
N test/oasis/baseline/not-wf/attlist02.xml
N test/oasis/baseline/not-wf/attlist03.xml
N test/oasis/baseline/not-wf/attlist04.xml
N test/oasis/baseline/not-wf/attlist05.xml
N test/oasis/baseline/not-wf/attlist06.xml
N test/oasis/baseline/not-wf/attlist07.xml
N test/oasis/baseline/not-wf/attlist08.xml
N test/oasis/baseline/not-wf/attlist09.xml
N test/oasis/baseline/not-wf/attlist10.xml
N test/oasis/baseline/not-wf/attlist11.xml
N test/oasis/baseline/not-wf/cond01.xml
N test/oasis/baseline/not-wf/cond02.xml
N test/oasis/baseline/not-wf/content01.xml
N test/oasis/baseline/not-wf/content02.xml
N test/oasis/baseline/not-wf/content03.xml
N test/oasis/baseline/not-wf/decl01.xml
N test/oasis/baseline/not-wf/dtd00.xml
N test/oasis/baseline/not-wf/dtd01.xml
N test/oasis/baseline/not-wf/dtd02.xml
N test/oasis/baseline/not-wf/dtd03.xml
N test/oasis/baseline/not-wf/dtd04.xml
N test/oasis/baseline/not-wf/dtd05.xml
N test/oasis/baseline/not-wf/dtd07.xml
N test/oasis/baseline/not-wf/element00.xml
N test/oasis/baseline/not-wf/element01.xml
N test/oasis/baseline/not-wf/element02.xml
N test/oasis/baseline/not-wf/element03.xml
N test/oasis/baseline/not-wf/element04.xml
N test/oasis/baseline/not-wf/encoding01.xml
N test/oasis/baseline/not-wf/encoding02.xml
N test/oasis/baseline/not-wf/encoding03.xml
N test/oasis/baseline/not-wf/encoding04.xml
N test/oasis/baseline/not-wf/encoding05.xml
N test/oasis/baseline/not-wf/encoding06.xml
N test/oasis/baseline/not-wf/encoding07.xml
N test/oasis/baseline/not-wf/pi.xml
N test/oasis/baseline/not-wf/pubid01.xml
N test/oasis/baseline/not-wf/pubid02.xml
N test/oasis/baseline/not-wf/pubid03.xml
N test/oasis/baseline/not-wf/pubid04.xml
N test/oasis/baseline/not-wf/pubid05.xml
N test/oasis/baseline/not-wf/sgml01.xml
N test/oasis/baseline/not-wf/sgml02.xml
N test/oasis/baseline/not-wf/sgml03.xml
N test/oasis/baseline/not-wf/sgml04.xml
N test/oasis/baseline/not-wf/sgml05.xml
N test/oasis/baseline/not-wf/sgml06.xml
N test/oasis/baseline/not-wf/sgml07.xml
N test/oasis/baseline/not-wf/sgml08.xml
N test/oasis/baseline/not-wf/sgml09.xml
N test/oasis/baseline/not-wf/sgml10.xml
N test/oasis/baseline/not-wf/sgml11.xml
N test/oasis/baseline/not-wf/sgml12.xml
N test/oasis/baseline/not-wf/sgml13.xml
N test/oasis/baseline/not-wf/uri01.xml
N test/oasis/baseline/not-wf/lang01.xml
N test/oasis/baseline/not-wf/lang02.xml
N test/oasis/baseline/not-wf/lang03.xml
N test/oasis/baseline/not-wf/lang04.xml
N test/oasis/baseline/not-wf/lang05.xml
N test/oasis/baseline/not-wf/lang06.xml
N test/oasis/baseline/oasis/p01pass2.xml
N test/oasis/baseline/oasis/p06pass1.xml
N test/oasis/baseline/oasis/p07pass1.xml
N test/oasis/baseline/oasis/p08pass1.xml
N test/oasis/baseline/oasis/p09pass1.xml
N test/oasis/baseline/oasis/p12pass1.xml
N test/oasis/baseline/oasis/p22pass4.xml
N test/oasis/baseline/oasis/p22pass5.xml
N test/oasis/baseline/oasis/p22pass6.xml
N test/oasis/baseline/oasis/p28pass1.xml
N test/oasis/baseline/oasis/p28pass3.xml
N test/oasis/baseline/oasis/p28pass4.xml
N test/oasis/baseline/oasis/p28pass5.xml
N test/oasis/baseline/oasis/p29pass1.xml
N test/oasis/baseline/oasis/p30pass1.xml
N test/oasis/baseline/oasis/p30pass2.xml
N test/oasis/baseline/oasis/p31pass1.xml
N test/oasis/baseline/oasis/p31pass2.xml
N test/oasis/baseline/oasis/p43pass1.xml
N test/oasis/baseline/oasis/p45pass1.xml
N test/oasis/baseline/oasis/p46pass1.xml
N test/oasis/baseline/oasis/p47pass1.xml
N test/oasis/baseline/oasis/p48pass1.xml
N test/oasis/baseline/oasis/p49pass1.xml
N test/oasis/baseline/oasis/p50pass1.xml
N test/oasis/baseline/oasis/p51pass1.xml
N test/oasis/baseline/oasis/p52pass1.xml
N test/oasis/baseline/oasis/p53pass1.xml
N test/oasis/baseline/oasis/p54pass1.xml
N test/oasis/baseline/oasis/p55pass1.xml
N test/oasis/baseline/oasis/p56pass1.xml
N test/oasis/baseline/oasis/p57pass1.xml
N test/oasis/baseline/oasis/p58pass1.xml
N test/oasis/baseline/oasis/p59pass1.xml
N test/oasis/baseline/oasis/p60pass1.xml
N test/oasis/baseline/oasis/p61pass1.xml
N test/oasis/baseline/oasis/p62pass1.xml
N test/oasis/baseline/oasis/p63pass1.xml
N test/oasis/baseline/oasis/p64pass1.xml
N test/oasis/baseline/oasis/p68pass1.xml
N test/oasis/baseline/oasis/p69pass1.xml
N test/oasis/baseline/oasis/p70pass1.xml
N test/oasis/baseline/oasis/p71pass1.xml
N test/oasis/baseline/oasis/p72pass1.xml
N test/oasis/baseline/oasis/p73pass1.xml
N test/oasis/baseline/oasis/p76pass1.xml
N test/oasis/baseline/oasis/p01pass1.xml
N test/oasis/baseline/oasis/p01pass3.xml
N test/oasis/baseline/oasis/p03pass1.xml
N test/oasis/baseline/oasis/p04pass1.xml
N test/oasis/baseline/oasis/p05pass1.xml
N test/oasis/baseline/oasis/p06fail1.xml
N test/oasis/baseline/oasis/p08fail1.xml
N test/oasis/baseline/oasis/p08fail2.xml
N test/oasis/baseline/oasis/p10pass1.xml
N test/oasis/baseline/oasis/p14pass1.xml
N test/oasis/baseline/oasis/p15pass1.xml
N test/oasis/baseline/oasis/p16fail3.xml
N test/oasis/baseline/oasis/p16pass1.xml
N test/oasis/baseline/oasis/p16pass2.xml
N test/oasis/baseline/oasis/p16pass3.xml
N test/oasis/baseline/oasis/p18pass1.xml
N test/oasis/baseline/oasis/p22pass1.xml
N test/oasis/baseline/oasis/p22pass2.xml
N test/oasis/baseline/oasis/p22pass3.xml
N test/oasis/baseline/oasis/p23pass1.xml
N test/oasis/baseline/oasis/p23pass2.xml
N test/oasis/baseline/oasis/p23pass3.xml
N test/oasis/baseline/oasis/p23pass4.xml
N test/oasis/baseline/oasis/p24pass1.xml
N test/oasis/baseline/oasis/p24pass2.xml
N test/oasis/baseline/oasis/p24pass3.xml
N test/oasis/baseline/oasis/p24pass4.xml
N test/oasis/baseline/oasis/p25pass1.xml
N test/oasis/baseline/oasis/p25pass2.xml
N test/oasis/baseline/oasis/p26pass1.xml
N test/oasis/baseline/oasis/p27pass1.xml
N test/oasis/baseline/oasis/p27pass2.xml
N test/oasis/baseline/oasis/p27pass3.xml
N test/oasis/baseline/oasis/p27pass4.xml
N test/oasis/baseline/oasis/p32pass1.xml
N test/oasis/baseline/oasis/p32pass2.xml
N test/oasis/baseline/oasis/p39pass1.xml
N test/oasis/baseline/oasis/p39pass2.xml
N test/oasis/baseline/oasis/p40pass1.xml
N test/oasis/baseline/oasis/p40pass2.xml
N test/oasis/baseline/oasis/p40pass3.xml
N test/oasis/baseline/oasis/p40pass4.xml
N test/oasis/baseline/oasis/p41pass1.xml
N test/oasis/baseline/oasis/p41pass2.xml
N test/oasis/baseline/oasis/p42pass1.xml
N test/oasis/baseline/oasis/p42pass2.xml
N test/oasis/baseline/oasis/p44pass1.xml
N test/oasis/baseline/oasis/p44pass2.xml
N test/oasis/baseline/oasis/p44pass3.xml
N test/oasis/baseline/oasis/p44pass4.xml
N test/oasis/baseline/oasis/p44pass5.xml
N test/oasis/baseline/oasis/p66pass1.xml
N test/oasis/baseline/oasis/p74pass1.xml
N test/oasis/baseline/oasis/p75pass1.xml
N test/oasis/baseline/oasis/p01fail1.xml
N test/oasis/baseline/oasis/p01fail2.xml
N test/oasis/baseline/oasis/p01fail3.xml
N test/oasis/baseline/oasis/p01fail4.xml
N test/oasis/baseline/oasis/p02fail1.xml
N test/oasis/baseline/oasis/p02fail10.xml
N test/oasis/baseline/oasis/p02fail11.xml
N test/oasis/baseline/oasis/p02fail12.xml
N test/oasis/baseline/oasis/p02fail13.xml
N test/oasis/baseline/oasis/p02fail14.xml
N test/oasis/baseline/oasis/p02fail15.xml
N test/oasis/baseline/oasis/p02fail16.xml
N test/oasis/baseline/oasis/p02fail17.xml
N test/oasis/baseline/oasis/p02fail18.xml
N test/oasis/baseline/oasis/p02fail19.xml
N test/oasis/baseline/oasis/p02fail2.xml
N test/oasis/baseline/oasis/p02fail20.xml
N test/oasis/baseline/oasis/p02fail21.xml
N test/oasis/baseline/oasis/p02fail22.xml
N test/oasis/baseline/oasis/p02fail23.xml
N test/oasis/baseline/oasis/p02fail24.xml
N test/oasis/baseline/oasis/p02fail25.xml
N test/oasis/baseline/oasis/p02fail26.xml
N test/oasis/baseline/oasis/p02fail27.xml
N test/oasis/baseline/oasis/p02fail28.xml
N test/oasis/baseline/oasis/p02fail29.xml
N test/oasis/baseline/oasis/p02fail3.xml
N test/oasis/baseline/oasis/p02fail30.xml
N test/oasis/baseline/oasis/p02fail31.xml
N test/oasis/baseline/oasis/p02fail4.xml
N test/oasis/baseline/oasis/p02fail5.xml
N test/oasis/baseline/oasis/p02fail6.xml
N test/oasis/baseline/oasis/p02fail7.xml
N test/oasis/baseline/oasis/p02fail8.xml
N test/oasis/baseline/oasis/p02fail9.xml
N test/oasis/baseline/oasis/p03fail1.xml
N test/oasis/baseline/oasis/p03fail10.xml
N test/oasis/baseline/oasis/p03fail11.xml
N test/oasis/baseline/oasis/p03fail12.xml
N test/oasis/baseline/oasis/p03fail13.xml
N test/oasis/baseline/oasis/p03fail14.xml
N test/oasis/baseline/oasis/p03fail15.xml
N test/oasis/baseline/oasis/p03fail16.xml
N test/oasis/baseline/oasis/p03fail17.xml
N test/oasis/baseline/oasis/p03fail18.xml
N test/oasis/baseline/oasis/p03fail19.xml
N test/oasis/baseline/oasis/p03fail2.xml
N test/oasis/baseline/oasis/p03fail20.xml
N test/oasis/baseline/oasis/p03fail21.xml
N test/oasis/baseline/oasis/p03fail22.xml
N test/oasis/baseline/oasis/p03fail23.xml
N test/oasis/baseline/oasis/p03fail24.xml
N test/oasis/baseline/oasis/p03fail25.xml
N test/oasis/baseline/oasis/p03fail26.xml
N test/oasis/baseline/oasis/p03fail27.xml
N test/oasis/baseline/oasis/p03fail28.xml
N test/oasis/baseline/oasis/p03fail29.xml
N test/oasis/baseline/oasis/p03fail3.xml
N test/oasis/baseline/oasis/p03fail4.xml
N test/oasis/baseline/oasis/p03fail5.xml
N test/oasis/baseline/oasis/p03fail7.xml
N test/oasis/baseline/oasis/p03fail8.xml
N test/oasis/baseline/oasis/p03fail9.xml
N test/oasis/baseline/oasis/p04fail1.xml
N test/oasis/baseline/oasis/p04fail2.xml
N test/oasis/baseline/oasis/p04fail3.xml
N test/oasis/baseline/oasis/p05fail1.xml
N test/oasis/baseline/oasis/p05fail2.xml
N test/oasis/baseline/oasis/p05fail3.xml
N test/oasis/baseline/oasis/p05fail4.xml
N test/oasis/baseline/oasis/p05fail5.xml
N test/oasis/baseline/oasis/p09fail1.xml
N test/oasis/baseline/oasis/p09fail2.xml
N test/oasis/baseline/oasis/p09fail3.xml
N test/oasis/baseline/oasis/p09fail4.xml
N test/oasis/baseline/oasis/p09fail5.xml
N test/oasis/baseline/oasis/p10fail1.xml
N test/oasis/baseline/oasis/p10fail2.xml
N test/oasis/baseline/oasis/p10fail3.xml
N test/oasis/baseline/oasis/p11fail1.xml
N test/oasis/baseline/oasis/p11fail2.xml
N test/oasis/baseline/oasis/p12fail1.xml
N test/oasis/baseline/oasis/p12fail2.xml
N test/oasis/baseline/oasis/p12fail3.xml
N test/oasis/baseline/oasis/p12fail4.xml
N test/oasis/baseline/oasis/p12fail5.xml
N test/oasis/baseline/oasis/p12fail6.xml
N test/oasis/baseline/oasis/p12fail7.xml
N test/oasis/baseline/oasis/p14fail1.xml
N test/oasis/baseline/oasis/p14fail2.xml
N test/oasis/baseline/oasis/p14fail3.xml
N test/oasis/baseline/oasis/p15fail1.xml
N test/oasis/baseline/oasis/p15fail2.xml
N test/oasis/baseline/oasis/p15fail3.xml
N test/oasis/baseline/oasis/p16fail1.xml
N test/oasis/baseline/oasis/p16fail2.xml
N test/oasis/baseline/oasis/p18fail1.xml
N test/oasis/baseline/oasis/p18fail2.xml
N test/oasis/baseline/oasis/p18fail3.xml
N test/oasis/baseline/oasis/p22fail1.xml
N test/oasis/baseline/oasis/p22fail2.xml
N test/oasis/baseline/oasis/p23fail1.xml
N test/oasis/baseline/oasis/p23fail2.xml
N test/oasis/baseline/oasis/p23fail3.xml
N test/oasis/baseline/oasis/p23fail4.xml
N test/oasis/baseline/oasis/p23fail5.xml
N test/oasis/baseline/oasis/p24fail1.xml
N test/oasis/baseline/oasis/p24fail2.xml
N test/oasis/baseline/oasis/p25fail1.xml
N test/oasis/baseline/oasis/p26fail1.xml
N test/oasis/baseline/oasis/p26fail2.xml
N test/oasis/baseline/oasis/p27fail1.xml
N test/oasis/baseline/oasis/p28fail1.xml
N test/oasis/baseline/oasis/p29fail1.xml
N test/oasis/baseline/oasis/p30fail1.xml
N test/oasis/baseline/oasis/p31fail1.xml
N test/oasis/baseline/oasis/p32fail1.xml
N test/oasis/baseline/oasis/p32fail2.xml
N test/oasis/baseline/oasis/p32fail3.xml
N test/oasis/baseline/oasis/p32fail4.xml
N test/oasis/baseline/oasis/p32fail5.xml
N test/oasis/baseline/oasis/p39fail1.xml
N test/oasis/baseline/oasis/p39fail2.xml
N test/oasis/baseline/oasis/p39fail3.xml
N test/oasis/baseline/oasis/p39fail4.xml
N test/oasis/baseline/oasis/p39fail5.xml
N test/oasis/baseline/oasis/p40fail1.xml
N test/oasis/baseline/oasis/p40fail2.xml
N test/oasis/baseline/oasis/p40fail3.xml
N test/oasis/baseline/oasis/p40fail4.xml
N test/oasis/baseline/oasis/p41fail1.xml
N test/oasis/baseline/oasis/p41fail2.xml
N test/oasis/baseline/oasis/p41fail3.xml
N test/oasis/baseline/oasis/p42fail1.xml
N test/oasis/baseline/oasis/p42fail2.xml
N test/oasis/baseline/oasis/p42fail3.xml
N test/oasis/baseline/oasis/p43fail1.xml
N test/oasis/baseline/oasis/p43fail2.xml
N test/oasis/baseline/oasis/p43fail3.xml
N test/oasis/baseline/oasis/p44fail1.xml
N test/oasis/baseline/oasis/p44fail2.xml
N test/oasis/baseline/oasis/p44fail3.xml
N test/oasis/baseline/oasis/p44fail4.xml
N test/oasis/baseline/oasis/p44fail5.xml
N test/oasis/baseline/oasis/p45fail1.xml
N test/oasis/baseline/oasis/p45fail2.xml
N test/oasis/baseline/oasis/p45fail3.xml
N test/oasis/baseline/oasis/p45fail4.xml
N test/oasis/baseline/oasis/p46fail1.xml
N test/oasis/baseline/oasis/p46fail2.xml
N test/oasis/baseline/oasis/p46fail3.xml
N test/oasis/baseline/oasis/p46fail4.xml
N test/oasis/baseline/oasis/p46fail5.xml
N test/oasis/baseline/oasis/p46fail6.xml
N test/oasis/baseline/oasis/p47fail1.xml
N test/oasis/baseline/oasis/p47fail2.xml
N test/oasis/baseline/oasis/p47fail3.xml
N test/oasis/baseline/oasis/p47fail4.xml
N test/oasis/baseline/oasis/p48fail1.xml
N test/oasis/baseline/oasis/p48fail2.xml
N test/oasis/baseline/oasis/p49fail1.xml
N test/oasis/baseline/oasis/p50fail1.xml
N test/oasis/baseline/oasis/p51fail1.xml
N test/oasis/baseline/oasis/p51fail2.xml
N test/oasis/baseline/oasis/p51fail3.xml
N test/oasis/baseline/oasis/p51fail4.xml
N test/oasis/baseline/oasis/p51fail5.xml
N test/oasis/baseline/oasis/p51fail6.xml
N test/oasis/baseline/oasis/p51fail7.xml
N test/oasis/baseline/oasis/p52fail1.xml
N test/oasis/baseline/oasis/p52fail2.xml
N test/oasis/baseline/oasis/p53fail1.xml
N test/oasis/baseline/oasis/p53fail2.xml
N test/oasis/baseline/oasis/p53fail3.xml
N test/oasis/baseline/oasis/p53fail4.xml
N test/oasis/baseline/oasis/p53fail5.xml
N test/oasis/baseline/oasis/p54fail1.xml
N test/oasis/baseline/oasis/p55fail1.xml
N test/oasis/baseline/oasis/p56fail1.xml
N test/oasis/baseline/oasis/p56fail2.xml
N test/oasis/baseline/oasis/p56fail3.xml
N test/oasis/baseline/oasis/p56fail4.xml
N test/oasis/baseline/oasis/p56fail5.xml
N test/oasis/baseline/oasis/p57fail1.xml
N test/oasis/baseline/oasis/p58fail1.xml
N test/oasis/baseline/oasis/p58fail2.xml
N test/oasis/baseline/oasis/p58fail3.xml
N test/oasis/baseline/oasis/p58fail4.xml
N test/oasis/baseline/oasis/p58fail5.xml
N test/oasis/baseline/oasis/p58fail6.xml
N test/oasis/baseline/oasis/p58fail7.xml
N test/oasis/baseline/oasis/p58fail8.xml
N test/oasis/baseline/oasis/p59fail1.xml
N test/oasis/baseline/oasis/p59fail2.xml
N test/oasis/baseline/oasis/p59fail3.xml
N test/oasis/baseline/oasis/p60fail1.xml
N test/oasis/baseline/oasis/p60fail2.xml
N test/oasis/baseline/oasis/p60fail3.xml
N test/oasis/baseline/oasis/p60fail4.xml
N test/oasis/baseline/oasis/p60fail5.xml
N test/oasis/baseline/oasis/p61fail1.xml
N test/oasis/baseline/oasis/p62fail1.xml
N test/oasis/baseline/oasis/p62fail2.xml
N test/oasis/baseline/oasis/p63fail1.xml
N test/oasis/baseline/oasis/p63fail2.xml
N test/oasis/baseline/oasis/p64fail1.xml
N test/oasis/baseline/oasis/p64fail2.xml
N test/oasis/baseline/oasis/p66fail1.xml
N test/oasis/baseline/oasis/p66fail2.xml
N test/oasis/baseline/oasis/p66fail3.xml
N test/oasis/baseline/oasis/p66fail4.xml
N test/oasis/baseline/oasis/p66fail5.xml
N test/oasis/baseline/oasis/p66fail6.xml
N test/oasis/baseline/oasis/p68fail1.xml
N test/oasis/baseline/oasis/p68fail2.xml
N test/oasis/baseline/oasis/p68fail3.xml
N test/oasis/baseline/oasis/p69fail1.xml
N test/oasis/baseline/oasis/p69fail2.xml
N test/oasis/baseline/oasis/p69fail3.xml
N test/oasis/baseline/oasis/p70fail1.xml
N test/oasis/baseline/oasis/p71fail1.xml
N test/oasis/baseline/oasis/p71fail2.xml
N test/oasis/baseline/oasis/p71fail3.xml
N test/oasis/baseline/oasis/p71fail4.xml
N test/oasis/baseline/oasis/p72fail1.xml
N test/oasis/baseline/oasis/p72fail2.xml
N test/oasis/baseline/oasis/p72fail3.xml
N test/oasis/baseline/oasis/p72fail4.xml
N test/oasis/baseline/oasis/p73fail1.xml
N test/oasis/baseline/oasis/p73fail2.xml
N test/oasis/baseline/oasis/p73fail3.xml
N test/oasis/baseline/oasis/p73fail4.xml
N test/oasis/baseline/oasis/p73fail5.xml
N test/oasis/baseline/oasis/p74fail1.xml
N test/oasis/baseline/oasis/p74fail2.xml
N test/oasis/baseline/oasis/p74fail3.xml
N test/oasis/baseline/oasis/p75fail1.xml
N test/oasis/baseline/oasis/p75fail2.xml
N test/oasis/baseline/oasis/p75fail3.xml
N test/oasis/baseline/oasis/p75fail4.xml
N test/oasis/baseline/oasis/p75fail5.xml
N test/oasis/baseline/oasis/p75fail6.xml
N test/oasis/baseline/oasis/p76fail1.xml
N test/oasis/baseline/oasis/p76fail2.xml
N test/oasis/baseline/oasis/p76fail3.xml
N test/oasis/baseline/oasis/p76fail4.xml
N test/oasis/baseline/oasis/p11pass1.xml
N test/oasis/baseline/valid/dtd00.xml
N test/oasis/baseline/valid/dtd01.xml
N test/oasis/baseline/valid/element.xml
N test/oasis/baseline/valid/empty.xml
N test/oasis/baseline/valid/ext01.xml
N test/oasis/baseline/valid/ext02.xml
N test/oasis/baseline/valid/not-sa01.xml
N test/oasis/baseline/valid/not-sa02.xml
N test/oasis/baseline/valid/not-sa03.xml
N test/oasis/baseline/valid/not-sa04.xml
N test/oasis/baseline/valid/notation01.xml
N test/oasis/baseline/valid/optional.xml
N test/oasis/baseline/valid/required00.xml
N test/oasis/baseline/valid/sa01.xml
N test/oasis/baseline/valid/sa02.xml
N test/oasis/baseline/valid/sa03.xml
N test/oasis/baseline/valid/sa04.xml
N test/oasis/baseline/valid/sa05.xml
N test/oasis/baseline/valid/sgml01.xml
N test/oasis/baseline/valid/v-lang01.xml
N test/oasis/baseline/valid/v-lang02.xml
N test/oasis/baseline/valid/v-lang03.xml
N test/oasis/baseline/valid/v-lang04.xml
N test/oasis/baseline/valid/v-lang05.xml
N test/oasis/baseline/valid/v-lang06.xml
N test/oasis/baseline/valid/pe00.xml
N test/oasis/baseline/valid/pe01.xml
N test/oasis/baseline/valid/pe02.xml
N test/oasis/baseline/xmltest/not-wf/sa/001.xml
N test/oasis/baseline/xmltest/not-wf/sa/002.xml
N test/oasis/baseline/xmltest/not-wf/sa/003.xml
N test/oasis/baseline/xmltest/not-wf/sa/004.xml
N test/oasis/baseline/xmltest/not-wf/sa/005.xml
N test/oasis/baseline/xmltest/not-wf/sa/006.xml
N test/oasis/baseline/xmltest/not-wf/sa/007.xml
N test/oasis/baseline/xmltest/not-wf/sa/008.xml
N test/oasis/baseline/xmltest/not-wf/sa/009.xml
N test/oasis/baseline/xmltest/not-wf/sa/010.xml
N test/oasis/baseline/xmltest/not-wf/sa/011.xml
N test/oasis/baseline/xmltest/not-wf/sa/012.xml
N test/oasis/baseline/xmltest/not-wf/sa/013.xml
N test/oasis/baseline/xmltest/not-wf/sa/014.xml
N test/oasis/baseline/xmltest/not-wf/sa/015.xml
N test/oasis/baseline/xmltest/not-wf/sa/016.xml
N test/oasis/baseline/xmltest/not-wf/sa/017.xml
N test/oasis/baseline/xmltest/not-wf/sa/018.xml
N test/oasis/baseline/xmltest/not-wf/sa/019.xml
N test/oasis/baseline/xmltest/not-wf/sa/020.xml
N test/oasis/baseline/xmltest/not-wf/sa/021.xml
N test/oasis/baseline/xmltest/not-wf/sa/022.xml
N test/oasis/baseline/xmltest/not-wf/sa/023.xml
N test/oasis/baseline/xmltest/not-wf/sa/024.xml
N test/oasis/baseline/xmltest/not-wf/sa/025.xml
N test/oasis/baseline/xmltest/not-wf/sa/026.xml
N test/oasis/baseline/xmltest/not-wf/sa/027.xml
N test/oasis/baseline/xmltest/not-wf/sa/028.xml
N test/oasis/baseline/xmltest/not-wf/sa/029.xml
N test/oasis/baseline/xmltest/not-wf/sa/030.xml
N test/oasis/baseline/xmltest/not-wf/sa/031.xml
N test/oasis/baseline/xmltest/not-wf/sa/032.xml
N test/oasis/baseline/xmltest/not-wf/sa/033.xml
N test/oasis/baseline/xmltest/not-wf/sa/034.xml
N test/oasis/baseline/xmltest/not-wf/sa/035.xml
N test/oasis/baseline/xmltest/not-wf/sa/036.xml
N test/oasis/baseline/xmltest/not-wf/sa/037.xml
N test/oasis/baseline/xmltest/not-wf/sa/038.xml
N test/oasis/baseline/xmltest/not-wf/sa/039.xml
N test/oasis/baseline/xmltest/not-wf/sa/040.xml
N test/oasis/baseline/xmltest/not-wf/sa/041.xml
N test/oasis/baseline/xmltest/not-wf/sa/042.xml
N test/oasis/baseline/xmltest/not-wf/sa/043.xml
N test/oasis/baseline/xmltest/not-wf/sa/044.xml
N test/oasis/baseline/xmltest/not-wf/sa/045.xml
N test/oasis/baseline/xmltest/not-wf/sa/046.xml
N test/oasis/baseline/xmltest/not-wf/sa/047.xml
N test/oasis/baseline/xmltest/not-wf/sa/048.xml
N test/oasis/baseline/xmltest/not-wf/sa/049.xml
N test/oasis/baseline/xmltest/not-wf/sa/050.xml
N test/oasis/baseline/xmltest/not-wf/sa/051.xml
N test/oasis/baseline/xmltest/not-wf/sa/052.xml
N test/oasis/baseline/xmltest/not-wf/sa/053.xml
N test/oasis/baseline/xmltest/not-wf/sa/054.xml
N test/oasis/baseline/xmltest/not-wf/sa/055.xml
N test/oasis/baseline/xmltest/not-wf/sa/056.xml
N test/oasis/baseline/xmltest/not-wf/sa/057.xml
N test/oasis/baseline/xmltest/not-wf/sa/058.xml
N test/oasis/baseline/xmltest/not-wf/sa/059.xml
N test/oasis/baseline/xmltest/not-wf/sa/060.xml
N test/oasis/baseline/xmltest/not-wf/sa/061.xml
N test/oasis/baseline/xmltest/not-wf/sa/062.xml
N test/oasis/baseline/xmltest/not-wf/sa/063.xml
N test/oasis/baseline/xmltest/not-wf/sa/064.xml
N test/oasis/baseline/xmltest/not-wf/sa/065.xml
N test/oasis/baseline/xmltest/not-wf/sa/066.xml
N test/oasis/baseline/xmltest/not-wf/sa/067.xml
N test/oasis/baseline/xmltest/not-wf/sa/068.xml
N test/oasis/baseline/xmltest/not-wf/sa/069.xml
N test/oasis/baseline/xmltest/not-wf/sa/070.xml
N test/oasis/baseline/xmltest/not-wf/sa/071.xml
N test/oasis/baseline/xmltest/not-wf/sa/072.xml
N test/oasis/baseline/xmltest/not-wf/sa/073.xml
N test/oasis/baseline/xmltest/not-wf/sa/074.xml
N test/oasis/baseline/xmltest/not-wf/sa/075.xml
N test/oasis/baseline/xmltest/not-wf/sa/076.xml
N test/oasis/baseline/xmltest/not-wf/sa/077.xml
N test/oasis/baseline/xmltest/not-wf/sa/078.xml
N test/oasis/baseline/xmltest/not-wf/sa/079.xml
N test/oasis/baseline/xmltest/not-wf/sa/080.xml
N test/oasis/baseline/xmltest/not-wf/sa/081.xml
N test/oasis/baseline/xmltest/not-wf/sa/082.xml
N test/oasis/baseline/xmltest/not-wf/sa/083.xml
N test/oasis/baseline/xmltest/not-wf/sa/084.xml
N test/oasis/baseline/xmltest/not-wf/sa/085.xml
N test/oasis/baseline/xmltest/not-wf/sa/086.xml
N test/oasis/baseline/xmltest/not-wf/sa/087.xml
N test/oasis/baseline/xmltest/not-wf/sa/088.xml
N test/oasis/baseline/xmltest/not-wf/sa/089.xml
N test/oasis/baseline/xmltest/not-wf/sa/090.xml
N test/oasis/baseline/xmltest/not-wf/sa/091.xml
N test/oasis/baseline/xmltest/not-wf/sa/092.xml
N test/oasis/baseline/xmltest/not-wf/sa/093.xml
N test/oasis/baseline/xmltest/not-wf/sa/094.xml
N test/oasis/baseline/xmltest/not-wf/sa/095.xml
N test/oasis/baseline/xmltest/not-wf/sa/096.xml
N test/oasis/baseline/xmltest/not-wf/sa/097.xml
N test/oasis/baseline/xmltest/not-wf/sa/098.xml
N test/oasis/baseline/xmltest/not-wf/sa/099.xml
N test/oasis/baseline/xmltest/not-wf/sa/100.xml
N test/oasis/baseline/xmltest/not-wf/sa/101.xml
N test/oasis/baseline/xmltest/not-wf/sa/102.xml
N test/oasis/baseline/xmltest/not-wf/sa/103.xml
N test/oasis/baseline/xmltest/not-wf/sa/104.xml
N test/oasis/baseline/xmltest/not-wf/sa/105.xml
N test/oasis/baseline/xmltest/not-wf/sa/106.xml
N test/oasis/baseline/xmltest/not-wf/sa/107.xml
N test/oasis/baseline/xmltest/not-wf/sa/108.xml
N test/oasis/baseline/xmltest/not-wf/sa/109.xml
N test/oasis/baseline/xmltest/not-wf/sa/110.xml
N test/oasis/baseline/xmltest/not-wf/sa/111.xml
N test/oasis/baseline/xmltest/not-wf/sa/112.xml
N test/oasis/baseline/xmltest/not-wf/sa/113.xml
N test/oasis/baseline/xmltest/not-wf/sa/114.xml
N test/oasis/baseline/xmltest/not-wf/sa/115.xml
N test/oasis/baseline/xmltest/not-wf/sa/116.xml
N test/oasis/baseline/xmltest/not-wf/sa/117.xml
N test/oasis/baseline/xmltest/not-wf/sa/118.xml
N test/oasis/baseline/xmltest/not-wf/sa/119.xml
N test/oasis/baseline/xmltest/not-wf/sa/120.xml
N test/oasis/baseline/xmltest/not-wf/sa/121.xml
N test/oasis/baseline/xmltest/not-wf/sa/122.xml
N test/oasis/baseline/xmltest/not-wf/sa/123.xml
N test/oasis/baseline/xmltest/not-wf/sa/124.xml
N test/oasis/baseline/xmltest/not-wf/sa/125.xml
N test/oasis/baseline/xmltest/not-wf/sa/126.xml
N test/oasis/baseline/xmltest/not-wf/sa/127.xml
N test/oasis/baseline/xmltest/not-wf/sa/128.xml
N test/oasis/baseline/xmltest/not-wf/sa/129.xml
N test/oasis/baseline/xmltest/not-wf/sa/130.xml
N test/oasis/baseline/xmltest/not-wf/sa/131.xml
N test/oasis/baseline/xmltest/not-wf/sa/132.xml
N test/oasis/baseline/xmltest/not-wf/sa/133.xml
N test/oasis/baseline/xmltest/not-wf/sa/134.xml
N test/oasis/baseline/xmltest/not-wf/sa/135.xml
N test/oasis/baseline/xmltest/not-wf/sa/136.xml
N test/oasis/baseline/xmltest/not-wf/sa/137.xml
N test/oasis/baseline/xmltest/not-wf/sa/138.xml
N test/oasis/baseline/xmltest/not-wf/sa/139.xml
N test/oasis/baseline/xmltest/not-wf/sa/140.xml
N test/oasis/baseline/xmltest/not-wf/sa/141.xml
N test/oasis/baseline/xmltest/not-wf/sa/142.xml
N test/oasis/baseline/xmltest/not-wf/sa/143.xml
N test/oasis/baseline/xmltest/not-wf/sa/144.xml
N test/oasis/baseline/xmltest/not-wf/sa/145.xml
N test/oasis/baseline/xmltest/not-wf/sa/146.xml
N test/oasis/baseline/xmltest/not-wf/sa/147.xml
N test/oasis/baseline/xmltest/not-wf/sa/148.xml
N test/oasis/baseline/xmltest/not-wf/sa/149.xml
N test/oasis/baseline/xmltest/not-wf/sa/150.xml
N test/oasis/baseline/xmltest/not-wf/sa/151.xml
N test/oasis/baseline/xmltest/not-wf/sa/152.xml
N test/oasis/baseline/xmltest/not-wf/sa/153.xml
N test/oasis/baseline/xmltest/not-wf/sa/154.xml
N test/oasis/baseline/xmltest/not-wf/sa/155.xml
N test/oasis/baseline/xmltest/not-wf/sa/156.xml
N test/oasis/baseline/xmltest/not-wf/sa/157.xml
N test/oasis/baseline/xmltest/not-wf/sa/158.xml
N test/oasis/baseline/xmltest/not-wf/sa/159.xml
N test/oasis/baseline/xmltest/not-wf/sa/160.xml
N test/oasis/baseline/xmltest/not-wf/sa/161.xml
N test/oasis/baseline/xmltest/not-wf/sa/162.xml
N test/oasis/baseline/xmltest/not-wf/sa/163.xml
N test/oasis/baseline/xmltest/not-wf/sa/164.xml
N test/oasis/baseline/xmltest/not-wf/sa/165.xml
N test/oasis/baseline/xmltest/not-wf/sa/166.xml
N test/oasis/baseline/xmltest/not-wf/sa/167.xml
N test/oasis/baseline/xmltest/not-wf/sa/168.xml
N test/oasis/baseline/xmltest/not-wf/sa/169.xml
N test/oasis/baseline/xmltest/not-wf/sa/170.xml
N test/oasis/baseline/xmltest/not-wf/sa/171.xml
N test/oasis/baseline/xmltest/not-wf/sa/172.xml
N test/oasis/baseline/xmltest/not-wf/sa/173.xml
N test/oasis/baseline/xmltest/not-wf/sa/174.xml
N test/oasis/baseline/xmltest/not-wf/sa/175.xml
N test/oasis/baseline/xmltest/not-wf/sa/176.xml
N test/oasis/baseline/xmltest/not-wf/sa/177.xml
N test/oasis/baseline/xmltest/not-wf/sa/178.xml
N test/oasis/baseline/xmltest/not-wf/sa/179.xml
N test/oasis/baseline/xmltest/not-wf/sa/180.xml
N test/oasis/baseline/xmltest/not-wf/sa/181.xml
N test/oasis/baseline/xmltest/not-wf/sa/182.xml
N test/oasis/baseline/xmltest/not-wf/sa/183.xml
N test/oasis/baseline/xmltest/not-wf/sa/184.xml
N test/oasis/baseline/xmltest/not-wf/sa/185.xml
N test/oasis/baseline/xmltest/not-wf/sa/186.xml
N test/oasis/baseline/xmltest/not-wf/not-sa/001.xml
N test/oasis/baseline/xmltest/not-wf/not-sa/002.xml
N test/oasis/baseline/xmltest/not-wf/not-sa/003.xml
N test/oasis/baseline/xmltest/not-wf/not-sa/004.xml
N test/oasis/baseline/xmltest/not-wf/not-sa/005.xml
N test/oasis/baseline/xmltest/not-wf/not-sa/006.xml
N test/oasis/baseline/xmltest/not-wf/not-sa/007.xml
N test/oasis/baseline/xmltest/not-wf/not-sa/008.xml
N test/oasis/baseline/xmltest/not-wf/ext-sa/001.xml
N test/oasis/baseline/xmltest/not-wf/ext-sa/002.xml
N test/oasis/baseline/xmltest/not-wf/ext-sa/003.xml
N test/oasis/baseline/xmltest/invalid/001.xml
N test/oasis/baseline/xmltest/invalid/002.xml
N test/oasis/baseline/xmltest/invalid/003.xml
N test/oasis/baseline/xmltest/invalid/004.xml
N test/oasis/baseline/xmltest/invalid/005.xml
N test/oasis/baseline/xmltest/invalid/006.xml
N test/oasis/baseline/xmltest/valid/sa/001.xml
N test/oasis/baseline/xmltest/valid/sa/002.xml
N test/oasis/baseline/xmltest/valid/sa/003.xml
N test/oasis/baseline/xmltest/valid/sa/004.xml
N test/oasis/baseline/xmltest/valid/sa/005.xml
N test/oasis/baseline/xmltest/valid/sa/006.xml
N test/oasis/baseline/xmltest/valid/sa/007.xml
N test/oasis/baseline/xmltest/valid/sa/008.xml
N test/oasis/baseline/xmltest/valid/sa/009.xml
N test/oasis/baseline/xmltest/valid/sa/010.xml
N test/oasis/baseline/xmltest/valid/sa/011.xml
N test/oasis/baseline/xmltest/valid/sa/012.xml
N test/oasis/baseline/xmltest/valid/sa/013.xml
N test/oasis/baseline/xmltest/valid/sa/014.xml
N test/oasis/baseline/xmltest/valid/sa/015.xml
N test/oasis/baseline/xmltest/valid/sa/016.xml
N test/oasis/baseline/xmltest/valid/sa/017.xml
N test/oasis/baseline/xmltest/valid/sa/018.xml
N test/oasis/baseline/xmltest/valid/sa/019.xml
N test/oasis/baseline/xmltest/valid/sa/020.xml
N test/oasis/baseline/xmltest/valid/sa/021.xml
N test/oasis/baseline/xmltest/valid/sa/022.xml
N test/oasis/baseline/xmltest/valid/sa/023.xml
N test/oasis/baseline/xmltest/valid/sa/024.xml
N test/oasis/baseline/xmltest/valid/sa/025.xml
N test/oasis/baseline/xmltest/valid/sa/026.xml
N test/oasis/baseline/xmltest/valid/sa/027.xml
N test/oasis/baseline/xmltest/valid/sa/028.xml
N test/oasis/baseline/xmltest/valid/sa/029.xml
N test/oasis/baseline/xmltest/valid/sa/030.xml
N test/oasis/baseline/xmltest/valid/sa/031.xml
N test/oasis/baseline/xmltest/valid/sa/032.xml
N test/oasis/baseline/xmltest/valid/sa/033.xml
N test/oasis/baseline/xmltest/valid/sa/034.xml
N test/oasis/baseline/xmltest/valid/sa/035.xml
N test/oasis/baseline/xmltest/valid/sa/036.xml
N test/oasis/baseline/xmltest/valid/sa/037.xml
N test/oasis/baseline/xmltest/valid/sa/038.xml
N test/oasis/baseline/xmltest/valid/sa/039.xml
N test/oasis/baseline/xmltest/valid/sa/040.xml
N test/oasis/baseline/xmltest/valid/sa/041.xml
N test/oasis/baseline/xmltest/valid/sa/042.xml
N test/oasis/baseline/xmltest/valid/sa/043.xml
N test/oasis/baseline/xmltest/valid/sa/044.xml
N test/oasis/baseline/xmltest/valid/sa/045.xml
N test/oasis/baseline/xmltest/valid/sa/046.xml
N test/oasis/baseline/xmltest/valid/sa/047.xml
N test/oasis/baseline/xmltest/valid/sa/048.xml
N test/oasis/baseline/xmltest/valid/sa/049.xml
N test/oasis/baseline/xmltest/valid/sa/050.xml
N test/oasis/baseline/xmltest/valid/sa/051.xml
N test/oasis/baseline/xmltest/valid/sa/052.xml
N test/oasis/baseline/xmltest/valid/sa/053.xml
N test/oasis/baseline/xmltest/valid/sa/054.xml
N test/oasis/baseline/xmltest/valid/sa/055.xml
N test/oasis/baseline/xmltest/valid/sa/056.xml
N test/oasis/baseline/xmltest/valid/sa/057.xml
N test/oasis/baseline/xmltest/valid/sa/058.xml
N test/oasis/baseline/xmltest/valid/sa/059.xml
N test/oasis/baseline/xmltest/valid/sa/060.xml
N test/oasis/baseline/xmltest/valid/sa/061.xml
N test/oasis/baseline/xmltest/valid/sa/062.xml
N test/oasis/baseline/xmltest/valid/sa/063.xml
N test/oasis/baseline/xmltest/valid/sa/064.xml
N test/oasis/baseline/xmltest/valid/sa/065.xml
N test/oasis/baseline/xmltest/valid/sa/066.xml
N test/oasis/baseline/xmltest/valid/sa/067.xml
N test/oasis/baseline/xmltest/valid/sa/068.xml
N test/oasis/baseline/xmltest/valid/sa/069.xml
N test/oasis/baseline/xmltest/valid/sa/070.xml
N test/oasis/baseline/xmltest/valid/sa/071.xml
N test/oasis/baseline/xmltest/valid/sa/072.xml
N test/oasis/baseline/xmltest/valid/sa/073.xml
N test/oasis/baseline/xmltest/valid/sa/074.xml
N test/oasis/baseline/xmltest/valid/sa/075.xml
N test/oasis/baseline/xmltest/valid/sa/076.xml
N test/oasis/baseline/xmltest/valid/sa/077.xml
N test/oasis/baseline/xmltest/valid/sa/078.xml
N test/oasis/baseline/xmltest/valid/sa/079.xml
N test/oasis/baseline/xmltest/valid/sa/080.xml
N test/oasis/baseline/xmltest/valid/sa/081.xml
N test/oasis/baseline/xmltest/valid/sa/082.xml
N test/oasis/baseline/xmltest/valid/sa/083.xml
N test/oasis/baseline/xmltest/valid/sa/084.xml
N test/oasis/baseline/xmltest/valid/sa/085.xml
N test/oasis/baseline/xmltest/valid/sa/086.xml
N test/oasis/baseline/xmltest/valid/sa/087.xml
N test/oasis/baseline/xmltest/valid/sa/088.xml
N test/oasis/baseline/xmltest/valid/sa/089.xml
N test/oasis/baseline/xmltest/valid/sa/090.xml
N test/oasis/baseline/xmltest/valid/sa/091.xml
N test/oasis/baseline/xmltest/valid/sa/092.xml
N test/oasis/baseline/xmltest/valid/sa/093.xml
N test/oasis/baseline/xmltest/valid/sa/094.xml
N test/oasis/baseline/xmltest/valid/sa/095.xml
N test/oasis/baseline/xmltest/valid/sa/096.xml
N test/oasis/baseline/xmltest/valid/sa/097.xml
N test/oasis/baseline/xmltest/valid/sa/098.xml
N test/oasis/baseline/xmltest/valid/sa/099.xml
N test/oasis/baseline/xmltest/valid/sa/100.xml
N test/oasis/baseline/xmltest/valid/sa/101.xml
N test/oasis/baseline/xmltest/valid/sa/102.xml
N test/oasis/baseline/xmltest/valid/sa/103.xml
N test/oasis/baseline/xmltest/valid/sa/104.xml
N test/oasis/baseline/xmltest/valid/sa/105.xml
N test/oasis/baseline/xmltest/valid/sa/106.xml
N test/oasis/baseline/xmltest/valid/sa/107.xml
N test/oasis/baseline/xmltest/valid/sa/108.xml
N test/oasis/baseline/xmltest/valid/sa/109.xml
N test/oasis/baseline/xmltest/valid/sa/110.xml
N test/oasis/baseline/xmltest/valid/sa/111.xml
N test/oasis/baseline/xmltest/valid/sa/112.xml
N test/oasis/baseline/xmltest/valid/sa/113.xml
N test/oasis/baseline/xmltest/valid/sa/114.xml
N test/oasis/baseline/xmltest/valid/sa/115.xml
N test/oasis/baseline/xmltest/valid/sa/116.xml
N test/oasis/baseline/xmltest/valid/sa/117.xml
N test/oasis/baseline/xmltest/valid/sa/118.xml
N test/oasis/baseline/xmltest/valid/sa/119.xml
N test/oasis/baseline/xmltest/valid/not-sa/001.xml
N test/oasis/baseline/xmltest/valid/not-sa/002.xml
N test/oasis/baseline/xmltest/valid/not-sa/003.xml
N test/oasis/baseline/xmltest/valid/not-sa/004.xml
N test/oasis/baseline/xmltest/valid/not-sa/005.xml
N test/oasis/baseline/xmltest/valid/not-sa/006.xml
N test/oasis/baseline/xmltest/valid/not-sa/007.xml
N test/oasis/baseline/xmltest/valid/not-sa/008.xml
N test/oasis/baseline/xmltest/valid/not-sa/009.xml
N test/oasis/baseline/xmltest/valid/not-sa/010.xml
N test/oasis/baseline/xmltest/valid/not-sa/011.xml
N test/oasis/baseline/xmltest/valid/not-sa/012.xml
N test/oasis/baseline/xmltest/valid/not-sa/013.xml
N test/oasis/baseline/xmltest/valid/not-sa/014.xml
N test/oasis/baseline/xmltest/valid/not-sa/015.xml
N test/oasis/baseline/xmltest/valid/not-sa/016.xml
N test/oasis/baseline/xmltest/valid/not-sa/017.xml
N test/oasis/baseline/xmltest/valid/not-sa/018.xml
N test/oasis/baseline/xmltest/valid/not-sa/019.xml
N test/oasis/baseline/xmltest/valid/not-sa/020.xml
N test/oasis/baseline/xmltest/valid/not-sa/021.xml
N test/oasis/baseline/xmltest/valid/not-sa/022.xml
N test/oasis/baseline/xmltest/valid/not-sa/023.xml
N test/oasis/baseline/xmltest/valid/not-sa/024.xml
N test/oasis/baseline/xmltest/valid/not-sa/025.xml
N test/oasis/baseline/xmltest/valid/not-sa/026.xml
N test/oasis/baseline/xmltest/valid/not-sa/027.xml
N test/oasis/baseline/xmltest/valid/not-sa/028.xml
N test/oasis/baseline/xmltest/valid/not-sa/029.xml
N test/oasis/baseline/xmltest/valid/not-sa/030.xml
N test/oasis/baseline/xmltest/valid/not-sa/031.xml
N test/oasis/baseline/xmltest/valid/ext-sa/001.xml
N test/oasis/baseline/xmltest/valid/ext-sa/002.xml
N test/oasis/baseline/xmltest/valid/ext-sa/003.xml
N test/oasis/baseline/xmltest/valid/ext-sa/004.xml
N test/oasis/baseline/xmltest/valid/ext-sa/005.xml
N test/oasis/baseline/xmltest/valid/ext-sa/006.xml
N test/oasis/baseline/xmltest/valid/ext-sa/007.xml
N test/oasis/baseline/xmltest/valid/ext-sa/008.xml
N test/oasis/baseline/xmltest/valid/ext-sa/009.xml
N test/oasis/baseline/xmltest/valid/ext-sa/011.xml
N test/oasis/baseline/xmltest/valid/ext-sa/012.xml
N test/oasis/baseline/xmltest/valid/ext-sa/013.xml
N test/oasis/baseline/xmltest/valid/ext-sa/014.xml
N test/oasis/baseline/myown/long-comment.xml

No conflicts created by this import

***** Bogus filespec: -
***** Bogus filespec: Imported
***** Bogus filespec: sources

From fdrake@users.sourceforge.net  Thu Mar 29 22:22:25 2001
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Thu, 29 Mar 2001 14:22:25 -0800
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libcursespanel.tex,1.1,1.2
Message-ID: <E14ikoD-0001Vs-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Doc/lib
In directory usw-pr-cvs1:/tmp/cvs-serv5800/lib

Modified Files:
	libcursespanel.tex 
Log Message:

Fix serious markup errors.

Index: libcursespanel.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/lib/libcursespanel.tex,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** libcursespanel.tex	2000/12/22 21:57:42	1.1
--- libcursespanel.tex	2001/03/29 22:22:23	1.2
***************
*** 21,27 ****
  \end{funcdesc}

! \begin{methoddesc}{new_panel}{win}
  Returns a panel object, associating it with the given window \var{win}.
! \end{methoddesc}

  \begin{funcdesc}{top_panel}{}
--- 21,27 ----
  \end{funcdesc}

! \begin{funcdesc}{new_panel}{win}
  Returns a panel object, associating it with the given window \var{win}.
! \end{funcdesc}

  \begin{funcdesc}{top_panel}{}
***************
*** 43,63 ****
  Panel objects have the following methods:

! \begin{methoddesc}{above}
  Returns the panel above the current panel.
  \end{methoddesc}

! \begin{methoddesc}{below}
  Returns the panel below the current panel.
  \end{methoddesc}

! \begin{methoddesc}{bottom}
  Push the panel to the bottom of the stack.
  \end{methoddesc}

! \begin{methoddesc}{hidden}
  Returns true if the panel is hidden (not visible), false otherwise.
  \end{methoddesc}

! \begin{methoddesc}{hide}
  Hide the panel. This does not delete the object, it just makes the
  window on screen invisible.
--- 43,63 ----
  Panel objects have the following methods:

! \begin{methoddesc}{above}{}
  Returns the panel above the current panel.
  \end{methoddesc}

! \begin{methoddesc}{below}{}
  Returns the panel below the current panel.
  \end{methoddesc}

! \begin{methoddesc}{bottom}{}
  Push the panel to the bottom of the stack.
  \end{methoddesc}

! \begin{methoddesc}{hidden}{}
  Returns true if the panel is hidden (not visible), false otherwise.
  \end{methoddesc}

! \begin{methoddesc}{hide}{}
  Hide the panel. This does not delete the object, it just makes the
  window on screen invisible.
***************
*** 77,93 ****
  \end{methoddesc}

! \begin{methoddesc}{show}
  Display the panel (which might have been hidden).
  \end{methoddesc}

! \begin{methoddesc}{top}
  Push panel to the top of the stack.
  \end{methoddesc}

! \begin{methoddesc}{userptr}
  Returns the user pointer for the panel.  This might be any Python object.
  \end{methoddesc}

! \begin{methoddesc}{window}
  Returns the window object associated with the panel.
  \end{methoddesc}
--- 77,93 ----
  \end{methoddesc}

! \begin{methoddesc}{show}{}
  Display the panel (which might have been hidden).
  \end{methoddesc}

! \begin{methoddesc}{top}{}
  Push panel to the top of the stack.
  \end{methoddesc}

! \begin{methoddesc}{userptr}{}
  Returns the user pointer for the panel.  This might be any Python object.
  \end{methoddesc}

! \begin{methoddesc}{window}{}
  Returns the window object associated with the panel.
  \end{methoddesc}

From fdrake@users.sourceforge.net  Thu Mar 29 22:23:21 2001
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Thu, 29 Mar 2001 14:23:21 -0800
Subject: [Python-checkins] CVS: python/dist/src/Doc Makefile.deps,1.62,1.63
Message-ID: <E14ikp7-0001Yj-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Doc
In directory usw-pr-cvs1:/tmp/cvs-serv5984

Modified Files:
	Makefile.deps 
Log Message:

Add entry for curses.panel documentation.

Index: Makefile.deps
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/Makefile.deps,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -r1.62 -r1.63
*** Makefile.deps	2001/03/23 16:23:21	1.62
--- Makefile.deps	2001/03/29 22:23:18	1.63
***************
*** 242,245 ****
--- 242,246 ----
  	lib/libcodeop.tex \
  	lib/libcurses.tex \
+ 	lib/libcursespanel.tex \
  	lib/libascii.tex \
  	lib/libdl.tex \

From fdrake@users.sourceforge.net  Thu Mar 29 22:23:21 2001
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Thu, 29 Mar 2001 14:23:21 -0800
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib lib.tex,1.183,1.184
Message-ID: <E14ikp7-0001Yo-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Doc/lib
In directory usw-pr-cvs1:/tmp/cvs-serv5984/lib

Modified Files:
	lib.tex 
Log Message:

Add entry for curses.panel documentation.

Index: lib.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/lib/lib.tex,v
retrieving revision 1.183
retrieving revision 1.184
diff -C2 -r1.183 -r1.184
*** lib.tex	2001/03/01 19:54:29	1.183
--- lib.tex	2001/03/29 22:23:19	1.184
***************
*** 141,144 ****
--- 141,145 ----
  \input{libcurses}
  \input{libascii}                % curses.ascii
+ \input{libcursespanel}
  \input{libgetopt}
  \input{libtempfile}

From fdrake@users.sourceforge.net  Thu Mar 29 23:31:24 2001
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Thu, 29 Mar 2001 15:31:24 -0800
Subject: [Python-checkins] CVS: python/dist/src/Doc/tools/sgmlconv docfixer.py,1.27,1.28
Message-ID: <E14ilsy-0003po-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Doc/tools/sgmlconv
In directory usw-pr-cvs1:/tmp/cvs-serv14725

Modified Files:
	docfixer.py 
Log Message:

Allow the <author/> element to appear before a paragraph without being
made a part of the paragraph.

Index: docfixer.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/tools/sgmlconv/docfixer.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** docfixer.py	2001/03/23 17:09:02	1.27
--- docfixer.py	2001/03/29 23:31:22	1.28
***************
*** 620,624 ****

  PARA_LEVEL_PRECEEDERS = (
!     "setindexsubitem",
      "stindex", "obindex", "COMMENT", "label", "input", "title",
      "versionadded", "versionchanged", "declaremodule", "modulesynopsis",
--- 620,624 ----

  PARA_LEVEL_PRECEEDERS = (
!     "setindexsubitem", "author",
      "stindex", "obindex", "COMMENT", "label", "input", "title",
      "versionadded", "versionchanged", "declaremodule", "modulesynopsis",

From moshez@users.sourceforge.net  Fri Mar 30 13:55:54 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Fri, 30 Mar 2001 05:55:54 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.2,1.81.2.3
Message-ID: <E14izNa-0007GC-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv24110/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
Documenting the _curses bug fix.

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.2
retrieving revision 1.81.2.3
diff -C2 -r1.81.2.2 -r1.81.2.3
*** NEWS	2001/03/15 17:12:36	1.81.2.2
--- NEWS	2001/03/30 13:55:52	1.81.2.3
***************
*** 16,19 ****
--- 16,21 ----
  - #117278, #117167: _tkinter

+ - #116172, curses module fails to build on SGI, _curses
+ 
  What's New in Python 2.0?
  =========================

From moshez@users.sourceforge.net  Fri Mar 30 14:23:08 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Fri, 30 Mar 2001 06:23:08 -0800
Subject: [Python-checkins] CVS: python/dist/src/Modules _cursesmodule.c,2.39.2.1,2.39.2.2
Message-ID: <E14iznw-0008W3-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv29389/Modules

Modified Files:
      Tag: release20-maint
	_cursesmodule.c 
Log Message:
More _curses compilation-problem fixes.
NetBSD, IRIX and platforms with term.h that makes "lines" a macro

Index: _cursesmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_cursesmodule.c,v
retrieving revision 2.39.2.1
retrieving revision 2.39.2.2
diff -C2 -r2.39.2.1 -r2.39.2.2
*** _cursesmodule.c	2001/03/29 19:27:29	2.39.2.1
--- _cursesmodule.c	2001/03/30 14:23:06	2.39.2.2
***************
*** 85,88 ****
--- 85,89 ----
      prototype here. */
  extern char *tigetstr(char *);
+ extern char *tparm(char *instring, ...);
  #endif

***************
*** 92,95 ****
--- 93,100 ----
  #endif

+ #if defined(_AIX)
+ #define STRICT_SYSV_CURSES
+ #endif
+ 
  /* Definition of exception curses.error */

***************
*** 262,268 ****
--- 267,281 ----
  Window_OneArgNoReturnFunction(clearok, int, "i;True(1) or False(0)")
  Window_OneArgNoReturnFunction(idlok, int, "i;True(1) or False(0)")
+ #if defined(__NetBSD__)
+ Window_OneArgNoReturnVoidFunction(keypad, int, "i;True(1) or False(0)")
+ #else
  Window_OneArgNoReturnFunction(keypad, int, "i;True(1) or False(0)")
+ #endif
  Window_OneArgNoReturnFunction(leaveok, int, "i;True(1) or False(0)")
+ #if defined(__NetBSD__)
+ Window_OneArgNoReturnVoidFunction(nodelay, int, "i;True(1) or False(0)")
+ #else
  Window_OneArgNoReturnFunction(nodelay, int, "i;True(1) or False(0)")
+ #endif
  Window_OneArgNoReturnFunction(notimeout, int, "i;True(1) or False(0)")
  Window_OneArgNoReturnFunction(scrollok, int, "i;True(1) or False(0)")
***************
*** 607,614 ****
--- 620,629 ----
    }

+ #if !defined(__NetBSD__)
    if (self->win->_flags & _ISPAD)
      return PyCursesCheckERR(pechochar(self->win, ch | attr), 
  			    "echochar");
    else
+ #endif
      return PyCursesCheckERR(wechochar(self->win, ch | attr), 
  			    "echochar");
***************
*** 687,691 ****
--- 702,710 ----
      return Py_BuildValue("c", rtn);
    else
+ #if defined(__NetBSD__)
+     return PyString_FromString(unctrl(rtn));
+ #else
      return PyString_FromString((char *)keyname(rtn));
+ #endif
  }

***************
*** 1006,1010 ****
--- 1025,1033 ----
    int rtn;

+ #if defined(__NetBSD__)
+   if (0) {
+ #else
    if (self->win->_flags & _ISPAD) {
+ #endif
      switch(ARG_COUNT(args)) {
      case 6:
***************
*** 1068,1072 ****
--- 1091,1099 ----
    int rtn;

+ #if defined(__NetBSD__)
+   if (0) {
+ #else
    if (self->win->_flags & _ISPAD) {
+ #endif
      switch(ARG_COUNT(args)) {
      case 6:
***************
*** 1132,1138 ****
--- 1159,1167 ----

    /* printf("Subwin: %i %i %i %i   \n", nlines, ncols, begin_y, begin_x); */
+ #if !defined(__NetBSD__)
    if (self->win->_flags & _ISPAD)
      win = subpad(self->win, nlines, ncols, begin_y, begin_x);
    else
+ #endif
      win = subwin(self->win, nlines, ncols, begin_y, begin_x);

***************
*** 1148,1152 ****
  PyCursesWindow_Scroll(PyCursesWindowObject *self, PyObject *args)
  {
!   int lines;
    switch(ARG_COUNT(args)) {
    case 0:
--- 1177,1181 ----
  PyCursesWindow_Scroll(PyCursesWindowObject *self, PyObject *args)
  {
!   int nlines;
    switch(ARG_COUNT(args)) {
    case 0:
***************
*** 1154,1160 ****
      break;
    case 1:
!     if (!PyArg_Parse(args, "i;lines", &lines))
        return NULL;
!     return PyCursesCheckERR(wscrl(self->win, lines), "scroll");
    default:
      PyErr_SetString(PyExc_TypeError, "scroll requires 0 or 1 arguments");
--- 1183,1189 ----
      break;
    case 1:
!     if (!PyArg_Parse(args, "i;nlines", &nlines))
        return NULL;
!     return PyCursesCheckERR(wscrl(self->win, nlines), "scroll");
    default:
      PyErr_SetString(PyExc_TypeError, "scroll requires 0 or 1 arguments");
***************
*** 1688,1692 ****
  {
    WINDOW *win;
!   PyObject *lines, *cols;

    if (!PyArg_NoArgs(args)) return NULL;
--- 1717,1721 ----
  {
    WINDOW *win;
!   PyObject *nlines, *cols;

    if (!PyArg_NoArgs(args)) return NULL;
***************
*** 1772,1778 ****
  #endif

!   lines = PyInt_FromLong((long) LINES);
!   PyDict_SetItemString(ModDict, "LINES", lines);
!   Py_DECREF(lines);
    cols = PyInt_FromLong((long) COLS);
    PyDict_SetItemString(ModDict, "COLS", cols);
--- 1801,1807 ----
  #endif

!   nlines = PyInt_FromLong((long) LINES);
!   PyDict_SetItemString(ModDict, "LINES", nlines);
!   Py_DECREF(nlines);
    cols = PyInt_FromLong((long) COLS);
    PyDict_SetItemString(ModDict, "COLS", cols);
***************
*** 1802,1805 ****
--- 1831,1835 ----
  }

+ #if !defined(__NetBSD__)
  static PyObject *
  PyCurses_KeyName(PyObject *self, PyObject *args)
***************
*** 1816,1819 ****
--- 1846,1850 ----
    return PyString_FromString((knp == NULL) ? "" : (char *)knp);
  }
+ #endif

  static PyObject *  
***************
*** 2215,2219 ****
--- 2246,2252 ----
    {"intrflush",           (PyCFunction)PyCurses_IntrFlush},
    {"isendwin",            (PyCFunction)PyCurses_isendwin},
+ #if !defined(__NetBSD__)
    {"keyname",             (PyCFunction)PyCurses_KeyName},
+ #endif
    {"killchar",            (PyCFunction)PyCurses_KillChar}, 
    {"longname",            (PyCFunction)PyCurses_longname}, 
***************
*** 2289,2293 ****
--- 2322,2328 ----
  	SetDictInt("A_BOLD",		A_BOLD);
  	SetDictInt("A_ALTCHARSET",	A_ALTCHARSET);
+ #if !defined(__NetBSD__)
  	SetDictInt("A_INVIS",           A_INVIS);
+ #endif
  	SetDictInt("A_PROTECT",         A_PROTECT);
  	SetDictInt("A_CHARTEXT",        A_CHARTEXT);
***************
*** 2361,2364 ****
--- 2396,2400 ----
  	  char *key_n;
  	  char *key_n2;
+ #if !defined(__NetBSD__)
  	  for (key=KEY_MIN;key < KEY_MAX; key++) {
  	    key_n = (char *)keyname(key);
***************
*** 2384,2387 ****
--- 2420,2424 ----
  	      free(key_n2);
  	  }
+ #endif
  	  SetDictInt("KEY_MIN", KEY_MIN);
  	  SetDictInt("KEY_MAX", KEY_MAX);

From moshez@users.sourceforge.net  Fri Mar 30 14:23:08 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Fri, 30 Mar 2001 06:23:08 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.3,1.81.2.4
Message-ID: <E14iznw-0008WA-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv29389/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
More _curses compilation-problem fixes.
NetBSD, IRIX and platforms with term.h that makes "lines" a macro

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.3
retrieving revision 1.81.2.4
diff -C2 -r1.81.2.3 -r1.81.2.4
*** NEWS	2001/03/30 13:55:52	1.81.2.3
--- NEWS	2001/03/30 14:23:06	1.81.2.4
***************
*** 18,21 ****
--- 18,27 ----
  - #116172, curses module fails to build on SGI, _curses

+ - Patch #103485, compile on NetBSD
+ 
+ - Rename lines to nlines, macro sometimes defined in term.h
+ 
+ - Patch #130117: add a prototype required to compile cleanly on IRIX
+ 
  What's New in Python 2.0?
  =========================

From moshez@users.sourceforge.net  Fri Mar 30 14:48:16 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Fri, 30 Mar 2001 06:48:16 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib locale.py,1.11,1.11.2.1
Message-ID: <E14j0CG-0001JZ-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv2100/Lib

Modified Files:
      Tag: release20-maint
	locale.py 
Log Message:
In Lib/locale.py, setlocale emulation, use != and not is not to compare
strings

Index: locale.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/locale.py,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -r1.11 -r1.11.2.1
*** locale.py	2000/07/16 12:04:30	1.11
--- locale.py	2001/03/30 14:48:14	1.11.2.1
***************
*** 66,70 ****
          """
          if value is not None and \
!            value is not 'C':
              raise Error, '_locale emulation only supports "C" locale'
          return 'C'
--- 66,70 ----
          """
          if value is not None and \
!            value != 'C':
              raise Error, '_locale emulation only supports "C" locale'
          return 'C'

From moshez@users.sourceforge.net  Fri Mar 30 14:48:16 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Fri, 30 Mar 2001 06:48:16 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.4,1.81.2.5
Message-ID: <E14j0CG-0001Je-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv2100/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
In Lib/locale.py, setlocale emulation, use != and not is not to compare
strings

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.4
retrieving revision 1.81.2.5
diff -C2 -r1.81.2.4 -r1.81.2.5
*** NEWS	2001/03/30 14:23:06	1.81.2.4
--- NEWS	2001/03/30 14:48:14	1.81.2.5
***************
*** 24,27 ****
--- 24,31 ----
  - Patch #130117: add a prototype required to compile cleanly on IRIX

+ - In Lib/locale.py, setlocale emulation, use != and not is not to compare
+   strings
+ 
+ 
  What's New in Python 2.0?
  =========================

From moshez@users.sourceforge.net  Fri Mar 30 15:37:34 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Fri, 30 Mar 2001 07:37:34 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.5,1.81.2.6
Message-ID: <E14j0xy-0003xs-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv9037/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
Fixing #409651 -- \ in a character group

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.5
retrieving revision 1.81.2.6
diff -C2 -r1.81.2.5 -r1.81.2.6
*** NEWS	2001/03/30 14:48:14	1.81.2.5
--- NEWS	2001/03/30 15:37:31	1.81.2.6
***************
*** 27,30 ****
--- 27,32 ----
    strings

+ - #409651 - in Lib/fnmatch.py, make \ in a character group work
+ 

  What's New in Python 2.0?

From moshez@users.sourceforge.net  Fri Mar 30 15:37:34 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Fri, 30 Mar 2001 07:37:34 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib fnmatch.py,1.8,1.8.2.1
Message-ID: <E14j0xy-0003xr-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv9037/Lib

Modified Files:
      Tag: release20-maint
	fnmatch.py 
Log Message:
Fixing #409651 -- \ in a character group

Index: fnmatch.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/fnmatch.py,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -r1.8 -r1.8.2.1
*** fnmatch.py	2000/06/28 14:48:01	1.8
--- fnmatch.py	2001/03/30 15:37:31	1.8.2.1
***************
*** 74,78 ****
  				res = res + '\\['
  			else:
! 				stuff = pat[i:j]
  				i = j+1
  				if stuff[0] == '!':
--- 74,78 ----
  				res = res + '\\['
  			else:
! 				stuff = pat[i:j].replace('\\','\\\\')
  				i = j+1
  				if stuff[0] == '!':

From bwarsaw@users.sourceforge.net  Fri Mar 30 16:29:46 2001
From: bwarsaw@users.sourceforge.net (Barry Warsaw)
Date: Fri, 30 Mar 2001 08:29:46 -0800
Subject: [Python-checkins] CVS: python/nondist/peps pep-0000.txt,1.85,1.86
Message-ID: <E14j1mU-0006V6-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/nondist/peps
In directory usw-pr-cvs1:/tmp/cvs-serv24980

Modified Files:
	pep-0000.txt 
Log Message:
Added PEPs 248 & 249, Python Database API Specification (v1.0 and
v2.0)

Index: pep-0000.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/pep-0000.txt,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -r1.85 -r1.86
*** pep-0000.txt	2001/03/29 03:13:49	1.85
--- pep-0000.txt	2001/03/30 16:29:44	1.86
***************
*** 33,36 ****
--- 33,38 ----

   I   247  pep-0247.txt  API for Cryptographic Hash Functions   Kuchling
+  I   248  pep-0248.txt  Python Database API Specification v1.0 Lemburg
+  I   249  pep-0249.txt  Python Database API Specification v2.0 Lemburg

   Active PEPs (under serious consideration for Python 2.1 - even if empty)
***************
*** 166,169 ****
--- 168,173 ----
   S   246  pep-0246.txt  Object Adaptation                      Evans
   I   247  pep-0247.txt  API for Cryptographic Hash Functions   Kuchling
+  I   248  pep-0248.txt  Python Database API Specification v1.0 Lemburg
+  I   249  pep-0249.txt  Python Database API Specification v2.0 Lemburg

From moshez@users.sourceforge.net  Fri Mar 30 16:31:52 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Fri, 30 Mar 2001 08:31:52 -0800
Subject: [Python-checkins] CVS: python/dist/src/Python compile.c,2.142,2.142.2.1 marshal.c,1.57,1.57.2.1
Message-ID: <E14j1oW-0006be-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Python
In directory usw-pr-cvs1:/tmp/cvs-serv21285/Python

Modified Files:
      Tag: release20-maint
	compile.c marshal.c 
Log Message:
SF bug 119622:  compile errors due to redundant atof decls.
Fixed in compile.c and marshal.c
Quote tim: "Python shouldn't be in the business of defining atof"

Index: compile.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/compile.c,v
retrieving revision 2.142
retrieving revision 2.142.2.1
diff -C2 -r2.142 -r2.142.2.1
*** compile.c	2000/09/26 05:46:01	2.142
--- compile.c	2001/03/30 16:31:49	2.142.2.1
***************
*** 768,772 ****
  parsenumber(struct compiling *co, char *s)
  {
- 	extern double atof(const char *);
  	char *end;
  	long x;
--- 768,771 ----

Index: marshal.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/marshal.c,v
retrieving revision 1.57
retrieving revision 1.57.2.1
diff -C2 -r1.57 -r1.57.2.1
*** marshal.c	2000/09/19 08:54:13	1.57
--- marshal.c	2001/03/30 16:31:49	1.57.2.1
***************
*** 404,408 ****
  	case TYPE_FLOAT:
  		{
- 			extern double atof(const char *);
  			char buf[256];
  			double dx;
--- 404,407 ----
***************
*** 423,427 ****
  	case TYPE_COMPLEX:
  		{
- 			extern double atof(const char *);
  			char buf[256];
  			Py_complex c;
--- 422,425 ----

From moshez@users.sourceforge.net  Fri Mar 30 16:31:52 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Fri, 30 Mar 2001 08:31:52 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.6,1.81.2.7
Message-ID: <E14j1oW-0006bl-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv21285/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
SF bug 119622:  compile errors due to redundant atof decls.
Fixed in compile.c and marshal.c
Quote tim: "Python shouldn't be in the business of defining atof"

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.6
retrieving revision 1.81.2.7
diff -C2 -r1.81.2.6 -r1.81.2.7
*** NEWS	2001/03/30 15:37:31	1.81.2.6
--- NEWS	2001/03/30 16:31:50	1.81.2.7
***************
*** 29,32 ****
--- 29,35 ----
  - #409651 - in Lib/fnmatch.py, make \ in a character group work

+ - #119622:  compile errors due to redundant atof decls. Removed from
+   Python/compile.c and Python/marshal.c
+ 

  What's New in Python 2.0?

From moshez@users.sourceforge.net  Fri Mar 30 16:49:09 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Fri, 30 Mar 2001 08:49:09 -0800
Subject: [Python-checkins] CVS: python/dist/src/Objects rangeobject.c,2.20,2.20.2.1
Message-ID: <E14j25F-0007V8-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Objects
In directory usw-pr-cvs1:/tmp/cvs-serv25889/Objects

Modified Files:
      Tag: release20-maint
	rangeobject.c 
Log Message:
Fixing #121965 -- containment in xrange objects.

Index: rangeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/rangeobject.c,v
retrieving revision 2.20
retrieving revision 2.20.2.1
diff -C2 -r2.20 -r2.20.2.1
*** rangeobject.c	2000/09/01 23:29:27	2.20
--- rangeobject.c	2001/03/30 16:49:06	2.20.2.1
***************
*** 3,6 ****
--- 3,8 ----

  #include "Python.h"
+ #include "structmember.h"
+ #include <string.h>

  typedef struct {
***************
*** 194,212 ****
  		return -1;

! 	if (num < r->start || (num - r->start) % r->step)
! 		return 0;
! 	if (num > (r->start + (r->len * r->step)))
! 		return 0;
  	return 1;
  }

  static PySequenceMethods range_as_sequence = {
! 	(inquiry)range_length, /*sq_length*/
  	(binaryfunc)range_concat, /*sq_concat*/
  	(intargfunc)range_repeat, /*sq_repeat*/
  	(intargfunc)range_item, /*sq_item*/
  	(intintargfunc)range_slice, /*sq_slice*/
! 	0,		/*sq_ass_item*/
! 	0,		/*sq_ass_slice*/
  	(objobjproc)range_contains, /*sq_contains*/
  };
--- 196,222 ----
  		return -1;

! 	if (r->step > 0) {
! 		if ((num < r->start) || ((num - r->start) % r->step))
! 			return 0;
! 		if (num >= (r->start + (r->len * r->step)))
! 			return 0;
! 	}
! 	else {
! 		if ((num > r->start) || ((num - r->start) % r->step))
! 			return 0;
! 		if (num <= (r->start + (r->len * r->step)))
! 			return 0;
! 	}
  	return 1;
  }

  static PySequenceMethods range_as_sequence = {
! 	(inquiry)range_length,	/*sq_length*/
  	(binaryfunc)range_concat, /*sq_concat*/
  	(intargfunc)range_repeat, /*sq_repeat*/
  	(intargfunc)range_item, /*sq_item*/
  	(intintargfunc)range_slice, /*sq_slice*/
! 	0,			/*sq_ass_item*/
! 	0,			/*sq_ass_slice*/
  	(objobjproc)range_contains, /*sq_contains*/
  };

From moshez@users.sourceforge.net  Fri Mar 30 16:49:09 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Fri, 30 Mar 2001 08:49:09 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.7,1.81.2.8
Message-ID: <E14j25F-0007VD-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv25889/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
Fixing #121965 -- containment in xrange objects.

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.7
retrieving revision 1.81.2.8
diff -C2 -r1.81.2.7 -r1.81.2.8
*** NEWS	2001/03/30 16:31:50	1.81.2.7
--- NEWS	2001/03/30 16:49:07	1.81.2.8
***************
*** 32,35 ****
--- 32,37 ----
    Python/compile.c and Python/marshal.c

+ - #121965 -- fixing containment in xrange() objects
+ 

  What's New in Python 2.0?

From akuchling@users.sourceforge.net  Fri Mar 30 16:56:17 2001
From: akuchling@users.sourceforge.net (A.M. Kuchling)
Date: Fri, 30 Mar 2001 08:56:17 -0800
Subject: [Python-checkins] CVS: python/nondist/peps pep-0248.txt,1.1,1.2 pep-0249.txt,1.1,1.2
Message-ID: <E14j2C9-0007pa-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/nondist/peps
In directory usw-pr-cvs1:/tmp/cvs-serv30019

Modified Files:
	pep-0248.txt pep-0249.txt 
Log Message:
Add Replaces and Replaced-By header.  
Use PEP number for DB-API 1.0.

Index: pep-0248.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/pep-0248.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** pep-0248.txt	2001/03/29 17:00:15	1.1
--- pep-0248.txt	2001/03/30 16:56:15	1.2
***************
*** 5,8 ****
--- 5,9 ----
  Editor: mal@lemburg.com (Marc-Andre Lemburg)
  Status: Draft
+ Replaced-By: 249
  Type: Informational

Index: pep-0249.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/pep-0249.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** pep-0249.txt	2001/03/29 17:00:15	1.1
--- pep-0249.txt	2001/03/30 16:56:15	1.2
***************
*** 6,9 ****
--- 6,10 ----
  Status: Draft
  Type: Informational
+ Replaces: 248

  Introduction
***************
*** 35,39 ****
      This document describes the Python Database API Specification
      2.0.  The previous version 1.0 version is still available as
!     reference, in PEP XXX. Package writers are encouraged to use
      this version of the specification as basis for new interfaces.

--- 36,40 ----
      This document describes the Python Database API Specification
      2.0.  The previous version 1.0 version is still available as
!     reference, in PEP 248. Package writers are encouraged to use
      this version of the specification as basis for new interfaces.

From moshez@users.sourceforge.net  Fri Mar 30 17:21:00 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Fri, 30 Mar 2001 09:21:00 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib pickle.py,1.39,1.39.2.1
Message-ID: <E14j2a4-0000ad-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv30389/Lib

Modified Files:
      Tag: release20-maint
	pickle.py 
Log Message:
#126161 and 123634 -- Unicode strings could not be pickled correctly.
This is *backwards incompatible* with the previous pickling scheme,
which wasnot reversible

Index: pickle.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/pickle.py,v
retrieving revision 1.39
retrieving revision 1.39.2.1
diff -C2 -r1.39 -r1.39.2.1
*** pickle.py	2000/09/15 15:14:51	1.39
--- pickle.py	2001/03/30 17:20:58	1.39.2.1
***************
*** 289,292 ****
--- 289,294 ----
              self.write(BINUNICODE + s + encoding)
          else:
+             object = object.replace(u"\\", u"\\u005c")
+             object = object.replace(u"\n", u"\\u000a")
              self.write(UNICODE + object.encode('raw-unicode-escape') + '\n')

From moshez@users.sourceforge.net  Fri Mar 30 17:21:00 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Fri, 30 Mar 2001 09:21:00 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.8,1.81.2.9
Message-ID: <E14j2a4-0000aY-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv30389/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
#126161 and 123634 -- Unicode strings could not be pickled correctly.
This is *backwards incompatible* with the previous pickling scheme,
which wasnot reversible

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.8
retrieving revision 1.81.2.9
diff -C2 -r1.81.2.8 -r1.81.2.9
*** NEWS	2001/03/30 16:49:07	1.81.2.8
--- NEWS	2001/03/30 17:20:58	1.81.2.9
***************
*** 34,37 ****
--- 34,42 ----
  - #121965 -- fixing containment in xrange() objects

+ - #126161 #123634 -- pickle.py, cPickle.c -- fix pickling unicode strings
+   this is *backwards incompatible* with older pickles containing unicode
+   strings -- but this has to be done, the previous pickling scheme broke
+   anyway.
+ 

  What's New in Python 2.0?

From moshez@users.sourceforge.net  Fri Mar 30 17:21:01 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Fri, 30 Mar 2001 09:21:01 -0800
Subject: [Python-checkins] CVS: python/dist/src/Modules cPickle.c,2.53,2.53.2.1
Message-ID: <E14j2a5-0000ap-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv30389/Modules

Modified Files:
      Tag: release20-maint
	cPickle.c 
Log Message:
#126161 and 123634 -- Unicode strings could not be pickled correctly.
This is *backwards incompatible* with the previous pickling scheme,
which wasnot reversible

Index: cPickle.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/cPickle.c,v
retrieving revision 2.53
retrieving revision 2.53.2.1
diff -C2 -r2.53 -r2.53.2.1
*** cPickle.c	2000/10/04 16:22:26	2.53
--- cPickle.c	2001/03/30 17:20:58	2.53.2.1
***************
*** 1150,1153 ****
--- 1150,1198 ----

+ /* A copy of PyUnicode_EncodeRawUnicodeEscape() that also translates
+    backslash and newline characters to \uXXXX escapes. */
+ static PyObject *
+ modified_EncodeRawUnicodeEscape(const Py_UNICODE *s, int size)
+ {
+     PyObject *repr;
+     char *p;
+     char *q;
+ 
+     static const char *hexdigit = "0123456789ABCDEF";
+ 
+     repr = PyString_FromStringAndSize(NULL, 6 * size);
+     if (repr == NULL)
+         return NULL;
+     if (size == 0)
+ 	return repr;
+ 
+     p = q = PyString_AS_STRING(repr);
+     while (size-- > 0) {
+         Py_UNICODE ch = *s++;
+ 	/* Map 16-bit characters to '\uxxxx' */
+ 	if (ch >= 256 || ch == '\\' || ch == '\n') {
+             *p++ = '\\';
+             *p++ = 'u';
+             *p++ = hexdigit[(ch >> 12) & 0xf];
+             *p++ = hexdigit[(ch >> 8) & 0xf];
+             *p++ = hexdigit[(ch >> 4) & 0xf];
+             *p++ = hexdigit[ch & 15];
+         }
+ 	/* Copy everything else as-is */
+ 	else
+             *p++ = (char) ch;
+     }
+     *p = '\0';
+     if (_PyString_Resize(&repr, p - q))
+ 	goto onError;
+ 
+     return repr;
+ 
+  onError:
+     Py_DECREF(repr);
+     return NULL;
+ }
+ 
+ 
  static int
  save_unicode(Picklerobject *self, PyObject *args, int doput) {
***************
*** 1162,1166 ****
          static char string = UNICODE;

!         UNLESS (repr = PyUnicode_AsRawUnicodeEscapeString(args))
              return -1;

--- 1207,1212 ----
          static char string = UNICODE;

!         UNLESS(repr = modified_EncodeRawUnicodeEscape(
! 		PyUnicode_AS_UNICODE(args), PyUnicode_GET_SIZE(args)))
              return -1;

***************
*** 2746,2750 ****

      if ((len = (*self->readline_func)(self, &s)) < 0) return -1;
!     if (len < 2) return bad_readline();

      UNLESS (str = PyUnicode_DecodeRawUnicodeEscape(s, len - 1, NULL))
--- 2792,2796 ----

      if ((len = (*self->readline_func)(self, &s)) < 0) return -1;
!     if (len < 1) return bad_readline();

      UNLESS (str = PyUnicode_DecodeRawUnicodeEscape(s, len - 1, NULL))

From moshez@users.sourceforge.net  Fri Mar 30 18:27:13 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Fri, 30 Mar 2001 10:27:13 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.9,1.81.2.10
Message-ID: <E14j3c9-0004AU-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv12593/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
Fixed bug in complex(). No SF id

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.9
retrieving revision 1.81.2.10
diff -C2 -r1.81.2.9 -r1.81.2.10
*** NEWS	2001/03/30 17:20:58	1.81.2.9
--- NEWS	2001/03/30 18:27:11	1.81.2.10
***************
*** 39,42 ****
--- 39,45 ----
    anyway.

+ - complex() could segfault on numeric types with NULL for float conversion.
+   Fixed.
+ 

  What's New in Python 2.0?

From moshez@users.sourceforge.net  Fri Mar 30 18:27:13 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Fri, 30 Mar 2001 10:27:13 -0800
Subject: [Python-checkins] CVS: python/dist/src/Python bltinmodule.c,2.181,2.181.2.1
Message-ID: <E14j3c9-0004AP-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Python
In directory usw-pr-cvs1:/tmp/cvs-serv12593/Python

Modified Files:
      Tag: release20-maint
	bltinmodule.c 
Log Message:
Fixed bug in complex(). No SF id

Index: bltinmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/bltinmodule.c,v
retrieving revision 2.181
retrieving revision 2.181.2.1
diff -C2 -r2.181 -r2.181.2.1
*** bltinmodule.c	2000/09/26 05:46:01	2.181
--- bltinmodule.c	2001/03/30 18:27:10	2.181.2.1
***************
*** 592,596 ****
  	}
  	else {
! 		tmp = (*nbr->nb_float)(r);
  		if (own_r) {
  			Py_DECREF(r);
--- 592,596 ----
  	}
  	else {
! 		tmp = PyNumber_Float(r);
  		if (own_r) {
  			Py_DECREF(r);
***************
*** 598,601 ****
--- 598,607 ----
  		if (tmp == NULL)
  			return NULL;
+ 		if (!PyFloat_Check(tmp)) {
+ 			PyErr_SetString(PyExc_TypeError,
+ 					"float(r) didn't return a float");
+ 			Py_DECREF(tmp);
+ 			return NULL;
+ 		}
  		cr.real = PyFloat_AsDouble(tmp);
  		Py_DECREF(tmp);

From moshez@users.sourceforge.net  Fri Mar 30 18:50:25 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Fri, 30 Mar 2001 10:50:25 -0800
Subject: [Python-checkins] CVS: python/dist/src/Python compile.c,2.142.2.1,2.142.2.2
Message-ID: <E14j3yb-0005Rd-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Python
In directory usw-pr-cvs1:/tmp/cvs-serv17116/Python

Modified Files:
      Tag: release20-maint
	compile.c 
Log Message:
Fix memory leak with from import ...

Index: compile.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/compile.c,v
retrieving revision 2.142.2.1
retrieving revision 2.142.2.2
diff -C2 -r2.142.2.1 -r2.142.2.2
*** compile.c	2001/03/30 16:31:49	2.142.2.1
--- compile.c	2001/03/30 18:50:23	2.142.2.2
***************
*** 2326,2334 ****
  {
  	int i;
- 	PyObject *tup;
  	REQ(n, import_stmt);
  	/* 'import' dotted_name (',' dotted_name)* |
  	   'from' dotted_name 'import' ('*' | NAME (',' NAME)*) */
  	if (STR(CHILD(n, 0))[0] == 'f') {
  		/* 'from' dotted_name 'import' ... */
  		REQ(CHILD(n, 1), dotted_name);
--- 2326,2334 ----
  {
  	int i;
  	REQ(n, import_stmt);
  	/* 'import' dotted_name (',' dotted_name)* |
  	   'from' dotted_name 'import' ('*' | NAME (',' NAME)*) */
  	if (STR(CHILD(n, 0))[0] == 'f') {
+ 		PyObject *tup;
  		/* 'from' dotted_name 'import' ... */
  		REQ(CHILD(n, 1), dotted_name);
***************
*** 2345,2348 ****
--- 2345,2349 ----
  		}
  		com_addoparg(c, LOAD_CONST, com_addconst(c, tup));
+ 		Py_DECREF(tup);
  		com_push(c, 1);
  		com_addopname(c, IMPORT_NAME, CHILD(n, 1));

From moshez@users.sourceforge.net  Fri Mar 30 19:18:25 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Fri, 30 Mar 2001 11:18:25 -0800
Subject: [Python-checkins] CVS: python/dist/src/Modules pwdmodule.c,1.24,1.24.2.1 grpmodule.c,2.14,2.14.2.1
Message-ID: <E14j4Ph-0006oc-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv23805/Modules

Modified Files:
      Tag: release20-maint
	pwdmodule.c grpmodule.c 
Log Message:
Fixing bug #407504. -- did not close pwd/grp databases.

Index: pwdmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/pwdmodule.c,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -C2 -r1.24 -r1.24.2.1
*** pwdmodule.c	2000/09/01 23:29:27	1.24
--- pwdmodule.c	2001/03/30 19:18:22	1.24.2.1
***************
*** 103,106 ****
--- 103,107 ----
  		Py_DECREF(v);
  	}
+ 	endpwent();
  	return d;
  }

Index: grpmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/grpmodule.c,v
retrieving revision 2.14
retrieving revision 2.14.2.1
diff -C2 -r2.14 -r2.14.2.1
*** grpmodule.c	2000/09/01 23:29:26	2.14
--- grpmodule.c	2001/03/30 19:18:22	2.14.2.1
***************
*** 88,91 ****
--- 88,92 ----
          Py_DECREF(v);
      }
+     endgrent();
      return d;
  }

From moshez@users.sourceforge.net  Fri Mar 30 19:18:26 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Fri, 30 Mar 2001 11:18:26 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.10,1.81.2.11
Message-ID: <E14j4Pi-0006ok-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv23805/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
Fixing bug #407504. -- did not close pwd/grp databases.

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.10
retrieving revision 1.81.2.11
diff -C2 -r1.81.2.10 -r1.81.2.11
*** NEWS	2001/03/30 18:27:11	1.81.2.10
--- NEWS	2001/03/30 19:18:23	1.81.2.11
***************
*** 42,45 ****
--- 42,49 ----
    Fixed.

+ - Fixed #407504 -- closing pwd and grp database when finished.
+ 
+ - Fixed memory leak in from import ...
+ 

  What's New in Python 2.0?

From moshez@users.sourceforge.net  Fri Mar 30 19:45:15 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Fri, 30 Mar 2001 11:45:15 -0800
Subject: [Python-checkins] CVS: python/dist/src/Python import.c,2.153,2.153.2.1
Message-ID: <E14j4pf-0007xV-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Python
In directory usw-pr-cvs1:/tmp/cvs-serv27821/Python

Modified Files:
      Tag: release20-maint
	import.c 
Log Message:
- Importing should now be safe with multiple Py_Initialize/Py_Finalize
  sequences.

Index: import.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/import.c,v
retrieving revision 2.153
retrieving revision 2.153.2.1
diff -C2 -r2.153 -r2.153.2.1
*** import.c	2000/10/03 16:02:05	2.153
--- import.c	2001/03/30 19:45:12	2.153.2.1
***************
*** 1843,1847 ****
  	static PyObject *builtins_str = NULL;
  	static PyObject *import_str = NULL;
- 	static PyObject *standard_builtins = NULL;
  	PyObject *globals = NULL;
  	PyObject *import = NULL;
--- 1843,1846 ----
***************
*** 1874,1886 ****
  		PyErr_Clear();

! 		if (standard_builtins == NULL) {
! 			standard_builtins =
! 				PyImport_ImportModule("__builtin__");
! 			if (standard_builtins == NULL)
! 				return NULL;
! 		}
! 
! 		builtins = standard_builtins;
! 		Py_INCREF(builtins);
  		globals = Py_BuildValue("{OO}", builtins_str, builtins);
  		if (globals == NULL)
--- 1873,1880 ----
  		PyErr_Clear();

! 		builtins = PyImport_ImportModuleEx("__builtin__",
! 		                                   NULL, NULL, NULL);
! 		if (builtins == NULL)
! 			return NULL;
  		globals = Py_BuildValue("{OO}", builtins_str, builtins);
  		if (globals == NULL)

From moshez@users.sourceforge.net  Fri Mar 30 19:45:15 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Fri, 30 Mar 2001 11:45:15 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.11,1.81.2.12
Message-ID: <E14j4pf-0007xd-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv27821/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
- Importing should now be safe with multiple Py_Initialize/Py_Finalize
  sequences.

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.11
retrieving revision 1.81.2.12
diff -C2 -r1.81.2.11 -r1.81.2.12
*** NEWS	2001/03/30 19:18:23	1.81.2.11
--- NEWS	2001/03/30 19:45:13	1.81.2.12
***************
*** 46,49 ****
--- 46,52 ----
  - Fixed memory leak in from import ...

+ - Importing should now be safe with multiple Py_Initialize/Py_Finalize
+   sequences.
+ 

  What's New in Python 2.0?

From moshez@users.sourceforge.net  Fri Mar 30 20:06:57 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Fri, 30 Mar 2001 12:06:57 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.12,1.81.2.13
Message-ID: <E14j5Af-0000bM-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv31915/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
- Add TELL64() hack #ifdef to FreeBSD, Apple and BSDI
Someone with BSDs, please test this!

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.12
retrieving revision 1.81.2.13
diff -C2 -r1.81.2.12 -r1.81.2.13
*** NEWS	2001/03/30 19:45:13	1.81.2.12
--- NEWS	2001/03/30 20:06:55	1.81.2.13
***************
*** 49,52 ****
--- 49,53 ----
    sequences.

+ - Add TELL64() hack #ifdef to FreeBSD, Apple and BSDI

  What's New in Python 2.0?

From moshez@users.sourceforge.net  Fri Mar 30 20:06:58 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Fri, 30 Mar 2001 12:06:58 -0800
Subject: [Python-checkins] CVS: python/dist/src/Objects fileobject.c,2.90,2.90.2.1
Message-ID: <E14j5Ag-0000bR-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Objects
In directory usw-pr-cvs1:/tmp/cvs-serv31915/Objects

Modified Files:
      Tag: release20-maint
	fileobject.c 
Log Message:
- Add TELL64() hack #ifdef to FreeBSD, Apple and BSDI
Someone with BSDs, please test this!

Index: fileobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/fileobject.c,v
retrieving revision 2.90
retrieving revision 2.90.2.1
diff -C2 -r2.90 -r2.90.2.1
*** fileobject.c	2000/10/06 20:42:33	2.90
--- fileobject.c	2001/03/30 20:06:55	2.90.2.1
***************
*** 59,63 ****
  #if defined(MS_WIN64)
  #define TELL64 _telli64
! #elif defined(__NetBSD__) || defined(__OpenBSD__)
  /* NOTE: this is only used on older
     NetBSD prior to f*o() funcions */
--- 59,63 ----
  #if defined(MS_WIN64)
  #define TELL64 _telli64
! #elif defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(_HAVE_BSDI) || defined(__APPLE__)
  /* NOTE: this is only used on older
     NetBSD prior to f*o() funcions */

From moshez@users.sourceforge.net  Fri Mar 30 20:26:34 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Fri, 30 Mar 2001 12:26:34 -0800
Subject: [Python-checkins] CVS: python/dist/src/Objects funcobject.c,2.30,2.30.2.1
Message-ID: <E14j5Te-0001RT-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Objects
In directory usw-pr-cvs1:/tmp/cvs-serv2982/Objects

Modified Files:
      Tag: release20-maint
	funcobject.c 
Log Message:
Fixed deleting func_defaults causes segmentation fault bug

Index: funcobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/funcobject.c,v
retrieving revision 2.30
retrieving revision 2.30.2.1
diff -C2 -r2.30 -r2.30.2.1
*** funcobject.c	2000/09/01 23:29:27	2.30
--- funcobject.c	2001/03/30 20:26:31	2.30.2.1
***************
*** 130,134 ****
  	}
  	else if (strcmp(name, "func_defaults") == 0) {
! 		if (value != Py_None && !PyTuple_Check(value)) {
  			PyErr_SetString(
  				PyExc_TypeError,
--- 130,135 ----
  	}
  	else if (strcmp(name, "func_defaults") == 0) {
! 		if (value != Py_None && 
! 		    (value == NULL || !PyTuple_Check(value))) {
  			PyErr_SetString(
  				PyExc_TypeError,

From moshez@users.sourceforge.net  Fri Mar 30 20:26:34 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Fri, 30 Mar 2001 12:26:34 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.13,1.81.2.14
Message-ID: <E14j5Te-0001Rb-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv2982/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
Fixed deleting func_defaults causes segmentation fault bug

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.13
retrieving revision 1.81.2.14
diff -C2 -r1.81.2.13 -r1.81.2.14
*** NEWS	2001/03/30 20:06:55	1.81.2.13
--- NEWS	2001/03/30 20:26:32	1.81.2.14
***************
*** 51,54 ****
--- 51,56 ----
  - Add TELL64() hack #ifdef to FreeBSD, Apple and BSDI

+ - del func.func_defaults raises a TypeError instead of dumping core
+ 
  What's New in Python 2.0?
  =========================

From moshez@users.sourceforge.net  Fri Mar 30 20:44:53 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Fri, 30 Mar 2001 12:44:53 -0800
Subject: [Python-checkins] CVS: python/dist/src/Objects stringobject.c,2.91,2.91.2.1
Message-ID: <E14j5lN-0002Gt-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Objects
In directory usw-pr-cvs1:/tmp/cvs-serv5843/Objects

Modified Files:
      Tag: release20-maint
	stringobject.c 
Log Message:
- #121013 - stringobject.c -- "".join(u"this is a test") dumped core

Index: stringobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/stringobject.c,v
retrieving revision 2.91
retrieving revision 2.91.2.1
diff -C2 -r2.91 -r2.91.2.1
*** stringobject.c	2000/10/07 08:54:09	2.91
--- stringobject.c	2001/03/30 20:44:51	2.91.2.1
***************
*** 836,840 ****
  				Py_DECREF(res);
  				Py_DECREF(seq);
! 				return PyUnicode_Join((PyObject *)self, seq);
  			}
  			PyErr_Format(PyExc_TypeError,
--- 836,840 ----
  				Py_DECREF(res);
  				Py_DECREF(seq);
! 				return PyUnicode_Join((PyObject *)self, orig);
  			}
  			PyErr_Format(PyExc_TypeError,

From moshez@users.sourceforge.net  Fri Mar 30 21:01:11 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Fri, 30 Mar 2001 13:01:11 -0800
Subject: [Python-checkins] CVS: python/dist/src/Python exceptions.c,1.17,1.17.2.1
Message-ID: <E14j619-00035C-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Python
In directory usw-pr-cvs1:/tmp/cvs-serv8873/Python

Modified Files:
      Tag: release20-maint
	exceptions.c 
Log Message:
- exceptions.c  - make_class() Added a "goto finally" so that if
  populate_methods() fails, the return status will be -1 (failure)
  instead of 0 (success).

  fini_exceptions(): When decref'ing the static pointers to the
  exception classes, clear out their dictionaries too.  This breaks a
  cycle from class->dict->method->class and allows the classes with
  unbound methods to be reclaimed.  This plugs a large memory leak in a
  common Py_Initialize()/dosomething/Py_Finalize() loop.

Index: exceptions.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/exceptions.c,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -C2 -r1.17 -r1.17.2.1
*** exceptions.c	2000/08/18 19:53:25	1.17
--- exceptions.c	2001/03/30 21:01:09	1.17.2.1
***************
*** 169,172 ****
--- 169,173 ----
  	Py_DECREF(*klass);
  	*klass = NULL;
+ 	goto finally;
      }

***************
*** 1097,1100 ****
--- 1098,1109 ----

      for (i=0; exctable[i].name; i++) {
+ 	/* clear the class's dictionary, freeing up circular references
+ 	 * between the class and its methods.
+ 	 */
+ 	PyObject* cdict = PyObject_GetAttrString(*exctable[i].exc, "__dict__");
+ 	PyDict_Clear(cdict);
+ 	Py_DECREF(cdict);
+ 
+ 	/* Now decref the exception class */
  	Py_XDECREF(*exctable[i].exc);
  	*exctable[i].exc = NULL;

From moshez@users.sourceforge.net  Fri Mar 30 21:01:11 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Fri, 30 Mar 2001 13:01:11 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.14,1.81.2.15
Message-ID: <E14j619-00035I-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv8873/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
- exceptions.c  - make_class() Added a "goto finally" so that if
  populate_methods() fails, the return status will be -1 (failure)
  instead of 0 (success).

  fini_exceptions(): When decref'ing the static pointers to the
  exception classes, clear out their dictionaries too.  This breaks a
  cycle from class->dict->method->class and allows the classes with
  unbound methods to be reclaimed.  This plugs a large memory leak in a
  common Py_Initialize()/dosomething/Py_Finalize() loop.

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.14
retrieving revision 1.81.2.15
diff -C2 -r1.81.2.14 -r1.81.2.15
*** NEWS	2001/03/30 20:26:32	1.81.2.14
--- NEWS	2001/03/30 21:01:09	1.81.2.15
***************
*** 53,56 ****
--- 53,68 ----
  - del func.func_defaults raises a TypeError instead of dumping core

+ - #121013 - stringobject.c -- "".join(u"this is a test") dumped core
+ 
+ - exceptions.c  - make_class() Added a "goto finally" so that if
+   populate_methods() fails, the return status will be -1 (failure)
+   instead of 0 (success).
+ 
+   fini_exceptions(): When decref'ing the static pointers to the
+   exception classes, clear out their dictionaries too.  This breaks a
+   cycle from class->dict->method->class and allows the classes with
+   unbound methods to be reclaimed.  This plugs a large memory leak in a
+   common Py_Initialize()/dosomething/Py_Finalize() loop.
+ 
  What's New in Python 2.0?
  =========================

From nascheme@users.sourceforge.net  Sat Mar 31 00:01:58 2001
From: nascheme@users.sourceforge.net (Neil Schemenauer)
Date: Fri, 30 Mar 2001 16:01:58 -0800
Subject: [Python-checkins] CVS: python/dist/src configure.in,1.213,1.214 configure,1.205,1.206
Message-ID: <E14j8q6-0000mr-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv2805

Modified Files:
	configure.in configure 
Log Message:
"install -d" does not work on BSDI systems even though autoconf thinks
install works on that system.   Use "install-sh" on BSDI.

Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.213
retrieving revision 1.214
diff -C2 -r1.213 -r1.214
*** configure.in	2001/03/22 00:29:55	1.213
--- configure.in	2001/03/31 00:01:55	1.214
***************
*** 271,274 ****
--- 271,283 ----
  AC_SUBST(AR)
  AC_CHECK_PROGS(AR, ar aal, ar)
+ 
+ case $MACHDEP in
+ bsdos*)
+ 	# install -d does not work on BSDI
+ 	if test -z "$INSTALL"
+ 	then
+ 		INSTALL="${srcdir}/install-sh -c"
+ 	fi
+ esac
  AC_PROG_INSTALL

Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.205
retrieving revision 1.206
diff -C2 -r1.205 -r1.206
*** configure	2001/03/22 00:34:03	1.205
--- configure	2001/03/31 00:01:55	1.206
***************
*** 1332,1335 ****
--- 1332,1344 ----
  test -n "$AR" || AR="ar"

+ 
+ case $MACHDEP in
+ bsdos*)
+ 	# install -d does not work on BSDI
+ 	if test -z "$INSTALL"
+ 	then
+ 		INSTALL="${srcdir}/install-sh -c"
[...3729 lines suppressed...]
  if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6142 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 6179,6183 ****
  SRCDIRS="Parser Grammar Objects Python Modules"
  echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:6182: checking for build directories" >&5
  for dir in $SRCDIRS; do
      if test ! -d $dir; then
--- 6188,6192 ----
  SRCDIRS="Parser Grammar Objects Python Modules"
  echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:6191: checking for build directories" >&5
  for dir in $SRCDIRS; do
      if test ! -d $dir; then

From esr@users.sourceforge.net  Sat Mar 31 01:50:55 2001
From: esr@users.sourceforge.net (Eric S. Raymond)
Date: Fri, 30 Mar 2001 17:50:55 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib webbrowser.py,1.16,1.17
Message-ID: <E14jAXX-0003Mp-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv12885

Modified Files:
	webbrowser.py 
Log Message:
Fixes a fatal bug when the module has computed alternatives containing %s.

Index: webbrowser.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/webbrowser.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** webbrowser.py	2001/03/26 15:06:15	1.16
--- webbrowser.py	2001/03/31 01:50:52	1.17
***************
*** 25,29 ****
          if browser.find('%s') > -1:
              # User gave us a command line, don't mess with it.
!             return browser
          else:
              # User gave us a browser name.
--- 25,29 ----
          if browser.find('%s') > -1:
              # User gave us a command line, don't mess with it.
!             return GenericBrowser(browser)
          else:
              # User gave us a browser name.

From akuchling@users.sourceforge.net  Sat Mar 31 02:41:03 2001
From: akuchling@users.sourceforge.net (A.M. Kuchling)
Date: Fri, 30 Mar 2001 18:41:03 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib/distutils dist.py,1.46,1.47
Message-ID: <E14jBK3-0004F4-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Lib/distutils
In directory usw-pr-cvs1:/tmp/cvs-serv16286

Modified Files:
	dist.py 
Log Message:
Back out the requirement to supply a version number

Index: dist.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/dist.py,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -r1.46 -r1.47
*** dist.py	2001/03/22 15:32:23	1.46
--- dist.py	2001/03/31 02:41:01	1.47
***************
*** 535,542 ****
          """

-         if self.metadata.version is None:
-             raise DistutilsSetupError, \
-                   "No version number specified for distribution"
- 
          keywords = self.metadata.keywords
          if keywords is not None:
--- 535,538 ----

From akuchling@users.sourceforge.net  Sat Mar 31 02:42:44 2001
From: akuchling@users.sourceforge.net (A.M. Kuchling)
Date: Fri, 30 Mar 2001 18:42:44 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.139,1.140
Message-ID: <E14jBLg-0004Gg-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv16326

Modified Files:
	NEWS 
Log Message:
Remove the backed-out version requirement

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.139
retrieving revision 1.140
diff -C2 -r1.139 -r1.140
*** NEWS	2001/03/23 14:18:27	1.139
--- NEWS	2001/03/31 02:42:42	1.140
***************
*** 98,103 ****

  - added 'platforms' and 'keywords' to the set of metadata that can be 
!   specified for a distribution.  Supplying a version number has been made
!   compulsory.

  - applied patches from Jason Tishler to make the compiler class work with
--- 98,102 ----

  - added 'platforms' and 'keywords' to the set of metadata that can be 
!   specified for a distribution.  

  - applied patches from Jason Tishler to make the compiler class work with

From moshez@users.sourceforge.net  Sat Mar 31 06:48:54 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Fri, 30 Mar 2001 22:48:54 -0800
Subject: [Python-checkins] CVS: python/dist/src/Objects stringobject.c,2.91.2.1,2.91.2.2 unicodeobject.c,2.66,2.66.2.1
Message-ID: <E14jFBu-0008Ff-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Objects
In directory usw-pr-cvs1:/tmp/cvs-serv30534/Objects

Modified Files:
      Tag: release20-maint
	stringobject.c unicodeobject.c 
Log Message:
- #122162 -- unicodeobject.c --- Fix unicode .split() off-by-one

- Loosely based on patch #103249 -- Fix core dumps in PyUnicode_Count

Index: stringobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/stringobject.c,v
retrieving revision 2.91.2.1
retrieving revision 2.91.2.2
diff -C2 -r2.91.2.1 -r2.91.2.2
*** stringobject.c	2001/03/30 20:44:51	2.91.2.1
--- stringobject.c	2001/03/31 06:48:51	2.91.2.2
***************
*** 1237,1243 ****
  		n = PyString_GET_SIZE(subobj);
  	}
! 	else if (PyUnicode_Check(subobj))
! 		return PyInt_FromLong(
! 		        PyUnicode_Count((PyObject *)self, subobj, i, last));
  	else if (PyObject_AsCharBuffer(subobj, &sub, &n))
  		return NULL;
--- 1237,1248 ----
  		n = PyString_GET_SIZE(subobj);
  	}
! 	else if (PyUnicode_Check(subobj)) {
! 		int count;
! 		count = PyUnicode_Count((PyObject *)self, subobj, i, last);
! 		if (count == -1)
! 			return NULL;
! 		else
! 		    	return PyInt_FromLong((long) count);
! 	}
  	else if (PyObject_AsCharBuffer(subobj, &sub, &n))
  		return NULL;
***************
*** 1638,1645 ****
  		plen = PyString_GET_SIZE(subobj);
  	}
! 	else if (PyUnicode_Check(subobj))
! 		return PyInt_FromLong(
! 		        PyUnicode_Tailmatch((PyObject *)self, 
! 					    subobj, start, end, -1));
  	else if (PyObject_AsCharBuffer(subobj, &prefix, &plen))
  		return NULL;
--- 1643,1655 ----
  		plen = PyString_GET_SIZE(subobj);
  	}
! 	else if (PyUnicode_Check(subobj)) {
! 	    	int rc;
! 		rc = PyUnicode_Tailmatch((PyObject *)self, 
! 					  subobj, start, end, -1);
! 		if (rc == -1)
! 			return NULL;
! 		else
! 			return PyInt_FromLong((long) rc);
! 	}
  	else if (PyObject_AsCharBuffer(subobj, &prefix, &plen))
  		return NULL;
***************
*** 1691,1698 ****
  		slen = PyString_GET_SIZE(subobj);
  	}
! 	else if (PyUnicode_Check(subobj))
! 		return PyInt_FromLong(
! 		        PyUnicode_Tailmatch((PyObject *)self, 
! 					    subobj, start, end, +1));
  	else if (PyObject_AsCharBuffer(subobj, &suffix, &slen))
  		return NULL;
--- 1701,1713 ----
  		slen = PyString_GET_SIZE(subobj);
  	}
! 	else if (PyUnicode_Check(subobj)) {
! 	    	int rc;
! 		rc = PyUnicode_Tailmatch((PyObject *)self, 
! 					  subobj, start, end, +1);
! 		if (rc == -1)
! 			return NULL;
! 		else
! 			return PyInt_FromLong((long) rc);
! 	}
  	else if (PyObject_AsCharBuffer(subobj, &suffix, &slen))
  		return NULL;

Index: unicodeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/unicodeobject.c,v
retrieving revision 2.66
retrieving revision 2.66.2.1
diff -C2 -r2.66 -r2.66.2.1
*** unicodeobject.c	2000/10/03 20:45:26	2.66
--- unicodeobject.c	2001/03/31 06:48:51	2.66.2.1
***************
*** 2358,2361 ****
--- 2358,2372 ----
      int count = 0;

+     if (start < 0)
+         start += self->length;
+     if (start < 0)
+         start = 0;
+     if (end > self->length)
+         end = self->length;
+     if (end < 0)
+         end += self->length;
+     if (end < 0)
+         end = 0;
+ 
      if (substring->length == 0)
  	return (end - start + 1);
***************
*** 2926,2930 ****
      PyObject *str;

!     for (i = j = 0; i < len - sublen; ) {
  	if (Py_UNICODE_MATCH(self, i, substring)) {
  	    if (maxcount-- <= 0)
--- 2937,2941 ----
      PyObject *str;

!     for (i = j = 0; i <= len - sublen; ) {
  	if (Py_UNICODE_MATCH(self, i, substring)) {
  	    if (maxcount-- <= 0)

From moshez@users.sourceforge.net  Sat Mar 31 06:48:54 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Fri, 30 Mar 2001 22:48:54 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.15,1.81.2.16
Message-ID: <E14jFBu-0008Fe-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv30534/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
- #122162 -- unicodeobject.c --- Fix unicode .split() off-by-one

- Loosely based on patch #103249 -- Fix core dumps in PyUnicode_Count

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.15
retrieving revision 1.81.2.16
diff -C2 -r1.81.2.15 -r1.81.2.16
*** NEWS	2001/03/30 21:01:09	1.81.2.15
--- NEWS	2001/03/31 06:48:52	1.81.2.16
***************
*** 65,68 ****
--- 65,72 ----
    common Py_Initialize()/dosomething/Py_Finalize() loop.

+ - #122162 -- unicodeobject.c --- Fix unicode .split() off-by-one
+ 
+ - Loosely based on patch #103249 -- Fix core dumps in PyUnicode_Count
+ 
  What's New in Python 2.0?
  =========================

From moshez@users.sourceforge.net  Sat Mar 31 07:13:32 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Fri, 30 Mar 2001 23:13:32 -0800
Subject: [Python-checkins] CVS: python/dist/src/Modules socketmodule.c,1.128,1.128.2.1
Message-ID: <E14jFZk-0000BM-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv32117/Modules

Modified Files:
      Tag: release20-maint
	socketmodule.c 
Log Message:
- #125981 -- socketmodule.c --  closing sockets was not thread-safe.

- Use openssl/*.h to include the OpenSSL header files

- Patch #103636: Allow writing strings containing null bytes to an SSL socket

Index: socketmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/socketmodule.c,v
retrieving revision 1.128
retrieving revision 1.128.2.1
diff -C2 -r1.128 -r1.128.2.1
*** socketmodule.c	2000/10/06 15:37:06	1.128
--- socketmodule.c	2001/03/31 07:13:29	1.128.2.1
***************
*** 157,166 ****

  #ifdef USE_SSL
! #include "rsa.h"
! #include "crypto.h"
! #include "x509.h"
! #include "pem.h"
! #include "ssl.h"
! #include "err.h"
  #endif /* USE_SSL */

--- 157,166 ----

  #ifdef USE_SSL
! #include "openssl/rsa.h"
! #include "openssl/crypto.h"
! #include "openssl/x509.h"
! #include "openssl/pem.h"
! #include "openssl/ssl.h"
! #include "openssl/err.h"
  #endif /* USE_SSL */

***************
*** 899,910 ****
  PySocketSock_close(PySocketSockObject *s, PyObject *args)
  {
  	if (!PyArg_ParseTuple(args, ":close"))
  		return NULL;
! 	if (s->sock_fd != -1) {
  		Py_BEGIN_ALLOW_THREADS
! 		(void) SOCKETCLOSE(s->sock_fd);
  		Py_END_ALLOW_THREADS
  	}
- 	s->sock_fd = -1;
  	Py_INCREF(Py_None);
  	return Py_None;
--- 899,911 ----
  PySocketSock_close(PySocketSockObject *s, PyObject *args)
  {
+ 	SOCKET_T fd;
  	if (!PyArg_ParseTuple(args, ":close"))
  		return NULL;
! 	if ((fd = s->sock_fd) != -1) {
! 		s->sock_fd = -1;
  		Py_BEGIN_ALLOW_THREADS
! 		(void) SOCKETCLOSE(fd);
  		Py_END_ALLOW_THREADS
  	}
  	Py_INCREF(Py_None);
  	return Py_None;
***************
*** 2133,2137 ****
  	size_t len = 0;

! 	if (!PyArg_ParseTuple(args, "s|i:write", &data, &len))
  		return NULL;

--- 2134,2138 ----
  	size_t len = 0;

! 	if (!PyArg_ParseTuple(args, "s#|i:write", &data, &len))
  		return NULL;

From moshez@users.sourceforge.net  Sat Mar 31 07:13:32 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Fri, 30 Mar 2001 23:13:32 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.16,1.81.2.17
Message-ID: <E14jFZk-0000BE-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv32117/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
- #125981 -- socketmodule.c --  closing sockets was not thread-safe.

- Use openssl/*.h to include the OpenSSL header files

- Patch #103636: Allow writing strings containing null bytes to an SSL socket

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.16
retrieving revision 1.81.2.17
diff -C2 -r1.81.2.16 -r1.81.2.17
*** NEWS	2001/03/31 06:48:52	1.81.2.16
--- NEWS	2001/03/31 07:13:29	1.81.2.17
***************
*** 69,72 ****
--- 69,78 ----
  - Loosely based on patch #103249 -- Fix core dumps in PyUnicode_Count

+ - #125981 -- socketmodule.c --  closing sockets was not thread-safe.
+ 
+ - Use openssl/*.h to include the OpenSSL header files
+ 
+ - Patch #103636: Allow writing strings containing null bytes to an SSL socket
+ 
  What's New in Python 2.0?
  =========================

From moshez@users.sourceforge.net  Sat Mar 31 07:33:58 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Fri, 30 Mar 2001 23:33:58 -0800
Subject: [Python-checkins] CVS: python/dist/src/Python errors.c,2.57,2.57.2.1
Message-ID: <E14jFtW-0000VF-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Python
In directory usw-pr-cvs1:/tmp/cvs-serv860/Python

Modified Files:
      Tag: release20-maint
	errors.c 
Log Message:
Use Py_CHARMASK for ctype macros. Fixes bug #232787.

Index: errors.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/errors.c,v
retrieving revision 2.57
retrieving revision 2.57.2.1
diff -C2 -r2.57 -r2.57.2.1
*** errors.c	2000/10/10 21:10:35	2.57
--- errors.c	2001/03/31 07:33:56	2.57.2.1
***************
*** 403,407 ****
  		if (*f == '%') {
  			const char* p = f;
! 			while (*++f && *f != '%' && !isalpha(*f))
  				;
  			switch (*f) {
--- 403,407 ----
  		if (*f == '%') {
  			const char* p = f;
! 			while (*++f && *f != '%' && !isalpha(Py_CHARMASK(*f)))
  				;
  			switch (*f) {
***************
*** 458,470 ****
  			   interested in the precision value, if any) */
  			n = 0;
! 			while (isdigit(*f))
  				n = (n*10) + *f++ - '0';
  			if (*f == '.') {
  				f++;
  				n = 0;
! 				while (isdigit(*f))
  					n = (n*10) + *f++ - '0';
  			}
! 			while (*f && *f != '%' && !isalpha(*f))
  				f++;
  			switch (*f) {
--- 458,470 ----
  			   interested in the precision value, if any) */
  			n = 0;
! 			while (isdigit(Py_CHARMASK(*f)))
  				n = (n*10) + *f++ - '0';
  			if (*f == '.') {
  				f++;
  				n = 0;
! 				while (isdigit(Py_CHARMASK(*f)))
  					n = (n*10) + *f++ - '0';
  			}
! 			while (*f && *f != '%' && !isalpha(Py_CHARMASK(*f)))
  				f++;
  			switch (*f) {

From moshez@users.sourceforge.net  Sat Mar 31 07:33:58 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Fri, 30 Mar 2001 23:33:58 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.17,1.81.2.18
Message-ID: <E14jFtW-0000V7-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv860/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
Use Py_CHARMASK for ctype macros. Fixes bug #232787.

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.17
retrieving revision 1.81.2.18
diff -C2 -r1.81.2.17 -r1.81.2.18
*** NEWS	2001/03/31 07:13:29	1.81.2.17
--- NEWS	2001/03/31 07:33:56	1.81.2.18
***************
*** 75,78 ****
--- 75,80 ----
  - Patch #103636: Allow writing strings containing null bytes to an SSL socket

+ - #232787 -- Modules/timemodule.c, Python/errors.c, Objects/intobject.c
+ 
  What's New in Python 2.0?
  =========================

From moshez@users.sourceforge.net  Sat Mar 31 07:33:58 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Fri, 30 Mar 2001 23:33:58 -0800
Subject: [Python-checkins] CVS: python/dist/src/Objects intobject.c,2.52,2.52.2.1
Message-ID: <E14jFtW-0000V9-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Objects
In directory usw-pr-cvs1:/tmp/cvs-serv860/Objects

Modified Files:
      Tag: release20-maint
	intobject.c 
Log Message:
Use Py_CHARMASK for ctype macros. Fixes bug #232787.

Index: intobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/intobject.c,v
retrieving revision 2.52
retrieving revision 2.52.2.1
diff -C2 -r2.52 -r2.52.2.1
*** intobject.c	2000/10/06 00:36:09	2.52
--- intobject.c	2001/03/31 07:33:56	2.52.2.1
***************
*** 183,187 ****
  	else
  		x = PyOS_strtol(s, &end, base);
! 	if (end == s || !isalnum(end[-1]))
  		goto bad;
  	while (*end && isspace(Py_CHARMASK(*end)))
--- 183,187 ----
  	else
  		x = PyOS_strtol(s, &end, base);
! 	if (end == s || !isalnum(Py_CHARMASK(end[-1])))
  		goto bad;
  	while (*end && isspace(Py_CHARMASK(*end)))

From moshez@users.sourceforge.net  Sat Mar 31 07:33:58 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Fri, 30 Mar 2001 23:33:58 -0800
Subject: [Python-checkins] CVS: python/dist/src/Modules timemodule.c,2.103,2.103.2.1
Message-ID: <E14jFtW-0000VK-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv860/Modules

Modified Files:
      Tag: release20-maint
	timemodule.c 
Log Message:
Use Py_CHARMASK for ctype macros. Fixes bug #232787.

Index: timemodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/timemodule.c,v
retrieving revision 2.103
retrieving revision 2.103.2.1
diff -C2 -r2.103 -r2.103.2.1
*** timemodule.c	2000/09/01 23:29:27	2.103
--- timemodule.c	2001/03/31 07:33:56	2.103.2.1
***************
*** 383,387 ****
  		return NULL;
  	}
! 	while (*s && isspace(*s))
  		s++;
  	if (*s) {
--- 383,387 ----
  		return NULL;
  	}
! 	while (*s && isspace(Py_CHARMASK(*s)))
  		s++;
  	if (*s) {

From moshez@users.sourceforge.net  Sat Mar 31 08:10:05 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 00:10:05 -0800
Subject: [Python-checkins] CVS: python/dist/src/Modules posixmodule.c,2.175,2.175.2.1
Message-ID: <E14jGST-0001AE-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv2690/Modules

Modified Files:
      Tag: release20-maint
	posixmodule.c 
Log Message:
- posixmodule.c - Add missing prototypes in for SunOS 4.1.4, plug memory leak

- #125891 - posixmodule.c - os.popen2,3 and 4 leaked file objects on Windows.

- #128053 - posixmodule.c - #ifdef for including "tmpfile" in the
            posix_methods[] array was wrong -- should be HAVE_TMPFILE

Index: posixmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/posixmodule.c,v
retrieving revision 2.175
retrieving revision 2.175.2.1
diff -C2 -r2.175 -r2.175.2.1
*** posixmodule.c	2000/10/03 16:54:24	2.175
--- posixmodule.c	2001/03/31 08:10:03	2.175.2.1
***************
*** 114,117 ****
--- 114,120 ----
  extern int pclose(FILE *);
  extern int fclose(FILE *);
+ extern int fsync(int);
+ extern int lstat(const char *, struct stat *);
+ extern int symlink(const char *, const char *);
  #endif

***************
*** 2510,2513 ****
--- 2513,2518 ----

  		 f = Py_BuildValue("OO",p1,p2);
+ 		 Py_XDECREF(p1);
+ 		 Py_XDECREF(p2);
  		 file_count = 2;
  		 break;
***************
*** 2540,2543 ****
--- 2545,2551 ----
  		 PyFile_SetBufSize(p3, 0);
  		 f = Py_BuildValue("OOO",p1,p2,p3);
+ 		 Py_XDECREF(p1);
+ 		 Py_XDECREF(p2);
+ 		 Py_XDECREF(p3);
  		 file_count = 3;
  		 break;
***************
*** 5349,5353 ****
  	{"statvfs",	posix_statvfs, METH_VARARGS, posix_statvfs__doc__},
  #endif
! #ifdef HAVE_TMPNAM
  	{"tmpfile",	posix_tmpfile, METH_VARARGS, posix_tmpfile__doc__},
  #endif
--- 5357,5361 ----
  	{"statvfs",	posix_statvfs, METH_VARARGS, posix_statvfs__doc__},
  #endif
! #ifdef HAVE_TMPFILE
  	{"tmpfile",	posix_tmpfile, METH_VARARGS, posix_tmpfile__doc__},
  #endif
***************
*** 5570,5574 ****

  #ifdef HAVE_PUTENV
! 	posix_putenv_garbage = PyDict_New();
  #endif
  }
--- 5578,5583 ----

  #ifdef HAVE_PUTENV
! 	if (posix_putenv_garbage == NULL)
! 		posix_putenv_garbage = PyDict_New();
  #endif
  }

From moshez@users.sourceforge.net  Sat Mar 31 08:10:05 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 00:10:05 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.18,1.81.2.19
Message-ID: <E14jGST-0001AD-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv2690/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
- posixmodule.c - Add missing prototypes in for SunOS 4.1.4, plug memory leak

- #125891 - posixmodule.c - os.popen2,3 and 4 leaked file objects on Windows.

- #128053 - posixmodule.c - #ifdef for including "tmpfile" in the
            posix_methods[] array was wrong -- should be HAVE_TMPFILE

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.18
retrieving revision 1.81.2.19
diff -C2 -r1.81.2.18 -r1.81.2.19
*** NEWS	2001/03/31 07:33:56	1.81.2.18
--- NEWS	2001/03/31 08:10:03	1.81.2.19
***************
*** 77,80 ****
--- 77,87 ----
  - #232787 -- Modules/timemodule.c, Python/errors.c, Objects/intobject.c

+ - posixmodule.c - Add missing prototypes in for SunOS 4.1.4, plug memory leak
+ 
+ - #125891 - posixmodule.c - os.popen2,3 and 4 leaked file objects on Windows.
+ 
+ - #128053 - posixmodule.c - #ifdef for including "tmpfile" in the 
+             posix_methods[] array was wrong -- should be HAVE_TMPFILE
+ 
  What's New in Python 2.0?
  =========================

From moshez@users.sourceforge.net  Sat Mar 31 08:31:15 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 00:31:15 -0800
Subject: [Python-checkins] CVS: python/dist/src/Modules cPickle.c,2.53.2.1,2.53.2.2
Message-ID: <E14jGmx-0001bB-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv4531/Modules

Modified Files:
      Tag: release20-maint
	cPickle.c 
Log Message:
Fixing #233200 - cPickle did not use Py_BEGIN_ALLOW_THREADS.

Index: cPickle.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/cPickle.c,v
retrieving revision 2.53.2.1
retrieving revision 2.53.2.2
diff -C2 -r2.53.2.1 -r2.53.2.2
*** cPickle.c	2001/03/30 17:20:58	2.53.2.1
--- cPickle.c	2001/03/31 08:31:13	2.53.2.2
***************
*** 402,412 ****
  }

! static int 
  write_file(Picklerobject *self, char *s, int  n) {
      if (s == NULL) {
          return 0;
      }

!     if (fwrite(s, sizeof(char), n, self->fp) != (size_t)n) {
          PyErr_SetFromErrno(PyExc_IOError);
          return -1;
--- 402,417 ----
  }

! static int
  write_file(Picklerobject *self, char *s, int  n) {
+     size_t nbyteswritten;
+ 
      if (s == NULL) {
          return 0;
      }

!     Py_BEGIN_ALLOW_THREADS
!     nbyteswritten = fwrite(s, sizeof(char), n, self->fp);
!     Py_END_ALLOW_THREADS
!     if (nbyteswritten != (size_t)n) {
          PyErr_SetFromErrno(PyExc_IOError);
          return -1;
***************
*** 473,491 ****
          else return -1;
        }
!     else 
        PDATA_PUSH(self->file, py_str, -1);
!     
!     self->buf_size = 0; 
      return n;
  }

! static int 
  read_file(Unpicklerobject *self, char **s, int  n) {

      if (self->buf_size == 0) {
          int size;

!         size = ((n < 32) ? 32 : n); 
          UNLESS (self->buf = (char *)malloc(size * sizeof(char))) {
              PyErr_NoMemory();
--- 478,497 ----
          else return -1;
        }
!     else
        PDATA_PUSH(self->file, py_str, -1);
! 
!     self->buf_size = 0;
      return n;
  }

! static int
  read_file(Unpicklerobject *self, char **s, int  n) {
+     size_t nbytesread;

      if (self->buf_size == 0) {
          int size;

!         size = ((n < 32) ? 32 : n);
          UNLESS (self->buf = (char *)malloc(size * sizeof(char))) {
              PyErr_NoMemory();
***************
*** 500,508 ****
              return -1;
          }
!  
          self->buf_size = n;
      }
!             
!     if (fread(self->buf, sizeof(char), n, self->fp) != (size_t)n) {
          if (feof(self->fp)) {
              PyErr_SetNone(PyExc_EOFError);
--- 506,517 ----
              return -1;
          }
! 
          self->buf_size = n;
      }
! 
!     Py_BEGIN_ALLOW_THREADS
!     nbytesread = fread(self->buf, sizeof(char), n, self->fp);
!     Py_END_ALLOW_THREADS
!     if (nbytesread != (size_t)n) {
          if (feof(self->fp)) {
              PyErr_SetNone(PyExc_EOFError);

From moshez@users.sourceforge.net  Sat Mar 31 08:31:15 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 00:31:15 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.19,1.81.2.20
Message-ID: <E14jGmx-0001b9-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv4531/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
Fixing #233200 - cPickle did not use Py_BEGIN_ALLOW_THREADS.

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.19
retrieving revision 1.81.2.20
diff -C2 -r1.81.2.19 -r1.81.2.20
*** NEWS	2001/03/31 08:10:03	1.81.2.19
--- NEWS	2001/03/31 08:31:12	1.81.2.20
***************
*** 84,87 ****
--- 84,89 ----
              posix_methods[] array was wrong -- should be HAVE_TMPFILE

+ - #233200 - cPickle did not use Py_BEGIN_ALLOW_THREADS.
+ 
  What's New in Python 2.0?
  =========================

From moshez@users.sourceforge.net  Sat Mar 31 08:42:39 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 00:42:39 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib shlex.py,1.9,1.9.2.1
Message-ID: <E14jGxz-0001p4-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv6919/Lib

Modified Files:
      Tag: release20-maint
	shlex.py 
Log Message:
Fixing #125452 - shlex.shlex hangs when it encounters a string with an 
unmatched quote

Index: shlex.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/shlex.py,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -r1.9 -r1.9.2.1
*** shlex.py	2000/07/09 16:44:26	1.9
--- shlex.py	2001/03/31 08:42:37	1.9.2.1
***************
*** 124,127 ****
--- 124,132 ----
                      self.state = ' '
                      break
+                 elif not nextchar:      # end of file
+                     if self.debug >= 2:
+                         print "shlex: I see EOF in quotes state"
+                     # XXX what error should be raised here?
+                     raise ValueError, "No closing quotation"
              elif self.state == 'a':
                  if not nextchar:

From moshez@users.sourceforge.net  Sat Mar 31 09:12:53 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 01:12:53 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib getopt.py,1.11,1.11.4.1 smtplib.py,1.29,1.29.2.1
Message-ID: <E14jHRF-00034Y-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv8231/Lib

Modified Files:
      Tag: release20-maint
	getopt.py smtplib.py 
Log Message:
- #119833 - close socket in smtplib if there was an error connecting
- #126863 - getopt long option handling fixed

Index: getopt.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/getopt.py,v
retrieving revision 1.11
retrieving revision 1.11.4.1
diff -C2 -r1.11 -r1.11.4.1
*** getopt.py	2000/02/25 16:34:11	1.11
--- getopt.py	2001/03/31 09:12:51	1.11.4.1
***************
*** 66,71 ****
      else:
          longopts = list(longopts)
!     longopts.sort()
!     while args and args[0][:1] == '-' and args[0] != '-':
          if args[0] == '--':
              args = args[1:]
--- 66,70 ----
      else:
          longopts = list(longopts)
!     while args and args[0].startswith('-') and args[0] != '-':
          if args[0] == '--':
              args = args[1:]
***************
*** 81,87 ****
      try:
          i = opt.index('=')
-         opt, optarg = opt[:i], opt[i+1:]
      except ValueError:
          optarg = None

      has_arg, opt = long_has_args(opt, longopts)
--- 80,87 ----
      try:
          i = opt.index('=')
      except ValueError:
          optarg = None
+     else:
+         opt, optarg = opt[:i], opt[i+1:]

      has_arg, opt = long_has_args(opt, longopts)
***************
*** 100,115 ****
  #   full option name
  def long_has_args(opt, longopts):
!     optlen = len(opt)
!     for i in range(len(longopts)):
!         x, y = longopts[i][:optlen], longopts[i][optlen:]
!         if opt != x:
!             continue
!         if y != '' and y != '=' and i+1 < len(longopts):
!             if opt == longopts[i+1][:optlen]:
!                 raise GetoptError('option --%s not a unique prefix' % opt, opt)
!         if longopts[i][-1:] in ('=', ):
!             return 1, longopts[i][:-1]
!         return 0, longopts[i]
!     raise GetoptError('option --%s not recognized' % opt, opt)

  def do_shorts(opts, optstring, shortopts, args):
--- 100,122 ----
  #   full option name
  def long_has_args(opt, longopts):
!     possibilities = [o for o in longopts if o.startswith(opt)]
!     if not possibilities:
!         raise GetoptError('option --%s not recognized' % opt, opt)
!     # Is there an exact match?
!     if opt in possibilities:
!         return 0, opt
!     elif opt + '=' in possibilities:
!         return 1, opt
!     # No exact match, so better be unique.
!     if len(possibilities) > 1:
!         # XXX since possibilities contains all valid continuations, might be
!         # nice to work them into the error msg
!         raise GetoptError('option --%s not a unique prefix' % opt, opt)
!     assert len(possibilities) == 1
!     unique_match = possibilities[0]
!     has_arg = unique_match.endswith('=')
!     if has_arg:
!         unique_match = unique_match[:-1]
!     return has_arg, unique_match

  def do_shorts(opts, optstring, shortopts, args):

Index: smtplib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/smtplib.py,v
retrieving revision 1.29
retrieving revision 1.29.2.1
diff -C2 -r1.29 -r1.29.2.1
*** smtplib.py	2000/09/01 06:40:07	1.29
--- smtplib.py	2001/03/31 09:12:51	1.29.2.1
***************
*** 215,219 ****
          self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
          if self.debuglevel > 0: print 'connect:', (host, port)
!         self.sock.connect((host, port))
          (code,msg)=self.getreply()
          if self.debuglevel >0 : print "connect:", msg
--- 215,223 ----
          self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
          if self.debuglevel > 0: print 'connect:', (host, port)
!         try:
!             self.sock.connect((host, port))
!         except socket.error:
!             self.close()
!             raise
          (code,msg)=self.getreply()
          if self.debuglevel >0 : print "connect:", msg

From moshez@users.sourceforge.net  Sat Mar 31 09:12:53 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 01:12:53 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.20,1.81.2.21
Message-ID: <E14jHRF-00034e-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv8231/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
- #119833 - close socket in smtplib if there was an error connecting
- #126863 - getopt long option handling fixed

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.20
retrieving revision 1.81.2.21
diff -C2 -r1.81.2.20 -r1.81.2.21
*** NEWS	2001/03/31 08:31:12	1.81.2.20
--- NEWS	2001/03/31 09:12:51	1.81.2.21
***************
*** 86,89 ****
--- 86,96 ----
  - #233200 - cPickle did not use Py_BEGIN_ALLOW_THREADS.

+ - #125452 - shlex.shlex hungs when it encounters a string with an unmatched 
+             quote
+ 
+ - #119833 - close socket in smtplib if there was an error connecting
+ 
+ - #126863 - getopt long option handling fixed
+ 
  What's New in Python 2.0?
  =========================

From moshez@users.sourceforge.net  Sat Mar 31 09:32:03 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 01:32:03 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib httplib.py,1.24,1.24.2.1
Message-ID: <E14jHjn-0003n6-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv12410/Lib

Modified Files:
      Tag: release20-maint
	httplib.py 
Log Message:
#123924: Windows - using OpenSSL, problem with socket in httplib.py.

Index: httplib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/httplib.py,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -C2 -r1.24 -r1.24.2.1
*** httplib.py	2000/10/12 19:58:36	1.24
--- httplib.py	2001/03/31 09:32:00	1.24.2.1
***************
*** 614,618 ****
          sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
          sock.connect((self.host, self.port))
!         ssl = socket.ssl(sock, self.key_file, self.cert_file)
          self.sock = FakeSocket(sock, ssl)

--- 614,621 ----
          sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
          sock.connect((self.host, self.port))
!         realsock = sock
!         if hasattr(sock, "_sock"):
!             realsock = sock._sock
!         ssl = socket.ssl(realsock, self.key_file, self.cert_file)
          self.sock = FakeSocket(sock, ssl)

From moshez@users.sourceforge.net  Sat Mar 31 09:32:03 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 01:32:03 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.21,1.81.2.22
Message-ID: <E14jHjn-0003nB-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv12410/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
#123924: Windows - using OpenSSL, problem with socket in httplib.py.

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.21
retrieving revision 1.81.2.22
diff -C2 -r1.81.2.21 -r1.81.2.22
*** NEWS	2001/03/31 09:12:51	1.81.2.21
--- NEWS	2001/03/31 09:32:01	1.81.2.22
***************
*** 93,96 ****
--- 93,98 ----
  - #126863 - getopt long option handling fixed

+ - #123924 - httplib.py - Windows - using OpenSSL, problem with socket
+ 
  What's New in Python 2.0?
  =========================

From moshez@users.sourceforge.net  Sat Mar 31 09:45:06 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 01:45:06 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.22,1.81.2.23
Message-ID: <E14jHwQ-0004FJ-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv14664/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
atexit.py - mutate list of functions in thread-safe way

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.22
retrieving revision 1.81.2.23
diff -C2 -r1.81.2.22 -r1.81.2.23
*** NEWS	2001/03/31 09:32:01	1.81.2.22
--- NEWS	2001/03/31 09:45:04	1.81.2.23
***************
*** 95,98 ****
--- 95,100 ----
  - #123924 - httplib.py - Windows - using OpenSSL, problem with socket

+ - atexit.py - mutate list of functions in thread-safe way
+ 
  What's New in Python 2.0?
  =========================

From moshez@users.sourceforge.net  Sat Mar 31 09:45:06 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 01:45:06 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib atexit.py,1.1,1.1.2.1
Message-ID: <E14jHwQ-0004FO-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv14664/Lib

Modified Files:
      Tag: release20-maint
	atexit.py 
Log Message:
atexit.py - mutate list of functions in thread-safe way

Index: atexit.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/atexit.py,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** atexit.py	2000/06/28 15:07:31	1.1
--- atexit.py	2001/03/31 09:45:04	1.1.2.1
***************
*** 15,21 ****

      while _exithandlers:
!         func, targs, kargs = _exithandlers[-1]
          apply(func, targs, kargs)
-         _exithandlers.remove(_exithandlers[-1])

  def register(func, *targs, **kargs):
--- 15,20 ----

      while _exithandlers:
!         func, targs, kargs = _exithandlers.pop()
          apply(func, targs, kargs)

  def register(func, *targs, **kargs):

From moshez@users.sourceforge.net  Sat Mar 31 10:06:20 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 02:06:20 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.23,1.81.2.24
Message-ID: <E14jIGy-00053m-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv17319/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
curses.ascii - space (ASCII 32) is now considered whitespace

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.23
retrieving revision 1.81.2.24
diff -C2 -r1.81.2.23 -r1.81.2.24
*** NEWS	2001/03/31 09:45:04	1.81.2.23
--- NEWS	2001/03/31 10:06:17	1.81.2.24
***************
*** 97,100 ****
--- 97,102 ----
  - atexit.py - mutate list of functions in thread-safe way

+ - curses.ascii - space (ASCII 32) is now considered whitespace
+ 
  What's New in Python 2.0?
  =========================

From moshez@users.sourceforge.net  Sat Mar 31 10:06:20 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 02:06:20 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib/curses ascii.py,1.3,1.3.4.1
Message-ID: <E14jIGy-00053n-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Lib/curses
In directory usw-pr-cvs1:/tmp/cvs-serv17319/Lib/curses

Modified Files:
      Tag: release20-maint
	ascii.py 
Log Message:
curses.ascii - space (ASCII 32) is now considered whitespace

Index: ascii.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/curses/ascii.py,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -C2 -r1.3 -r1.3.4.1
*** ascii.py	2000/07/11 10:38:24	1.3
--- ascii.py	2001/03/31 10:06:18	1.3.4.1
***************
*** 62,66 ****
  def isprint(c): return _ctoi(c) >= 32 and _ctoi(c) <= 126
  def ispunct(c): return _ctoi(c) != 32 and not isalnum(c)
! def isspace(c): return _ctoi(c) in (12, 10, 13, 9, 11)
  def isupper(c): return _ctoi(c) >= 65 and _ctoi(c) <= 90
  def isxdigit(c): return isdigit(c) or \
--- 62,66 ----
  def isprint(c): return _ctoi(c) >= 32 and _ctoi(c) <= 126
  def ispunct(c): return _ctoi(c) != 32 and not isalnum(c)
! def isspace(c): return _ctoi(c) in (9, 10, 11, 12, 13, 32)
  def isupper(c): return _ctoi(c) >= 65 and _ctoi(c) <= 90
  def isxdigit(c): return isdigit(c) or \

From moshez@users.sourceforge.net  Sat Mar 31 10:29:05 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 02:29:05 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.24,1.81.2.25
Message-ID: <E14jIcz-0005mG-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv19544/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
#125375 - parsermodule.c - fix parser.tuple2ast() failure on valid parse tree

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.24
retrieving revision 1.81.2.25
diff -C2 -r1.81.2.24 -r1.81.2.25
*** NEWS	2001/03/31 10:06:17	1.81.2.24
--- NEWS	2001/03/31 10:29:03	1.81.2.25
***************
*** 99,102 ****
--- 99,104 ----
  - curses.ascii - space (ASCII 32) is now considered whitespace

+ - #125375 - parsermodule.c - fix parser.tuple2ast() failure on valid parse tree
+ 
  What's New in Python 2.0?
  =========================

From moshez@users.sourceforge.net  Sat Mar 31 10:29:05 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 02:29:05 -0800
Subject: [Python-checkins] CVS: python/dist/src/Modules parsermodule.c,2.57,2.57.2.1
Message-ID: <E14jIcz-0005mL-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv19544/Modules

Modified Files:
      Tag: release20-maint
	parsermodule.c 
Log Message:
#125375 - parsermodule.c - fix parser.tuple2ast() failure on valid parse tree

Index: parsermodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/parsermodule.c,v
retrieving revision 2.57
retrieving revision 2.57.2.1
diff -C2 -r2.57 -r2.57.2.1
*** parsermodule.c	2000/09/12 21:58:06	2.57
--- parsermodule.c	2001/03/31 10:29:03	2.57.2.1
***************
*** 1099,1102 ****
--- 1099,1104 ----
      int sym;

+     if (!res)
+         return 0;
      if (nch < 1) {
          err_string("varargslist missing child nodes");
***************
*** 1105,1108 ****
--- 1107,1113 ----
      sym = TYPE(CHILD(tree, 0));
      if (sym == STAR || sym == DOUBLESTAR)
+         /* whole thing matches:
+          *      '*' NAME [',' '**' NAME] | '**' NAME
+          */
          res = validate_varargslist_trailer(tree, 0);
      else if (sym == fpdef) {
***************
*** 1128,1136 ****
                  if (res && i < nch) {
                      res = validate_comma(CHILD(tree, i));
!                     if (res)
!                         ++i;
                  }
              }
!             /* handle '*' NAME [',' '**' NAME] | '**' NAME */
              if (res)
                  res = validate_varargslist_trailer(tree, i);
--- 1133,1146 ----
                  if (res && i < nch) {
                      res = validate_comma(CHILD(tree, i));
!                     ++i;
!                     if (res && i < nch
!                         && (TYPE(CHILD(tree, i)) == DOUBLESTAR
!                             || TYPE(CHILD(tree, i)) == STAR))
!                         break;
                  }
              }
!             /* ... '*' NAME [',' '**' NAME] | '**' NAME
!              * i --^^^
!              */
              if (res)
                  res = validate_varargslist_trailer(tree, i);
***************
*** 1140,1143 ****
--- 1150,1154 ----
               *  fpdef ['=' test] (',' fpdef ['=' test])* [',']
               */
+             /* strip trailing comma node */
              if (sym == COMMA) {
                  res = validate_comma(CHILD(tree, nch-1));
***************
*** 1151,1157 ****
              res = validate_fpdef(CHILD(tree, 0));
              ++i;
!             if (res && (i+2 < nch) && TYPE(CHILD(tree, 1)) == EQUAL) {
!                 res = (validate_equal(CHILD(tree, 1))
!                        && validate_test(CHILD(tree, 2)));
                  i += 2;
              }
--- 1162,1168 ----
              res = validate_fpdef(CHILD(tree, 0));
              ++i;
!             if (res && (i+2 <= nch) && TYPE(CHILD(tree, i)) == EQUAL) {
!                 res = (validate_equal(CHILD(tree, i))
!                        && validate_test(CHILD(tree, i+1)));
                  i += 2;
              }
***************
*** 1164,1173 ****
                         && validate_fpdef(CHILD(tree, i+1)));
                  i += 2;
!                 if (res && (nch - i) >= 2
!                     && TYPE(CHILD(tree, i)) == COMMA) {
!                     res = (validate_comma(CHILD(tree, i))
                             && validate_test(CHILD(tree, i+1)));
!                     if (res)
!                         i += 2;
                  }
              }
--- 1175,1182 ----
                         && validate_fpdef(CHILD(tree, i+1)));
                  i += 2;
!                 if (res && (nch - i) >= 2 && TYPE(CHILD(tree, i)) == EQUAL) {
!                     res = (validate_equal(CHILD(tree, i))
                             && validate_test(CHILD(tree, i+1)));
!                     i += 2;
                  }
              }

From moshez@users.sourceforge.net  Sat Mar 31 10:55:49 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 02:55:49 -0800
Subject: [Python-checkins] CVS: python/dist/src/Modules mpzmodule.c,2.34,2.34.2.1
Message-ID: <E14jJ2r-0007K6-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv23401/Modules

Modified Files:
      Tag: release20-maint
	mpzmodule.c 
Log Message:
Make mpz's .binary() work on 64 bit platforms
Make mpzmodule compile with cygwin

Index: mpzmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/mpzmodule.c,v
retrieving revision 2.34
retrieving revision 2.34.2.1
diff -C2 -r2.34 -r2.34.2.1
*** mpzmodule.c	2000/10/11 21:53:34	2.34
--- mpzmodule.c	2001/03/31 10:55:47	2.34.2.1
***************
*** 1478,1481 ****
--- 1478,1487 ----
  		*cp++ = (unsigned char)((ldigit >>= 8) & 0xFF);
  		*cp++ = (unsigned char)((ldigit >>= 8) & 0xFF);
+ 		if (sizeof(ldigit) == 8 && BITS_PER_MP_LIMB == 64) {
+ 			*cp++ = (unsigned char)((ldigit >>= 8) & 0xFF);
+ 			*cp++ = (unsigned char)((ldigit >>= 8) & 0xFF);
+ 			*cp++ = (unsigned char)((ldigit >>= 8) & 0xFF);
+ 			*cp++ = (unsigned char)((ldigit >>= 8) & 0xFF);
+ 		}
  	}

***************
*** 1585,1589 ****

  static PyTypeObject MPZtype = {
! 	PyObject_HEAD_INIT(&PyType_Type)
  	0,			/*ob_size*/
  	"mpz",			/*tp_name*/
--- 1591,1595 ----

  static PyTypeObject MPZtype = {
! 	PyObject_HEAD_INIT(NULL)
  	0,			/*ob_size*/
  	"mpz",			/*tp_name*/
***************
*** 1717,1720 ****
--- 1723,1727 ----

  	mp_set_memory_functions( mp_allocate, mp_reallocate, mp_free );
+         MPZtype.ob_type = &PyType_Type;
  	module = Py_InitModule("mpz", mpz_functions);

From moshez@users.sourceforge.net  Sat Mar 31 10:55:49 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 02:55:49 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.25,1.81.2.26
Message-ID: <E14jJ2r-0007K5-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv23401/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
Make mpz's .binary() work on 64 bit platforms
Make mpzmodule compile with cygwin

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.25
retrieving revision 1.81.2.26
diff -C2 -r1.81.2.25 -r1.81.2.26
*** NEWS	2001/03/31 10:29:03	1.81.2.25
--- NEWS	2001/03/31 10:55:47	1.81.2.26
***************
*** 101,104 ****
--- 101,107 ----
  - #125375 - parsermodule.c - fix parser.tuple2ast() failure on valid parse tree

+ - mpzmodule.c - make .binary() work on 64-bit system, make it compile with 
+   Cygwin
+ 
  What's New in Python 2.0?
  =========================

From moshez@users.sourceforge.net  Sat Mar 31 11:14:45 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 03:14:45 -0800
Subject: [Python-checkins] CVS: python/dist/src/Modules binascii.c,2.27,2.27.2.1
Message-ID: <E14jJLB-00081Q-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv28421/Modules

Modified Files:
      Tag: release20-maint
	binascii.c 
Log Message:
Address a bug in the uuencode decoder, reported bu "donut" in SF bug
#127718: '@' and '`' seem to be confused.

Index: binascii.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/binascii.c,v
retrieving revision 2.27
retrieving revision 2.27.2.1
diff -C2 -r2.27 -r2.27.2.1
*** binascii.c	2000/09/01 23:29:26	2.27
--- binascii.c	2001/03/31 11:14:43	2.27.2.1
***************
*** 205,209 ****
  			** The 64 in stead of the expected 63 is because
  			** there are a few uuencodes out there that use
! 			** '@' as zero instead of space.
  			*/
  			if ( this_ch < ' ' || this_ch > (' ' + 64)) {
--- 205,209 ----
  			** The 64 in stead of the expected 63 is because
  			** there are a few uuencodes out there that use
! 			** '`' as zero instead of space.
  			*/
  			if ( this_ch < ' ' || this_ch > (' ' + 64)) {
***************
*** 233,238 ****
  	while( ascii_len-- > 0 ) {
  		this_ch = *ascii_data++;
! 		/* Extra '@' may be written as padding in some cases */
! 		if ( this_ch != ' ' && this_ch != '@' &&
  		     this_ch != '\n' && this_ch != '\r' ) {
  			PyErr_SetString(Error, "Trailing garbage");
--- 233,238 ----
  	while( ascii_len-- > 0 ) {
  		this_ch = *ascii_data++;
! 		/* Extra '`' may be written as padding in some cases */
! 		if ( this_ch != ' ' && this_ch != ' '+64 &&
  		     this_ch != '\n' && this_ch != '\r' ) {
  			PyErr_SetString(Error, "Trailing garbage");

From moshez@users.sourceforge.net  Sat Mar 31 11:14:45 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 03:14:45 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.26,1.81.2.27
Message-ID: <E14jJLB-00081N-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv28421/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
Address a bug in the uuencode decoder, reported bu "donut" in SF bug
#127718: '@' and '`' seem to be confused.

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.26
retrieving revision 1.81.2.27
diff -C2 -r1.81.2.26 -r1.81.2.27
*** NEWS	2001/03/31 10:55:47	1.81.2.26
--- NEWS	2001/03/31 11:14:42	1.81.2.27
***************
*** 104,107 ****
--- 104,109 ----
    Cygwin

+ - #127718 - '@' were '`' seem to be confused.
+ 
  What's New in Python 2.0?
  =========================

From moshez@users.sourceforge.net  Sat Mar 31 13:18:38 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 05:18:38 -0800
Subject: [Python-checkins] CVS: python/dist/src/Python pythonrun.c,2.115,2.115.2.1 getargs.c,2.49,2.49.2.1
Message-ID: <E14jLH4-0003xR-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Python
In directory usw-pr-cvs1:/tmp/cvs-serv14060/Python

Modified Files:
      Tag: release20-maint
	pythonrun.c getargs.c 
Log Message:
- #119862 - getargs.c - patched memory leak

- #128475 - pythonrun.c - In Py_Finalize, don't reset initialized flag
            until after the exit funcs have run

Index: pythonrun.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/pythonrun.c,v
retrieving revision 2.115
retrieving revision 2.115.2.1
diff -C2 -r2.115 -r2.115.2.1
*** pythonrun.c	2000/09/16 16:32:19	2.115
--- pythonrun.c	2001/03/31 13:18:35	2.115.2.1
***************
*** 184,190 ****
  	if (!initialized)
  		return;
- 	initialized = 0;

  	call_sys_exitfunc();

  	/* Get current thread state and interpreter pointer */
--- 184,199 ----
  	if (!initialized)
  		return;

+ 	/* The interpreter is still entirely intact at this point, and the
+ 	 * exit funcs may be relying on that.  In particular, if some thread
+ 	 * or exit func is still waiting to do an import, the import machinery
+ 	 * expects Py_IsInitialized() to return true.  So don't say the
+ 	 * interpreter is uninitialized until after the exit funcs have run.
+ 	 * Note that Threading.py uses an exit func to do a join on all the
+ 	 * threads created thru it, so this also protects pending imports in
+ 	 * the threads created via Threading.
+ 	 */
  	call_sys_exitfunc();
+ 	initialized = 0;

  	/* Get current thread state and interpreter pointer */

Index: getargs.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/getargs.c,v
retrieving revision 2.49
retrieving revision 2.49.2.1
diff -C2 -r2.49 -r2.49.2.1
*** getargs.c	2000/09/26 05:46:01	2.49
--- getargs.c	2001/03/31 13:18:35	2.49.2.1
***************
*** 1125,1128 ****
--- 1125,1129 ----
  			}
  			converted++;
+ 			Py_DECREF(item);
  		}
  		else {

From moshez@users.sourceforge.net  Sat Mar 31 13:18:37 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 05:18:37 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.27,1.81.2.28
Message-ID: <E14jLH3-0003xL-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv14060/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
- #119862 - getargs.c - patched memory leak

- #128475 - pythonrun.c - In Py_Finalize, don't reset initialized flag
            until after the exit funcs have run

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.27
retrieving revision 1.81.2.28
diff -C2 -r1.81.2.27 -r1.81.2.28
*** NEWS	2001/03/31 11:14:42	1.81.2.27
--- NEWS	2001/03/31 13:18:35	1.81.2.28
***************
*** 106,109 ****
--- 106,114 ----
  - #127718 - '@' were '`' seem to be confused.

+ - #119862 - getargs.c - patched memory leak
+ 
+ - #128475 - pythonrun.c - In Py_Finalize, don't reset initialized flag
+             until after the exit funcs have run
+ 
  What's New in Python 2.0?
  =========================

From moshez@users.sourceforge.net  Sat Mar 31 13:23:22 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 05:23:22 -0800
Subject: [Python-checkins] CVS: python/dist/src/Modules mmapmodule.c,2.24,2.24.2.1
Message-ID: <E14jLLe-0004B7-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv15193/Modules

Modified Files:
      Tag: release20-maint
	mmapmodule.c 
Log Message:
- #128713 - mmapmodule.c -  type(mmap_object) blew up on Linux.
- mmap on windows creates a mapping without a name when tagname isn't
  specified

Index: mmapmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/mmapmodule.c,v
retrieving revision 2.24
retrieving revision 2.24.2.1
diff -C2 -r2.24 -r2.24.2.1
*** mmapmodule.c	2000/10/01 17:50:46	2.24
--- mmapmodule.c	2001/03/31 13:23:19	2.24.2.1
***************
*** 842,848 ****
  	HANDLE fh = 0;

- 	/* Patch the object type */
- 	mmap_object_type.ob_type = &PyType_Type;
- 
  	if (!PyArg_ParseTuple(args,
  			  "iO|z",
--- 842,845 ----
***************
*** 908,912 ****

  	/* set the tag name */
! 	if (tagname != NULL) {
  		m_obj->tagname = PyMem_Malloc(strlen(tagname)+1);
  		if (m_obj->tagname == NULL) {
--- 905,909 ----

  	/* set the tag name */
! 	if (tagname != NULL && *tagname != '\0') {
  		m_obj->tagname = PyMem_Malloc(strlen(tagname)+1);
  		if (m_obj->tagname == NULL) {
***************
*** 925,929 ****
  					       0,
  					       m_obj->size,
! 					       tagname);
  	if (m_obj->map_handle != NULL) {
  		m_obj->data = (char *) MapViewOfFile (m_obj->map_handle,
--- 922,926 ----
  					       0,
  					       m_obj->size,
! 					       m_obj->tagname);
  	if (m_obj->map_handle != NULL) {
  		m_obj->data = (char *) MapViewOfFile (m_obj->map_handle,
***************
*** 963,966 ****
--- 960,967 ----
  {
  	PyObject *dict, *module;
+ 
+ 	/* Patch the object type */
+ 	mmap_object_type.ob_type = &PyType_Type;
+ 
  	module = Py_InitModule ("mmap", mmap_functions);
  	dict = PyModule_GetDict (module);

From moshez@users.sourceforge.net  Sat Mar 31 13:32:41 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 05:32:41 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.28,1.81.2.29
Message-ID: <E14jLUf-0004WQ-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv16574/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
Fix two typos in __imul__.  Closes Bug #117745.

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.28
retrieving revision 1.81.2.29
diff -C2 -r1.81.2.28 -r1.81.2.29
*** NEWS	2001/03/31 13:18:35	1.81.2.28
--- NEWS	2001/03/31 13:32:38	1.81.2.29
***************
*** 111,114 ****
--- 111,121 ----
              until after the exit funcs have run

+ - #128713 - mmapmodule.c -  type(mmap_object) blew up on Linux.
+ 
+ - mmap on windows creates a mapping without a name when tagname isn't
+   specified
+ 
+ - #117745 - UserString.py - Fix two typos in __imul__.
+ 
  What's New in Python 2.0?
  =========================

From moshez@users.sourceforge.net  Sat Mar 31 13:32:41 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 05:32:41 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib UserString.py,1.6,1.6.2.1
Message-ID: <E14jLUf-0004WP-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv16574/Lib

Modified Files:
      Tag: release20-maint
	UserString.py 
Log Message:
Fix two typos in __imul__.  Closes Bug #117745.

Index: UserString.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/UserString.py,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** UserString.py	2000/08/24 21:47:34	1.6
--- UserString.py	2001/03/31 13:32:38	1.6.2.1
***************
*** 62,67 ****
          return self.__class__(self.data*n)
      __rmul__ = __mul__
!     def __imull__(self, n):
!         self.data += n
          return self

--- 62,67 ----
          return self.__class__(self.data*n)
      __rmul__ = __mul__
!     def __imul__(self, n):
!         self.data *= n
          return self

From moshez@users.sourceforge.net  Sat Mar 31 13:46:36 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 05:46:36 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib statcache.py,1.7,1.7.4.1
Message-ID: <E14jLi8-0004v7-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv18533/Lib

Modified Files:
      Tag: release20-maint
	statcache.py 
Log Message:
- #130306 - statcache.py - full of thread problems.

- Made statcache.forget_dir more portable

Index: statcache.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/statcache.py,v
retrieving revision 1.7
retrieving revision 1.7.4.1
diff -C2 -r1.7 -r1.7.4.1
*** statcache.py	2000/02/04 15:39:30	1.7
--- statcache.py	2001/03/31 13:46:33	1.7.4.1
***************
*** 15,20 ****
  def stat(path):
  	"""Stat a file, possibly out of the cache."""
! 	if cache.has_key(path):
! 		return cache[path]
  	cache[path] = ret = os.stat(path)
  	return ret
--- 15,21 ----
  def stat(path):
  	"""Stat a file, possibly out of the cache."""
! 	ret = cache.get(path, None)
! 	if ret is not None:
! 		return ret
  	cache[path] = ret = os.stat(path)
  	return ret
***************
*** 23,34 ****
  def reset():
  	"""Reset the cache completely."""
! 	global cache
! 	cache = {}

  def forget(path):
  	"""Remove a given item from the cache, if it exists."""
! 	if cache.has_key(path):
  		del cache[path]

--- 24,36 ----
  def reset():
  	"""Reset the cache completely."""
! 	cache.clear()

  def forget(path):
  	"""Remove a given item from the cache, if it exists."""
! 	try:
  		del cache[path]
+ 	except KeyError:
+ 		pass

***************
*** 38,42 ****
  	for path in cache.keys():
  		if path[:n] == prefix:
! 			del cache[path]

--- 40,44 ----
  	for path in cache.keys():
  		if path[:n] == prefix:
! 			forget(path)

***************
*** 44,60 ****
  	"""Forget about a directory and all entries in it, but not about
  	entries in subdirectories."""
! 	if prefix[-1:] == '/' and prefix <> '/':
! 		prefix = prefix[:-1]
  	forget(prefix)
- 	if prefix[-1:] <> '/':
- 		prefix = prefix + '/'
- 	n = len(prefix)
  	for path in cache.keys():
! 		if path[:n] == prefix:
! 			rest = path[n:]
! 			if rest[-1:] == '/': rest = rest[:-1]
! 			if '/' not in rest:
! 				del cache[path]
! 

  def forget_except_prefix(prefix):
--- 46,55 ----
  	"""Forget about a directory and all entries in it, but not about
  	entries in subdirectories."""
! 	import os.path
! 	prefix = os.path.dirname(os.path.join(prefix, "xxx"))
  	forget(prefix)
  	for path in cache.keys():
! 	if path.startswith(prefix) and os.path.dirname(path) == prefix:
! 		forget(path)

  def forget_except_prefix(prefix):
***************
*** 64,68 ****
  	for path in cache.keys():
  		if path[:n] <> prefix:
! 			del cache[path]

--- 59,63 ----
  	for path in cache.keys():
  		if path[:n] <> prefix:
! 			forget(path)

From moshez@users.sourceforge.net  Sat Mar 31 13:46:36 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 05:46:36 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.29,1.81.2.30
Message-ID: <E14jLi8-0004vC-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv18533/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
- #130306 - statcache.py - full of thread problems.

- Made statcache.forget_dir more portable

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.29
retrieving revision 1.81.2.30
diff -C2 -r1.81.2.29 -r1.81.2.30
*** NEWS	2001/03/31 13:32:38	1.81.2.29
--- NEWS	2001/03/31 13:46:34	1.81.2.30
***************
*** 118,121 ****
--- 118,125 ----
  - #117745 - UserString.py - Fix two typos in __imul__.

+ - #130306 - statcache.py - full of thread problems.
+ 
+ - Made statcache.forget_dir more portable
+ 
  What's New in Python 2.0?
  =========================

From moshez@users.sourceforge.net  Sat Mar 31 13:52:04 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 05:52:04 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib site.py,1.20,1.20.2.1
Message-ID: <E14jLnQ-000597-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv19002/Lib

Modified Files:
      Tag: release20-maint
	site.py 
Log Message:
The ".pth" code knew about the layout of Python trees on unix and
windows, but not on the mac. Fixed.

Index: site.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/site.py,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -C2 -r1.20 -r1.20.2.1
*** site.py	2000/10/03 17:11:37	1.20
--- site.py	2001/03/31 13:52:02	1.20.2.1
***************
*** 123,126 ****
--- 123,128 ----
                                   "site-packages"),
                          makepath(prefix, "lib", "site-python")]
+         elif os.sep == ':':
+             sitedirs = [makepath(prefix, "lib", "site-packages")]
          else:
              sitedirs = [prefix]

From moshez@users.sourceforge.net  Sat Mar 31 13:52:04 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 05:52:04 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.30,1.81.2.31
Message-ID: <E14jLnQ-00059C-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv19002/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
The ".pth" code knew about the layout of Python trees on unix and
windows, but not on the mac. Fixed.

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.30
retrieving revision 1.81.2.31
diff -C2 -r1.81.2.30 -r1.81.2.31
*** NEWS	2001/03/31 13:46:34	1.81.2.30
--- NEWS	2001/03/31 13:52:02	1.81.2.31
***************
*** 122,125 ****
--- 122,128 ----
  - Made statcache.forget_dir more portable

+ - In site.py, the ".pth" code knew about the layout of Python trees on 
+   unix and windows, but not on the mac. Fixed.
+ 
  What's New in Python 2.0?
  =========================

From moshez@users.sourceforge.net  Sat Mar 31 14:01:16 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 06:01:16 -0800
Subject: [Python-checkins] CVS: python/dist/src/Modules config.c.in,1.71,1.71.2.1
Message-ID: <E14jLwK-0005Xe-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv20456/Modules

Modified Files:
      Tag: release20-maint
	config.c.in 
Log Message:
- #121706 - config.c - _PyImport_Inittab: define the exceptions module's init
                       function.

Index: config.c.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/config.c.in,v
retrieving revision 1.71
retrieving revision 1.71.2.1
diff -C2 -r1.71 -r1.71.2.1
*** config.c.in	2000/07/23 00:02:15	1.71
--- config.c.in	2001/03/31 14:01:13	1.71.2.1
***************
*** 38,42 ****
  	{"__builtin__", NULL},
  	{"sys", NULL},
! 	{"exceptions", NULL},

  	/* Sentinel */
--- 38,42 ----
  	{"__builtin__", NULL},
  	{"sys", NULL},
! 	{"exceptions", init_exceptions},

  	/* Sentinel */

From moshez@users.sourceforge.net  Sat Mar 31 14:01:16 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 06:01:16 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.31,1.81.2.32
Message-ID: <E14jLwK-0005XZ-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv20456/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
- #121706 - config.c - _PyImport_Inittab: define the exceptions module's init
                       function.

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.31
retrieving revision 1.81.2.32
diff -C2 -r1.81.2.31 -r1.81.2.32
*** NEWS	2001/03/31 13:52:02	1.81.2.31
--- NEWS	2001/03/31 14:01:13	1.81.2.32
***************
*** 125,128 ****
--- 125,131 ----
    unix and windows, but not on the mac. Fixed.

+ - #121706 - config.c - _PyImport_Inittab: define the exceptions module's init 
+                        function.
+ 
  What's New in Python 2.0?
  =========================

From moshez@users.sourceforge.net  Sat Mar 31 14:06:34 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 06:06:34 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.32,1.81.2.33
Message-ID: <E14jM1S-0005kQ-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv21496/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
- Update install-sh using version from automake 1.4.

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.32
retrieving revision 1.81.2.33
diff -C2 -r1.81.2.32 -r1.81.2.33
*** NEWS	2001/03/31 14:01:13	1.81.2.32
--- NEWS	2001/03/31 14:06:31	1.81.2.33
***************
*** 128,131 ****
--- 128,133 ----
                         function.

+ - Update install-sh using version from automake 1.4.
+ 
  What's New in Python 2.0?
  =========================

From moshez@users.sourceforge.net  Sat Mar 31 14:06:34 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 06:06:34 -0800
Subject: [Python-checkins] CVS: python/dist/src install-sh,2.3,2.3.4.1
Message-ID: <E14jM1S-0005kV-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv21496

Modified Files:
      Tag: release20-maint
	install-sh 
Log Message:
- Update install-sh using version from automake 1.4.

Index: install-sh
===================================================================
RCS file: /cvsroot/python/python/dist/src/install-sh,v
retrieving revision 2.3
retrieving revision 2.3.4.1
diff -C2 -r2.3 -r2.3.4.1
*** install-sh	1998/08/13 16:08:45	2.3
--- install-sh	2001/03/31 14:06:32	2.3.4.1
***************
*** 1,13 ****
  #!/bin/sh
- 
  #
  # install - install a program, script, or datafile
! # This comes from X11R5; it is not part of GNU.
  #
! # $XConsortium: install.sh,v 1.2 89/12/18 14:47:22 jim Exp $
  #
! # This script is compatible with the BSD install script, but was written
! # from scratch.
  #

--- 1,26 ----
  #!/bin/sh
  #
  # install - install a program, script, or datafile
! # This comes from X11R5 (mit/util/scripts/install.sh).
  #
! # Copyright 1991 by the Massachusetts Institute of Technology
  #
! # Permission to use, copy, modify, distribute, and sell this software and its
! # documentation for any purpose is hereby granted without fee, provided that
! # the above copyright notice appear in all copies and that both that
! # copyright notice and this permission notice appear in supporting
! # documentation, and that the name of M.I.T. not be used in advertising or
! # publicity pertaining to distribution of the software without specific,
! # written prior permission.  M.I.T. makes no representations about the
! # suitability of this software for any purpose.  It is provided "as is"
! # without express or implied warranty.
  #
+ # Calling this script install-sh is preferred over install.sh, to prevent
+ # `make' implicit rules from creating a file called install from it
+ # when there is no Makefile.
+ #
+ # This script is compatible with the BSD install script, but was written
+ # from scratch.  It can only install one file at a time, a restriction
+ # shared with many OS's install programs.

***************
*** 27,33 ****
  stripprog="${STRIPPROG-strip}"
  rmprog="${RMPROG-rm}"

  instcmd="$mvprog"
! chmodcmd=""
  chowncmd=""
  chgrpcmd=""
--- 40,49 ----
  stripprog="${STRIPPROG-strip}"
  rmprog="${RMPROG-rm}"
+ mkdirprog="${MKDIRPROG-mkdir}"

+ transformbasename=""
+ transform_arg=""
  instcmd="$mvprog"
! chmodcmd="$chmodprog 0755"
  chowncmd=""
  chgrpcmd=""
***************
*** 37,40 ****
--- 53,57 ----
  src=""
  dst=""
+ dir_arg=""

  while [ x"$1" != x ]; do
***************
*** 44,47 ****
--- 61,68 ----
  	    continue;;

+ 	-d) dir_arg=true
+ 	    shift
+ 	    continue;;
+ 
  	-m) chmodcmd="$chmodprog $2"
  	    shift
***************
*** 63,70 ****
--- 84,101 ----
  	    continue;;

+ 	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
+ 	    shift
+ 	    continue;;
+ 
+ 	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+ 	    shift
+ 	    continue;;
+ 
  	*)  if [ x"$src" = x ]
  	    then
  		src=$1
  	    else
+ 		# this colon is to work around a 386BSD /bin/sh bug
+ 		:
  		dst=$1
  	    fi
***************
*** 76,119 ****
  if [ x"$src" = x ]
  then
! 	echo "install:  no input file specified"
  	exit 1
  fi

! if [ x"$dst" = x ]
! then
! 	echo "install:  no destination specified"
! 	exit 1
! fi
! 

  # If destination is a directory, append the input filename; if your system
  # does not like double slashes in filenames, you may need to add some logic

! if [ -d $dst ]
! then
! 	dst="$dst"/`basename $src`
  fi

  # Make a temp file name in the proper directory.

! # Avoid dirname, which doesn't exist everywhere...
! dstdir=`echo $dst | sed 's,/[^/]*$,,'`
! dsttmp=$dstdir/#inst.$$#

  # Move or copy the file name to the temp name

! $doit $instcmd $src $dsttmp || exit $?

  # and set any options; do chmod last to preserve setuid bits

! if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; fi
! if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; fi
! if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; fi
! if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; fi

  # Now rename the file to the real destination.

! $doit $rmcmd $dst
! $doit $mvcmd $dsttmp $dst || exit $?

--- 107,250 ----
  if [ x"$src" = x ]
  then
! 	echo "install:	no input file specified"
  	exit 1
+ else
+ 	true
  fi

! if [ x"$dir_arg" != x ]; then
! 	dst=$src
! 	src=""
! 	
! 	if [ -d $dst ]; then
! 		instcmd=:
! 		chmodcmd=""
! 	else
! 		instcmd=mkdir
! 	fi
! else
! 
! # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
! # might cause directories to be created, which would be especially bad 
! # if $src (and thus $dsttmp) contains '*'.
! 
! 	if [ -f $src -o -d $src ]
! 	then
! 		true
! 	else
! 		echo "install:  $src does not exist"
! 		exit 1
! 	fi
! 	
! 	if [ x"$dst" = x ]
! 	then
! 		echo "install:	no destination specified"
! 		exit 1
! 	else
! 		true
! 	fi

  # If destination is a directory, append the input filename; if your system
  # does not like double slashes in filenames, you may need to add some logic

! 	if [ -d $dst ]
! 	then
! 		dst="$dst"/`basename $src`
! 	else
! 		true
! 	fi
! fi
! 
! ## this sed command emulates the dirname command
! dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
! 
! # Make sure that the destination directory exists.
! #  this part is taken from Noah Friedman's mkinstalldirs script
! 
! # Skip lots of stat calls in the usual case.
! if [ ! -d "$dstdir" ]; then
! defaultIFS='	
! '
! IFS="${IFS-${defaultIFS}}"
! 
! oIFS="${IFS}"
! # Some sh's can't handle IFS=/ for some reason.
! IFS='%'
! set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
! IFS="${oIFS}"
! 
! pathcomp=''
! 
! while [ $# -ne 0 ] ; do
! 	pathcomp="${pathcomp}${1}"
! 	shift
! 
! 	if [ ! -d "${pathcomp}" ] ;
!         then
! 		$mkdirprog "${pathcomp}"
! 	else
! 		true
! 	fi
! 
! 	pathcomp="${pathcomp}/"
! done
  fi

+ if [ x"$dir_arg" != x ]
+ then
+ 	$doit $instcmd $dst &&
+ 
+ 	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
+ 	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
+ 	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
+ 	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
+ else
+ 
+ # If we're going to rename the final executable, determine the name now.
+ 
+ 	if [ x"$transformarg" = x ] 
+ 	then
+ 		dstfile=`basename $dst`
+ 	else
+ 		dstfile=`basename $dst $transformbasename | 
+ 			sed $transformarg`$transformbasename
+ 	fi
+ 
+ # don't allow the sed command to completely eliminate the filename
+ 
+ 	if [ x"$dstfile" = x ] 
+ 	then
+ 		dstfile=`basename $dst`
+ 	else
+ 		true
+ 	fi
+ 
  # Make a temp file name in the proper directory.

! 	dsttmp=$dstdir/#inst.$$#

  # Move or copy the file name to the temp name
+ 
+ 	$doit $instcmd $src $dsttmp &&

! 	trap "rm -f ${dsttmp}" 0 &&

  # and set any options; do chmod last to preserve setuid bits

! # If any of these fail, we abort the whole thing.  If we want to
! # ignore errors from any of these, just make sure not to ignore
! # errors from the above "$doit $instcmd $src $dsttmp" command.
! 
! 	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
! 	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
! 	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
! 	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&

  # Now rename the file to the real destination.
+ 
+ 	$doit $rmcmd -f $dstdir/$dstfile &&
+ 	$doit $mvcmd $dsttmp $dstdir/$dstfile 

! fi &&

From moshez@users.sourceforge.net  Sat Mar 31 14:13:28 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 06:13:28 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.33,1.81.2.34
Message-ID: <E14jM88-0005yI-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv22532/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
- #12195 - webbrowser.py - there was typo in Mac code

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.33
retrieving revision 1.81.2.34
diff -C2 -r1.81.2.33 -r1.81.2.34
*** NEWS	2001/03/31 14:06:31	1.81.2.33
--- NEWS	2001/03/31 14:13:25	1.81.2.34
***************
*** 130,133 ****
--- 130,135 ----
  - Update install-sh using version from automake 1.4.

+ - #12195 - webbrowser.py - there was typo in Mac code
+ 
  What's New in Python 2.0?
  =========================

From moshez@users.sourceforge.net  Sat Mar 31 14:13:28 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 06:13:28 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib webbrowser.py,1.4,1.4.2.1
Message-ID: <E14jM88-0005yH-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv22532/Lib

Modified Files:
      Tag: release20-maint
	webbrowser.py 
Log Message:
- #12195 - webbrowser.py - there was typo in Mac code

Index: webbrowser.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/webbrowser.py,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** webbrowser.py	2000/10/02 03:40:51	1.4
--- webbrowser.py	2001/03/31 14:13:26	1.4.2.1
***************
*** 216,220 ****
      class InternetConfig:
          def open(self, url, new=0):
!             ic.launcurl(url)

          def open_new(self, url):
--- 216,220 ----
      class InternetConfig:
          def open(self, url, new=0):
!             ic.launchurl(url)

          def open_new(self, url):

From moshez@users.sourceforge.net  Sat Mar 31 14:14:45 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 06:14:45 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib quopri.py,1.7,1.7.2.1
Message-ID: <E14jM9N-0005zr-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv22973/Lib

Modified Files:
      Tag: release20-maint
	quopri.py 
Log Message:
Treat \r as whitespace too, when removing trailing whitespace

Index: quopri.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/quopri.py,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -r1.7 -r1.7.2.1
*** quopri.py	2000/10/05 17:24:33	1.7
--- quopri.py	2001/03/31 14:14:43	1.7.2.1
***************
*** 64,68 ****
              partial = 0; n = n-1
              # Strip trailing whitespace
!             while n > 0 and line[n-1] in (' ', '\t'):
                  n = n-1
          else:
--- 64,68 ----
              partial = 0; n = n-1
              # Strip trailing whitespace
!             while n > 0 and line[n-1] in " \t\r":
                  n = n-1
          else:

From moshez@users.sourceforge.net  Sat Mar 31 14:26:56 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 06:26:56 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.34,1.81.2.35
Message-ID: <E14jMLA-0006II-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv23452/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
- xmllib.py - Moved clearing of "literal" flag.  The flag is set in setliteral
  which can be called from a start tag handler.  When the corresponding end
  tag is read the flag is cleared.  However, it didn't get cleared when
  the start tag was for an empty element of the type <tag .../>.  This
  modification fixes the problem.

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.34
retrieving revision 1.81.2.35
diff -C2 -r1.81.2.34 -r1.81.2.35
*** NEWS	2001/03/31 14:13:25	1.81.2.34
--- NEWS	2001/03/31 14:26:53	1.81.2.35
***************
*** 132,135 ****
--- 132,143 ----
  - #12195 - webbrowser.py - there was typo in Mac code

+ - quopri.py - treat \r as whitespace too
+ 
+ - xmllib.py - Moved clearing of "literal" flag.  The flag is set in setliteral 
+   which can be called from a start tag handler.  When the corresponding end
+   tag is read the flag is cleared.  However, it didn't get cleared when
+   the start tag was for an empty element of the type <tag .../>.  This
+   modification fixes the problem.
+ 
  What's New in Python 2.0?
  =========================

From moshez@users.sourceforge.net  Sat Mar 31 14:26:56 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 06:26:56 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib xmllib.py,1.23,1.23.2.1
Message-ID: <E14jMLA-0006IM-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv23452/Lib

Modified Files:
      Tag: release20-maint
	xmllib.py 
Log Message:
- xmllib.py - Moved clearing of "literal" flag.  The flag is set in setliteral
  which can be called from a start tag handler.  When the corresponding end
  tag is read the flag is cleared.  However, it didn't get cleared when
  the start tag was for an empty element of the type <tag .../>.  This
  modification fixes the problem.

Index: xmllib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/xmllib.py,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -C2 -r1.23 -r1.23.2.1
*** xmllib.py	2000/08/31 10:26:52	1.23
--- xmllib.py	2001/03/31 14:26:54	1.23.2.1
***************
*** 684,688 ****
                      self.handle_data(rawdata[i])
                      return i+1
-                 self.literal = 0
              k = res.end(0)
          if endbracket.match(rawdata, k) is None:
--- 684,687 ----
***************
*** 700,703 ****
--- 699,703 ----
      # Internal -- finish processing of end tag
      def finish_endtag(self, tag):
+         self.literal = 0
          if not tag:
              self.syntax_error('name-less end tag')

From moshez@users.sourceforge.net  Sat Mar 31 14:48:37 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 06:48:37 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.35,1.81.2.36
Message-ID: <E14jMg9-0006zZ-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv24736/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
- #117606 - configure.in, configure - use gcc -shared and gcc -fPIC

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.35
retrieving revision 1.81.2.36
diff -C2 -r1.81.2.35 -r1.81.2.36
*** NEWS	2001/03/31 14:26:53	1.81.2.35
--- NEWS	2001/03/31 14:48:34	1.81.2.36
***************
*** 140,143 ****
--- 140,145 ----
    modification fixes the problem.

+ - #117606 - configure.in, configure - use gcc -shared and gcc -fPIC
+ 
  What's New in Python 2.0?
  =========================

From moshez@users.sourceforge.net  Sat Mar 31 14:48:40 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 06:48:40 -0800
Subject: [Python-checkins] CVS: python/dist/src configure,1.165,1.165.2.1 configure.in,1.173,1.173.2.1
Message-ID: <E14jMgC-0006zi-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv24736

Modified Files:
      Tag: release20-maint
	configure configure.in 
Log Message:
- #117606 - configure.in, configure - use gcc -shared and gcc -fPIC

Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.165
retrieving revision 1.165.2.1
diff -C2 -r1.165 -r1.165.2.1
*** configure	2000/10/16 16:59:12	1.165
--- configure	2001/03/31 14:48:35	1.165.2.1
***************
*** 1,5 ****
  #! /bin/sh

! # From configure.in Revision: 1.172 

  # Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----
  #! /bin/sh

! # From configure.in Revision: 1.173 

[...3153 lines suppressed...]
  echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
! echo "configure:5893: checking for socklen_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5898 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 5900,5909 ----
  EOF
  echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
! echo "configure:5903: checking for socklen_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5908 "configure"
  #include "confdefs.h"
  #include <sys/types.h>

Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.173
retrieving revision 1.173.2.1
diff -C2 -r1.173 -r1.173.2.1
*** configure.in	2000/10/16 16:59:12	1.173
--- configure.in	2001/03/31 14:48:37	1.173.2.1
***************
*** 309,314 ****
  	yes)
  		case $ac_cv_prog_cc_g in
! 		yes)	OPT="-g -O2 -Wall -Wstrict-prototypes";;
! 		*)	OPT="-O2 -Wall -Wstrict-prototypes";;
  		esac
  		;;
--- 309,314 ----
  	yes)
  		case $ac_cv_prog_cc_g in
! 		yes)	OPT="-g -O2 -Wall -Wstrict-prototypes -fPIC";;
! 		*)	OPT="-O2 -Wall -Wstrict-prototypes -fPIC";;
  		esac
  		;;
***************
*** 565,569 ****
  	SunOS/5*) 
  		if test "$GCC" = "yes"
! 		then LDSHARED='$(CC) -G'
  		else LDSHARED="ld -G";
  		fi ;;
--- 565,569 ----
  	SunOS/5*) 
  		if test "$GCC" = "yes"
! 		then LDSHARED='$(CC) -shared'
  		else LDSHARED="ld -G";
  		fi ;;

From moshez@users.sourceforge.net  Sat Mar 31 14:58:23 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 06:58:23 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib urllib.py,1.107,1.107.2.1
Message-ID: <E14jMpb-0007CH-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv26992/Lib

Modified Files:
      Tag: release20-maint
	urllib.py 
Log Message:
- #227562 - urllib.py - call URLopener.http_error_default when
                        an invalid 401 request is being handled.
- urllib.py - provide simple recovery/escape from apparent redirect recursion
- #129288 - urllib.py - chanign %02x to %02X in quoting
- urllib.py - HTTPS now works with string URLs

Index: urllib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/urllib.py,v
retrieving revision 1.107
retrieving revision 1.107.2.1
diff -C2 -r1.107 -r1.107.2.1
*** urllib.py	2000/10/02 23:04:02	1.107
--- urllib.py	2001/03/31 14:58:20	1.107.2.1
***************
*** 513,516 ****
--- 513,518 ----
          apply(URLopener.__init__, (self,) + args)
          self.auth_cache = {}
+         self.tries = 0
+         self.maxtries = 10

      def http_error_default(self, url, fp, errcode, errmsg, headers):
***************
*** 520,524 ****
      def http_error_302(self, url, fp, errcode, errmsg, headers, data=None):
          """Error 302 -- relocated (temporarily)."""
!         # XXX The server can force infinite recursion here!
          if headers.has_key('location'):
              newurl = headers['location']
--- 522,540 ----
      def http_error_302(self, url, fp, errcode, errmsg, headers, data=None):
          """Error 302 -- relocated (temporarily)."""
!         self.tries += 1
!         if self.maxtries and self.tries >= self.maxtries:
!             if hasattr(self, "http_error_500"):
!                 meth = self.http_error_500
!             else:
!                 meth = self.http_error_default
!             self.tries = 0
!             return meth(url, fp, 500,
!                         "Internal Server Error: Redirect Recursion", headers)
!         result = self.redirect_internal(url, fp, errcode, errmsg, headers,
!                                         data)
!         self.tries = 0
!         return result
! 
!     def redirect_internal(self, url, fp, errcode, errmsg, headers, data):
          if headers.has_key('location'):
              newurl = headers['location']
***************
*** 556,559 ****
--- 572,577 ----
                     else:
                         return getattr(self,name)(url, realm, data)
+         return URLopener.http_error_default(self, url, fp, 
+                                                   errcode, errmsg, headers)

      def retry_http_basic_auth(self, url, realm, data=None):
***************
*** 690,694 ****
                  conn = self.ftp.ntransfercmd(cmd)
              except ftplib.error_perm, reason:
!                 if reason[:3] != '550':
                      raise IOError, ('ftp error', reason), sys.exc_info()[2]
          if not conn:
--- 708,712 ----
                  conn = self.ftp.ntransfercmd(cmd)
              except ftplib.error_perm, reason:
!                 if str(reason)[:3] != '550':
                      raise IOError, ('ftp error', reason), sys.exc_info()[2]
          if not conn:
***************
*** 1037,1041 ****
          c = res[i]
          if not _fast_safe.has_key(c):
!             res[i] = '%%%02x' % ord(c)
      return string.join(res, '')

--- 1055,1059 ----
          c = res[i]
          if not _fast_safe.has_key(c):
!             res[i] = '%%%02X' % ord(c)
      return string.join(res, '')

***************
*** 1068,1072 ****
          c = res[i]
          if c not in safe:
!             res[i] = '%%%02x' % ord(c)
      return string.join(res, '')

--- 1086,1090 ----
          c = res[i]
          if c not in safe:
!             res[i] = '%%%02X' % ord(c)
      return string.join(res, '')

From moshez@users.sourceforge.net  Sat Mar 31 14:58:23 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 06:58:23 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.36,1.81.2.37
Message-ID: <E14jMpb-0007CC-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv26992/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
- #227562 - urllib.py - call URLopener.http_error_default when
                        an invalid 401 request is being handled.
- urllib.py - provide simple recovery/escape from apparent redirect recursion
- #129288 - urllib.py - chanign %02x to %02X in quoting
- urllib.py - HTTPS now works with string URLs

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.36
retrieving revision 1.81.2.37
diff -C2 -r1.81.2.36 -r1.81.2.37
*** NEWS	2001/03/31 14:48:34	1.81.2.36
--- NEWS	2001/03/31 14:58:19	1.81.2.37
***************
*** 142,145 ****
--- 142,154 ----
  - #117606 - configure.in, configure - use gcc -shared and gcc -fPIC

+ - #227562 - urllib.py - call URLopener.http_error_default when
+                         an invalid 401 request is being handled.
+ 
+ - urllib.py - provide simple recovery/escape from apparent redirect recursion
+ 
+ - #129288 - urllib.py - chanign %02x to %02X in quoting
+ 
+ - urllib.py - HTTPS now works with string URLs
+ 
  What's New in Python 2.0?
  =========================

From moshez@users.sourceforge.net  Sat Mar 31 15:03:09 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 07:03:09 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.37,1.81.2.38
Message-ID: <E14jMuD-0007Lw-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv27705/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
- distutils/command/install.py - make .get_outputs() produce a list of unique
                                 filenames

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.37
retrieving revision 1.81.2.38
diff -C2 -r1.81.2.37 -r1.81.2.38
*** NEWS	2001/03/31 14:58:19	1.81.2.37
--- NEWS	2001/03/31 15:03:07	1.81.2.38
***************
*** 147,153 ****
  - urllib.py - provide simple recovery/escape from apparent redirect recursion

! - #129288 - urllib.py - chanign %02x to %02X in quoting

  - urllib.py - HTTPS now works with string URLs

  What's New in Python 2.0?
--- 147,156 ----
  - urllib.py - provide simple recovery/escape from apparent redirect recursion

! - #129288 - urllib.py - changing %02x to %02X in quoting

  - urllib.py - HTTPS now works with string URLs
+ 
+ - distutils/command/install.py - make .get_outputs() produce a list of unique 
+                                  filenames

  What's New in Python 2.0?

From moshez@users.sourceforge.net  Sat Mar 31 15:03:09 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 07:03:09 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib/distutils/command install.py,1.54,1.54.2.1
Message-ID: <E14jMuD-0007Ls-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Lib/distutils/command
In directory usw-pr-cvs1:/tmp/cvs-serv27705/Lib/distutils/command

Modified Files:
      Tag: release20-maint
	install.py 
Log Message:
- distutils/command/install.py - make .get_outputs() produce a list of unique
                                 filenames

Index: install.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/install.py,v
retrieving revision 1.54
retrieving revision 1.54.2.1
diff -C2 -r1.54 -r1.54.2.1
*** install.py	2000/10/14 04:06:40	1.54
--- install.py	2001/03/31 15:03:06	1.54.2.1
***************
*** 530,534 ****
          for cmd_name in self.get_sub_commands():
              cmd = self.get_finalized_command(cmd_name)
!             outputs.extend(cmd.get_outputs())

          return outputs
--- 530,538 ----
          for cmd_name in self.get_sub_commands():
              cmd = self.get_finalized_command(cmd_name)
!             # Add the contents of cmd.get_outputs(), ensuring
!             # that outputs doesn't contain duplicate entries
!             for filename in cmd.get_outputs():
!                 if filename not in outputs:
!                     outputs.append(filename)

          return outputs

From moshez@users.sourceforge.net  Sat Mar 31 15:44:18 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 07:44:18 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.38,1.81.2.39
Message-ID: <E14jNY2-0000Pl-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv321/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
Backported pyexpat memory-leak plugs
backported by Martin van Lowis

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.38
retrieving revision 1.81.2.39
diff -C2 -r1.81.2.38 -r1.81.2.39
*** NEWS	2001/03/31 15:03:07	1.81.2.38
--- NEWS	2001/03/31 15:44:15	1.81.2.39
***************
*** 154,157 ****
--- 154,159 ----
                                   filenames

+ - pyexpat.c - removed memory leaks
+ 
  What's New in Python 2.0?
  =========================

From moshez@users.sourceforge.net  Sat Mar 31 15:44:18 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 07:44:18 -0800
Subject: [Python-checkins] CVS: python/dist/src/Modules pyexpat.c,2.27,2.27.2.1
Message-ID: <E14jNY2-0000Pq-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv321/Modules

Modified Files:
      Tag: release20-maint
	pyexpat.c 
Log Message:
Backported pyexpat memory-leak plugs
backported by Martin van Lowis

Index: pyexpat.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/pyexpat.c,v
retrieving revision 2.27
retrieving revision 2.27.2.1
diff -C2 -r2.27 -r2.27.2.1
*** pyexpat.c	2000/09/29 19:23:29	2.27
--- pyexpat.c	2001/03/31 15:44:16	2.27.2.1
***************
*** 6,9 ****
--- 6,16 ----
  #endif

+ #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
+ 
  enum HandlerTypes {
      StartElement,
***************
*** 76,79 ****
--- 83,87 ----
              if (PyDict_SetItemString(attrs_obj,
                                       (char*)*attrs_k, rv) < 0) {
+                 Py_DECREF(rv);
                  Py_DECREF(attrs_obj);
                  attrs_obj = NULL;
***************
*** 199,208 ****
  /* Callback routines */

! static void clear_handlers(xmlparseobject *self);

  static void
  flag_error(xmlparseobject *self)
  {
!     clear_handlers(self);
  }

--- 207,216 ----
  /* Callback routines */

! static void clear_handlers(xmlparseobject *self, int decref);

  static void
  flag_error(xmlparseobject *self)
  {
!     clear_handlers(self, 1);
  }

***************
*** 501,504 ****
--- 509,519 ----
              break;
      }
+     if (rv == 0) {
+         PyErr_Format(ErrorObject, "%.200s: line %i, column %i",
+                      XML_ErrorString(XML_GetErrorCode(self->itself)),
+                      XML_GetErrorLineNumber(self->itself),
+                      XML_GetErrorColumnNumber(self->itself));
+         return NULL;
+     }
      return Py_BuildValue("i", rv);
  }
***************
*** 569,576 ****

      new_parser->itself = XML_ExternalEntityParserCreate(self->itself, context,
! 							encoding);    
!     if (!new_parser) {
!         Py_DECREF(new_parser);
!         return PyErr_NoMemory();
      }

--- 584,594 ----

      new_parser->itself = XML_ExternalEntityParserCreate(self->itself, context,
! 							encoding);
!     new_parser->handlers = 0;
!     PyObject_GC_Init(new_parser);
! 
!     if (!new_parser->itself) {
! 	    Py_DECREF(new_parser);
! 	    return PyErr_NoMemory();
      }

***************
*** 582,586 ****

      new_parser->handlers = malloc(sizeof(PyObject *)*i);
!     clear_handlers(new_parser);

      /* then copy handlers from self */
--- 600,608 ----

      new_parser->handlers = malloc(sizeof(PyObject *)*i);
!     if (!new_parser->handlers) {
! 	    Py_DECREF(new_parser);
! 	    return PyErr_NoMemory();
!     }
!     clear_handlers(new_parser, 0);

      /* then copy handlers from self */
***************
*** 616,620 ****

! static xmlparseobject *
  newxmlparseobject(char *encoding, char *namespace_separator)
  {
--- 638,642 ----

! static PyObject *
  newxmlparseobject(char *encoding, char *namespace_separator)
  {
***************
*** 636,639 ****
--- 658,662 ----
      self->returns_unicode = 1;
  #endif
+     self->handlers = NULL;
      if (namespace_separator) {
          self->itself = XML_ParserCreateNS(encoding, *namespace_separator);
***************
*** 642,645 ****
--- 665,669 ----
          self->itself = XML_ParserCreate(encoding);
      }
+     PyObject_GC_Init(self);
      if (self->itself == NULL) {
          PyErr_SetString(PyExc_RuntimeError, 
***************
*** 654,660 ****

      self->handlers = malloc(sizeof(PyObject *)*i);
!     clear_handlers(self);

!     return self;
  }

--- 678,688 ----

      self->handlers = malloc(sizeof(PyObject *)*i);
!     if (!self->handlers){
! 	    Py_DECREF(self);
! 	    return PyErr_NoMemory();
!     }
!     clear_handlers(self, 0);

!     return (PyObject*)self;
  }

***************
*** 664,673 ****
  {
      int i;
      if (self->itself)
          XML_ParserFree(self->itself);
      self->itself = NULL;

!     for (i=0; handler_info[i].name != NULL; i++) {
!         Py_XDECREF(self->handlers[i]);
      }
  #if PY_MAJOR_VERSION == 1 && PY_MINOR_VERSION < 6
--- 692,705 ----
  {
      int i;
+     PyObject_GC_Fini(self);
      if (self->itself)
          XML_ParserFree(self->itself);
      self->itself = NULL;

!     if(self->handlers){
! 	    for (i=0; handler_info[i].name != NULL; i++) {
! 		    Py_XDECREF(self->handlers[i]);
! 	    }
! 	    free (self->handlers);
      }
  #if PY_MAJOR_VERSION == 1 && PY_MINOR_VERSION < 6
***************
*** 781,784 ****
--- 813,839 ----
  }

+ #ifdef WITH_CYCLE_GC
+ static int
+ xmlparse_traverse(xmlparseobject *op, visitproc visit, void *arg)
+ {
+ 	int i, err;
+ 	for (i = 0; handler_info[i].name != NULL; i++) {
+ 		if (!op->handlers[i])
+ 			continue;
+ 		err = visit(op->handlers[i], arg);
+ 		if (err)
+ 			return err;
+ 	}
+ 	return 0;
+ }
+ 
+ static int
+ xmlparse_clear(xmlparseobject *op)
+ {
+ 	clear_handlers(op, 1);
+ 	return 0;
+ }
+ #endif
+ 
  static char Xmlparsetype__doc__[] = 
  "XML parser";
***************
*** 788,792 ****
  	0,				/*ob_size*/
  	"xmlparser",			/*tp_name*/
! 	sizeof(xmlparseobject),		/*tp_basicsize*/
  	0,				/*tp_itemsize*/
  	/* methods */
--- 843,847 ----
  	0,				/*ob_size*/
  	"xmlparser",			/*tp_name*/
! 	sizeof(xmlparseobject) + PyGC_HEAD_SIZE,/*tp_basicsize*/
  	0,				/*tp_itemsize*/
  	/* methods */
***************
*** 803,810 ****
  	(ternaryfunc)0,		/*tp_call*/
  	(reprfunc)0,		/*tp_str*/
! 
! 	/* Space for future expansion */
! 	0L,0L,0L,0L,
! 	Xmlparsetype__doc__ /* Documentation string */
  };

--- 858,872 ----
  	(ternaryfunc)0,		/*tp_call*/
  	(reprfunc)0,		/*tp_str*/
! 	0,		/* tp_getattro */
! 	0,		/* tp_setattro */
! 	0,		/* tp_as_buffer */
! 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_GC, /*tp_flags*/	
! 	Xmlparsetype__doc__, /* Documentation string */
! #ifdef WITH_CYCLE_GC
! 	(traverseproc)xmlparse_traverse,	/* tp_traverse */
! 	(inquiry)xmlparse_clear		/* tp_clear */
! #else
! 	0, 0
! #endif
  };

***************
*** 969,980 ****

  static void
! clear_handlers(xmlparseobject *self)
  {
!     int i = 0;

!     for (; handler_info[i].name!=NULL; i++) {
!         self->handlers[i]=NULL;
!         handler_info[i].setter(self->itself, NULL);
!     }
  }

--- 1031,1045 ----

  static void
! clear_handlers(xmlparseobject *self, int decref)
  {
! 	int i = 0;

! 	for (; handler_info[i].name!=NULL; i++) {
! 		if (decref){
! 			Py_XDECREF(self->handlers[i]);
! 		}
! 		self->handlers[i]=NULL;
! 		handler_info[i].setter(self->itself, NULL);
! 	}
  }

From moshez@users.sourceforge.net  Sat Mar 31 16:09:34 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 08:09:34 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib/distutils/command build_ext.py,1.68,1.68.2.1
Message-ID: <E14jNwU-0001Ng-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Lib/distutils/command
In directory usw-pr-cvs1:/tmp/cvs-serv4312/Lib/distutils/command

Modified Files:
      Tag: release20-maint
	build_ext.py 
Log Message:
- #233253 - distutils/command/build_ext.py - the --define and --undef options
            didn't work, whether specified on the command-line or in setup.cfg.
- distutils/command/build_ext.py - make docstrings raw
- #128930 - distutils/command/build_ext.py - split rpath argument
Suggested by AMK, but had to be massaged a bit from the cvs diff

Index: build_ext.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/build_ext.py,v
retrieving revision 1.68
retrieving revision 1.68.2.1
diff -C2 -r1.68 -r1.68.2.1
*** build_ext.py	2000/09/30 18:27:54	1.68
--- build_ext.py	2001/03/31 16:09:32	1.68.2.1
***************
*** 152,155 ****
--- 152,157 ----
          if self.rpath is None:
              self.rpath = []
+         elif type(self.rpath) is StringType:
+             self.rpath = string.split(self.rpath, os.pathsep)

          # for extensions under windows use different directories
***************
*** 162,165 ****
--- 164,183 ----
              else:
                  self.build_temp = os.path.join(self.build_temp, "Release")
+ 
+         # The argument parsing will result in self.define being a string, but
+         # it has to be a list of 2-tuples.  All the preprocessor symbols
+         # specified by the 'define' option will be set to '1'.  Multiple
+         # symbols can be separated with commas.
+ 
+         if self.define:
+             defines = string.split(self.define, ',')
+             self.define = map(lambda symbol: (symbol, '1'), defines)
+ 
+         # The option for macros to undefine is also a string from the
+         # option parsing, but has to be a list.  Multiple symbols can also
+         # be separated with commas here.
+         if self.undef:
+             self.undef = string.split(self.undef, ',')
+ 
      # finalize_options ()

***************
*** 529,533 ****

      def get_ext_filename (self, ext_name):
!         """Convert the name of an extension (eg. "foo.bar") into the name
          of the file from which it will be loaded (eg. "foo/bar.so", or
          "foo\bar.pyd").
--- 547,551 ----

      def get_ext_filename (self, ext_name):
!         r"""Convert the name of an extension (eg. "foo.bar") into the name
          of the file from which it will be loaded (eg. "foo/bar.so", or
          "foo\bar.pyd").

From moshez@users.sourceforge.net  Sat Mar 31 16:09:34 2001
From: moshez@users.sourceforge.net (Moshe Zadka)
Date: Sat, 31 Mar 2001 08:09:34 -0800
Subject: [Python-checkins] CVS: python/dist/src/Misc NEWS,1.81.2.39,1.81.2.40
Message-ID: <E14jNwU-0001Nb-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv4312/Misc

Modified Files:
      Tag: release20-maint
	NEWS 
Log Message:
- #233253 - distutils/command/build_ext.py - the --define and --undef options
            didn't work, whether specified on the command-line or in setup.cfg.
- distutils/command/build_ext.py - make docstrings raw
- #128930 - distutils/command/build_ext.py - split rpath argument
Suggested by AMK, but had to be massaged a bit from the cvs diff

Index: NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.81.2.39
retrieving revision 1.81.2.40
diff -C2 -r1.81.2.39 -r1.81.2.40
*** NEWS	2001/03/31 15:44:15	1.81.2.39
--- NEWS	2001/03/31 16:09:32	1.81.2.40
***************
*** 156,159 ****
--- 156,166 ----
  - pyexpat.c - removed memory leaks

+ - #233253 - distutils/command/build_ext.py - the --define and --undef options 
+             didn't work, whether specified on the command-line or in setup.cfg.
+ 
+ - distutils/command/build_ext.py - make docstrings raw
+ 
+ - #128930 - distutils/command/build_ext.py - split rpath argument
+ 
  What's New in Python 2.0?
  =========================

From loewis@users.sourceforge.net  Sat Mar 31 16:30:43 2001
From: loewis@users.sourceforge.net (Martin v. L?wis)
Date: Sat, 31 Mar 2001 08:30:43 -0800
Subject: [Python-checkins] CVS: python/dist/src/Lib/xml/dom minidom.py,1.28,1.29
Message-ID: <E14jOGx-0002CX-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/python/python/dist/src/Lib/xml/dom
In directory usw-pr-cvs1:/tmp/cvs-serv8346

Modified Files:
	minidom.py 
Log Message:
Initialize Attr.value with empty string in createAttribute*, as per DOM
spec. Closes bug #412036.
Also reindent toprettyxml.

Index: minidom.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/xml/dom/minidom.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** minidom.py	2001/03/13 10:50:13	1.28
--- minidom.py	2001/03/31 16:30:40	1.29
***************
*** 88,96 ****

      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()

      def hasChildNodes(self):
--- 88,96 ----

      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()

      def hasChildNodes(self):
***************
*** 795,798 ****
--- 795,799 ----
          a = Attr(qName)
          a.ownerDocument = self
+         a.value = ""
          return a

***************
*** 807,810 ****
--- 808,812 ----
          a = Attr(qualifiedName, namespaceURI, localName, prefix)
          a.ownerDocument = self
+         a.value = ""
          return a