From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 9 Aug 2010 13:05:35 +0000 (+0000)
Subject: don't alias directly, so that extra arguments don't appear #6678
X-Git-Tag: v3.2a2~390
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=42ac47548de06ac4c022e54abdbdc467f80cecb2;p=python

don't alias directly, so that extra arguments don't appear #6678
---

diff --git a/Lib/inspect.py b/Lib/inspect.py
index bfb6d00b5b..1690f94771 100644
--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -1062,10 +1062,9 @@ def getinnerframes(tb, context=1):
         tb = tb.tb_next
     return framelist
 
-if hasattr(sys, '_getframe'):
-    currentframe = sys._getframe
-else:
-    currentframe = lambda _=None: None
+def currentframe():
+    """Return the frame or the caller or None if this is not possible."""
+    return sys._getframe(1) if hasattr(sys, "_getframe") else None
 
 def stack(context=1):
     """Return a list of records for the stack above the caller's frame."""