python: Update initialization of types

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/_pakfire/archive.c b/src/_pakfire/archive.c
index da293ba31bc2cf48e878d0dfd9fb321b9ffc895c..4cee44f03b6ff01c32075a5cd8ef17857b4a4711 100644 (file)
--- a/src/_pakfire/archive.c
+++ b/src/_pakfire/archive.c
@@ -269,17 +269,13 @@ static struct PyGetSetDef Archive_getsetters[] = {
 
 PyTypeObject ArchiveType = {
        PyVarObject_HEAD_INIT(NULL, 0)
-       tp_name:            "_pakfire.Archive",
-       tp_basicsize:       sizeof(ArchiveObject),
-       tp_flags:           Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE,
-       tp_new:             Archive_new,
-       tp_dealloc:         (destructor)Archive_dealloc,
-       tp_init:            (initproc)Archive_init,
-       tp_doc:             "Archive object",
-       tp_methods:         Archive_methods,
-       tp_getset:          Archive_getsetters,
-       //tp_hash:            (hashfunc)Archive_hash,
-       //tp_repr:            (reprfunc)Archive_repr,
-       //tp_str:             (reprfunc)Archive_str,
-       //tp_richcompare:     (richcmpfunc)Archive_richcompare,
+       .tp_name            = "_pakfire.Archive",
+       .tp_basicsize       = sizeof(ArchiveObject),
+       .tp_flags           = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE,
+       .tp_new             = Archive_new,
+       .tp_dealloc         = (destructor)Archive_dealloc,
+       .tp_init            = (initproc)Archive_init,
+       .tp_doc             = "Archive Object",
+       .tp_methods         = Archive_methods,
+       .tp_getset          = Archive_getsetters,
 };

diff --git a/src/_pakfire/ctx.c b/src/_pakfire/ctx.c
index 1ec16afbb3dd59d588cc5021dd04f196817ac1ff..8de9dd1abb269c874064ef732608a1401f5b2298 100644 (file)
--- a/src/_pakfire/ctx.c
+++ b/src/_pakfire/ctx.c
@@ -253,13 +253,13 @@ static struct PyGetSetDef Ctx_getsetters[] = {
 
 PyTypeObject CtxType = {
        PyVarObject_HEAD_INIT(NULL, 0)
-       tp_name:            "_pakfire.Ctx",
-       tp_basicsize:       sizeof(CtxObject),
-       tp_flags:           Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE,
-       tp_new:             Ctx_new,
-       tp_dealloc:         (destructor)Ctx_dealloc,
-       tp_init:            (initproc)Ctx_init,
-       tp_doc:             "Ctx Object",
-       tp_methods:         Ctx_methods,
-       tp_getset:          Ctx_getsetters,
+       .tp_name            = "_pakfire.Ctx",
+       .tp_basicsize       = sizeof(CtxObject),
+       .tp_flags           = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE,
+       .tp_new             = Ctx_new,
+       .tp_dealloc         = (destructor)Ctx_dealloc,
+       .tp_init            = (initproc)Ctx_init,
+       .tp_doc             = "Ctx Object",
+       .tp_methods         = Ctx_methods,
+       .tp_getset          = Ctx_getsetters,
 };

diff --git a/src/_pakfire/file.c b/src/_pakfire/file.c
index 4d6ea32992887aaa592fcbcac606ee7d7843f642..e6cb9c8f9025694154deb647415c0dc83fc47243 100644 (file)
--- a/src/_pakfire/file.c
+++ b/src/_pakfire/file.c
@@ -250,13 +250,13 @@ static struct PyGetSetDef File_getsetters[] = {
 
 PyTypeObject FileType = {
        PyVarObject_HEAD_INIT(NULL, 0)
-       tp_name:            "_pakfire.File",
-       tp_basicsize:       sizeof(FileObject),
-       tp_flags:           Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE,
-       tp_dealloc:         (destructor)File_dealloc,
-       tp_doc:             "File object",
-       tp_methods:         File_methods,
-       tp_getset:          File_getsetters,
-       tp_repr:            (reprfunc)File_repr,
-       tp_str:             (reprfunc)File_get_path,
+       .tp_name            = "_pakfire.File",
+       .tp_basicsize       = sizeof(FileObject),
+       .tp_flags           = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE,
+       .tp_dealloc         = (destructor)File_dealloc,
+       .tp_doc             = "File object",
+       .tp_methods         = File_methods,
+       .tp_getset          = File_getsetters,
+       .tp_repr            = (reprfunc)File_repr,
+       .tp_str             = (reprfunc)File_get_path,
 };

diff --git a/src/_pakfire/key.c b/src/_pakfire/key.c
index dcda49b61e744102532e101100656c392b975b28..052f3af8771de8cfe3ccfaec863a501001641b76 100644 (file)
--- a/src/_pakfire/key.c
+++ b/src/_pakfire/key.c
@@ -270,14 +270,14 @@ static struct PyGetSetDef Key_getsetters[] = {
 
 PyTypeObject KeyType = {
        PyVarObject_HEAD_INIT(NULL, 0)
-       tp_name:            "_pakfire.Key",
-       tp_basicsize:       sizeof(KeyObject),
-       tp_flags:           Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE,
-       tp_new:             Key_new,
-       tp_dealloc:         (destructor)Key_dealloc,
-       tp_doc:             "Key object",
-       tp_methods:         Key_methods,
-       tp_getset:          Key_getsetters,
-       tp_repr:            (reprfunc)Key_repr,
-       tp_str:             (reprfunc)Key_str,
+       .tp_name            = "_pakfire.Key",
+       .tp_basicsize       = sizeof(KeyObject),
+       .tp_flags           = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE,
+       .tp_new             = Key_new,
+       .tp_dealloc         = (destructor)Key_dealloc,
+       .tp_doc             = "Key Object",
+       .tp_methods         = Key_methods,
+       .tp_getset          = Key_getsetters,
+       .tp_repr            = (reprfunc)Key_repr,
+       .tp_str             = (reprfunc)Key_str,
 };

diff --git a/src/_pakfire/package.c b/src/_pakfire/package.c
index 17c8e3a19347c154066259505b1ad6a2fa85bbd2..37832abd8561cbf87d43eb046d86c633c4fc8d57 100644 (file)
--- a/src/_pakfire/package.c
+++ b/src/_pakfire/package.c
@@ -1068,17 +1068,17 @@ static struct PyGetSetDef Package_getsetters[] = {
 
 PyTypeObject PackageType = {
        PyVarObject_HEAD_INIT(NULL, 0)
-       tp_name:            "_pakfire.Package",
-       tp_basicsize:       sizeof(PackageObject),
-       tp_flags:           Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE,
-       tp_new:             Package_new,
-       tp_dealloc:         (destructor)Package_dealloc,
-       tp_init:            (initproc)Package_init,
-       tp_doc:             "Package object",
-       tp_methods:         Package_methods,
-       tp_getset:          Package_getsetters,
-       tp_hash:            (hashfunc)Package_hash,
-       tp_repr:            (reprfunc)Package_repr,
-       tp_str:             (reprfunc)Package_str,
-       tp_richcompare:     (richcmpfunc)Package_richcompare,
+       .tp_name            = "_pakfire.Package",
+       .tp_basicsize       = sizeof(PackageObject),
+       .tp_flags           = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE,
+       .tp_new             = Package_new,
+       .tp_dealloc         = (destructor)Package_dealloc,
+       .tp_init            = (initproc)Package_init,
+       .tp_doc             = "Package Object",
+       .tp_methods         = Package_methods,
+       .tp_getset          = Package_getsetters,
+       .tp_hash            = (hashfunc)Package_hash,
+       .tp_repr            = (reprfunc)Package_repr,
+       .tp_str             = (reprfunc)Package_str,
+       .tp_richcompare     = (richcmpfunc)Package_richcompare,
 };

diff --git a/src/_pakfire/pakfire.c b/src/_pakfire/pakfire.c
index 61c366e148bffa118388bff9f9369a45d496c9d0..f6e6f8f1717c7ec2f7d5f054bae58767bb4ccdf2 100644 (file)
--- a/src/_pakfire/pakfire.c
+++ b/src/_pakfire/pakfire.c
@@ -862,14 +862,14 @@ static struct PyGetSetDef Pakfire_getsetters[] = {
 
 PyTypeObject PakfireType = {
        PyVarObject_HEAD_INIT(NULL, 0)
-       tp_name:            "_pakfire.Pakfire",
-       tp_basicsize:       sizeof(PakfireObject),
-       tp_flags:           Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE,
-       tp_new:             Pakfire_new,
-       tp_dealloc:         (destructor)Pakfire_dealloc,
-       tp_init:            (initproc)Pakfire_init,
-       tp_doc:             "Pakfire object",
-       tp_methods:         Pakfire_methods,
-       tp_getset:          Pakfire_getsetters,
-       tp_repr:            (reprfunc)Pakfire_repr,
+       .tp_name            = "_pakfire.Pakfire",
+       .tp_basicsize       = sizeof(PakfireObject),
+       .tp_flags           = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE,
+       .tp_new             = Pakfire_new,
+       .tp_dealloc         = (destructor)Pakfire_dealloc,
+       .tp_init            = (initproc)Pakfire_init,
+       .tp_doc             = "Pakfire Object",
+       .tp_methods         = Pakfire_methods,
+       .tp_getset          = Pakfire_getsetters,
+       .tp_repr            = (reprfunc)Pakfire_repr,
 };

diff --git a/src/_pakfire/problem.c b/src/_pakfire/problem.c
index 393f038a380454e4a1d392c6389ff8770cdd0e7d..d36ab97d2e7b5df6855bd6210128211ae1d8e61c 100644 (file)
--- a/src/_pakfire/problem.c
+++ b/src/_pakfire/problem.c
@@ -132,15 +132,15 @@ static struct PyGetSetDef Problem_getsetters[] = {
 
 PyTypeObject ProblemType = {
        PyVarObject_HEAD_INIT(NULL, 0)
-       tp_name:            "_pakfire.Problem",
-       tp_basicsize:       sizeof(ProblemObject),
-       tp_flags:           Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE,
-       tp_new:             Problem_new,
-       tp_dealloc:         (destructor)Problem_dealloc,
-       tp_init:            (initproc)Problem_init,
-       tp_doc:             "Problem object",
-       tp_methods:         Problem_methods,
-       tp_getset:          Problem_getsetters,
-       tp_repr:            (reprfunc)Problem_repr,
-       tp_str:             (reprfunc)Problem_string,
+       .tp_name            = "_pakfire.Problem",
+       .tp_basicsize       = sizeof(ProblemObject),
+       .tp_flags           = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE,
+       .tp_new             = Problem_new,
+       .tp_dealloc         = (destructor)Problem_dealloc,
+       .tp_init            = (initproc)Problem_init,
+       .tp_doc             = "Problem Object",
+       .tp_methods         = Problem_methods,
+       .tp_getset          = Problem_getsetters,
+       .tp_repr            = (reprfunc)Problem_repr,
+       .tp_str             = (reprfunc)Problem_string,
 };

diff --git a/src/_pakfire/repo.c b/src/_pakfire/repo.c
index 8e29cacd7e0ade94765391849ddee22dafc705b3..e220ed2ea568caeece8fd3578950050ba9c10431 100644 (file)
--- a/src/_pakfire/repo.c
+++ b/src/_pakfire/repo.c
@@ -387,22 +387,22 @@ static struct PyGetSetDef Repo_getsetters[] = {
 };
 
 static PySequenceMethods Repo_sequence = {
-       sq_length:          (lenfunc)Repo_len,
+       .sq_length          = (lenfunc)Repo_len,
 };
 
 PyTypeObject RepoType = {
        PyVarObject_HEAD_INIT(NULL, 0)
-       tp_name:            "_pakfire.Repo",
-       tp_basicsize:       sizeof(RepoObject),
-       tp_flags:           Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE,
-       tp_new:             Repo_new,
-       tp_dealloc:         (destructor)Repo_dealloc,
-       tp_init:            (initproc)Repo_init,
-       tp_doc:             "Repo object",
-       tp_methods:         Repo_methods,
-       tp_getset:          Repo_getsetters,
-       tp_repr:            (reprfunc)Repo_repr,
-       tp_as_sequence:     &Repo_sequence,
-       tp_hash:            (hashfunc)Repo_hash,
-       tp_richcompare:     (richcmpfunc)Repo_richcompare,
+       .tp_name            = "_pakfire.Repo",
+       .tp_basicsize       = sizeof(RepoObject),
+       .tp_flags           = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE,
+       .tp_new             = Repo_new,
+       .tp_dealloc         = (destructor)Repo_dealloc,
+       .tp_init            = (initproc)Repo_init,
+       .tp_doc             = "Repo Object",
+       .tp_methods         = Repo_methods,
+       .tp_getset          = Repo_getsetters,
+       .tp_repr            = (reprfunc)Repo_repr,
+       .tp_as_sequence     = &Repo_sequence,
+       .tp_hash            = (hashfunc)Repo_hash,
+       .tp_richcompare     = (richcmpfunc)Repo_richcompare,
 };

diff --git a/src/_pakfire/solution.c b/src/_pakfire/solution.c
index 4a3edd2bb75154b95ec118e41880be08d6af8aeb..c33c2bf1e9415ae632450dbf08d5b65971043a3c 100644 (file)
--- a/src/_pakfire/solution.c
+++ b/src/_pakfire/solution.c
@@ -64,12 +64,12 @@ static PyObject* Solution_string(SolutionObject* self) {
 
 PyTypeObject SolutionType = {
        PyVarObject_HEAD_INIT(NULL, 0)
-       tp_name:            "_pakfire.Solution",
-       tp_basicsize:       sizeof(SolutionObject),
-       tp_flags:           Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE,
-       tp_new:             Solution_new,
-       tp_dealloc:         (destructor)Solution_dealloc,
-       tp_init:            (initproc)Solution_init,
-       tp_doc:             "Solution object",
-       tp_str:             (reprfunc)Solution_string,
+       .tp_name            = "_pakfire.Solution",
+       .tp_basicsize       = sizeof(SolutionObject),
+       .tp_flags           = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE,
+       .tp_new             = Solution_new,
+       .tp_dealloc         = (destructor)Solution_dealloc,
+       .tp_init            = (initproc)Solution_init,
+       .tp_doc             = "Solution Object",
+       .tp_str             = (reprfunc)Solution_string,
 };