From 82ffd40870956bb6cfb0d5a6fa4c258e278b553a Mon Sep 17 00:00:00 2001
From: Wenzel Jakob <wenzel@inf.ethz.ch>
Date: Sun, 17 Jan 2016 22:36:38 +0100
Subject: [PATCH] type of void fixed (None -> NoneType)

---
 example/example11.ref   | 8 ++++----
 example/example5.ref    | 2 +-
 include/pybind11/cast.h | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/example/example11.ref b/example/example11.ref
index b7719b132..dafa62cc6 100644
--- a/example/example11.ref
+++ b/example/example11.ref
@@ -1,17 +1,17 @@
 Help on built-in function kw_func
 
 kkww__ffuunncc(...)
-    Signature : (x : int, y : int) -> None
+    Signature : (x : int, y : int) -> NoneType
 
 Help on built-in function kw_func2
 
 kkww__ffuunncc22(...)
-    Signature : (x : int = 100L, y : int = 200L) -> None
+    Signature : (x : int = 100L, y : int = 200L) -> NoneType
 
 Help on built-in function kw_func3
 
 kkww__ffuunncc33(...)
-    Signature : (data : str = u'Hello world!') -> None
+    Signature : (data : str = u'Hello world!') -> NoneType
 
 kw_func(x=5, y=10)
 kw_func(x=5, y=10)
@@ -23,5 +23,5 @@ kw_func(x=100, y=10)
 kw_func(x=5, y=10)
 kw_func(x=5, y=10)
 Caught expected exception: Incompatible function arguments. The following argument types are supported:
-    1. (x : int = 100L, y : int = 200L) -> None
+    1. (x : int = 100L, y : int = 200L) -> NoneType
 
diff --git a/example/example5.ref b/example/example5.ref
index 372cbe817..41544c8e6 100644
--- a/example/example5.ref
+++ b/example/example5.ref
@@ -4,7 +4,7 @@ Molly is a dog
 Molly is a dog
 Woof!
 The following error is expected: Incompatible function arguments. The following argument types are supported:
-    1. (Dog) -> None
+    1. (Dog) -> NoneType
 
 Callback function 1 called!
 False
diff --git a/include/pybind11/cast.h b/include/pybind11/cast.h
index ad7367218..c98be0a22 100644
--- a/include/pybind11/cast.h
+++ b/include/pybind11/cast.h
@@ -235,7 +235,7 @@ public:
         Py_INCREF(Py_None);
         return Py_None;
     }
-    PYBIND11_TYPE_CASTER(void_type, _("None"));
+    PYBIND11_TYPE_CASTER(void_type, _("NoneType"));
 };
 
 template <> class type_caster<void> : public type_caster<void_type> { };