[Python-checkins] python/dist/src/Lib cmd.py,1.35,1.36 copy.py,1.38,1.39 os.py,1.67,1.68 trace.py,1.1,1.2

tim_one@users.sourceforge.net tim_one@users.sourceforge.net
Tue, 18 Feb 2003 18:35:36 -0800


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

Modified Files:
	cmd.py copy.py os.py trace.py 
Log Message:
Whitespace normalization.


Index: cmd.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/cmd.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** cmd.py	6 Feb 2003 01:45:10 -0000	1.35
--- cmd.py	19 Feb 2003 02:35:02 -0000	1.36
***************
*** 80,86 ****
          """Instantiate a line-oriented interpreter framework.
  
!         The optional argument 'completekey' is the readline name of a 
!         completion key; it defaults to the Tab key. If completekey is 
!         not None and the readline module is available, command completion 
          is done automatically. The optional arguments stdin and stdout
          specify alternate input and output file objects; if not specified,
--- 80,86 ----
          """Instantiate a line-oriented interpreter framework.
  
!         The optional argument 'completekey' is the readline name of a
!         completion key; it defaults to the Tab key. If completekey is
!         not None and the readline module is available, command completion
          is done automatically. The optional arguments stdin and stdout
          specify alternate input and output file objects; if not specified,

Index: copy.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/copy.py,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** copy.py	19 Feb 2003 01:20:40 -0000	1.38
--- copy.py	19 Feb 2003 02:35:02 -0000	1.39
***************
*** 94,98 ****
  
      return _reconstruct(x, rv, 0)
!     
  
  _copy_dispatch = d = {}
--- 94,98 ----
  
      return _reconstruct(x, rv, 0)
! 
  
  _copy_dispatch = d = {}

Index: os.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/os.py,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** os.py	14 Feb 2003 19:35:29 -0000	1.67
--- os.py	19 Feb 2003 02:35:03 -0000	1.68
***************
*** 45,49 ****
          pass
      import posixpath as path
!     
      import posix
      __all__.extend(_get_exports_list(posix))
--- 45,49 ----
          pass
      import posixpath as path
! 
      import posix
      __all__.extend(_get_exports_list(posix))
***************
*** 59,63 ****
          pass
      import ntpath as path
!     
      import nt
      __all__.extend(_get_exports_list(nt))
--- 59,63 ----
          pass
      import ntpath as path
! 
      import nt
      __all__.extend(_get_exports_list(nt))
***************
*** 76,80 ****
      else:
          import os2emxpath as path
!     
      import os2
      __all__.extend(_get_exports_list(os2))
--- 76,80 ----
      else:
          import os2emxpath as path
! 
      import os2
      __all__.extend(_get_exports_list(os2))
***************
*** 90,94 ****
          pass
      import macpath as path
!     
      import mac
      __all__.extend(_get_exports_list(mac))
--- 90,94 ----
          pass
      import macpath as path
! 
      import mac
      __all__.extend(_get_exports_list(mac))
***************
*** 105,109 ****
      # We can use the standard Windows path.
      import ntpath as path
!     
      import ce
      __all__.extend(_get_exports_list(ce))
--- 105,109 ----
      # We can use the standard Windows path.
      import ntpath as path
! 
      import ce
      __all__.extend(_get_exports_list(ce))
***************
*** 119,123 ****
          pass
      import riscospath as path
!     
      import riscos
      __all__.extend(_get_exports_list(riscos))
--- 119,123 ----
          pass
      import riscospath as path
! 
      import riscos
      __all__.extend(_get_exports_list(riscos))

Index: trace.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/trace.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** trace.py	18 Feb 2003 15:06:17 -0000	1.1
--- trace.py	19 Feb 2003 02:35:03 -0000	1.2
***************
*** 147,151 ****
  class CoverageResults:
      def __init__(self, counts=None, calledfuncs=None, infile=None,
!                  outfile=None): 
          self.counts = counts
          if self.counts is None:
--- 147,151 ----
  class CoverageResults:
      def __init__(self, counts=None, calledfuncs=None, infile=None,
!                  outfile=None):
          self.counts = counts
          if self.counts is None:
***************
*** 165,169 ****
                      # backwards compatibility for old trace.py after
                      # Zooko touched it but before calledfuncs  --Zooko
