[Python-checkins] CVS: distutils/distutils text_file.py,1.11,1.12

Greg Ward python-dev@python.org
Sat, 16 Sep 2000 11:09:26 -0700


Update of /cvsroot/python/distutils/distutils
In directory slayer.i.sourceforge.net:/tmp/cvs-serv19930

Modified Files:
	text_file.py 
Log Message:
Andrew Kuchling:
Fixed precendence bug that meant setting skip_blanks to false didn't work
under some circumstances.


Index: text_file.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/text_file.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** text_file.py	2000/09/16 18:06:31	1.11
--- text_file.py	2000/09/16 18:09:22	1.12
***************
*** 257,261 ****
              # blank line (whether we rstrip'ed or not)? skip to next line
              # if appropriate
!             if line == '' or line == '\n' and self.skip_blanks:
                  continue
  
--- 257,261 ----
              # blank line (whether we rstrip'ed or not)? skip to next line
              # if appropriate
!             if (line == '' or line == '\n') and self.skip_blanks:
                  continue