Move linecache code to new file, use super()

michaelmulley · michaelmulley · commit 7ca380d12e3e · 2015-03-25T17:40:46.000-04:00
diff --git a/bpython/history.py b/bpython/history.py
@@ -25,7 +25,6 @@
 
 from __future__ import unicode_literals
 import io
-import linecache
 import os
 import stat
 from itertools import islice
@@ -233,74 +232,3 @@ def append_reload_and_write(self, s, filename, encoding):
                 # Make sure that entries contains at least one element. If the
                 # file and s are empty, this can occur.
                 self.entries = ['']
-
-class BPythonLinecache(dict):
-    """Replaces the cache dict in the standard-library linecache module,
-    to also remember (in an unerasable way) bpython console input."""
-
-    def __init__(self, *args, **kwargs):
-        dict.__init__(self, *args, **kwargs)
-        self.bpython_history = []
-
-    def is_bpython_filename(self, fname):
-        try:
-            return fname.startswith('<bpython-input-')
-        except AttributeError:
-            # In case the key isn't a string
-            return False
-
-    def get_bpython_history(self, key):
-        """Given a filename provided by remember_bpython_input,
-        returns the associated source string."""
-        try:
-            idx = int(key.split('-')[2][:-1])
-            return self.bpython_history[idx]
-        except (IndexError, ValueError):
-            raise KeyError
-
-    def remember_bpython_input(self, source):
-        """Remembers a string of source code, and returns
-        a fake filename to use to retrieve it later."""
-        filename = '<bpython-input-%s>' % len(self.bpython_history)
-        self.bpython_history.append((len(source), None,
-            source.splitlines(True), filename))
-        return filename
-
-    def __getitem__(self, key):
-        if self.is_bpython_filename(key):
-            return self.get_bpython_history(key)
-        return dict.__getitem__(self, key)
-
-    def __contains__(self, key):
-        if self.is_bpython_filename(key):
-            try:
-                self.get_bpython_history(key)
-                return True
-            except KeyError:
-                return False
-        return dict.__contains__(self, key)
-
-    def __delitem__(self, key):
-        if not self.is_bpython_filename(key):
-            return dict.__delitem__(self, key)
-
-def _bpython_clear_linecache():
-    try:
-        bpython_history = linecache.cache.bpython_history
-    except AttributeError:
-        bpython_history = []
-    linecache.cache = BPythonLinecache()
-    linecache.cache.bpython_history = bpython_history
-
-# Monkey-patch the linecache module so that we're able
-# to hold our command history there and have it persist
-linecache.cache = BPythonLinecache(linecache.cache)
-linecache.clearcache = _bpython_clear_linecache
-
-def filename_for_console_input(code_string):
-    """Remembers a string of source code, and returns
-    a fake filename to use to retrieve it later."""
-    try:
-        return linecache.cache.remember_bpython_input(code_string)
-    except AttributeError:
-        return '<input>'
diff --git a/bpython/patch_linecache.py b/bpython/patch_linecache.py
@@ -0,0 +1,75 @@
+import linecache
+
+class BPythonLinecache(dict):
+    """Replaces the cache dict in the standard-library linecache module,
+    to also remember (in an unerasable way) bpython console input."""
+
+    def __init__(self, *args, **kwargs):
+        super(BPythonLinecache, self).__init__(*args, **kwargs)
+        self.bpython_history = []
+
+    def is_bpython_filename(self, fname):
+        try:
+            return fname.startswith('<bpython-input-')
+        except AttributeError:
+            # In case the key isn't a string
+            return False
+
+    def get_bpython_history(self, key):
+        """Given a filename provided by remember_bpython_input,
+        returns the associated source string."""
+        try:
+            idx = int(key.split('-')[2][:-1])
+            return self.bpython_history[idx]
+        except (IndexError, ValueError):
+            raise KeyError
+
+    def remember_bpython_input(self, source):
+        """Remembers a string of source code, and returns
+        a fake filename to use to retrieve it later."""
+        filename = '<bpython-input-%s>' % len(self.bpython_history)
+        self.bpython_history.append((len(source), None,
+            source.splitlines(True), filename))
+        return filename
+
+    def __getitem__(self, key):
+        if self.is_bpython_filename(key):
+            return self.get_bpython_history(key)
+        return super(BPythonLinecache, self).__getitem__(key)
+
+    def __contains__(self, key):
+        if self.is_bpython_filename(key):
+            try:
+                self.get_bpython_history(key)
+                return True
+            except KeyError:
+                return False
+        return super(BPythonLinecache, self).__contains__(key)
+
+    def __delitem__(self, key):
+        if not self.is_bpython_filename(key):
+            return super(BPythonLinecache, self).__delitem__(key)
+
+def _bpython_clear_linecache():
+    try:
+        bpython_history = linecache.cache.bpython_history
+    except AttributeError:
+        bpython_history = []
+    linecache.cache = BPythonLinecache()
+    linecache.cache.bpython_history = bpython_history
+
+# Monkey-patch the linecache module so that we're able
+# to hold our command history there and have it persist
+linecache.cache = BPythonLinecache(linecache.cache)
+linecache.clearcache = _bpython_clear_linecache
+
+def filename_for_console_input(code_string):
+    """Remembers a string of source code, and returns
+    a fake filename to use to retrieve it later."""
+    try:
+        return linecache.cache.remember_bpython_input(code_string)
+    except AttributeError:
+        # If someone else has patched linecache.cache, better for code to
+        # simply be unavailable to inspect.getsource() than to raise
+        # an exception.
+        return '<input>'
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -47,8 +47,9 @@
 from bpython.clipboard import get_clipboard, CopyFailed
 from bpython.config import getpreferredencoding
 from bpython.formatter import Parenthesis
-from bpython.history import History, filename_for_console_input
+from bpython.history import History
 from bpython.paste import PasteHelper, PastePinnwand, PasteFailed
+from bpython.patch_linecache import filename_for_console_input
 from bpython.translations import _, ngettext
 
 
