Skip to content

Commit f2c89a7

Browse files
jdavidjdavid
committed
(partial) review the way we handle Python int/long
1 parent f37cf25 commit f2c89a7

File tree

12 files changed

+95
-91
lines changed

12 files changed

+95
-91
lines changed

‎src/blob.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ PyDoc_STRVAR(Blob_size__doc__, "Size.");
133133
PyObject *
134134
Blob_size__get__(Blob *self)
135135
{
136-
return PyLong_FromLongLong(git_blob_rawsize(self->blob));
136+
return PyInt_FromLongLong(git_blob_rawsize(self->blob));
137137
}
138138

139139

‎src/commit.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ PyDoc_STRVAR(Commit_commit_time__doc__, "Commit time.");
8080
PyObject *
8181
Commit_commit_time__get__(Commit *commit)
8282
{
83-
return PyLong_FromLongLong(git_commit_time(commit->commit));
83+
return PyInt_FromLongLong(git_commit_time(commit->commit));
8484
}
8585

8686

@@ -89,7 +89,7 @@ PyDoc_STRVAR(Commit_commit_time_offset__doc__, "Commit time offset.");
8989
PyObject *
9090
Commit_commit_time_offset__get__(Commit *commit)
9191
{
92-
return PyLong_FromLong(git_commit_time_offset(commit->commit));
92+
return PyInt_FromLong(git_commit_time_offset(commit->commit));
9393
}
9494

9595

‎src/diff.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -587,23 +587,23 @@ PyDoc_STRVAR(DiffStats_insertions__doc__, "Total number of insertions");
587587
PyObject *
588588
DiffStats_insertions__get__(DiffStats *self)
589589
{
590-
return PyLong_FromSize_t(git_diff_stats_insertions(self->stats));
590+
return PyInt_FromSize_t(git_diff_stats_insertions(self->stats));
591591
}
592592

593593
PyDoc_STRVAR(DiffStats_deletions__doc__, "Total number of deletions");
594594

595595
PyObject *
596596
DiffStats_deletions__get__(DiffStats *self)
597597
{
598-
return PyLong_FromSize_t(git_diff_stats_deletions(self->stats));
598+
return PyInt_FromSize_t(git_diff_stats_deletions(self->stats));
599599
}
600600

601601
PyDoc_STRVAR(DiffStats_files_changed__doc__, "Total number of files changed");
602602

603603
PyObject *
604604
DiffStats_files_changed__get__(DiffStats *self)
605605
{
606-
return PyLong_FromSize_t(git_diff_stats_files_changed(self->stats));
606+
return PyInt_FromSize_t(git_diff_stats_files_changed(self->stats));
607607
}
608608

