diff options
| author | Georg Brandl <georg@python.org> | 2009-08-13 08:37:59 +0000 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2009-08-13 08:37:59 +0000 |
| commit | 01a30523f9782f9e8b8f49efc3b2a703b94394f3 (patch) | |
| tree | a9baee4f5cc059c0d5a300b15ed225ed5fa03f55 /Lib/inspect.py | |
| parent | 878c3b004b09cb9242f7523366b616ae0715438a (diff) | |
| download | cpython-01a30523f9782f9e8b8f49efc3b2a703b94394f3.tar.gz cpython-01a30523f9782f9e8b8f49efc3b2a703b94394f3.zip | |
Merged revisions 74264 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
................
r74264 | alexandre.vassalotti | 2009-07-29 22:12:15 +0200 (Mi, 29 Jul 2009) | 32 lines
Merged revisions 74075,74187,74197,74201,74216,74225 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r74075 | georg.brandl | 2009-07-18 05:06:31 -0400 (Sat, 18 Jul 2009) | 1 line
#6505: fix typos.
........
r74187 | benjamin.peterson | 2009-07-23 10:19:08 -0400 (Thu, 23 Jul 2009) | 1 line
use bools for autoraise
........
r74197 | benjamin.peterson | 2009-07-24 22:03:48 -0400 (Fri, 24 Jul 2009) | 1 line
clarify
........
r74201 | amaury.forgeotdarc | 2009-07-25 12:22:06 -0400 (Sat, 25 Jul 2009) | 2 lines
Better name a variable: 'buf' seems to imply a mutable buffer.
........
r74216 | michael.foord | 2009-07-26 17:12:14 -0400 (Sun, 26 Jul 2009) | 1 line
Issue 6581. Michael Foord
........
r74225 | kurt.kaiser | 2009-07-27 12:09:28 -0400 (Mon, 27 Jul 2009) | 5 lines
1. Clean workspace more thoughly before build.
2. Add url of branch we are building to 'results' webpage.
(url is now available in $repo_path, could be added to failure email.)
3. Adjust permissions to improve upload reliability.
........
................
Diffstat (limited to 'Lib/inspect.py')
| -rw-r--r-- | Lib/inspect.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/inspect.py b/Lib/inspect.py index 4b3e27a4ca2..79565c14378 100644 --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -990,7 +990,10 @@ def getinnerframes(tb, context=1): tb = tb.tb_next return framelist -currentframe = sys._getframe +if hasattr(sys, '_getframe'): + currentframe = sys._getframe +else: + currentframe = lambda _=None: None def stack(context=1): """Return a list of records for the stack above the caller's frame.""" |