diff options
| author | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2009-02-19 12:31:32 (GMT) |
|---|---|---|
| committer | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2009-02-19 12:31:32 (GMT) |
| commit | 1a0d2befeaf445a2a7094744b30e7cab1492c340 (patch) | |
| tree | 344562adce503bb2f36eda72f767c8b38c2d86a2 | |
| parent | 8f9a1eee0d99710801117dc313f5588c2a6c22b1 (diff) | |
| download | cpython-1a0d2befeaf445a2a7094744b30e7cab1492c340.zip cpython-1a0d2befeaf445a2a7094744b30e7cab1492c340.tar.gz cpython-1a0d2befeaf445a2a7094744b30e7cab1492c340.tar.bz2 | |
#5287: Add exception handling around findCaller() call to help out IronPython.
| -rw-r--r-- | Lib/logging/__init__.py | 7 | ||||
| -rw-r--r-- | Misc/NEWS | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py index 8773225..e7eb51d 100644 --- a/Lib/logging/__init__.py +++ b/Lib/logging/__init__.py @@ -1128,7 +1128,12 @@ class Logger(Filterer): all the handlers of this logger to handle the record. """ if _srcfile: - fn, lno, func = self.findCaller() + #IronPython doesn't track Python frames, so findCaller throws an + #exception. We trap it here so that IronPython can use logging. + try: + fn, lno, func = self.findCaller() + except ValueError: + fn, lno, func = "(unknown file)", 0, "(unknown function)" else: fn, lno, func = "(unknown file)", 0, "(unknown function)" if exc_info: @@ -161,16 +161,18 @@ Core and Builtins Library ------- +- Issue #5287: Add exception handling around findCaller() call to help out + IronPython. - Issue #5282: Fixed mmap resize on 32bit windows and unix. When offset > 0, The file was resized to wrong size. - Issue #5292: Fixed mmap crash on its boundary access m[len(m)]. -- Issue #2279: distutils.sdist.add_defaults now add files +- Issue #2279: distutils.sdist.add_defaults now add files from the package_data and the data_files metadata. -- Issue #5257: refactored all tests in distutils, so they use +- Issue #5257: refactored all tests in distutils, so they use support.TempdirManager, to avoid writing in the tests directory. - Issue #4524: distutils build_script command failed with --with-suffix=3. |