2001-10-18 17:47:51 -03:00
|
|
|
/* Implementation helper: a struct that looks like a tuple. See timemodule
|
|
|
|
and posixmodule for example uses. */
|
|
|
|
|
|
|
|
#include "Python.h"
|
|
|
|
#include "structmember.h"
|
|
|
|
|
2015-12-25 13:53:18 -04:00
|
|
|
static const char visible_length_key[] = "n_sequence_fields";
|
|
|
|
static const char real_length_key[] = "n_fields";
|
|
|
|
static const char unnamed_fields_key[] = "n_unnamed_fields";
|
2001-10-18 17:47:51 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
/* Fields with this name have only a field index, not a field name.
|
2002-10-16 15:27:39 -03:00
|
|
|
They are only allowed for indices < n_visible_fields. */
|
|
|
|
char *PyStructSequence_UnnamedField = "unnamed field";
|
2013-07-16 20:22:45 -03:00
|
|
|
_Py_IDENTIFIER(n_sequence_fields);
|
|
|
|
_Py_IDENTIFIER(n_fields);
|
|
|
|
_Py_IDENTIFIER(n_unnamed_fields);
|
2002-10-16 15:27:39 -03:00
|
|
|
|
2007-12-18 22:45:37 -04:00
|
|
|
#define VISIBLE_SIZE(op) Py_SIZE(op)
|
2015-09-06 15:25:30 -03:00
|
|
|
#define VISIBLE_SIZE_TP(tp) PyLong_AsSsize_t( \
|
2013-07-16 20:22:45 -03:00
|
|
|
_PyDict_GetItemId((tp)->tp_dict, &PyId_n_sequence_fields))
|
2001-10-18 17:47:51 -03:00
|
|
|
|
2015-09-06 15:25:30 -03:00
|
|
|
#define REAL_SIZE_TP(tp) PyLong_AsSsize_t( \
|
2013-07-16 20:22:45 -03:00
|
|
|
_PyDict_GetItemId((tp)->tp_dict, &PyId_n_fields))
|
2007-12-18 22:45:37 -04:00
|
|
|
#define REAL_SIZE(op) REAL_SIZE_TP(Py_TYPE(op))
|
2001-10-18 17:47:51 -03:00
|
|
|
|
2015-09-06 15:25:30 -03:00
|
|
|
#define UNNAMED_FIELDS_TP(tp) PyLong_AsSsize_t( \
|
2013-07-16 20:22:45 -03:00
|
|
|
_PyDict_GetItemId((tp)->tp_dict, &PyId_n_unnamed_fields))
|
2007-12-18 22:45:37 -04:00
|
|
|
#define UNNAMED_FIELDS(op) UNNAMED_FIELDS_TP(Py_TYPE(op))
|
2002-10-16 16:10:03 -03:00
|
|
|
|
2001-10-18 17:47:51 -03:00
|
|
|
|
|
|
|
PyObject *
|
|
|
|
PyStructSequence_New(PyTypeObject *type)
|
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
PyStructSequence *obj;
|
2010-07-07 17:54:01 -03:00
|
|
|
Py_ssize_t size = REAL_SIZE_TP(type), i;
|
Merged revisions 59933-59951 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59935 | raymond.hettinger | 2008-01-13 07:15:15 +0100 (Sun, 13 Jan 2008) | 1 line
Named tuple is a concept, not a specific type.
........
r59936 | raymond.hettinger | 2008-01-13 07:18:07 +0100 (Sun, 13 Jan 2008) | 1 line
Fix spelling.
........
r59937 | georg.brandl | 2008-01-13 10:36:18 +0100 (Sun, 13 Jan 2008) | 2 lines
Clarify the effect of text mode.
........
r59938 | thomas.heller | 2008-01-13 12:19:43 +0100 (Sun, 13 Jan 2008) | 1 line
Make Modules/socketobject.c compile for Windows again.
........
r59939 | ka-ping.yee | 2008-01-13 12:25:13 +0100 (Sun, 13 Jan 2008) | 9 lines
Check in the patch proposed by Ben Hayden (benjhayden) for issue
#1550: help('modules') broken by several 3rd party libraries.
Tested with Python build: trunk:54235:59936M -- the reported error
occurs with Django installed (or with any __init__.py present on
the path that raises an exception), and such errors indeed go away
when this change is applied.
........
r59940 | georg.brandl | 2008-01-13 16:04:05 +0100 (Sun, 13 Jan 2008) | 2 lines
Back out r59931 - test_ctypes fails with it.
........
r59943 | amaury.forgeotdarc | 2008-01-14 01:22:44 +0100 (Mon, 14 Jan 2008) | 6 lines
As discussed in issue 1700288:
ctypes takes some liberties when creating python types: it modifies the types'
__dict__ directly, bypassing all the machinery of type objects which deal with
special methods. And this broke recent optimisations of method lookup.
Now we try to modify the type with more "official" functions.
........
r59944 | amaury.forgeotdarc | 2008-01-14 01:29:41 +0100 (Mon, 14 Jan 2008) | 5 lines
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
now that ctypes uses a more supported method to create types:
Method cache optimization, by Armin Rigo, ported to 2.6 by Kevin Jacobs.
........
r59946 | amaury.forgeotdarc | 2008-01-14 02:07:27 +0100 (Mon, 14 Jan 2008) | 4 lines
?Why did my tests not notice this before?
Slots inheritance is very different from OO inheritance.
This code lead to infinite recursion on classes derived from StructType.
........
r59947 | christian.heimes | 2008-01-14 04:33:52 +0100 (Mon, 14 Jan 2008) | 1 line
Added new an better structseq representation. E.g. repr(time.gmtime(0)) now returns 'time.struct_time(tm_year=1970, tm_mon=1, tm_mday=1, tm_hour=0, tm_min=0, tm_sec=0, tm_wday=3, tm_yday=1, tm_isdst=0)' instead of '(1970, 1, 1, 0, 0, 0, 3, 1, 0)'. The feature is part of #1816: sys.flags
........
r59948 | christian.heimes | 2008-01-14 04:35:38 +0100 (Mon, 14 Jan 2008) | 1 line
I missed the most important file
........
r59949 | christian.heimes | 2008-01-14 04:42:48 +0100 (Mon, 14 Jan 2008) | 1 line
Applied patch #1816: sys.flags patch
........
r59950 | christian.heimes | 2008-01-14 05:13:37 +0100 (Mon, 14 Jan 2008) | 2 lines
Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's
readonly and help(sys.float_info) explains the attributes nicely.
........
r59951 | christian.heimes | 2008-01-14 07:06:19 +0100 (Mon, 14 Jan 2008) | 1 line
Added more comments to the new structseq repr code and implemented several of Neal's suggestions.
........
2008-01-14 14:49:24 -04:00
|
|
|
|
2010-07-07 17:54:01 -03:00
|
|
|
obj = PyObject_GC_NewVar(PyStructSequence, type, size);
|
2010-05-09 12:52:27 -03:00
|
|
|
if (obj == NULL)
|
|
|
|
return NULL;
|
2010-07-08 19:33:03 -03:00
|
|
|
/* Hack the size of the variable object, so invisible fields don't appear
|
|
|
|
to Python code. */
|
|
|
|
Py_SIZE(obj) = VISIBLE_SIZE_TP(type);
|
2010-07-07 17:54:01 -03:00
|
|
|
for (i = 0; i < size; i++)
|
|
|
|
obj->ob_item[i] = NULL;
|
2001-10-18 17:47:51 -03:00
|
|
|
|
2010-07-07 17:54:01 -03:00
|
|
|
return (PyObject*)obj;
|
Merge the trunk changes in. Breaks socket.ssl for now.
Merged revisions 57392-57619 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r57395 | georg.brandl | 2007-08-24 19:23:23 +0200 (Fri, 24 Aug 2007) | 2 lines
Bug #1011: fix rfc822.Message.getheader docs.
........
r57397 | georg.brandl | 2007-08-24 19:38:49 +0200 (Fri, 24 Aug 2007) | 2 lines
Patch #1006: port test_winreg to unittest.
........
r57398 | georg.brandl | 2007-08-24 19:46:54 +0200 (Fri, 24 Aug 2007) | 2 lines
Fix #1012: wrong URL to :mod:`site` in install/index.rst.
........
r57399 | georg.brandl | 2007-08-24 20:07:52 +0200 (Fri, 24 Aug 2007) | 2 lines
Patch #1008: port test_signal to unittest.
........
r57400 | georg.brandl | 2007-08-24 20:22:54 +0200 (Fri, 24 Aug 2007) | 2 lines
Port test_frozen to unittest.
........
r57401 | georg.brandl | 2007-08-24 20:27:43 +0200 (Fri, 24 Aug 2007) | 2 lines
Document new utility functions in test_support.
........
r57402 | georg.brandl | 2007-08-24 20:30:06 +0200 (Fri, 24 Aug 2007) | 2 lines
Remove test_rgbimg output file, there is no test_rgbimg.py.
........
r57403 | georg.brandl | 2007-08-24 20:35:27 +0200 (Fri, 24 Aug 2007) | 2 lines
Remove output file for test_ossaudiodev, also properly close the dsp object.
........
r57404 | georg.brandl | 2007-08-24 20:46:27 +0200 (Fri, 24 Aug 2007) | 2 lines
Convert test_linuxaudiodev to unittest. Fix a wrong finally clause in test_ossaudiodev.
........
r57406 | collin.winter | 2007-08-24 21:13:58 +0200 (Fri, 24 Aug 2007) | 1 line
Convert test_pkg to use unittest.
........
r57408 | georg.brandl | 2007-08-24 21:22:34 +0200 (Fri, 24 Aug 2007) | 2 lines
Catch the correct errors.
........
r57409 | georg.brandl | 2007-08-24 21:33:53 +0200 (Fri, 24 Aug 2007) | 2 lines
Port test_class to unittest. Patch #1671298.
........
r57415 | collin.winter | 2007-08-24 23:09:42 +0200 (Fri, 24 Aug 2007) | 1 line
Make test_structmembers pass when run with regrtests's -R flag.
........
r57455 | nick.coghlan | 2007-08-25 06:32:07 +0200 (Sat, 25 Aug 2007) | 1 line
Revert misguided attempt at fixing incompatibility between -m and -i switches (better fix coming soon)
........
r57456 | nick.coghlan | 2007-08-25 06:35:54 +0200 (Sat, 25 Aug 2007) | 1 line
Revert compile.c changes that shouldn't have been included in previous checkin
........
r57461 | nick.coghlan | 2007-08-25 12:50:41 +0200 (Sat, 25 Aug 2007) | 1 line
Fix bug 1764407 - the -i switch now does the right thing when using the -m switch
........
r57464 | guido.van.rossum | 2007-08-25 17:08:43 +0200 (Sat, 25 Aug 2007) | 4 lines
Server-side SSL and certificate validation, by Bill Janssen.
While cleaning up Bill's C style, I may have cleaned up some code
he didn't touch as well (in _ssl.c).
........
r57465 | neal.norwitz | 2007-08-25 18:41:36 +0200 (Sat, 25 Aug 2007) | 3 lines
Try to get this to build with Visual Studio by moving all the variable
declarations to the beginning of a scope.
........
r57466 | neal.norwitz | 2007-08-25 18:54:38 +0200 (Sat, 25 Aug 2007) | 1 line
Fix test so it is skipped properly if there is no SSL support.
........
r57467 | neal.norwitz | 2007-08-25 18:58:09 +0200 (Sat, 25 Aug 2007) | 2 lines
Fix a few more variables to try to get this to compile with Visual Studio.
........
r57473 | neal.norwitz | 2007-08-25 19:25:17 +0200 (Sat, 25 Aug 2007) | 1 line
Try to get this test to pass for systems that do not have SO_REUSEPORT
........
r57482 | gregory.p.smith | 2007-08-26 02:26:00 +0200 (Sun, 26 Aug 2007) | 7 lines
keep setup.py from listing unneeded hash modules (_md5, _sha*) as
missing when they were not built because _hashlib with openssl provided
their functionality instead.
don't build bsddb185 if bsddb was built.
........
r57483 | neal.norwitz | 2007-08-26 03:08:16 +0200 (Sun, 26 Aug 2007) | 1 line
Fix typo in docstring (missing c in reacquire)
........
r57484 | neal.norwitz | 2007-08-26 03:42:03 +0200 (Sun, 26 Aug 2007) | 2 lines
Spell check (also americanify behaviour, it's almost 3 times as common)
........
r57503 | neal.norwitz | 2007-08-26 08:29:57 +0200 (Sun, 26 Aug 2007) | 4 lines
Reap children before the test starts so hopefully SocketServer
won't find any old children left around which causes an exception
in collect_children() and the test to fail.
........
r57510 | neal.norwitz | 2007-08-26 20:50:39 +0200 (Sun, 26 Aug 2007) | 1 line
Fail gracefully if the cert files cannot be created
........
r57513 | guido.van.rossum | 2007-08-26 21:35:09 +0200 (Sun, 26 Aug 2007) | 4 lines
Bill Janssen wrote:
Here's a patch which makes test_ssl a better player in the buildbots
environment. I deep-ended on "try-except-else" clauses.
........
r57518 | neal.norwitz | 2007-08-26 23:40:16 +0200 (Sun, 26 Aug 2007) | 1 line
Get the test passing by commenting out some writes (should they be removed?)
........
r57522 | neal.norwitz | 2007-08-27 00:16:23 +0200 (Mon, 27 Aug 2007) | 3 lines
Catch IOError for when the device file doesn't exist or the user doesn't have
permission to write to the device.
........
r57524 | neal.norwitz | 2007-08-27 00:20:03 +0200 (Mon, 27 Aug 2007) | 5 lines
Another patch from Bill Janssen that:
1) Fixes the bug that two class names are initial-lower-case.
2) Replaces the poll waiting for the server to become ready with
a threading.Event signal.
........
r57536 | neal.norwitz | 2007-08-27 02:58:33 +0200 (Mon, 27 Aug 2007) | 1 line
Stop using string.join (from the module) to ease upgrade to py3k
........
r57537 | neal.norwitz | 2007-08-27 03:03:18 +0200 (Mon, 27 Aug 2007) | 1 line
Make a utility function for handling (printing) an error
........
r57538 | neal.norwitz | 2007-08-27 03:15:33 +0200 (Mon, 27 Aug 2007) | 4 lines
If we can't create a certificate, print a warning, but don't fail the test.
Modified patch from what Bill Janssen sent on python-3000.
........
r57539 | facundo.batista | 2007-08-27 03:15:34 +0200 (Mon, 27 Aug 2007) | 7 lines
Ignore test failures caused by 'resource temporarily unavailable'
exceptions raised in the test server thread, since SimpleXMLRPCServer
does not gracefully handle them. Changed number of requests handled
by tests server thread to one (was 2) because no tests require more
than one request. [GSoC - Alan McIntyre]
........
r57561 | guido.van.rossum | 2007-08-27 19:19:42 +0200 (Mon, 27 Aug 2007) | 8 lines
> Regardless, building a fixed test certificate and checking it in sounds like
> the better option. Then the openssl command in the test code can be turned
> into a comment describing how the test data was pregenerated.
Here's a patch that does that.
Bill
........
r57568 | guido.van.rossum | 2007-08-27 20:42:23 +0200 (Mon, 27 Aug 2007) | 26 lines
> Some of the code sets the error string in this directly before
> returning NULL, and other pieces of the code call PySSL_SetError,
> which creates the error string. I think some of the places which set
> the string directly probably shouldn't; instead, they should call
> PySSL_SetError to cons up the error name directly from the err code.
> However, PySSL_SetError only works after the construction of an ssl
> object, which means it can't be used there... I'll take a longer look
> at it and see if there's a reasonable fix.
Here's a patch which addresses this. It also fixes the indentation in
PySSL_SetError, bringing it into line with PEP 7, fixes a compile warning
about one of the OpenSSL macros, and makes the namespace a bit more
consistent. I've tested it on FC 7 and OS X 10.4.
% ./python ./Lib/test/regrtest.py -R :1: -u all test_ssl
test_ssl
beginning 6 repetitions
123456
......
1 test OK.
[29244 refs]
%
[GvR: slightly edited to enforce 79-char line length, even if it required
violating the style guide.]
........
r57570 | guido.van.rossum | 2007-08-27 21:11:11 +0200 (Mon, 27 Aug 2007) | 2 lines
Patch 10124 by Bill Janssen, docs for the new ssl code.
........
r57574 | guido.van.rossum | 2007-08-27 22:51:00 +0200 (Mon, 27 Aug 2007) | 3 lines
Patch # 1739906 by Christian Heimes -- add reduce to functools (importing
it from __builtin__).
........
r57575 | guido.van.rossum | 2007-08-27 22:52:10 +0200 (Mon, 27 Aug 2007) | 2 lines
News about functools.reduce.
........
r57611 | georg.brandl | 2007-08-28 10:29:08 +0200 (Tue, 28 Aug 2007) | 2 lines
Document rev. 57574.
........
r57612 | sean.reifschneider | 2007-08-28 11:07:54 +0200 (Tue, 28 Aug 2007) | 2 lines
Adding basic imputil documentation.
........
r57614 | georg.brandl | 2007-08-28 12:48:18 +0200 (Tue, 28 Aug 2007) | 2 lines
Fix some glitches.
........
r57616 | lars.gustaebel | 2007-08-28 14:31:09 +0200 (Tue, 28 Aug 2007) | 5 lines
TarFile.__init__() no longer fails if no name argument is passed and
the fileobj argument has no usable name attribute (e.g. StringIO).
(will backport to 2.5)
........
r57619 | thomas.wouters | 2007-08-28 17:28:19 +0200 (Tue, 28 Aug 2007) | 22 lines
Improve extended slicing support in builtin types and classes. Specifically:
- Specialcase extended slices that amount to a shallow copy the same way as
is done for simple slices, in the tuple, string and unicode case.
- Specialcase step-1 extended slices to optimize the common case for all
involved types.
- For lists, allow extended slice assignment of differing lengths as long
as the step is 1. (Previously, 'l[:2:1] = []' failed even though
'l[:2] = []' and 'l[:2:None] = []' do not.)
- Implement extended slicing for buffer, array, structseq, mmap and
UserString.UserString.
- Implement slice-object support (but not non-step-1 slice assignment) for
UserString.MutableString.
- Add tests for all new functionality.
........
2007-08-28 18:37:11 -03:00
|
|
|
}
|
|
|
|
|
2010-12-03 16:14:31 -04:00
|
|
|
void
|
|
|
|
PyStructSequence_SetItem(PyObject* op, Py_ssize_t i, PyObject* v)
|
|
|
|
{
|
|
|
|
PyStructSequence_SET_ITEM(op, i, v);
|
|
|
|
}
|
|
|
|
|
|
|
|
PyObject*
|
|
|
|
PyStructSequence_GetItem(PyObject* op, Py_ssize_t i)
|
|
|
|
{
|
|
|
|
return PyStructSequence_GET_ITEM(op, i);
|
|
|
|
}
|
|
|
|
|
2010-07-08 19:33:03 -03:00
|
|
|
static void
|
|
|
|
structseq_dealloc(PyStructSequence *obj)
|
|
|
|
{
|
|
|
|
Py_ssize_t i, size;
|
2013-07-16 20:22:45 -03:00
|
|
|
|
2010-07-08 19:33:03 -03:00
|
|
|
size = REAL_SIZE(obj);
|
|
|
|
for (i = 0; i < size; ++i) {
|
|
|
|
Py_XDECREF(obj->ob_item[i]);
|
|
|
|
}
|
|
|
|
PyObject_GC_Del(obj);
|
|
|
|
}
|
|
|
|
|
2017-03-19 03:51:07 -03:00
|
|
|
/*[clinic input]
|
|
|
|
class structseq "PyStructSequence *" "NULL"
|
|
|
|
[clinic start generated code]*/
|
|
|
|
/*[clinic end generated code: output=da39a3ee5e6b4b0d input=9d781c6922c77752]*/
|
|
|
|
|
|
|
|
#include "clinic/structseq.c.h"
|
|
|
|
|
|
|
|
/*[clinic input]
|
|
|
|
@classmethod
|
|
|
|
structseq.__new__ as structseq_new
|
|
|
|
sequence as arg: object
|
|
|
|
dict: object = NULL
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
2001-10-18 17:47:51 -03:00
|
|
|
static PyObject *
|
2017-03-19 03:51:07 -03:00
|
|
|
structseq_new_impl(PyTypeObject *type, PyObject *arg, PyObject *dict)
|
|
|
|
/*[clinic end generated code: output=baa082e788b171da input=9b44810243907377]*/
|
2001-10-18 17:47:51 -03:00
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject *ob;
|
|
|
|
PyStructSequence *res = NULL;
|
|
|
|
Py_ssize_t len, min_len, max_len, i, n_unnamed_fields;
|
|
|
|
|
|
|
|
arg = PySequence_Fast(arg, "constructor requires a sequence");
|
|
|
|
|
|
|
|
if (!arg) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (dict && !PyDict_Check(dict)) {
|
|
|
|
PyErr_Format(PyExc_TypeError,
|
|
|
|
"%.500s() takes a dict as second arg, if any",
|
|
|
|
type->tp_name);
|
|
|
|
Py_DECREF(arg);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
len = PySequence_Fast_GET_SIZE(arg);
|
|
|
|
min_len = VISIBLE_SIZE_TP(type);
|
|
|
|
max_len = REAL_SIZE_TP(type);
|
|
|
|
n_unnamed_fields = UNNAMED_FIELDS_TP(type);
|
|
|
|
|
|
|
|
if (min_len != max_len) {
|
|
|
|
if (len < min_len) {
|
|
|
|
PyErr_Format(PyExc_TypeError,
|
2012-02-14 21:52:58 -04:00
|
|
|
"%.500s() takes an at least %zd-sequence (%zd-sequence given)",
|
|
|
|
type->tp_name, min_len, len);
|
|
|
|
Py_DECREF(arg);
|
|
|
|
return NULL;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
if (len > max_len) {
|
|
|
|
PyErr_Format(PyExc_TypeError,
|
2012-02-14 21:52:58 -04:00
|
|
|
"%.500s() takes an at most %zd-sequence (%zd-sequence given)",
|
|
|
|
type->tp_name, max_len, len);
|
|
|
|
Py_DECREF(arg);
|
|
|
|
return NULL;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (len != min_len) {
|
|
|
|
PyErr_Format(PyExc_TypeError,
|
2012-02-14 21:52:58 -04:00
|
|
|
"%.500s() takes a %zd-sequence (%zd-sequence given)",
|
|
|
|
type->tp_name, min_len, len);
|
|
|
|
Py_DECREF(arg);
|
|
|
|
return NULL;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
res = (PyStructSequence*) PyStructSequence_New(type);
|
|
|
|
if (res == NULL) {
|
2012-02-14 21:51:43 -04:00
|
|
|
Py_DECREF(arg);
|
2010-05-09 12:52:27 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
for (i = 0; i < len; ++i) {
|
|
|
|
PyObject *v = PySequence_Fast_GET_ITEM(arg, i);
|
|
|
|
Py_INCREF(v);
|
|
|
|
res->ob_item[i] = v;
|
|
|
|
}
|
|
|
|
for (; i < max_len; ++i) {
|
|
|
|
if (dict && (ob = PyDict_GetItemString(
|
|
|
|
dict, type->tp_members[i-n_unnamed_fields].name))) {
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
ob = Py_None;
|
|
|
|
}
|
|
|
|
Py_INCREF(ob);
|
|
|
|
res->ob_item[i] = ob;
|
|
|
|
}
|
|
|
|
|
|
|
|
Py_DECREF(arg);
|
|
|
|
return (PyObject*) res;
|
2001-10-18 17:47:51 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
structseq_repr(PyStructSequence *obj)
|
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
/* buffer and type size were chosen well considered. */
|
Merged revisions 59933-59951 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59935 | raymond.hettinger | 2008-01-13 07:15:15 +0100 (Sun, 13 Jan 2008) | 1 line
Named tuple is a concept, not a specific type.
........
r59936 | raymond.hettinger | 2008-01-13 07:18:07 +0100 (Sun, 13 Jan 2008) | 1 line
Fix spelling.
........
r59937 | georg.brandl | 2008-01-13 10:36:18 +0100 (Sun, 13 Jan 2008) | 2 lines
Clarify the effect of text mode.
........
r59938 | thomas.heller | 2008-01-13 12:19:43 +0100 (Sun, 13 Jan 2008) | 1 line
Make Modules/socketobject.c compile for Windows again.
........
r59939 | ka-ping.yee | 2008-01-13 12:25:13 +0100 (Sun, 13 Jan 2008) | 9 lines
Check in the patch proposed by Ben Hayden (benjhayden) for issue
#1550: help('modules') broken by several 3rd party libraries.
Tested with Python build: trunk:54235:59936M -- the reported error
occurs with Django installed (or with any __init__.py present on
the path that raises an exception), and such errors indeed go away
when this change is applied.
........
r59940 | georg.brandl | 2008-01-13 16:04:05 +0100 (Sun, 13 Jan 2008) | 2 lines
Back out r59931 - test_ctypes fails with it.
........
r59943 | amaury.forgeotdarc | 2008-01-14 01:22:44 +0100 (Mon, 14 Jan 2008) | 6 lines
As discussed in issue 1700288:
ctypes takes some liberties when creating python types: it modifies the types'
__dict__ directly, bypassing all the machinery of type objects which deal with
special methods. And this broke recent optimisations of method lookup.
Now we try to modify the type with more "official" functions.
........
r59944 | amaury.forgeotdarc | 2008-01-14 01:29:41 +0100 (Mon, 14 Jan 2008) | 5 lines
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
now that ctypes uses a more supported method to create types:
Method cache optimization, by Armin Rigo, ported to 2.6 by Kevin Jacobs.
........
r59946 | amaury.forgeotdarc | 2008-01-14 02:07:27 +0100 (Mon, 14 Jan 2008) | 4 lines
?Why did my tests not notice this before?
Slots inheritance is very different from OO inheritance.
This code lead to infinite recursion on classes derived from StructType.
........
r59947 | christian.heimes | 2008-01-14 04:33:52 +0100 (Mon, 14 Jan 2008) | 1 line
Added new an better structseq representation. E.g. repr(time.gmtime(0)) now returns 'time.struct_time(tm_year=1970, tm_mon=1, tm_mday=1, tm_hour=0, tm_min=0, tm_sec=0, tm_wday=3, tm_yday=1, tm_isdst=0)' instead of '(1970, 1, 1, 0, 0, 0, 3, 1, 0)'. The feature is part of #1816: sys.flags
........
r59948 | christian.heimes | 2008-01-14 04:35:38 +0100 (Mon, 14 Jan 2008) | 1 line
I missed the most important file
........
r59949 | christian.heimes | 2008-01-14 04:42:48 +0100 (Mon, 14 Jan 2008) | 1 line
Applied patch #1816: sys.flags patch
........
r59950 | christian.heimes | 2008-01-14 05:13:37 +0100 (Mon, 14 Jan 2008) | 2 lines
Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's
readonly and help(sys.float_info) explains the attributes nicely.
........
r59951 | christian.heimes | 2008-01-14 07:06:19 +0100 (Mon, 14 Jan 2008) | 1 line
Added more comments to the new structseq repr code and implemented several of Neal's suggestions.
........
2008-01-14 14:49:24 -04:00
|
|
|
#define REPR_BUFFER_SIZE 512
|
|
|
|
#define TYPE_MAXSIZE 100
|
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
PyTypeObject *typ = Py_TYPE(obj);
|
2015-09-06 15:25:30 -03:00
|
|
|
Py_ssize_t i;
|
|
|
|
int removelast = 0;
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_ssize_t len;
|
|
|
|
char buf[REPR_BUFFER_SIZE];
|
|
|
|
char *endofbuf, *pbuf = buf;
|
|
|
|
|
|
|
|
/* pointer to end of writeable buffer; safes space for "...)\0" */
|
|
|
|
endofbuf= &buf[REPR_BUFFER_SIZE-5];
|
|
|
|
|
|
|
|
/* "typename(", limited to TYPE_MAXSIZE */
|
2019-03-19 20:32:11 -03:00
|
|
|
assert(TYPE_MAXSIZE < sizeof(buf));
|
|
|
|
len = strlen(typ->tp_name);
|
|
|
|
if (len <= TYPE_MAXSIZE) {
|
|
|
|
strcpy(pbuf, typ->tp_name);
|
|
|
|
pbuf += len;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
strncpy(pbuf, typ->tp_name, TYPE_MAXSIZE);
|
|
|
|
pbuf += TYPE_MAXSIZE;
|
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
*pbuf++ = '(';
|
|
|
|
|
|
|
|
for (i=0; i < VISIBLE_SIZE(obj); i++) {
|
|
|
|
PyObject *val, *repr;
|
2016-11-20 04:16:47 -04:00
|
|
|
const char *cname, *crepr;
|
2010-05-09 12:52:27 -03:00
|
|
|
|
|
|
|
cname = typ->tp_members[i].name;
|
2010-07-08 19:33:03 -03:00
|
|
|
if (cname == NULL) {
|
2019-03-14 05:47:27 -03:00
|
|
|
PyErr_Format(PyExc_SystemError, "In structseq_repr(), member %zd name is NULL"
|
2010-07-08 19:33:03 -03:00
|
|
|
" for type %.500s", i, typ->tp_name);
|
2010-05-09 12:52:27 -03:00
|
|
|
return NULL;
|
2010-07-08 19:33:03 -03:00
|
|
|
}
|
2010-07-07 17:54:01 -03:00
|
|
|
val = PyStructSequence_GET_ITEM(obj, i);
|
2010-05-09 12:52:27 -03:00
|
|
|
repr = PyObject_Repr(val);
|
2010-07-07 17:54:01 -03:00
|
|
|
if (repr == NULL)
|
2010-05-09 12:52:27 -03:00
|
|
|
return NULL;
|
2016-11-20 03:13:07 -04:00
|
|
|
crepr = PyUnicode_AsUTF8(repr);
|
2010-05-09 12:52:27 -03:00
|
|
|
if (crepr == NULL) {
|
|
|
|
Py_DECREF(repr);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* + 3: keep space for "=" and ", " */
|
|
|
|
len = strlen(cname) + strlen(crepr) + 3;
|
|
|
|
if ((pbuf+len) <= endofbuf) {
|
|
|
|
strcpy(pbuf, cname);
|
|
|
|
pbuf += strlen(cname);
|
|
|
|
*pbuf++ = '=';
|
|
|
|
strcpy(pbuf, crepr);
|
|
|
|
pbuf += strlen(crepr);
|
|
|
|
*pbuf++ = ',';
|
|
|
|
*pbuf++ = ' ';
|
|
|
|
removelast = 1;
|
|
|
|
Py_DECREF(repr);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
strcpy(pbuf, "...");
|
|
|
|
pbuf += 3;
|
|
|
|
removelast = 0;
|
|
|
|
Py_DECREF(repr);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (removelast) {
|
|
|
|
/* overwrite last ", " */
|
|
|
|
pbuf-=2;
|
|
|
|
}
|
|
|
|
*pbuf++ = ')';
|
|
|
|
*pbuf = '\0';
|
|
|
|
|
|
|
|
return PyUnicode_FromString(buf);
|
2001-10-18 17:47:51 -03:00
|
|
|
}
|
|
|
|
|
2002-03-05 09:27:58 -04:00
|
|
|
static PyObject *
|
|
|
|
structseq_reduce(PyStructSequence* self)
|
|
|
|
{
|
2013-07-17 08:41:39 -03:00
|
|
|
PyObject* tup = NULL;
|
|
|
|
PyObject* dict = NULL;
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject* result;
|
2015-09-06 15:25:30 -03:00
|
|
|
Py_ssize_t n_fields, n_visible_fields, n_unnamed_fields, i;
|
2010-05-09 12:52:27 -03:00
|
|
|
|
|
|
|
n_fields = REAL_SIZE(self);
|
|
|
|
n_visible_fields = VISIBLE_SIZE(self);
|
|
|
|
n_unnamed_fields = UNNAMED_FIELDS(self);
|
|
|
|
tup = PyTuple_New(n_visible_fields);
|
2013-07-17 08:41:39 -03:00
|
|
|
if (!tup)
|
|
|
|
goto error;
|
2010-05-09 12:52:27 -03:00
|
|
|
|
|
|
|
dict = PyDict_New();
|
2013-07-17 08:41:39 -03:00
|
|
|
if (!dict)
|
|
|
|
goto error;
|
2010-05-09 12:52:27 -03:00
|
|
|
|
|
|
|
for (i = 0; i < n_visible_fields; i++) {
|
|
|
|
Py_INCREF(self->ob_item[i]);
|
|
|
|
PyTuple_SET_ITEM(tup, i, self->ob_item[i]);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (; i < n_fields; i++) {
|
2016-11-22 01:58:08 -04:00
|
|
|
const char *n = Py_TYPE(self)->tp_members[i-n_unnamed_fields].name;
|
2013-07-17 08:41:39 -03:00
|
|
|
if (PyDict_SetItemString(dict, n, self->ob_item[i]) < 0)
|
|
|
|
goto error;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
result = Py_BuildValue("(O(OO))", Py_TYPE(self), tup, dict);
|
|
|
|
|
|
|
|
Py_DECREF(tup);
|
|
|
|
Py_DECREF(dict);
|
|
|
|
|
|
|
|
return result;
|
2013-07-17 08:41:39 -03:00
|
|
|
|
|
|
|
error:
|
|
|
|
Py_XDECREF(tup);
|
|
|
|
Py_XDECREF(dict);
|
|
|
|
return NULL;
|
2002-03-05 09:27:58 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyMethodDef structseq_methods[] = {
|
2010-07-07 17:54:01 -03:00
|
|
|
{"__reduce__", (PyCFunction)structseq_reduce, METH_NOARGS, NULL},
|
2010-05-09 12:52:27 -03:00
|
|
|
{NULL, NULL}
|
2002-03-05 09:27:58 -04:00
|
|
|
};
|
|
|
|
|
2001-10-18 17:47:51 -03:00
|
|
|
static PyTypeObject _struct_sequence_template = {
|
2010-05-09 12:52:27 -03:00
|
|
|
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
|
|
|
NULL, /* tp_name */
|
2010-07-07 17:54:01 -03:00
|
|
|
sizeof(PyStructSequence) - sizeof(PyObject *), /* tp_basicsize */
|
|
|
|
sizeof(PyObject *), /* tp_itemsize */
|
2010-07-08 19:33:03 -03:00
|
|
|
(destructor)structseq_dealloc, /* tp_dealloc */
|
2010-05-09 12:52:27 -03:00
|
|
|
0, /* tp_print */
|
|
|
|
0, /* tp_getattr */
|
|
|
|
0, /* tp_setattr */
|
|
|
|
0, /* tp_reserved */
|
|
|
|
(reprfunc)structseq_repr, /* tp_repr */
|
|
|
|
0, /* tp_as_number */
|
2010-07-07 17:54:01 -03:00
|
|
|
0, /* tp_as_sequence */
|
|
|
|
0, /* tp_as_mapping */
|
|
|
|
0, /* tp_hash */
|
2010-05-09 12:52:27 -03:00
|
|
|
0, /* tp_call */
|
|
|
|
0, /* tp_str */
|
|
|
|
0, /* tp_getattro */
|
|
|
|
0, /* tp_setattro */
|
|
|
|
0, /* tp_as_buffer */
|
2010-07-07 17:54:01 -03:00
|
|
|
Py_TPFLAGS_DEFAULT, /* tp_flags */
|
2010-05-09 12:52:27 -03:00
|
|
|
NULL, /* tp_doc */
|
|
|
|
0, /* tp_traverse */
|
|
|
|
0, /* tp_clear */
|
2010-07-07 17:54:01 -03:00
|
|
|
0, /* tp_richcompare */
|
2010-05-09 12:52:27 -03:00
|
|
|
0, /* tp_weaklistoffset */
|
|
|
|
0, /* tp_iter */
|
|
|
|
0, /* tp_iternext */
|
|
|
|
structseq_methods, /* tp_methods */
|
|
|
|
NULL, /* tp_members */
|
|
|
|
0, /* tp_getset */
|
|
|
|
0, /* tp_base */
|
|
|
|
0, /* tp_dict */
|
|
|
|
0, /* tp_descr_get */
|
|
|
|
0, /* tp_descr_set */
|
|
|
|
0, /* tp_dictoffset */
|
|
|
|
0, /* tp_init */
|
|
|
|
0, /* tp_alloc */
|
|
|
|
structseq_new, /* tp_new */
|
2001-10-18 17:47:51 -03:00
|
|
|
};
|
|
|
|
|
2013-07-22 17:24:54 -03:00
|
|
|
int
|
|
|
|
PyStructSequence_InitType2(PyTypeObject *type, PyStructSequence_Desc *desc)
|
2001-10-18 17:47:51 -03:00
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject *dict;
|
|
|
|
PyMemberDef* members;
|
2015-09-06 15:25:30 -03:00
|
|
|
Py_ssize_t n_members, n_unnamed_members, i, k;
|
2013-07-22 17:24:54 -03:00
|
|
|
PyObject *v;
|
2001-10-18 17:47:51 -03:00
|
|
|
|
2006-04-21 07:40:58 -03:00
|
|
|
#ifdef Py_TRACE_REFS
|
2010-05-09 12:52:27 -03:00
|
|
|
/* if the type object was chained, unchain it first
|
|
|
|
before overwriting its storage */
|
|
|
|
if (type->ob_base.ob_base._ob_next) {
|
|
|
|
_Py_ForgetReference((PyObject*)type);
|
|
|
|
}
|
2006-04-21 07:40:58 -03:00
|
|
|
#endif
|
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
n_unnamed_members = 0;
|
|
|
|
for (i = 0; desc->fields[i].name != NULL; ++i)
|
|
|
|
if (desc->fields[i].name == PyStructSequence_UnnamedField)
|
|
|
|
n_unnamed_members++;
|
|
|
|
n_members = i;
|
|
|
|
|
|
|
|
memcpy(type, &_struct_sequence_template, sizeof(PyTypeObject));
|
2010-07-07 17:54:01 -03:00
|
|
|
type->tp_base = &PyTuple_Type;
|
2010-05-09 12:52:27 -03:00
|
|
|
type->tp_name = desc->name;
|
|
|
|
type->tp_doc = desc->doc;
|
|
|
|
|
|
|
|
members = PyMem_NEW(PyMemberDef, n_members-n_unnamed_members+1);
|
2013-07-22 17:24:54 -03:00
|
|
|
if (members == NULL) {
|
|
|
|
PyErr_NoMemory();
|
|
|
|
return -1;
|
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
|
|
|
|
for (i = k = 0; i < n_members; ++i) {
|
|
|
|
if (desc->fields[i].name == PyStructSequence_UnnamedField)
|
|
|
|
continue;
|
|
|
|
members[k].name = desc->fields[i].name;
|
|
|
|
members[k].type = T_OBJECT;
|
|
|
|
members[k].offset = offsetof(PyStructSequence, ob_item)
|
|
|
|
+ i * sizeof(PyObject*);
|
|
|
|
members[k].flags = READONLY;
|
|
|
|
members[k].doc = desc->fields[i].doc;
|
|
|
|
k++;
|
|
|
|
}
|
|
|
|
members[k].name = NULL;
|
|
|
|
|
|
|
|
type->tp_members = members;
|
|
|
|
|
|
|
|
if (PyType_Ready(type) < 0)
|
2013-07-22 17:24:54 -03:00
|
|
|
return -1;
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_INCREF(type);
|
|
|
|
|
|
|
|
dict = type->tp_dict;
|
2015-09-06 15:25:30 -03:00
|
|
|
#define SET_DICT_FROM_SIZE(key, value) \
|
2010-05-09 12:52:27 -03:00
|
|
|
do { \
|
2015-09-06 15:25:30 -03:00
|
|
|
v = PyLong_FromSsize_t(value); \
|
2013-07-22 17:24:54 -03:00
|
|
|
if (v == NULL) \
|
|
|
|
return -1; \
|
|
|
|
if (PyDict_SetItemString(dict, key, v) < 0) { \
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_DECREF(v); \
|
2013-07-22 17:24:54 -03:00
|
|
|
return -1; \
|
2010-05-09 12:52:27 -03:00
|
|
|
} \
|
2013-07-22 17:24:54 -03:00
|
|
|
Py_DECREF(v); \
|
2010-05-09 12:52:27 -03:00
|
|
|
} while (0)
|
|
|
|
|
2015-09-06 15:25:30 -03:00
|
|
|
SET_DICT_FROM_SIZE(visible_length_key, desc->n_in_sequence);
|
|
|
|
SET_DICT_FROM_SIZE(real_length_key, n_members);
|
|
|
|
SET_DICT_FROM_SIZE(unnamed_fields_key, n_unnamed_members);
|
2013-07-22 17:24:54 -03:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
PyStructSequence_InitType(PyTypeObject *type, PyStructSequence_Desc *desc)
|
|
|
|
{
|
|
|
|
(void)PyStructSequence_InitType2(type, desc);
|
2001-10-18 17:47:51 -03:00
|
|
|
}
|
2010-12-03 16:14:31 -04:00
|
|
|
|
|
|
|
PyTypeObject*
|
|
|
|
PyStructSequence_NewType(PyStructSequence_Desc *desc)
|
|
|
|
{
|
2013-07-16 20:22:45 -03:00
|
|
|
PyTypeObject *result;
|
|
|
|
|
|
|
|
result = (PyTypeObject*)PyType_GenericAlloc(&PyType_Type, 0);
|
2013-07-22 17:24:54 -03:00
|
|
|
if (result == NULL)
|
|
|
|
return NULL;
|
|
|
|
if (PyStructSequence_InitType2(result, desc) < 0) {
|
|
|
|
Py_DECREF(result);
|
|
|
|
return NULL;
|
2012-08-19 06:20:41 -03:00
|
|
|
}
|
2010-12-03 16:14:31 -04:00
|
|
|
return result;
|
|
|
|
}
|
2013-07-16 20:22:45 -03:00
|
|
|
|
|
|
|
int _PyStructSequence_Init(void)
|
|
|
|
{
|
|
|
|
if (_PyUnicode_FromId(&PyId_n_sequence_fields) == NULL
|
|
|
|
|| _PyUnicode_FromId(&PyId_n_fields) == NULL
|
|
|
|
|| _PyUnicode_FromId(&PyId_n_unnamed_fields) == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|