[Python-checkins] cpython (merge 3.3 -> default): Merge from 3.3.

[stefan.krah]

http://hg.python.org/cpython/rev/a37aa98c6318
changeset:   88581:a37aa98c6318
parent:      88579:1e75ab9fd760
parent:      88580:f82b6ec1ae6e
user:        Stefan Krah <skrah at bytereef.org>
date:        Mon Jan 20 15:35:38 2014 +0100
summary:
  Merge from 3.3.

files:
  Misc/ACKS          |  1 +
  Python/fileutils.c |  3 ++-
  2 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -562,6 +562,7 @@
 Nadav Horesh
 Alon Horev
 Jan Hosang
+Alan Hourihane
 Ken Howard
 Brad Howes
 Mike Hoy
diff --git a/Python/fileutils.c b/Python/fileutils.c
--- a/Python/fileutils.c
+++ b/Python/fileutils.c
@@ -1,11 +1,12 @@
 #include "Python.h"
 #include "osdefs.h"
+#include <locale.h>
+
 #ifdef MS_WINDOWS
 #  include <windows.h>
 #endif
 
 #ifdef HAVE_LANGINFO_H
-#include <locale.h>
 #include <langinfo.h>
 #endif
 

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