openstack/deb-python-pygit2
Code Issues Proposed changes

Fix warning, and coding style a bit

Browse Source
This commit is contained in:
J. David Ibáñez 2017-04-08 16:56:04 +02:00
parent 11ff7a99eb
commit f37cf25b8e
4 changed files with 51 additions and 57 deletions

85
src/options.c

@ -66,7 +66,8 @@ option(PyObject *self, PyObject *args)
return NULL; return NULL;
if (!PyLong_Check(py_option)) if (!PyLong_Check(py_option))
return Error_type_error("option should be an integer, got %.200s", py_option); return Error_type_error(
"option should be an integer, got %.200s", py_option);
option = PyLong_AsLong(py_option); option = PyLong_AsLong(py_option);
@ -80,7 +81,8 @@ option(PyObject *self, PyObject *args)
return NULL; return NULL;
if (!PyLong_Check(py_level)) if (!PyLong_Check(py_level))
return Error_type_error("level should be an integer, got %.200s", py_level); return Error_type_error(
"level should be an integer, got %.200s", py_level);
return get_search_path(PyLong_AsLong(py_level)); return get_search_path(PyLong_AsLong(py_level));
} }
@ -100,19 +102,19 @@ option(PyObject *self, PyObject *args)
return NULL; return NULL;
if (!PyLong_Check(py_level)) if (!PyLong_Check(py_level))
return Error_type_error("level should be an integer, got %.200s", py_level); return Error_type_error(
"level should be an integer, got %.200s", py_level);
path = py_str_borrow_c_str(&tpath, py_path, NULL); path = py_str_borrow_c_str(&tpath, py_path, NULL);
if (!path) if (!path)
return NULL; return NULL;
err = git_libgit2_opts(GIT_OPT_SET_SEARCH_PATH, PyLong_AsLong(py_level), path); err = git_libgit2_opts(
GIT_OPT_SET_SEARCH_PATH, PyLong_AsLong(py_level), path);
Py_DECREF(tpath); Py_DECREF(tpath);
if (err < 0) { if (err < 0)
Error_set(err); return Error_set(err);
return NULL;
}
Py_RETURN_NONE; Py_RETURN_NONE;
} }
@ -122,10 +124,8 @@ option(PyObject *self, PyObject *args)
size_t size; size_t size;
error = git_libgit2_opts(GIT_OPT_GET_MWINDOW_SIZE, &size); error = git_libgit2_opts(GIT_OPT_GET_MWINDOW_SIZE, &size);
if (error < 0) { if (error < 0)
Error_set(error); return Error_set(error);
return NULL;
}
return PyLong_FromSize_t(size); return PyLong_FromSize_t(size);
} }
@ -140,14 +140,13 @@ option(PyObject *self, PyObject *args)
return NULL; return NULL;
if (!PyLong_Check(py_size)) if (!PyLong_Check(py_size))
return Error_type_error("size should be an integer, got %.200s", py_size); return Error_type_error(
"size should be an integer, got %.200s", py_size);
size = PyLong_AsSize_t(py_size); size = PyLong_AsSize_t(py_size);
error = git_libgit2_opts(GIT_OPT_SET_MWINDOW_SIZE, size); error = git_libgit2_opts(GIT_OPT_SET_MWINDOW_SIZE, size);
if (error < 0) { if (error < 0)
Error_set(error); return Error_set(error);
return NULL;
}
Py_RETURN_NONE; Py_RETURN_NONE;
} }
@ -157,10 +156,8 @@ option(PyObject *self, PyObject *args)
size_t limit; size_t limit;
error = git_libgit2_opts(GIT_OPT_GET_MWINDOW_MAPPED_LIMIT, &limit); error = git_libgit2_opts(GIT_OPT_GET_MWINDOW_MAPPED_LIMIT, &limit);
if (error < 0) { if (error < 0)
Error_set(error); return Error_set(error);
return NULL;
}
return PyLong_FromSize_t(limit); return PyLong_FromSize_t(limit);
} }
@ -175,14 +172,13 @@ option(PyObject *self, PyObject *args)
return NULL; return NULL;
if (!PyLong_Check(py_limit)) if (!PyLong_Check(py_limit))
return Error_type_error("limit should be an integer, got %.200s", py_limit); return Error_type_error(
"limit should be an integer, got %.200s", py_limit);
limit = PyLong_AsSize_t(py_limit); limit = PyLong_AsSize_t(py_limit);
error = git_libgit2_opts(GIT_OPT_SET_MWINDOW_MAPPED_LIMIT, limit); error = git_libgit2_opts(GIT_OPT_SET_MWINDOW_MAPPED_LIMIT, limit);
if (error < 0) { if (error < 0)
Error_set(error); return Error_set(error);
return NULL;
}
Py_RETURN_NONE; Py_RETURN_NONE;
} }
@ -202,16 +198,16 @@ option(PyObject *self, PyObject *args)
return NULL; return NULL;
if (!PyLong_Check(py_limit)) if (!PyLong_Check(py_limit))
return Error_type_error("limit should be an integer, got %.200s", py_limit); return Error_type_error(
"limit should be an integer, got %.200s", py_limit);
object_type = PyLong_AsLong(py_object_type); object_type = PyLong_AsLong(py_object_type);
limit = PyLong_AsSize_t(py_limit); limit = PyLong_AsSize_t(py_limit);
error = git_libgit2_opts(GIT_OPT_SET_CACHE_OBJECT_LIMIT, object_type, limit); error = git_libgit2_opts(
GIT_OPT_SET_CACHE_OBJECT_LIMIT, object_type, limit);
if (error < 0) { if (error < 0)
Error_set(error); return Error_set(error);
return NULL;
}
Py_RETURN_NONE; Py_RETURN_NONE;
} }
@ -226,14 +222,13 @@ option(PyObject *self, PyObject *args)
return NULL; return NULL;
if (!PyLong_Check(py_max_size)) if (!PyLong_Check(py_max_size))
return Error_type_error("max_size should be an integer, got %.200s", py_max_size); return Error_type_error(
"max_size should be an integer, got %.200s", py_max_size);
max_size = PyLong_AsSize_t(py_max_size); max_size = PyLong_AsSize_t(py_max_size);
error = git_libgit2_opts(GIT_OPT_SET_CACHE_MAX_SIZE, max_size); error = git_libgit2_opts(GIT_OPT_SET_CACHE_MAX_SIZE, max_size);
if (error < 0) { if (error < 0)
Error_set(error); return Error_set(error);
return NULL;
}
Py_RETURN_NONE; Py_RETURN_NONE;
} }
@ -246,14 +241,13 @@ option(PyObject *self, PyObject *args)
py_flag = PyTuple_GetItem(args, 1); py_flag = PyTuple_GetItem(args, 1);
if (!PyLong_Check(py_flag)) if (!PyLong_Check(py_flag))
return Error_type_error("flag should be an integer, got %.200s", py_flag); return Error_type_error(
"flag should be an integer, got %.200s", py_flag);
flag = PyLong_AsSize_t(py_flag); flag = PyLong_AsSize_t(py_flag);
error = git_libgit2_opts(GIT_OPT_ENABLE_CACHING, flag); error = git_libgit2_opts(GIT_OPT_ENABLE_CACHING, flag);
if (error < 0) { if (error < 0)
Error_set(error); return Error_set(error);
return NULL;
}
Py_RETURN_NONE; Py_RETURN_NONE;
} }
@ -265,10 +259,9 @@ option(PyObject *self, PyObject *args)
PyObject* tup = PyTuple_New(2); PyObject* tup = PyTuple_New(2);
error = git_libgit2_opts(GIT_OPT_GET_CACHED_MEMORY, &current, &allowed); error = git_libgit2_opts(GIT_OPT_GET_CACHED_MEMORY, &current, &allowed);
if (error < 0) { if (error < 0)
Error_set(error); return Error_set(error);
return NULL;
}
PyTuple_SetItem(tup, 0, PyLong_FromLong(current)); PyTuple_SetItem(tup, 0, PyLong_FromLong(current));
PyTuple_SetItem(tup, 1, PyLong_FromLong(allowed)); PyTuple_SetItem(tup, 1, PyLong_FromLong(allowed));

