[Python-checkins] r85361 - in python/branches: py3k/Lib/logging/__init__.py py3k/Misc/NEWS release27-maint/Lib/logging/__init__.py release27-maint/Misc/NEWS

[vinay.sajip]

Author: vinay.sajip
Date: Sun Oct 10 22:36:04 2010
New Revision: 85361

Log:
Issue #9948: logging: fixed problem of losing filename case information.

Modified:
   python/branches/py3k/Lib/logging/__init__.py
   python/branches/py3k/Misc/NEWS
   python/branches/release27-maint/Lib/logging/__init__.py
   python/branches/release27-maint/Misc/NEWS

Modified: python/branches/py3k/Lib/logging/__init__.py
==============================================================================
--- python/branches/py3k/Lib/logging/__init__.py	(original)
+++ python/branches/py3k/Lib/logging/__init__.py	Sun Oct 10 22:36:04 2010
@@ -1174,7 +1174,7 @@
             if filename == _srcfile:
                 f = f.f_back
                 continue
-            rv = (filename, f.f_lineno, co.co_name)
+            rv = (co.co_filename, f.f_lineno, co.co_name)
             break
         return rv
 

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Sun Oct 10 22:36:04 2010
@@ -92,6 +92,8 @@
 Library
 -------
 
+- Issue #9948: Fixed problem of losing filename case information.
+
 - Issue #9437: Fix building C extensions with non-default LDFLAGS.
 
 - Issue #4661: email can now parse bytes input and generate either converted

Modified: python/branches/release27-maint/Lib/logging/__init__.py
==============================================================================
--- python/branches/release27-maint/Lib/logging/__init__.py	(original)
+++ python/branches/release27-maint/Lib/logging/__init__.py	Sun Oct 10 22:36:04 2010
@@ -1211,7 +1211,7 @@
             if filename == _srcfile:
                 f = f.f_back
                 continue
-            rv = (filename, f.f_lineno, co.co_name)
+            rv = (co.co_filename, f.f_lineno, co.co_name)
             break
         return rv
 

Modified: python/branches/release27-maint/Misc/NEWS
==============================================================================
--- python/branches/release27-maint/Misc/NEWS	(original)
+++ python/branches/release27-maint/Misc/NEWS	Sun Oct 10 22:36:04 2010
@@ -48,6 +48,8 @@
 Library
 -------
 
+- Issue #9948: Fixed problem of losing filename case information.
+
 - Issue #9437: Fix building C extensions with non-default LDFLAGS.
 
 - Issue #9759: GzipFile now raises ValueError when an operation is attempted