[Python-checkins] CVS: python/dist/src/Lib formatter.py,1.17,1.18

[Fred L. Drake]

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

Modified Files:
	formatter.py 
Log Message:

Remove a bare try/except completely -- it just did not make sense!

Add a comment elsewhere making clear an assumption in the code.


Index: formatter.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/formatter.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** formatter.py	2001/02/09 10:58:30	1.17
--- formatter.py	2001/05/11 19:25:08	1.18
***************
*** 114,129 ****
          label = ''
          for c in format:
!             try:
!                 if c == '1':
!                     label = label + ('%d' % counter)
!                 elif c in 'aA':
!                     if counter > 0:
!                         label = label + self.format_letter(c, counter)
!                 elif c in 'iI':
!                     if counter > 0:
!                         label = label + self.format_roman(c, counter)
!                 else:
!                     label = label + c
!             except:
                  label = label + c
          return label
--- 114,126 ----
          label = ''
          for c in format:
!             if c == '1':
!                 label = label + ('%d' % counter)
!             elif c in 'aA':
!                 if counter > 0:
!                     label = label + self.format_letter(c, counter)
!             elif c in 'iI':
!                 if counter > 0:
!                     label = label + self.format_roman(c, counter)
!             else:
                  label = label + c
          return label
***************
*** 133,136 ****
--- 130,136 ----
          while counter > 0:
              counter, x = divmod(counter-1, 26)
+             # This makes a strong assumption that lowercase letters
+             # and uppercase letters form two contiguous blocks, with
+             # letters in order!
              s = chr(ord(case) + x)
              label = s + label