[Python-checkins] cpython (merge 3.2 -> default): merge 3.2

[benjamin.peterson]

http://hg.python.org/cpython/rev/e38bb637328c
changeset:   71222:e38bb637328c
parent:      71219:842147eb1b26
parent:      71220:7eb85a23cf3d
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Jul 04 22:28:00 2011 -0500
summary:
  merge 3.2

files:
  Python/_warnings.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Python/_warnings.c b/Python/_warnings.c
--- a/Python/_warnings.c
+++ b/Python/_warnings.c
@@ -517,7 +517,7 @@
     }
     else {
         const char *module_str = _PyUnicode_AsString(*module);
-        Py_XDECREF(*filename);
+        *filename = NULL;
         if (module_str == NULL)
                 goto handle_error;
         if (strcmp(module_str, "__main__") == 0) {

-- 
Repository URL: http://hg.python.org/cpython