diff options
| author | Yevgen Muntyan <muntyan@tamu.edu> | 2006-11-18 13:24:42 +0000 |
|---|---|---|
| committer | Johan Dahlin <johan@src.gnome.org> | 2006-11-18 13:24:42 +0000 |
| commit | 432a1851feaa99e8c3e6feb54a2c6d97810be0ec (patch) | |
| tree | dde3798d219c006b619a1045754251348ae934ec /gobject | |
| parent | f27cb5674c9526d1f1fc4537bd4612c42d9dce4d (diff) | |
| download | pygobject-432a1851feaa99e8c3e6feb54a2c6d97810be0ec.tar.gz pygobject-432a1851feaa99e8c3e6feb54a2c6d97810be0ec.tar.xz pygobject-432a1851feaa99e8c3e6feb54a2c6d97810be0ec.zip | |
reviewed by: Johan Dahlin <johan@gnome.org>
2006-11-18 Yevgen Muntyan <muntyan@tamu.edu>
reviewed by: Johan Dahlin <johan@gnome.org>
* gobject/gobjectmodule.c: (create_property):
* gobject/pygparamspec.c: (pyg_param_spec_getattr):
* tests/test_properties.py:
Avoid truncating in pyg_param_spec_getattr, add test for all non-float
numeric types. Fixes #353943
Diffstat (limited to 'gobject')
| -rw-r--r-- | gobject/gobjectmodule.c | 4 | ||||
| -rw-r--r-- | gobject/pygparamspec.c | 24 |
2 files changed, 14 insertions, 14 deletions
diff --git a/gobject/gobjectmodule.c b/gobject/gobjectmodule.c index df3f8b7..d71a9e4 100644 --- a/gobject/gobjectmodule.c +++ b/gobject/gobjectmodule.c @@ -740,7 +740,7 @@ create_property (const gchar *prop_name, { guint minimum, maximum, default_value; - if (!PyArg_ParseTuple(args, "iii", &minimum, &maximum, + if (!PyArg_ParseTuple(args, "III", &minimum, &maximum, &default_value)) return NULL; pspec = g_param_spec_uint (prop_name, nick, blurb, minimum, @@ -762,7 +762,7 @@ create_property (const gchar *prop_name, { gulong minimum, maximum, default_value; - if (!PyArg_ParseTuple(args, "lll", &minimum, &maximum, + if (!PyArg_ParseTuple(args, "kkk", &minimum, &maximum, &default_value)) return NULL; pspec = g_param_spec_ulong (prop_name, nick, blurb, minimum, diff --git a/gobject/pygparamspec.c b/gobject/pygparamspec.c index b8bd3ee..2c0e001 100644 --- a/gobject/pygparamspec.c +++ b/gobject/pygparamspec.c @@ -182,11 +182,11 @@ pyg_param_spec_getattr(PyGParamSpec *self, const gchar *attr) "name", "nick", "owner_type", "value_type"); } else if (!strcmp(attr, "default_value")) { - return PyInt_FromLong(G_PARAM_SPEC_UINT(pspec)->default_value); + return PyLong_FromUnsignedLong(G_PARAM_SPEC_UINT(pspec)->default_value); } else if (!strcmp(attr, "minimum")) { - return PyInt_FromLong(G_PARAM_SPEC_UINT(pspec)->minimum); + return PyLong_FromUnsignedLong(G_PARAM_SPEC_UINT(pspec)->minimum); } else if (!strcmp(attr, "maximum")) { - return PyInt_FromLong(G_PARAM_SPEC_UINT(pspec)->maximum); + return PyLong_FromUnsignedLong(G_PARAM_SPEC_UINT(pspec)->maximum); } } else if (G_IS_PARAM_SPEC_LONG(pspec)) { if (!strcmp(attr, "__members__")) { @@ -208,11 +208,11 @@ pyg_param_spec_getattr(PyGParamSpec *self, const gchar *attr) "flags", "maximum", "minimum", "name", "nick", "owner_type", "value_type"); } else if (!strcmp(attr, "default_value")) { - return PyLong_FromLong(G_PARAM_SPEC_ULONG(pspec)->default_value); + return PyLong_FromUnsignedLong(G_PARAM_SPEC_ULONG(pspec)->default_value); } else if (!strcmp(attr, "minimum")) { - return PyLong_FromLong(G_PARAM_SPEC_ULONG(pspec)->minimum); + return PyLong_FromUnsignedLong(G_PARAM_SPEC_ULONG(pspec)->minimum); } else if (!strcmp(attr, "maximum")) { - return PyLong_FromLong(G_PARAM_SPEC_ULONG(pspec)->maximum); + return PyLong_FromUnsignedLong(G_PARAM_SPEC_ULONG(pspec)->maximum); } } else if (G_IS_PARAM_SPEC_INT64(pspec)) { if (!strcmp(attr, "__members__")) { @@ -221,11 +221,11 @@ pyg_param_spec_getattr(PyGParamSpec *self, const gchar *attr) "flags", "maximum", "minimum", "name", "nick", "owner_type", "value_type"); } else if (!strcmp(attr, "default_value")) { - return PyLong_FromLong(G_PARAM_SPEC_INT64(pspec)->default_value); + return PyLong_FromLongLong(G_PARAM_SPEC_INT64(pspec)->default_value); } else if (!strcmp(attr, "minimum")) { - return PyLong_FromLong(G_PARAM_SPEC_INT64(pspec)->minimum); + return PyLong_FromLongLong(G_PARAM_SPEC_INT64(pspec)->minimum); } else if (!strcmp(attr, "maximum")) { - return PyLong_FromLong(G_PARAM_SPEC_INT64(pspec)->maximum); + return PyLong_FromLongLong(G_PARAM_SPEC_INT64(pspec)->maximum); } } else if (G_IS_PARAM_SPEC_UINT64(pspec)) { if (!strcmp(attr, "__members__")) { @@ -235,11 +235,11 @@ pyg_param_spec_getattr(PyGParamSpec *self, const gchar *attr) "name", "nick", "owner_type", "value_type"); } else if (!strcmp(attr, "default_value")) { - return PyLong_FromLong(G_PARAM_SPEC_UINT64(pspec)->default_value); + return PyLong_FromUnsignedLongLong(G_PARAM_SPEC_UINT64(pspec)->default_value); } else if (!strcmp(attr, "minimum")) { - return PyLong_FromLong(G_PARAM_SPEC_UINT64(pspec)->minimum); + return PyLong_FromUnsignedLongLong(G_PARAM_SPEC_UINT64(pspec)->minimum); } else if (!strcmp(attr, "maximum")) { - return PyLong_FromLong(G_PARAM_SPEC_UINT64(pspec)->maximum); + return PyLong_FromUnsignedLongLong(G_PARAM_SPEC_UINT64(pspec)->maximum); } } else if (G_IS_PARAM_SPEC_UNICHAR(pspec)) { if (!strcmp(attr, "__members__")) { |