updated for version 7.3.1239
Problem: Can't build with Python and MSVC10.
Solution: Move #if outside of macro. (Taro Muraoka)
diff --git a/src/if_py_both.h b/src/if_py_both.h
index 4f977c3..d66e2cb 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -139,13 +139,15 @@
}
else
{
- PyErr_FORMAT(PyExc_TypeError,
#if PY_MAJOR_VERSION < 3
- N_("expected str() or unicode() instance, but got %s")
+ PyErr_FORMAT(PyExc_TypeError,
+ N_("expected str() or unicode() instance, but got %s"),
+ Py_TYPE_NAME(obj));
#else
- N_("expected bytes() or str() instance, but got %s")
+ PyErr_FORMAT(PyExc_TypeError,
+ N_("expected bytes() or str() instance, but got %s"),
+ Py_TYPE_NAME(obj));
#endif
- , Py_TYPE_NAME(obj));
return NULL;
}
@@ -191,15 +193,17 @@
}
else
{
- PyErr_FORMAT(PyExc_TypeError,
#if PY_MAJOR_VERSION < 3
+ PyErr_FORMAT(PyExc_TypeError,
N_("expected int(), long() or something supporting "
- "coercing to long(), but got %s")
+ "coercing to long(), but got %s"),
+ Py_TYPE_NAME(obj));
#else
+ PyErr_FORMAT(PyExc_TypeError,
N_("expected int() or something supporting coercing to int(), "
- "but got %s")
+ "but got %s"),
+ Py_TYPE_NAME(obj));
#endif
- , Py_TYPE_NAME(obj));
return -1;
}
diff --git a/src/version.c b/src/version.c
index 9541472..203daed 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1239,
+/**/
1238,
/**/
1237,