[Python-checkins] r86983 - in python/branches/py3k: Doc/library/difflib.rst Lib/difflib.py

[terry.reedy]

Author: terry.reedy
Date: Fri Dec  3 19:57:42 2010
New Revision: 86983

Log:


Modified:
   python/branches/py3k/Doc/library/difflib.rst
   python/branches/py3k/Lib/difflib.py

Modified: python/branches/py3k/Doc/library/difflib.rst
==============================================================================
--- python/branches/py3k/Doc/library/difflib.rst	(original)
+++ python/branches/py3k/Doc/library/difflib.rst	Fri Dec  3 19:57:42 2010
@@ -358,6 +358,16 @@
    .. versionadded:: 3.2
       The *autojunk* parameter.
 
+   SequenceMatcher objects get three data attributes: *bjunk* is the
+   set of elements of b for which *isjunk* is True; *bpopular* is the set of non-
+   junk elements considered popular by the heuristic (if it is not disabled);
+   *b2j* is a dict mapping the remaining elements of b to a list of positions where
+   they occur. All three are reset whenever *b* is reset with :meth:`set_seqs`
+   or :meth:`set_seq2`.
+
+.. versionadded:: 3.2
+      The *bjunk* and *bpopular* attributes.
+
    :class:`SequenceMatcher` objects have the following methods:
 
 
@@ -538,7 +548,7 @@
 SequenceMatcher Examples
 ------------------------
 
-This example compares two strings, considering blanks to be "junk:"
+This example compares two strings, considering blanks to be "junk":
 
    >>> s = SequenceMatcher(lambda x: x == " ",
    ...                     "private Thread currentThread;",

Modified: python/branches/py3k/Lib/difflib.py
==============================================================================
--- python/branches/py3k/Lib/difflib.py	(original)
+++ python/branches/py3k/Lib/difflib.py	Fri Dec  3 19:57:42 2010
@@ -213,6 +213,10 @@
         #      (at least 200 elements) and x accounts for more than 1 + 1% of
         #      its elements (when autojunk is enabled).
         #      DOES NOT WORK for x in a!
+        # bjunk
+        #      the items in b for which isjunk is True.
+        # bpopular
+        #      nonjunk items in b treated as junk by the heuristic (if used).
 
         self.isjunk = isjunk
         self.a = self.b = None
@@ -321,7 +325,7 @@
             indices.append(i)
 
         # Purge junk elements
-        junk = set()
+        self.bjunk = junk = set()
         isjunk = self.isjunk
         if isjunk:
             for elt in list(b2j.keys()):  # using list() since b2j is modified
@@ -330,7 +334,7 @@
                     del b2j[elt]
 
         # Purge popular elements that are not junk
-        popular = set()
+        self.bpopular = popular = set()
         n = len(b)
         if self.autojunk and n >= 200:
             ntest = n // 100 + 1