3
src/utils.c

@ -83,7 +83,8 @@ py_str_borrow_c_str(PyObject **tvalue, PyObject *value, const char *encoding)
} }
/* Type error */ /* Type error */
return Error_type_error("unexpected %.200s", value); Error_type_error("unexpected %.200s", value);
return NULL;
} }
/** /**

2
src/utils.h

@ -47,7 +47,6 @@
#undef PyLong_Check #undef PyLong_Check
#define PyLong_Check PyInt_Check #define PyLong_Check PyInt_Check
#define PyLong_FromLong PyInt_FromLong #define PyLong_FromLong PyInt_FromLong
#define PyInteger_Type PyInt_Type
#define PyBytes_AS_STRING PyString_AS_STRING #define PyBytes_AS_STRING PyString_AS_STRING
#define PyBytes_AsString PyString_AsString #define PyBytes_AsString PyString_AsString
#define PyBytes_AsStringAndSize PyString_AsStringAndSize #define PyBytes_AsStringAndSize PyString_AsStringAndSize
@ -58,7 +57,6 @@
#define to_path(x) to_bytes(x) #define to_path(x) to_bytes(x)
#define to_encoding(x) to_bytes(x) #define to_encoding(x) to_bytes(x)
#else #else
#define PyInteger_Type PyLong_Type
#define to_path(x) to_unicode(x, Py_FileSystemDefaultEncoding, "strict") #define to_path(x) to_unicode(x, Py_FileSystemDefaultEncoding, "strict")
#define to_encoding(x) PyUnicode_DecodeASCII(x, strlen(x), "strict") #define to_encoding(x) PyUnicode_DecodeASCII(x, strlen(x), "strict")
#define PyString_FromFormat(s, ...) PyUnicode_FromFormat(s, __VA_ARGS__) #define PyString_FromFormat(s, ...) PyUnicode_FromFormat(s, __VA_ARGS__)

18
test/test_options.py

@ -31,14 +31,16 @@ from __future__ import absolute_import
from __future__ import unicode_literals from __future__ import unicode_literals
import unittest import unittest
import pygit2 import pygit2
from pygit2 import GIT_OBJ_BLOB from pygit2 import (
from pygit2 import GIT_OPT_GET_MWINDOW_SIZE, GIT_OPT_SET_MWINDOW_SIZE GIT_OBJ_BLOB,
from pygit2 import GIT_OPT_GET_SEARCH_PATH, GIT_OPT_SET_SEARCH_PATH GIT_OPT_GET_MWINDOW_SIZE, GIT_OPT_SET_MWINDOW_SIZE,
from pygit2 import GIT_OPT_GET_MWINDOW_MAPPED_LIMIT, GIT_OPT_SET_MWINDOW_MAPPED_LIMIT GIT_OPT_GET_SEARCH_PATH, GIT_OPT_SET_SEARCH_PATH,
from pygit2 import GIT_CONFIG_LEVEL_SYSTEM, GIT_CONFIG_LEVEL_XDG, GIT_CONFIG_LEVEL_GLOBAL GIT_OPT_GET_MWINDOW_MAPPED_LIMIT, GIT_OPT_SET_MWINDOW_MAPPED_LIMIT,
from pygit2 import GIT_OPT_SET_CACHE_OBJECT_LIMIT GIT_CONFIG_LEVEL_SYSTEM, GIT_CONFIG_LEVEL_XDG, GIT_CONFIG_LEVEL_GLOBAL,
from pygit2 import GIT_OPT_GET_CACHED_MEMORY GIT_OPT_SET_CACHE_OBJECT_LIMIT,
from pygit2 import GIT_OPT_ENABLE_CACHING GIT_OPT_GET_CACHED_MEMORY,
GIT_OPT_ENABLE_CACHING,
)
from pygit2 import option from pygit2 import option
from . import utils from . import utils