[Python-checkins] python/dist/src/Lib ConfigParser.py,1.60,1.61

fdrake at users.sourceforge.net fdrake at users.sourceforge.net
Tue Oct 21 12:45:03 EDT 2003


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

Modified Files:
	ConfigParser.py 
Log Message:
Make both items() methods return lists; one had changed to return an
iterator where it probably shouldn't have.
Closes SF bug #818861.


Index: ConfigParser.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/ConfigParser.py,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** ConfigParser.py	20 Oct 2003 14:01:49 -0000	1.60
--- ConfigParser.py	21 Oct 2003 16:45:00 -0000	1.61
***************
*** 543,552 ****
              options.remove("__name__")
          if raw:
!             for option in options:
!                 yield (option, d[option])
          else:
!             for option in options:
!                 yield (option,
!                        self._interpolate(section, option, d[option], d))
  
      def _interpolate(self, section, option, rawval, vars):
--- 543,551 ----
              options.remove("__name__")
          if raw:
!             return [(option, d[option])
!                     for option in options]
          else:
!             return [(option, self._interpolate(section, option, d[option], d))
!                     for option in options]
  
      def _interpolate(self, section, option, rawval, vars):





More information about the Python-checkins mailing list