summaryrefslogtreecommitdiffstats
path: root/Lib/logging
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2007-02-16 22:36:24 (GMT)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2007-02-16 22:36:24 (GMT)
commitf7ccc101d2d623428dd03114bd8723946d5dbcae (patch)
treed0c2691c823cf78c55ae6a4aeb69262e18bd5041 /Lib/logging
parentfa6521b4fd72a6b2e959549792c390f6d77e72fe (diff)
downloadcpython-f7ccc101d2d623428dd03114bd8723946d5dbcae.zip
cpython-f7ccc101d2d623428dd03114bd8723946d5dbcae.tar.gz
cpython-f7ccc101d2d623428dd03114bd8723946d5dbcae.tar.bz2
Minor fix for currentframe (SF #1652788).
Diffstat (limited to 'Lib/logging')
-rw-r--r--Lib/logging/__init__.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index b3412fc..321e118 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2001-2005 by Vinay Sajip. All Rights Reserved.
+# Copyright 2001-2007 by Vinay Sajip. All Rights Reserved.
#
# Permission to use, copy, modify, and distribute this software and its
# documentation for any purpose and without fee is hereby granted,
@@ -21,7 +21,7 @@ comp.lang.python, and influenced by Apache's log4j system.
Should work under Python versions >= 1.5.2, except that source line
information is not available unless 'sys._getframe()' is.
-Copyright (C) 2001-2004 Vinay Sajip. All Rights Reserved.
+Copyright (C) 2001-2007 Vinay Sajip. All Rights Reserved.
To use, simply 'import logging' and log away!
"""
@@ -41,8 +41,8 @@ except ImportError:
__author__ = "Vinay Sajip <vinay_sajip@red-dove.com>"
__status__ = "production"
-__version__ = "0.5.0.1"
-__date__ = "09 January 2007"
+__version__ = "0.5.0.2"
+__date__ = "16 February 2007"
#---------------------------------------------------------------------------
# Miscellaneous module data
@@ -68,7 +68,7 @@ def currentframe():
except:
return sys.exc_traceback.tb_frame.f_back
-if hasattr(sys, '_getframe'): currentframe = sys._getframe
+if hasattr(sys, '_getframe'): currentframe = lambda: sys._getframe(3)
# done filching
# _srcfile is only used in conjunction with sys._getframe().