Commit 805cf073 authored by Stefan Behnel's avatar Stefan Behnel

more cleanup

parent ddec9330
...@@ -4344,10 +4344,10 @@ static int __Pyx_ArgTypeTest(PyObject *obj, PyTypeObject *type, int none_allowed ...@@ -4344,10 +4344,10 @@ static int __Pyx_ArgTypeTest(PyObject *obj, PyTypeObject *type, int none_allowed
raise_argtuple_invalid_utility_code = [ raise_argtuple_invalid_utility_code = [
""" """
static void __Pyx_RaiseArgtupleInvalid(const char* func_name, int exact, static INLINE void __Pyx_RaiseArgtupleInvalid(const char* func_name, int exact,
Py_ssize_t num_min, Py_ssize_t num_max, Py_ssize_t num_found); /*proto*/ Py_ssize_t num_min, Py_ssize_t num_max, Py_ssize_t num_found); /*proto*/
""",""" ""","""
static void __Pyx_RaiseArgtupleInvalid( static INLINE void __Pyx_RaiseArgtupleInvalid(
const char* func_name, const char* func_name,
int exact, int exact,
Py_ssize_t num_min, Py_ssize_t num_min,
...@@ -4355,14 +4355,7 @@ static void __Pyx_RaiseArgtupleInvalid( ...@@ -4355,14 +4355,7 @@ static void __Pyx_RaiseArgtupleInvalid(
Py_ssize_t num_found) Py_ssize_t num_found)
{ {
Py_ssize_t num_expected; Py_ssize_t num_expected;
char *message, *number, *more_or_less; char *number, *more_or_less;
message =
#if PY_VERSION_HEX < 0x02050000
"%s() takes %s %d positional argument%s (%d given)";
#else
"%s() takes %s %zd positional argument%s (%zd given)";
#endif
if (num_found < num_min) { if (num_found < num_min) {
num_expected = num_min; num_expected = num_min;
...@@ -4375,8 +4368,13 @@ static void __Pyx_RaiseArgtupleInvalid( ...@@ -4375,8 +4368,13 @@ static void __Pyx_RaiseArgtupleInvalid(
more_or_less = "exactly"; more_or_less = "exactly";
} }
number = (num_expected == 1) ? "" : "s"; number = (num_expected == 1) ? "" : "s";
PyErr_Format(PyExc_TypeError, message, func_name, more_or_less, PyErr_Format(PyExc_TypeError,
num_expected, number, num_found); #if PY_VERSION_HEX < 0x02050000
"%s() takes %s %d positional argument%s (%d given)",
#else
"%s() takes %s %zd positional argument%s (%zd given)",
#endif
func_name, more_or_less, num_expected, number, num_found);
} }
"""] """]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment