[Python-checkins] python/dist/src/Lib getopt.py,1.20,1.21 httplib.py,1.60,1.61 imaplib.py,1.54,1.55 rfc822.py,1.72,1.73 textwrap.py,1.12,1.13 urllib2.py,1.32,1.33 weakref.py,1.17,1.18

tim_one@users.sourceforge.net tim_one@users.sourceforge.net
Tue, 16 Jul 2002 14:35:25 -0700


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

Modified Files:
	getopt.py httplib.py imaplib.py rfc822.py textwrap.py 
	urllib2.py weakref.py 
Log Message:
Whitespace normalization.


Index: getopt.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/getopt.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** getopt.py	7 Jun 2002 03:26:43 -0000	1.20
--- getopt.py	16 Jul 2002 21:35:23 -0000	1.21
***************
*** 10,14 ****
  getopt() -- Parse command line options
  gnu_getopt() -- Like getopt(), but allow option and non-option arguments
! to be intermixed. 
  GetoptError -- exception (class) raised with 'opt' attribute, which is the
  option involved with the exception.
--- 10,14 ----
  getopt() -- Parse command line options
  gnu_getopt() -- Like getopt(), but allow option and non-option arguments
! to be intermixed.
  GetoptError -- exception (class) raised with 'opt' attribute, which is the
  option involved with the exception.
***************
*** 104,108 ****
      environment variable POSIXLY_CORRECT is set, then option
      processing stops as soon as a non-option argument is encountered.
!     
      """
  
--- 104,108 ----
      environment variable POSIXLY_CORRECT is set, then option
      processing stops as soon as a non-option argument is encountered.
! 
      """
  

Index: httplib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/httplib.py,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** httplib.py	16 Jul 2002 21:21:11 -0000	1.60
--- httplib.py	16 Jul 2002 21:35:23 -0000	1.61
***************
*** 277,281 ****
                  if self.debuglevel > 0:
                      print "header:", skip
!             
          self.status = status
          self.reason = reason.strip()
--- 277,281 ----
                  if self.debuglevel > 0:
                      print "header:", skip
! 
          self.status = status
          self.reason = reason.strip()
***************
*** 483,487 ****
          self.__response = None
          self.__state = _CS_IDLE
!         
          self._set_hostport(host, port)
          if strict is not None:
--- 483,487 ----
          self.__response = None
          self.__state = _CS_IDLE
! 
          self._set_hostport(host, port)
          if strict is not None:
***************
*** 816,820 ****
  
      BUFSIZE = 8192
!     
      def __init__(self, sock, ssl, bufsize=None):
          SharedSocketClient.__init__(self, sock)
--- 816,820 ----
  
      BUFSIZE = 8192
! 
      def __init__(self, sock, ssl, bufsize=None):
          SharedSocketClient.__init__(self, sock)
***************
*** 1140,1144 ****
                  return s + self._file.read()
              else:
!                 return s + self._file.read(amt - len(s))                
          else:
              assert amt <= self._line_left
--- 1140,1144 ----
                  return s + self._file.read()
              else:
!                 return s + self._file.read(amt - len(s))
          else:
              assert amt <= self._line_left
***************
*** 1151,1155 ****
                  self._done()
              return s
!         
      def readline(self):
          s = self._line[self._line_offset:]
--- 1151,1155 ----
                  self._done()
              return s
! 
      def readline(self):
          s = self._line[self._line_offset:]
***************
*** 1208,1212 ****
  
      if hasattr(socket, 'ssl'):
