From a5e564be83e99403f0006effd93d5fe4be7bb3a7 Mon Sep 17 00:00:00 2001
From: "Ralf W. Grosse-Kunstleve" <rwgk@yahoo.com>
Date: Wed, 13 Apr 2011 17:34:35 +0000
Subject: [PATCH] merging current boost/python and libs/python from trunk into
 release branch

[SVN r71226]
---
 example/README                       | 1 -
 src/converter/builtin_converters.cpp | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/example/README b/example/README
index 120db6bf..29a94f67 100644
--- a/example/README
+++ b/example/README
@@ -14,4 +14,3 @@ http://www.boost.org/more/getting_started.html for details about the
 If you move this example from its place in the Boost development tree
 you'll need to edit the two lines indicated in Jamroot and
 boost-build.jam.
-
diff --git a/src/converter/builtin_converters.cpp b/src/converter/builtin_converters.cpp
index c9d6bcbf..19f0126c 100644
--- a/src/converter/builtin_converters.cpp
+++ b/src/converter/builtin_converters.cpp
@@ -431,7 +431,10 @@ namespace
           if (!result.empty())
           {
               int err = PyUnicode_AsWideChar(
-                  (PyUnicodeObject *)intermediate
+#if PY_VERSION_HEX < 0x03020000
+                  (PyUnicodeObject *)
+#endif
+                    intermediate
                 , &result[0]
                 , result.size());