609609
PyDoc_STRVAR(DiffStats_format__doc__,
@@ -805,10 +805,10 @@ Diff_getitem(Diff *self, PyObject *value)
805805
{
806806
size_t i;
807807

808-
if (!PyLong_Check(value))
809-
return NULL;
808+
if (!PyInt_Check(value))
809+
return NULL; /* FIXME Raise error */
810810

811-
i = PyLong_AsUnsignedLong(value);
811+
i = PyInt_AsSize_t(value);
812812
return diff_get_patch_byindex(self->diff, i);
813813
}
814814

‎src/object.c‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ PyDoc_STRVAR(Object_type__doc__,
9797
PyObject *
9898
Object_type__get__(Object *self)
9999
{
100-
return PyLong_FromLong(git_object_type(self->obj));
100+
return PyInt_FromLong(git_object_type(self->obj));
101101
}
102102

103103
PyDoc_STRVAR(Object__pointer__doc__, "Get the object's pointer. For internal use only.");
@@ -143,14 +143,15 @@ PyDoc_STRVAR(Object_peel__doc__,
143143
PyObject *
144144
Object_peel(Object *self, PyObject *py_type)
145145
{
146-
int type = -1, err;
146+
int err;
147+
git_otype otype;
147148
git_object *peeled;
148149

149-
type = py_object_to_object_type(py_type);
150-
if (type == -1)
150+
otype = py_object_to_otype(py_type);
151+
if (otype == GIT_OBJ_BAD)
151152
return NULL;
152153

153-
err = git_object_peel(&peeled, self->obj, (git_otype)type);
154+
err = git_object_peel(&peeled, self->obj, otype);
154155
if (err < 0)
155156
return Error_set(err);
156157

‎src/options.c‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ option(PyObject *self, PyObject *args)
6565
if (!py_option)
6666
return NULL;
6767

68-
if (!PyLong_Check(py_option))
68+
if (!PyInt_Check(py_option))
6969
return Error_type_error(
7070
"option should be an integer, got %.200s", py_option);
7171

72-
option = PyLong_AsLong(py_option);
72+
option = PyInt_AsLong(py_option);
7373

7474
switch (option) {
7575
case GIT_OPT_GET_SEARCH_PATH:
@@ -80,11 +80,11 @@ option(PyObject *self, PyObject *args)
8080
if (!py_level)
8181
return NULL;
8282

83-
if (!PyLong_Check(py_level))
83+
if (!PyInt_Check(py_level))
8484
return Error_type_error(
8585
"level should be an integer, got %.200s", py_level);
8686

87-
return get_search_path(PyLong_AsLong(py_level));
87+
return get_search_path(PyInt_AsLong(py_level));
8888
}
8989

9090
case GIT_OPT_SET_SEARCH_PATH:
@@ -101,7 +101,7 @@ option(PyObject *self, PyObject *args)
101101
if (!py_path)
102102
return NULL;
103103

104-
if (!PyLong_Check(py_level))
104+
if (!PyInt_Check(py_level))
105105
return Error_type_error(
106106
"level should be an integer, got %.200s", py_level);
107107

@@ -110,7 +110,7 @@ option(PyObject *self, PyObject *args)
110110
return NULL;
111111

112112
err = git_libgit2_opts(
113-
GIT_OPT_SET_SEARCH_PATH, PyLong_AsLong(py_level), path);
113+
GIT_OPT_SET_SEARCH_PATH, PyInt_AsLong(py_level), path);
114114
Py_DECREF(tpath);
115115

116116
if (err < 0)
@@ -127,7 +127,7 @@ option(PyObject *self, PyObject *args)
127127
if (error < 0)
128128
return Error_set(error);
129129

130-
return PyLong_FromSize_t(size);
130+
return PyInt_FromSize_t(size);
131131
}
132132

133133
case GIT_OPT_SET_MWINDOW_SIZE:
@@ -139,11 +139,11 @@ option(PyObject *self, PyObject *args)
139139
if (!py_size)
140140
return NULL;
141141

142-
if (!PyLong_Check(py_size))
142+
if (!PyInt_Check(py_size))
143143
return Error_type_error(
144144
"size should be an integer, got %.200s", py_size);
145145

146-
size = PyLong_AsSize_t(py_size);
146+
size = PyInt_AsSize_t(py_size);
147147
error = git_libgit2_opts(GIT_OPT_SET_MWINDOW_SIZE, size);
148148
if (error < 0)
149149
return Error_set(error);
@@ -159,7 +159,7 @@ option(PyObject *self, PyObject *args)
159159
if (error < 0)
160160
return Error_set(error);
161161

162-
return PyLong_FromSize_t(limit);
162+
return PyInt_FromSize_t(limit);
163163
}
164164

165165
case GIT_OPT_SET_MWINDOW_MAPPED_LIMIT:
@@ -171,11 +171,11 @@ option(PyObject *self, PyObject *args)
171171
if (!py_limit)
172172
return NULL;
173173

174-
if (!PyLong_Check(py_limit))
174+
if (!PyInt_Check(py_limit))
175175
return Error_type_error(
176176
"limit should be an integer, got %.200s", py_limit);
177177

178-
limit = PyLong_AsSize_t(py_limit);
178+
limit = PyInt_AsSize_t(py_limit);
179179
error = git_libgit2_opts(GIT_OPT_SET_MWINDOW_MAPPED_LIMIT, limit);
180180
if (error < 0)
181181
return Error_set(error);
@@ -197,12 +197,12 @@ option(PyObject *self, PyObject *args)
197197
if (!py_limit)
198198
return NULL;
199199

200-
if (!PyLong_Check(py_limit))
200+
if (!PyInt_Check(py_limit))
201201
return Error_type_error(
202202
"limit should be an integer, got %.200s", py_limit);
203203

204-
object_type = PyLong_AsLong(py_object_type);
205-
limit = PyLong_AsSize_t(py_limit);
204+
object_type = PyInt_AsLong(py_object_type);
205+
limit = PyInt_AsSize_t(py_limit);
206206
error = git_libgit2_opts(
207207
GIT_OPT_SET_CACHE_OBJECT_LIMIT, object_type, limit);
208208

@@ -221,11 +221,11 @@ option(PyObject *self, PyObject *args)
221221
if (!py_max_size)
222222
return NULL;
223223

224-
if (!PyLong_Check(py_max_size))
224+
if (!PyInt_Check(py_max_size))
225225
return Error_type_error(
226226
"max_size should be an integer, got %.200s", py_max_size);
227227

228-
max_size = PyLong_AsSize_t(py_max_size);
228+
max_size = PyInt_AsSize_t(py_max_size);
229229
error = git_libgit2_opts(GIT_OPT_SET_CACHE_MAX_SIZE, max_size);
230230
if (error < 0)
231231
return Error_set(error);
@@ -240,11 +240,11 @@ option(PyObject *self, PyObject *args)
240240

241241
py_flag = PyTuple_GetItem(args, 1);
242242

243-
if (!PyLong_Check(py_flag))
243+
if (!PyInt_Check(py_flag))
244244
return Error_type_error(
245245
"flag should be an integer, got %.200s", py_flag);
246246

247-
flag = PyLong_AsSize_t(py_flag);
247+
flag = PyInt_AsSize_t(py_flag);
248248
error = git_libgit2_opts(GIT_OPT_ENABLE_CACHING, flag);
249249
if (error < 0)
250250
return Error_set(error);
@@ -262,8 +262,8 @@ option(PyObject *self, PyObject *args)
262262
if (error < 0)
263263
return Error_set(error);
264264

265-
PyTuple_SetItem(tup, 0, PyLong_FromLong(current));
266-
PyTuple_SetItem(tup, 1, PyLong_FromLong(allowed));
265+
PyTuple_SetItem(tup, 0, PyInt_FromLong(current));
266+
PyTuple_SetItem(tup, 1, PyInt_FromLong(allowed));
267267

268268
return tup;
269269
}

