[Python-checkins] python/dist/src/Lib difflib.py,1.12,1.13

[rhettinger@users.sourceforge.net]

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

Modified Files:
	difflib.py 
Log Message:
For the context and unified diff functions:

* Simplified test for visible changes
* Improved variable names and line spacing
* Replaced dict(a=3) style with Py2.2 compatable {'a':3}



Index: difflib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/difflib.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** difflib.py	8 Jun 2003 11:07:08 -0000	1.12
--- difflib.py	8 Jun 2003 19:38:42 -0000	1.13
***************
*** 1206,1210 ****
  
      started = False
!     prefixmap = dict(insert='+ ', delete='- ', replace='! ', equal='  ')
      for group in SequenceMatcher(None,a,b).get_grouped_opcodes(n):
          if not started:
--- 1206,1210 ----
  
      started = False
!     prefixmap = {'insert':'+ ', 'delete':'- ', 'replace':'! ', 'equal':'  '}
      for group in SequenceMatcher(None,a,b).get_grouped_opcodes(n):
          if not started:
***************
*** 1212,1215 ****
--- 1212,1216 ----
              yield '--- %s %s%s' % (tofile, tofiledate, lineterm)
              started = True
+ 
          yield '***************%s' % (lineterm,)
          if group[-1][2] - group[0][1] >= 2:
***************
*** 1217,1241 ****
          else:
              yield '*** %d ****%s' % (group[-1][2], lineterm)
!         empty = True
!         for tag, i1, i2, j1, j2 in group:
!             if tag == 'replace' or tag == 'delete':
!                 empty = False
!                 break
!         if not empty:
!             for tag, i1, i2, j1, j2 in group:
                  if tag != 'insert':
                      for line in a[i1:i2]:
                          yield prefixmap[tag] + line
          if group[-1][4] - group[0][3] >= 2:
              yield '--- %d,%d ----%s' % (group[0][3]+1, group[-1][4], lineterm)
          else:
              yield '--- %d ----%s' % (group[-1][4], lineterm)
!         empty = True
!         for tag, i1, i2, j1, j2 in group:
!             if tag == 'replace' or tag == 'insert':
!                 empty = False
!                 break
!         if not empty:
!             for tag, i1, i2, j1, j2 in group:
                  if tag != 'delete':
                      for line in b[j1:j2]:
--- 1218,1235 ----
          else:
              yield '*** %d ****%s' % (group[-1][2], lineterm)
!         visiblechanges = [e for e in group if e[0] in ('replace', 'delete')]
!         if visiblechanges:
!             for tag, i1, i2, _, _ in group:
                  if tag != 'insert':
                      for line in a[i1:i2]:
                          yield prefixmap[tag] + line
+ 
          if group[-1][4] - group[0][3] >= 2:
              yield '--- %d,%d ----%s' % (group[0][3]+1, group[-1][4], lineterm)
          else:
              yield '--- %d ----%s' % (group[-1][4], lineterm)
!         visiblechanges = [e for e in group if e[0] in ('replace', 'insert')]
!         if visiblechanges:
!             for tag, _, _, j1, j2 in group:
                  if tag != 'delete':
                      for line in b[j1:j2]: