[Python-checkins] cpython (merge 3.4 -> default): merge 3.4 (#21089)

[benjamin.peterson]

http://hg.python.org/cpython/rev/c73b71363d4c
changeset:   90012:c73b71363d4c
parent:      90009:19b374217d07
parent:      90011:c88a7c38eb0d
user:        Benjamin Peterson <benjamin at python.org>
date:        Fri Mar 28 18:55:04 2014 -0400
summary:
  merge 3.4 (#21089)

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


diff --git a/Python/sysmodule.c b/Python/sysmodule.c
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -1799,6 +1799,7 @@
 #endif
 
 #undef SET_SYS_FROM_STRING
+#undef SET_SYS_FROM_STRING_BORROW
     if (PyErr_Occurred())
         return NULL;
     return m;

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