‎src/reference.c‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ Reference_type__get__(Reference *self)
325325

326326
CHECK_REFERENCE(self);
327327
c_type = git_reference_type(self->reference);
328-
return PyLong_FromLong(c_type);
328+
return PyInt_FromLong(c_type);
329329
}
330330

331331

@@ -379,7 +379,8 @@ PyDoc_STRVAR(Reference_peel__doc__,
379379
PyObject *
380380
Reference_peel(Reference *self, PyObject *args)
381381
{
382-
int err, type;
382+
int err;
383+
git_otype otype;
383384
git_object *obj;
384385
PyObject *py_type = Py_None;
385386

@@ -388,11 +389,11 @@ Reference_peel(Reference *self, PyObject *args)
388389
if (!PyArg_ParseTuple(args, "|O", &py_type))
389390
return NULL;
390391

391-
type = py_object_to_object_type(py_type);
392-
if (type == -1)
392+
otype = py_object_to_otype(py_type);
393+
if (otype == GIT_OBJ_BAD)
393394
return NULL;
394395

395-
err = git_reference_peel(&obj, self->reference, type);
396+
err = git_reference_peel(&obj, self->reference, otype);
396397
if (err < 0)
397398
return Error_set(err);
398399

‎src/repository.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1564,7 +1564,7 @@ Repository_status(Repository *self)
15641564
path = entry->head_to_index->old_file.path;
15651565
else
15661566
path = entry->index_to_workdir->old_file.path;
1567-
status = PyLong_FromLong((long) entry->status);
1567+
status = PyInt_FromLong((long) entry->status);
15681568

15691569
err = PyDict_SetItemString(dict, path, status);
15701570
Py_CLEAR(status);
@@ -1606,7 +1606,7 @@ Repository_status_file(Repository *self, PyObject *value)
16061606
free(path);
16071607
return err_obj;
16081608
}
1609-
return PyLong_FromLong(status);
1609+
return PyInt_FromLong(status);
16101610
}
16111611

16121612

‎src/signature.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ PyDoc_STRVAR(Signature_time__doc__, "Unix time.");
158158
PyObject *
159159
Signature_time__get__(Signature *self)
160160
{
161-
return PyLong_FromLongLong(self->signature->when.time);
161+
return PyInt_FromLongLong(self->signature->when.time);
162162
}
163163

164164

@@ -167,7 +167,7 @@ PyDoc_STRVAR(Signature_offset__doc__, "Offset from UTC in minutes.");
167167
PyObject *
168168
Signature_offset__get__(Signature *self)
169169
{
170-
return PyLong_FromLong(self->signature->when.offset);
170+
return PyInt_FromLong(self->signature->when.offset);
171171
}
172172

173173
PyGetSetDef Signature_getseters[] = {

‎src/tree.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ PyDoc_STRVAR(TreeEntry_filemode__doc__, "Filemode.");
5454
PyObject *
5555
TreeEntry_filemode__get__(TreeEntry *self)
5656
{
57-
return PyLong_FromLong(git_tree_entry_filemode(self->entry));
57+
return PyInt_FromLong(git_tree_entry_filemode(self->entry));
5858
}
5959

6060

@@ -290,7 +290,7 @@ Tree_fix_index(Tree *self, PyObject *py_index)
290290
size_t len;
291291
long slen;
292292

293-
index = PyLong_AsLong(py_index);
293+
index = PyInt_AsLong(py_index);
294294
if (PyErr_Occurred())
295295
return -1;
296296

@@ -359,7 +359,7 @@ Tree_getitem(Tree *self, PyObject *value)
359359
int err;
360360

361361
/* Case 1: integer */
362-
if (PyLong_Check(value))
362+
if (PyInt_Check(value))
363363
return Tree_getitem_by_index(self, value);
364364

365365
/* Case 2: byte or text string */

0 commit comments

Comments
 (0)