[Python-checkins] python/dist/src/Doc/tools mkpkglist,1.1,1.2

fdrake@users.sourceforge.net fdrake@users.sourceforge.net
Mon, 14 Oct 2002 08:04:41 -0700


Update of /cvsroot/python/python/dist/src/Doc/tools
In directory usw-pr-cvs1:/tmp/cvs-serv22420

Modified Files:
	mkpkglist 
Log Message:
Minor refactoring to avoid code duplication.


Index: mkpkglist
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/tools/mkpkglist,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mkpkglist	8 Dec 2001 00:26:07 -0000	1.1
--- mkpkglist	14 Oct 2002 15:04:33 -0000	1.2
***************
*** 60,63 ****
--- 60,70 ----
      return int(round(os.path.getsize(fn) / 1024.0))
  
+ def get_file_cell(prefix, ext, have):
+     if have:
+         kb = get_size(prefix, ext)
+         return FILE_TEMPLATE % (release, prefix, release, ext, kb)
+     else:
+         return NO_FILE_TEMPLATE
+ 
  for name, prefix in PKG_TYPES:
      zip_fn = "%s-%s.zip" % (prefix, release)
***************
*** 72,92 ****
          print "    <tr><td>%s</td>" % name
  
!         if have_zip:
!             kb = get_size(prefix, ".zip")
!             print FILE_TEMPLATE % (release, prefix, release, ".zip", kb)
!         else:
!             print NO_FILE_TEMPLATE
! 
!         if have_tgz:
!             kb = get_size(prefix, ".tgz")
!             print FILE_TEMPLATE % (release, prefix, release, ".tgz", kb)
!         else:
!             print NO_FILE_TEMPLATE
! 
!         if have_bz2:
!             kb = get_size(prefix, ".tar.bz2")
!             print FILE_TEMPLATE % (release, prefix, release, ".tar.bz2", kb)
!         else:
!             print NO_FILE_TEMPLATE
  
          print "      </tr>"
--- 79,85 ----
          print "    <tr><td>%s</td>" % name
  
!         print get_file_cell(prefix, ".zip", have_zip)
!         print get_file_cell(prefix, ".tgz", have_tgz)
!         print get_file_cell(prefix, ".tar.bz2", have_bz2)
  
          print "      </tr>"