[Python-checkins] python/dist/src/Misc BeOS-setup.py, 1.5, 1.6 find_recursionlimit.py, 1.1, 1.2

[tim_one at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30209

Modified Files:
	BeOS-setup.py find_recursionlimit.py 
Log Message:
Whitespace normalization, via reindent.py.


Index: BeOS-setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/BeOS-setup.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BeOS-setup.py	2 Jun 2004 17:42:56 -0000	1.5
--- BeOS-setup.py	18 Jul 2004 06:04:36 -0000	1.6
***************
*** 94,98 ****
  
          # Parse Modules/Setup to figure out which modules are turned
!         # on in the file. 
          input = text_file.TextFile('Modules/Setup', join_lines=1)
          remove_modules = []
--- 94,98 ----
  
          # Parse Modules/Setup to figure out which modules are turned
!         # on in the file.
          input = text_file.TextFile('Modules/Setup', join_lines=1)
          remove_modules = []
***************
*** 103,111 ****
              remove_modules.append( line[0] )
          input.close()
!         
          for ext in self.extensions[:]:
              if ext.name in remove_modules:
                  self.extensions.remove(ext)
!         
          # When you run "make CC=altcc" or something similar, you really want
          # those environment variables passed into the setup.py phase.  Here's
--- 103,111 ----
              remove_modules.append( line[0] )
          input.close()
! 
          for ext in self.extensions[:]:
              if ext.name in remove_modules:
                  self.extensions.remove(ext)
! 
          # When you run "make CC=altcc" or something similar, you really want
          # those environment variables passed into the setup.py phase.  Here's
***************
*** 143,158 ****
  
      def detect_modules(self):
! 	try:
! 		belibs = os.environ['BELIBRARIES'].split(';')
! 	except KeyError:
! 		belibs = ['/boot/beos/system/lib']
! 	belibs.append('/boot/home/config/lib')
! 	self.compiler.library_dirs.append('/boot/home/config/lib')
! 	try:
! 		beincl = os.environ['BEINCLUDES'].split(';')
! 	except KeyError:
! 		beincl = []
! 	beincl.append('/boot/home/config/include')
! 	self.compiler.include_dirs.append('/boot/home/config/include')
          # lib_dirs and inc_dirs are used to search for files;
          # if a file is found in one of those directories, it can
--- 143,158 ----
  
      def detect_modules(self):
!         try:
!             belibs = os.environ['BELIBRARIES'].split(';')
!         except KeyError:
!             belibs = ['/boot/beos/system/lib']
!         belibs.append('/boot/home/config/lib')
!         self.compiler.library_dirs.append('/boot/home/config/lib')
!         try:
!             beincl = os.environ['BEINCLUDES'].split(';')
!         except KeyError:
!             beincl = []
!         beincl.append('/boot/home/config/include')
!         self.compiler.include_dirs.append('/boot/home/config/include')
          # lib_dirs and inc_dirs are used to search for files;
          # if a file is found in one of those directories, it can
***************
*** 163,167 ****
  
          platform = self.get_platform()
!         
          # Check for MacOS X, which doesn't need libm.a at all
          math_libs = ['m']
--- 163,167 ----
  
          platform = self.get_platform()
! 
          # Check for MacOS X, which doesn't need libm.a at all
          math_libs = ['m']
***************
*** 348,352 ****
          if self.compiler.find_library_file(lib_dirs, 'db'):
              dblib = ['db']
!         
          db185_incs = find_file('db_185.h', inc_dirs,
                                 ['/usr/include/db3', '/usr/include/db2'])
--- 348,352 ----
          if self.compiler.find_library_file(lib_dirs, 'db'):
              dblib = ['db']
! 
          db185_incs = find_file('db_185.h', inc_dirs,
                                 ['/usr/include/db3', '/usr/include/db2'])
***************
*** 389,393 ****
              # Generic dynamic loading module
              #exts.append( Extension('dl', ['dlmodule.c']) )
!             
              # Sun yellow pages. Some systems have the functions in libc.
              if platform not in ['cygwin']:
--- 389,393 ----
              # Generic dynamic loading module
              #exts.append( Extension('dl', ['dlmodule.c']) )
! 
              # Sun yellow pages. Some systems have the functions in libc.
              if platform not in ['cygwin']:
***************
*** 500,512 ****
      def detect_tkinter(self, inc_dirs, lib_dirs):
          # The _tkinter module.
!         
          # Assume we haven't found any of the libraries or include files
          tcllib = tklib = tcl_includes = tk_includes = None
          for version in ['8.4', '8.3', '8.2', '8.1', '8.0']:
!              tklib = self.compiler.find_library_file(lib_dirs,
!                                                      'tk' + version )
!              tcllib = self.compiler.find_library_file(lib_dirs,
!                                                       'tcl' + version )
!              if tklib and tcllib:
                  # Exit the loop when we've found the Tcl/Tk libraries
                  break
--- 500,512 ----
      def detect_tkinter(self, inc_dirs, lib_dirs):
          # The _tkinter module.
! 
          # Assume we haven't found any of the libraries or include files
          tcllib = tklib = tcl_includes = tk_includes = None
          for version in ['8.4', '8.3', '8.2', '8.1', '8.0']:
!             tklib = self.compiler.find_library_file(lib_dirs,
!                                                     'tk' + version )
!             tcllib = self.compiler.find_library_file(lib_dirs,
!                                                      'tcl' + version )
!             if tklib and tcllib:
                  # Exit the loop when we've found the Tcl/Tk libraries
                  break

Index: find_recursionlimit.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/find_recursionlimit.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** find_recursionlimit.py	31 Aug 2000 19:24:17 -0000	1.1
--- find_recursionlimit.py	18 Jul 2004 06:04:36 -0000	1.2
***************
*** 58,62 ****
  def test_getitem():
      return RecursiveBlowup6()[5]
!     
  def test_recurse():
      return test_recurse()
--- 58,62 ----
  def test_getitem():
      return RecursiveBlowup6()[5]
! 
  def test_recurse():
      return test_recurse()
***************
*** 86,88 ****
      print "Limit of %d is fine" % limit
      limit = limit + 100
-     
--- 86,87 ----