Docstring fixes; cleanup dead/Py2 vestigial code

3 files changed, 5 insertions, 16 deletions

diff --git a/pyparsing/core.py b/pyparsing/core.py
index 7cf9639..977aabc 100644
--- a/pyparsing/core.py
+++ b/pyparsing/core.py
@@ -2244,7 +2244,7 @@ class Word(Token):
     def _generateDefaultName(self):
         def charsAsStr(s):
             max_repr_len = 16
-            s = _collapseStringToRanges(s)
+            s = _collapseStringToRanges(s, re_escape=False)
             if len(s) > max_repr_len:
                 return s[: max_repr_len - 3] + "..."
             else:
@@ -2431,7 +2431,7 @@ class Regex(Token):
     def sub(self, repl):
         r"""
         Return :class:`Regex` with an attached parse action to transform the parsed
-        result as if called using ``re.sub(expr, repl, string)`` `<https://docs.python.org/3/library/re.html#re.sub>`_.
+        result as if called using `re.sub(expr, repl, string) <https://docs.python.org/3/library/re.html#re.sub>`_.
 
         Example::
 
diff --git a/pyparsing/results.py b/pyparsing/results.py
index bfd8490..c3fcd2d 100644
--- a/pyparsing/results.py
+++ b/pyparsing/results.py
@@ -204,7 +204,7 @@ class ParseResults:
         return ((k, self[k]) for k in self.keys())
 
     def haskeys(self):
-        """Since `keys()` returns an iterator, this method is helpful in bypassing
+        """Since ``keys()`` returns an iterator, this method is helpful in bypassing
            code that looks for the existence of any defined results names."""
         return bool(self._tokdict)
 
diff --git a/pyparsing/util.py b/pyparsing/util.py
index e7843d6..1a700ec 100644
--- a/pyparsing/util.py
+++ b/pyparsing/util.py
@@ -87,14 +87,10 @@ class _UnboundedCache:
         def clear(self):
             cache.clear()
 
-        def cache_len(self):
-            return len(cache)
-
         self.size = None
         self.get = types.MethodType(get, self)
         self.set = types.MethodType(set, self)
         self.clear = types.MethodType(clear, self)
-        self.__len__ = types.MethodType(cache_len, self)
 
 
 class _FifoCache:
@@ -108,23 +104,16 @@ class _FifoCache:
 
         def set(self, key, value):
             cache[key] = value
-            try:
-                while len(cache) > size:
-                    cache.popitem(last=False)
-            except KeyError:
-                pass
+            while len(cache) > size:
+                cache.popitem(last=False)
 
         def clear(self):
             cache.clear()
 
-        def cache_len(self):
-            return len(cache)
-
         self.size = size
         self.get = types.MethodType(get, self)
         self.set = types.MethodType(set, self)
         self.clear = types.MethodType(clear, self)
-        self.__len__ = types.MethodType(cache_len, self)
 
 
 def _escapeRegexRangeChars(s):