Visitar URL original
GH-78724: Initialize struct.Struct in __new__ by kumaraditya303 · Pull Request #94532 · python/cpython · GitHub
Skip to content

GH-78724: Initialize struct.Struct in __new__ #94532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mdickinson merged 8 commits into from
Sep 25, 2022
Merged

GH-78724: Initialize struct.Struct in __new__ #94532

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4583625
initialize Struct in __new__
kumaraditya303 Jul 3, 2022
a026273
fix ref leaks
kumaraditya303 Jul 3, 2022
f23671c
use PyType_GetSlot
kumaraditya303 Jul 3, 2022
d44201f
📜🤖 Added by blurb_it.
blurb-it[bot] Jul 3, 2022
a74cdbb
fix typo
kumaraditya303 Jul 3, 2022
1306df3
backwards compatibility
kumaraditya303 Jul 6, 2022
f163b76
Merge branch 'main' of https://github.com/python/cpython into struct-…
kumaraditya303 Sep 17, 2022
d7ce7d8
remove __init__
kumaraditya303 Sep 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
remove __init__
  • Loading branch information
@kumaraditya303
kumaraditya303 authored Sep 17, 2022
commit d7ce7d8d7bb399c4468a8e5f36d569a25dd263a6
3 changes: 1 addition & 2 deletions Lib/test/test_struct.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -710,8 +710,7 @@ def test__struct_Struct__new__initialized(self):
@support.cpython_only
def test__struct_Struct_subclassing(self):
class Bob(struct.Struct):
def __init__(self, format):
super().__init__(format)
pass

s = Bob("b")
s.unpack_from(b"abcd")
Expand Down
38 changes: 0 additions & 38 deletions Modules/_struct.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1489,43 +1489,6 @@ Struct_impl(PyTypeObject *type, PyObject *format)
return (PyObject *)self;
}

/*[clinic input]
Struct.__init__

format: object

[clinic start generated code]*/

static int
Struct___init___impl(PyStructObject *self, PyObject *format)
/*[clinic end generated code: output=b8e80862444e92d0 input=6c10faf9b8d53954]*/
{
if (PyUnicode_Check(format)) {
format = PyUnicode_AsASCIIString(format);
if (format == NULL) {
return -1;
}
}
else {
Py_INCREF(format);
}

if (!PyBytes_Check(format)) {
Py_DECREF(format);
PyErr_Format(PyExc_TypeError,
"Struct() argument 1 must be a str or bytes object, "
"not %.200s",
_PyType_Name(Py_TYPE(format)));
return -1;
}

Py_SETREF(self->s_format, format);

if (prepare_s(self) < 0) {
return -1;
}
return 0;
}

static int
s_clear(PyStructObject *s)
Expand Down Expand Up @@ -2132,7 +2095,6 @@ static PyType_Slot PyStructType_slots[] = {
{Py_tp_members, s_members},
{Py_tp_getset, s_getsetlist},
{Py_tp_new, Struct},
{Py_tp_init, Struct___init__},
{Py_tp_alloc, PyType_GenericAlloc},
{Py_tp_free, PyObject_GC_Del},
{0, 0},
Expand Down
50 changes: 1 addition & 49 deletions Modules/clinic/_struct.c.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.