[Python-checkins] python/dist/src/Lib platform.py,1.5.8.2,1.5.8.3

[bcannon at users.sourceforge.net]

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

Modified Files:
      Tag: release23-maint
	platform.py 
Log Message:
Fix last patch to make backwards-compatible with Python 1.5.2 .
Bumped up micro version number.


Index: platform.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/platform.py,v
retrieving revision 1.5.8.2
retrieving revision 1.5.8.3
diff -C2 -d -r1.5.8.2 -r1.5.8.3
*** platform.py	25 Mar 2004 16:56:14 -0000	1.5.8.2
--- platform.py	25 Mar 2004 18:35:38 -0000	1.5.8.3
***************
*** 32,35 ****
--- 32,36 ----
  #
  #    History:
+ #    1.0.2 - fix a bug with caching of value for platform()
  #    1.0.1 - reformatted to make doc.py happy
  #    1.0.0 - reformatted a bit and checked into Python CVS
***************
*** 103,107 ****
  """
  
! __version__ = '1.0.1'
  
  import sys,string,os,re
--- 104,108 ----
  """
  
! __version__ = '1.0.2'
  
  import sys,string,os,re
***************
*** 202,206 ****
          # Check for slackware verson tag file (thanks to Greg Andruk)
          verfiles = os.listdir('/usr/lib/setup')
!         for n in range(len(verfiles)-1, -1, -1):
              if verfiles[n][:14] != 'slack-version-':
                  del verfiles[n]
--- 203,207 ----
          # Check for slackware verson tag file (thanks to Greg Andruk)
          verfiles = os.listdir('/usr/lib/setup')
!         for n in reversed(xrange(len(verfiles))):
              if verfiles[n][:14] != 'slack-version-':
                  del verfiles[n]
***************
*** 1083,1087 ****
      """
      global _sys_version_cache
-     import time
  
      if _sys_version_cache is not None:
--- 1084,1087 ----
***************
*** 1137,1142 ****
  ### The Opus Magnum of platform strings :-)
  
! _platform_cache = {True:None, False:None}
! _platform_aliased_cache = {True:None, False:None}
  
  def platform(aliased=0, terse=0):
--- 1137,1144 ----
  ### The Opus Magnum of platform strings :-)
  
! _platform_cache_terse = None
! _platform_cache_not_terse = None
! _platform_aliased_cache_terse = None
! _platform_aliased_cache_not_terse = None
  
  def platform(aliased=0, terse=0):
***************
*** 1159,1168 ****
  
      """
!     global _platform_cache,_platform_aliased_cache
  
!     if not aliased and (_platform_cache[bool(terse)] is not None):
!         return _platform_cache[bool(terse)]
!     elif _platform_aliased_cache[bool(terse)] is not None:
!         return _platform_aliased_cache[bool(terse)]
  
      # Get uname information and then apply platform specific cosmetics
--- 1161,1175 ----
  
      """
!     global _platform_cache_terse, _platform_cache_not_terse
!     global _platform_aliased_cache_terse, _platform_aliased_cache_not_terse
  
!     if not aliased and terse and (_platform_cache_terse is not None):
!         return _platform_cache_terse
!     elif not aliased and not terse and (_platform_cache_not_terse is not None):
!         return _platform_cache_not_terse
!     elif terse and _platform_aliased_cache_terse is not None:
!         return _platform_aliased_cache_terse
!     elif not terse and _platform_aliased_cache_not_terse is not None:
!         return _platform_aliased_cache_not_terse
  
      # Get uname information and then apply platform specific cosmetics
***************
*** 1220,1229 ****
              platform = _platform(system,release,machine,processor,bits,linkage)
  
!     if aliased:
!         _platform_aliased_cache[bool(terse)] = platform
      elif terse:
          pass
      else:
!         _platform_cache[bool(terse)] = platform
      return platform
  
--- 1227,1241 ----
              platform = _platform(system,release,machine,processor,bits,linkage)
  
!     if aliased and terse:
!         _platform_aliased_cache_terse = platform
!     elif aliased and not terse:
!         _platform_aliased_cache_not_terse = platform
      elif terse:
          pass
      else:
!         if terse:
!             _platform_cache_terse = platform
!         else:
!             _platform_cache_not_terse = platform
      return platform