!         
          for host, selector in (('sourceforge.net', '/projects/python'),
                                 ('dbserv2.theopalgroup.com', '/mediumfile'),
--- 1208,1212 ----
  
      if hasattr(socket, 'ssl'):
! 
          for host, selector in (('sourceforge.net', '/projects/python'),
                                 ('dbserv2.theopalgroup.com', '/mediumfile'),

Index: imaplib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/imaplib.py,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** imaplib.py	30 Jun 2002 03:39:14 -0000	1.54
--- imaplib.py	16 Jul 2002 21:35:23 -0000	1.55
***************
*** 1059,1063 ****
          data = self.sslobj.read(size)
          while len(data) < size:
!                 data += self.sslobj.read(size-len(data))
  
          return data
--- 1059,1063 ----
          data = self.sslobj.read(size)
          while len(data) < size:
!             data += self.sslobj.read(size-len(data))
  
          return data

Index: rfc822.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/rfc822.py,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** rfc822.py	5 Jun 2002 19:07:39 -0000	1.72
--- rfc822.py	16 Jul 2002 21:35:23 -0000	1.73
***************
*** 444,448 ****
      def __contains__(self, name):
          """Determine whether a message contains the named header."""
!         return name.lower() in self.dict        
  
      def keys(self):
--- 444,448 ----
      def __contains__(self, name):
          """Determine whether a message contains the named header."""
!         return name.lower() in self.dict
  
      def keys(self):

Index: textwrap.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/textwrap.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** textwrap.py	4 Jul 2002 14:51:49 -0000	1.12
--- textwrap.py	16 Jul 2002 21:35:23 -0000	1.13
***************
*** 49,53 ****
                                          ' ' * len(string.whitespace))
  
!     # This funky little regex is just the trick for splitting 
      # text up into word-wrappable chunks.  E.g.
      #   "Hello there -- you goof-ball, use the -b option!"
--- 49,53 ----
                                          ' ' * len(string.whitespace))
  
!     # This funky little regex is just the trick for splitting
      # text up into word-wrappable chunks.  E.g.
      #   "Hello there -- you goof-ball, use the -b option!"
***************
*** 82,86 ****
          self.fix_sentence_endings = fix_sentence_endings
          self.break_long_words = break_long_words
!         
  
      # -- Private methods -----------------------------------------------
--- 82,86 ----
          self.fix_sentence_endings = fix_sentence_endings
          self.break_long_words = break_long_words
! 
  
      # -- Private methods -----------------------------------------------
***************
*** 210,214 ****
  
              # The current line is full, and the next chunk is too big to
!             # fit on *any* line (not just this one).  
              if chunks and len(chunks[0]) > width:
                  self._handle_long_word(chunks, cur_line, cur_len, width)
--- 210,214 ----
  
              # The current line is full, and the next chunk is too big to
!             # fit on *any* line (not just this one).
              if chunks and len(chunks[0]) > width:
                  self._handle_long_word(chunks, cur_line, cur_len, width)

Index: urllib2.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/urllib2.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** urllib2.py	7 Jul 2002 16:57:35 -0000	1.32
--- urllib2.py	16 Jul 2002 21:35:23 -0000	1.33
***************
*** 166,170 ****
          # object.  In some cases, the HTTPError may not have a valid
          # file object.  If this happens, the simplest workaround is to
!         # not initialize the base classes.  
          if fp is not None:
              self.__super_init(fp, hdrs, url)
--- 166,170 ----
          # object.  In some cases, the HTTPError may not have a valid
          # file object.  If this happens, the simplest workaround is to
!         # not initialize the base classes.
          if fp is not None:
              self.__super_init(fp, hdrs, url)
***************
*** 461,465 ****
              if ':' in user_pass:
                  user, password = user_pass.split(':', 1)
!                 user_pass = base64.encodestring('%s:%s' % (unquote(user), 
                                                             unquote(password)))
                  req.add_header('Proxy-Authorization', 'Basic ' + user_pass)
--- 461,465 ----
              if ':' in user_pass:
                  user, password = user_pass.split(':', 1)
!                 user_pass = base64.encodestring('%s:%s' % (unquote(user),
                                                             unquote(password)))
                  req.add_header('Proxy-Authorization', 'Basic ' + user_pass)

Index: weakref.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/weakref.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** weakref.py	10 Jun 2002 19:59:04 -0000	1.17
--- weakref.py	16 Jul 2002 21:35:23 -0000	1.18
***************
*** 192,196 ****
              return 0
          return wr in self.data
!     
      def items(self):
          L = []
--- 192,196 ----
              return 0
          return wr in self.data
! 
      def items(self):
          L = []