!                     # 2001-10-24 
                      self.update(self.__class__(thingie))
                  elif type(thingie) is types.TupleType and len(thingie) == 2:
--- 165,169 ----
                      # backwards compatibility for old trace.py after
                      # Zooko touched it but before calledfuncs  --Zooko
!                     # 2001-10-24
                      self.update(self.__class__(thingie))
                  elif type(thingie) is types.TupleType and len(thingie) == 2:
***************
*** 174,178 ****
              except pickle.UnpicklingError:
                  # backwards compatibility for old trace.py before
!                 # Zooko touched it  --Zooko 2001-10-24 
                  self.update(self.__class__(marshal.load(open(self.infile))))
  
--- 174,178 ----
              except pickle.UnpicklingError:
                  # backwards compatibility for old trace.py before
!                 # Zooko touched it  --Zooko 2001-10-24
                  self.update(self.__class__(marshal.load(open(self.infile))))
  
***************
*** 188,192 ****
                  # backwards compatibility for abortive attempt to
                  # stuff calledfuncs into self.counts, by Zooko
!                 # --Zooko 2001-10-24 
                  counts[key] = counts.get(key, 0) + other_counts[key]
  
--- 188,192 ----
                  # backwards compatibility for abortive attempt to
                  # stuff calledfuncs into self.counts, by Zooko
!                 # --Zooko 2001-10-24
                  counts[key] = counts.get(key, 0) + other_counts[key]
  
***************
*** 407,422 ****
          """
          @param count true iff it should count number of times each
!                      line is executed  
          @param trace true iff it should print out each line that is
!                      being counted 
          @param countfuncs true iff it should just output a list of
                       (filename, modulename, funcname,) for functions
                       that were called at least once;  This overrides
!                      `count' and `trace'  
          @param ignoremods a list of the names of modules to ignore
          @param ignoredirs a list of the names of directories to ignore
!                      all of the (recursive) contents of 
          @param infile file from which to read stored counts to be
!                      added into the results 
          @param outfile file in which to write the results
          """
--- 407,422 ----
          """
          @param count true iff it should count number of times each
!                      line is executed
          @param trace true iff it should print out each line that is
!                      being counted
          @param countfuncs true iff it should just output a list of
                       (filename, modulename, funcname,) for functions
                       that were called at least once;  This overrides
!                      `count' and `trace'
          @param ignoremods a list of the names of modules to ignore
          @param ignoredirs a list of the names of directories to ignore
!                      all of the (recursive) contents of
          @param infile file from which to read stored counts to be
!                      added into the results
          @param outfile file in which to write the results
          """
***************
*** 517,533 ****
              # `getfilename(frame)' to use in place of the presumably
              # heavier `getframeinfo()'.  --Zooko 2001-10-14
!             
              filename, lineno, funcname, context, lineindex = \
                        inspect.getframeinfo(frame, 1)
              key = filename, lineno
              self.counts[key] = self.counts.get(key, 0) + 1
!             
              # XXX not convinced that this memoizing is a performance
              # win -- I don't know enough about Python guts to tell.
              # --Zooko 2001-10-14
!             
              bname = self.pathtobasename.get(filename)
              if bname is None:
!                 
                  # Using setdefault faster than two separate lines?
                  # --Zooko 2001-10-14
--- 517,533 ----
              # `getfilename(frame)' to use in place of the presumably
              # heavier `getframeinfo()'.  --Zooko 2001-10-14
! 
              filename, lineno, funcname, context, lineindex = \
                        inspect.getframeinfo(frame, 1)
              key = filename, lineno
              self.counts[key] = self.counts.get(key, 0) + 1
! 
              # XXX not convinced that this memoizing is a performance
              # win -- I don't know enough about Python guts to tell.
              # --Zooko 2001-10-14
! 
              bname = self.pathtobasename.get(filename)
              if bname is None:
! 
                  # Using setdefault faster than two separate lines?
                  # --Zooko 2001-10-14
***************
*** 554,558 ****
              filename, lineno, funcname, context, lineindex = \
                        inspect.getframeinfo(frame)
!             
              # XXX not convinced that this memoizing is a performance
              # win -- I don't know enough about Python guts to tell.
--- 554,558 ----
              filename, lineno, funcname, context, lineindex = \
                        inspect.getframeinfo(frame)
! 
              # XXX not convinced that this memoizing is a performance
              # win -- I don't know enough about Python guts to tell.