[Python-checkins] CVS: python/dist/src/Lib shlex.py,1.9,1.10 netrc.py,1.7,1.8 multifile.py,1.12,1.13

[A.M. Kuchling]

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

Modified Files:
	shlex.py netrc.py multifile.py 
Log Message:
Remove superfluous semicolons


Index: shlex.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/shlex.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** shlex.py	2000/07/09 16:44:26	1.9
--- shlex.py	2000/12/23 14:20:23	1.10
***************
*** 23,27 ****
          self.quotes = '\'"'
          self.state = ' '
!         self.pushback = [];
          self.lineno = 1
          self.debug = 0
--- 23,27 ----
          self.quotes = '\'"'
          self.state = ' '
!         self.pushback = []
          self.lineno = 1
          self.debug = 0
***************
*** 37,41 ****
          if self.debug >= 1:
              print "shlex: pushing token " + `tok`
!         self.pushback = [tok] + self.pushback;
  
      def get_token(self):
--- 37,41 ----
          if self.debug >= 1:
              print "shlex: pushing token " + `tok`
!         self.pushback = [tok] + self.pushback
  
      def get_token(self):
***************
*** 84,88 ****
          tok = ''
          while 1:
!             nextchar = self.instream.read(1);
              if nextchar == '\n':
                  self.lineno = self.lineno + 1
--- 84,88 ----
          tok = ''
          while 1:
!             nextchar = self.instream.read(1)
              if nextchar == '\n':
                  self.lineno = self.lineno + 1
***************
*** 91,99 ****
                        "I see character:", repr(nextchar) 
              if self.state is None:
!                 self.token = '';        # past end of file
                  break
              elif self.state == ' ':
                  if not nextchar:
!                     self.state = None;  # end of file
                      break
                  elif nextchar in self.whitespace:
--- 91,99 ----
                        "I see character:", repr(nextchar) 
              if self.state is None:
!                 self.token = ''         # past end of file
                  break
              elif self.state == ' ':
                  if not nextchar:
!                     self.state = None   # end of file
                      break
                  elif nextchar in self.whitespace:
***************
*** 126,130 ****
              elif self.state == 'a':
                  if not nextchar:
!                     self.state = None;  # end of file
                      break
                  elif nextchar in self.whitespace:
--- 126,130 ----
              elif self.state == 'a':
                  if not nextchar:
!                     self.state = None   # end of file
                      break
                  elif nextchar in self.whitespace:

Index: netrc.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/netrc.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** netrc.py	2000/12/12 23:20:44	1.7
--- netrc.py	2000/12/23 14:20:24	1.8
***************
*** 47,51 ****
                  if tt=='' or tt == 'machine' or tt == 'default' or tt == 'macdef':
                      if toplevel == 'macdef':
!                         break;
                      elif login and password:
                          self.hosts[entryname] = (login, account, password)
--- 47,51 ----
                  if tt=='' or tt == 'machine' or tt == 'default' or tt == 'macdef':
                      if toplevel == 'macdef':
!                         break
                      elif login and password:
                          self.hosts[entryname] = (login, account, password)

Index: multifile.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/multifile.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** multifile.py	2000/12/12 23:20:44	1.12
--- multifile.py	2000/12/23 14:20:24	1.13
***************
*** 87,91 ****
  		else:
  			# Ignore trailing whitespace on marker lines 
! 			k = len(line) - 1;
  			while line[k] in string.whitespace:
  				k = k - 1
--- 87,91 ----
  		else:
  			# Ignore trailing whitespace on marker lines 
! 			k = len(line) - 1
  			while line[k] in string.whitespace:
  				k = k - 1