1999-03-24 15:06:42 -04:00
|
|
|
/* Dictionary object implementation using a hash table */
|
1993-03-29 06:43:31 -04:00
|
|
|
|
2003-05-03 03:51:59 -03:00
|
|
|
/* The distribution includes a separate file, Objects/dictnotes.txt,
|
2005-12-31 21:19:23 -04:00
|
|
|
describing explorations into dictionary design and optimization.
|
2003-05-03 03:51:59 -03:00
|
|
|
It covers typical dictionary use patterns, the parameters for
|
|
|
|
tuning dictionaries, and several ideas for possible optimizations.
|
|
|
|
*/
|
|
|
|
|
2016-09-07 21:40:12 -03:00
|
|
|
/* PyDictKeysObject
|
2012-04-23 12:24:50 -03:00
|
|
|
|
2016-09-07 21:40:12 -03:00
|
|
|
This implements the dictionary's hashtable.
|
2012-04-23 12:24:50 -03:00
|
|
|
|
2016-10-22 13:58:14 -03:00
|
|
|
As of Python 3.6, this is compact and ordered. Basic idea is described here:
|
|
|
|
* https://mail.python.org/pipermail/python-dev/2012-December/123028.html
|
|
|
|
* https://morepypy.blogspot.com/2015/01/faster-more-memory-efficient-and-more.html
|
2012-04-23 12:24:50 -03:00
|
|
|
|
2016-09-07 21:40:12 -03:00
|
|
|
layout:
|
2012-04-23 12:24:50 -03:00
|
|
|
|
2022-02-22 07:03:15 -04:00
|
|
|
+---------------------+
|
|
|
|
| dk_refcnt |
|
|
|
|
| dk_log2_size |
|
|
|
|
| dk_log2_index_bytes |
|
|
|
|
| dk_kind |
|
2024-03-01 15:48:26 -04:00
|
|
|
| dk_version |
|
2022-02-22 07:03:15 -04:00
|
|
|
| dk_usable |
|
|
|
|
| dk_nentries |
|
|
|
|
+---------------------+
|
|
|
|
| dk_indices[] |
|
|
|
|
| |
|
|
|
|
+---------------------+
|
|
|
|
| dk_entries[] |
|
|
|
|
| |
|
|
|
|
+---------------------+
|
2016-09-07 21:40:12 -03:00
|
|
|
|
|
|
|
dk_indices is actual hashtable. It holds index in entries, or DKIX_EMPTY(-1)
|
|
|
|
or DKIX_DUMMY(-2).
|
2024-10-21 23:48:16 -03:00
|
|
|
Size of indices is dk_size. Type of each index in indices varies with dk_size:
|
2012-04-23 12:24:50 -03:00
|
|
|
|
2016-09-07 21:40:12 -03:00
|
|
|
* int8 for dk_size <= 128
|
|
|
|
* int16 for 256 <= dk_size <= 2**15
|
|
|
|
* int32 for 2**16 <= dk_size <= 2**31
|
|
|
|
* int64 for 2**32 <= dk_size
|
2012-04-23 12:24:50 -03:00
|
|
|
|
2022-03-01 19:09:28 -04:00
|
|
|
dk_entries is array of PyDictKeyEntry when dk_kind == DICT_KEYS_GENERAL or
|
|
|
|
PyDictUnicodeEntry otherwise. Its length is USABLE_FRACTION(dk_size).
|
2016-09-07 21:40:12 -03:00
|
|
|
|
|
|
|
NOTE: Since negative value is used for DKIX_EMPTY and DKIX_DUMMY, type of
|
|
|
|
dk_indices entry is signed integer and int16 is used for table which
|
|
|
|
dk_size == 256.
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2012-04-23 12:24:50 -03:00
|
|
|
The DictObject can be in one of two forms.
|
2016-09-07 21:40:12 -03:00
|
|
|
|
2012-04-23 12:24:50 -03:00
|
|
|
Either:
|
|
|
|
A combined table:
|
|
|
|
ma_values == NULL, dk_refcnt == 1.
|
2024-03-01 15:48:26 -04:00
|
|
|
Values are stored in the me_value field of the PyDictKeyEntry.
|
2012-04-23 12:24:50 -03:00
|
|
|
Or:
|
|
|
|
A split table:
|
|
|
|
ma_values != NULL, dk_refcnt >= 1
|
|
|
|
Values are stored in the ma_values array.
|
2016-09-07 21:40:12 -03:00
|
|
|
Only string (unicode) keys are allowed.
|
|
|
|
|
|
|
|
There are four kinds of slots in the table (slot is index, and
|
|
|
|
DK_ENTRIES(keys)[index] if index >= 0):
|
|
|
|
|
|
|
|
1. Unused. index == DKIX_EMPTY
|
|
|
|
Does not hold an active (key, value) pair now and never did. Unused can
|
|
|
|
transition to Active upon key insertion. This is each slot's initial state.
|
2012-04-23 12:24:50 -03:00
|
|
|
|
2016-09-07 21:40:12 -03:00
|
|
|
2. Active. index >= 0, me_key != NULL and me_value != NULL
|
|
|
|
Holds an active (key, value) pair. Active can transition to Dummy or
|
|
|
|
Pending upon key deletion (for combined and split tables respectively).
|
|
|
|
This is the only case in which me_value != NULL.
|
|
|
|
|
|
|
|
3. Dummy. index == DKIX_DUMMY (combined only)
|
|
|
|
Previously held an active (key, value) pair, but that was deleted and an
|
|
|
|
active pair has not yet overwritten the slot. Dummy can transition to
|
|
|
|
Active upon key insertion. Dummy slots cannot be made Unused again
|
|
|
|
else the probe sequence in case of collision would have no way to know
|
|
|
|
they were once active.
|
2024-02-20 21:08:14 -04:00
|
|
|
In free-threaded builds dummy slots are not re-used to allow lock-free
|
|
|
|
lookups to proceed safely.
|
2016-09-07 21:40:12 -03:00
|
|
|
|
|
|
|
4. Pending. index >= 0, key != NULL, and value == NULL (split only)
|
|
|
|
Not yet inserted in split-table.
|
2012-04-23 12:24:50 -03:00
|
|
|
*/
|
|
|
|
|
2016-09-07 21:40:12 -03:00
|
|
|
/*
|
|
|
|
Preserving insertion order
|
2012-04-23 12:24:50 -03:00
|
|
|
|
2016-09-07 21:40:12 -03:00
|
|
|
It's simple for combined table. Since dk_entries is mostly append only, we can
|
|
|
|
get insertion order by just iterating dk_entries.
|
|
|
|
|
|
|
|
One exception is .popitem(). It removes last item in dk_entries and decrement
|
|
|
|
dk_nentries to achieve amortized O(1). Since there are DKIX_DUMMY remains in
|
|
|
|
dk_indices, we can't increment dk_usable even though dk_nentries is
|
|
|
|
decremented.
|
|
|
|
|
2021-10-06 09:19:53 -03:00
|
|
|
To preserve the order in a split table, a bit vector is used to record the
|
|
|
|
insertion order. When a key is inserted the bit vector is shifted up by 4 bits
|
|
|
|
and the index of the key is stored in the low 4 bits.
|
|
|
|
As a consequence of this, split keys have a maximum size of 16.
|
2016-09-07 21:40:12 -03:00
|
|
|
*/
|
|
|
|
|
|
|
|
/* PyDict_MINSIZE is the starting size for any new dict.
|
2012-04-23 12:24:50 -03:00
|
|
|
* 8 allows dicts with no more than 5 active entries; experiments suggested
|
|
|
|
* this suffices for the majority of dicts (consisting mostly of usually-small
|
|
|
|
* dicts created to pass keyword arguments).
|
|
|
|
* Making this 8, rather than 4 reduces the number of resizes for most
|
|
|
|
* dictionaries, without any significant extra memory use.
|
|
|
|
*/
|
2021-05-28 05:54:10 -03:00
|
|
|
#define PyDict_LOG_MINSIZE 3
|
2016-09-07 21:40:12 -03:00
|
|
|
#define PyDict_MINSIZE 8
|
2012-04-23 12:24:50 -03:00
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
#include "Python.h"
|
2024-02-22 16:02:39 -04:00
|
|
|
#include "pycore_bitutils.h" // _Py_bit_length
|
|
|
|
#include "pycore_call.h" // _PyObject_CallNoArgs()
|
|
|
|
#include "pycore_ceval.h" // _PyEval_GetBuiltin()
|
|
|
|
#include "pycore_code.h" // stats
|
|
|
|
#include "pycore_critical_section.h" // Py_BEGIN_CRITICAL_SECTION, Py_END_CRITICAL_SECTION
|
|
|
|
#include "pycore_dict.h" // export _PyDict_SizeOf()
|
|
|
|
#include "pycore_freelist.h" // _PyFreeListState_GET()
|
|
|
|
#include "pycore_gc.h" // _PyObject_GC_IS_TRACKED()
|
|
|
|
#include "pycore_object.h" // _PyObject_GC_TRACK(), _PyDebugAllocatorStats()
|
|
|
|
#include "pycore_pyatomic_ft_wrappers.h" // FT_ATOMIC_LOAD_SSIZE_RELAXED
|
|
|
|
#include "pycore_pyerrors.h" // _PyErr_GetRaisedException()
|
|
|
|
#include "pycore_pystate.h" // _PyThreadState_GET()
|
|
|
|
#include "pycore_setobject.h" // _PySet_NextEntry()
|
|
|
|
#include "stringlib/eq.h" // unicode_eq()
|
1993-03-27 14:11:32 -04:00
|
|
|
|
2022-03-01 19:09:28 -04:00
|
|
|
#include <stdbool.h>
|
|
|
|
|
2014-01-07 16:41:53 -04:00
|
|
|
/*[clinic input]
|
2014-01-26 00:43:29 -04:00
|
|
|
class dict "PyDictObject *" "&PyDict_Type"
|
2014-01-07 16:41:53 -04:00
|
|
|
[clinic start generated code]*/
|
2014-01-28 09:00:08 -04:00
|
|
|
/*[clinic end generated code: output=da39a3ee5e6b4b0d input=f157a5a0ce9589d6]*/
|
2013-11-23 19:37:55 -04:00
|
|
|
|
2012-04-23 12:24:50 -03:00
|
|
|
|
|
|
|
/*
|
|
|
|
To ensure the lookup algorithm terminates, there must be at least one Unused
|
|
|
|
slot (NULL key) in the table.
|
|
|
|
To avoid slowing down lookups on a near-full table, we resize the table when
|
|
|
|
it's USABLE_FRACTION (currently two-thirds) full.
|
|
|
|
*/
|
1997-01-27 20:00:11 -04:00
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
ASSERT_DICT_LOCKED(PyObject *op)
|
|
|
|
{
|
|
|
|
_Py_CRITICAL_SECTION_ASSERT_OBJECT_LOCKED(op);
|
|
|
|
}
|
|
|
|
#define ASSERT_DICT_LOCKED(op) ASSERT_DICT_LOCKED(_Py_CAST(PyObject*, op))
|
2024-05-24 14:39:06 -03:00
|
|
|
#define ASSERT_WORLD_STOPPED_OR_DICT_LOCKED(op) \
|
|
|
|
if (!_PyInterpreterState_GET()->stoptheworld.world_stopped) { \
|
|
|
|
ASSERT_DICT_LOCKED(op); \
|
|
|
|
}
|
2024-07-10 15:02:08 -03:00
|
|
|
#define ASSERT_WORLD_STOPPED_OR_OBJ_LOCKED(op) \
|
|
|
|
if (!_PyInterpreterState_GET()->stoptheworld.world_stopped) { \
|
|
|
|
_Py_CRITICAL_SECTION_ASSERT_OBJECT_LOCKED(op); \
|
|
|
|
}
|
2024-05-24 14:39:06 -03:00
|
|
|
|
2024-02-20 21:08:14 -04:00
|
|
|
#define IS_DICT_SHARED(mp) _PyObject_GC_IS_SHARED(mp)
|
|
|
|
#define SET_DICT_SHARED(mp) _PyObject_GC_SET_SHARED(mp)
|
|
|
|
#define LOAD_INDEX(keys, size, idx) _Py_atomic_load_int##size##_relaxed(&((const int##size##_t*)keys->dk_indices)[idx]);
|
|
|
|
#define STORE_INDEX(keys, size, idx, value) _Py_atomic_store_int##size##_relaxed(&((int##size##_t*)keys->dk_indices)[idx], (int##size##_t)value);
|
|
|
|
#define ASSERT_OWNED_OR_SHARED(mp) \
|
|
|
|
assert(_Py_IsOwnedByCurrentThread((PyObject *)mp) || IS_DICT_SHARED(mp));
|
2024-02-22 16:02:39 -04:00
|
|
|
|
2024-04-25 19:34:05 -03:00
|
|
|
#define LOCK_KEYS_IF_SPLIT(keys, kind) \
|
|
|
|
if (kind == DICT_KEYS_SPLIT) { \
|
2024-07-10 15:04:12 -03:00
|
|
|
LOCK_KEYS(keys); \
|
2024-04-25 19:34:05 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
#define UNLOCK_KEYS_IF_SPLIT(keys, kind) \
|
|
|
|
if (kind == DICT_KEYS_SPLIT) { \
|
2024-07-10 15:04:12 -03:00
|
|
|
UNLOCK_KEYS(keys); \
|
2024-04-25 19:34:05 -03:00
|
|
|
}
|
|
|
|
|
2024-02-22 16:02:39 -04:00
|
|
|
static inline Py_ssize_t
|
|
|
|
load_keys_nentries(PyDictObject *mp)
|
|
|
|
{
|
|
|
|
PyDictKeysObject *keys = _Py_atomic_load_ptr(&mp->ma_keys);
|
|
|
|
return _Py_atomic_load_ssize(&keys->dk_nentries);
|
|
|
|
}
|
2024-02-20 21:08:14 -04:00
|
|
|
|
|
|
|
static inline void
|
|
|
|
set_keys(PyDictObject *mp, PyDictKeysObject *keys)
|
|
|
|
{
|
|
|
|
ASSERT_OWNED_OR_SHARED(mp);
|
|
|
|
_Py_atomic_store_ptr_release(&mp->ma_keys, keys);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
set_values(PyDictObject *mp, PyDictValues *values)
|
|
|
|
{
|
|
|
|
ASSERT_OWNED_OR_SHARED(mp);
|
|
|
|
_Py_atomic_store_ptr_release(&mp->ma_values, values);
|
|
|
|
}
|
|
|
|
|
2024-02-20 20:40:37 -04:00
|
|
|
#define LOCK_KEYS(keys) PyMutex_LockFlags(&keys->dk_mutex, _Py_LOCK_DONT_DETACH)
|
|
|
|
#define UNLOCK_KEYS(keys) PyMutex_Unlock(&keys->dk_mutex)
|
|
|
|
|
|
|
|
#define ASSERT_KEYS_LOCKED(keys) assert(PyMutex_IsLocked(&keys->dk_mutex))
|
|
|
|
#define LOAD_SHARED_KEY(key) _Py_atomic_load_ptr_acquire(&key)
|
|
|
|
#define STORE_SHARED_KEY(key, value) _Py_atomic_store_ptr_release(&key, value)
|
|
|
|
// Inc refs the keys object, giving the previous value
|
|
|
|
#define INCREF_KEYS(dk) _Py_atomic_add_ssize(&dk->dk_refcnt, 1)
|
|
|
|
// Dec refs the keys object, giving the previous value
|
|
|
|
#define DECREF_KEYS(dk) _Py_atomic_add_ssize(&dk->dk_refcnt, -1)
|
2024-07-10 15:04:12 -03:00
|
|
|
#define LOAD_KEYS_NENTRIES(keys) _Py_atomic_load_ssize_relaxed(&keys->dk_nentries)
|
2024-02-20 20:40:37 -04:00
|
|
|
|
2024-04-25 19:34:05 -03:00
|
|
|
#define INCREF_KEYS_FT(dk) dictkeys_incref(dk)
|
|
|
|
#define DECREF_KEYS_FT(dk, shared) dictkeys_decref(_PyInterpreterState_GET(), dk, shared)
|
|
|
|
|
2024-02-20 20:40:37 -04:00
|
|
|
static inline void split_keys_entry_added(PyDictKeysObject *keys)
|
|
|
|
{
|
|
|
|
ASSERT_KEYS_LOCKED(keys);
|
|
|
|
|
|
|
|
// We increase before we decrease so we never get too small of a value
|
|
|
|
// when we're racing with reads
|
|
|
|
_Py_atomic_store_ssize_relaxed(&keys->dk_nentries, keys->dk_nentries + 1);
|
|
|
|
_Py_atomic_store_ssize_release(&keys->dk_usable, keys->dk_usable - 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
#else /* Py_GIL_DISABLED */
|
2024-02-06 18:03:43 -04:00
|
|
|
|
|
|
|
#define ASSERT_DICT_LOCKED(op)
|
2024-05-24 14:39:06 -03:00
|
|
|
#define ASSERT_WORLD_STOPPED_OR_DICT_LOCKED(op)
|
2024-07-10 15:02:08 -03:00
|
|
|
#define ASSERT_WORLD_STOPPED_OR_OBJ_LOCKED(op)
|
2024-02-20 20:40:37 -04:00
|
|
|
#define LOCK_KEYS(keys)
|
|
|
|
#define UNLOCK_KEYS(keys)
|
|
|
|
#define ASSERT_KEYS_LOCKED(keys)
|
|
|
|
#define LOAD_SHARED_KEY(key) key
|
|
|
|
#define STORE_SHARED_KEY(key, value) key = value
|
|
|
|
#define INCREF_KEYS(dk) dk->dk_refcnt++
|
|
|
|
#define DECREF_KEYS(dk) dk->dk_refcnt--
|
2024-07-10 15:04:12 -03:00
|
|
|
#define LOAD_KEYS_NENTRIES(keys) keys->dk_nentries
|
2024-04-25 19:34:05 -03:00
|
|
|
#define INCREF_KEYS_FT(dk)
|
|
|
|
#define DECREF_KEYS_FT(dk, shared)
|
|
|
|
#define LOCK_KEYS_IF_SPLIT(keys, kind)
|
|
|
|
#define UNLOCK_KEYS_IF_SPLIT(keys, kind)
|
2024-02-20 21:08:14 -04:00
|
|
|
#define IS_DICT_SHARED(mp) (false)
|
|
|
|
#define SET_DICT_SHARED(mp)
|
|
|
|
#define LOAD_INDEX(keys, size, idx) ((const int##size##_t*)(keys->dk_indices))[idx]
|
|
|
|
#define STORE_INDEX(keys, size, idx, value) ((int##size##_t*)(keys->dk_indices))[idx] = (int##size##_t)value
|
2024-02-20 20:40:37 -04:00
|
|
|
|
|
|
|
static inline void split_keys_entry_added(PyDictKeysObject *keys)
|
|
|
|
{
|
|
|
|
keys->dk_usable--;
|
|
|
|
keys->dk_nentries++;
|
|
|
|
}
|
2024-02-06 18:03:43 -04:00
|
|
|
|
2024-02-20 21:08:14 -04:00
|
|
|
static inline void
|
|
|
|
set_keys(PyDictObject *mp, PyDictKeysObject *keys)
|
|
|
|
{
|
|
|
|
mp->ma_keys = keys;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
set_values(PyDictObject *mp, PyDictValues *values)
|
|
|
|
{
|
|
|
|
mp->ma_values = values;
|
|
|
|
}
|
|
|
|
|
2024-02-22 16:02:39 -04:00
|
|
|
static inline Py_ssize_t
|
|
|
|
load_keys_nentries(PyDictObject *mp)
|
|
|
|
{
|
|
|
|
return mp->ma_keys->dk_nentries;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
#endif
|
|
|
|
|
2024-02-28 18:53:19 -04:00
|
|
|
#define STORE_KEY(ep, key) FT_ATOMIC_STORE_PTR_RELEASE(ep->me_key, key)
|
|
|
|
#define STORE_VALUE(ep, value) FT_ATOMIC_STORE_PTR_RELEASE(ep->me_value, value)
|
|
|
|
#define STORE_SPLIT_VALUE(mp, idx, value) FT_ATOMIC_STORE_PTR_RELEASE(mp->ma_values->values[idx], value)
|
|
|
|
#define STORE_HASH(ep, hash) FT_ATOMIC_STORE_SSIZE_RELAXED(ep->me_hash, hash)
|
|
|
|
#define STORE_KEYS_USABLE(keys, usable) FT_ATOMIC_STORE_SSIZE_RELAXED(keys->dk_usable, usable)
|
|
|
|
#define STORE_KEYS_NENTRIES(keys, nentries) FT_ATOMIC_STORE_SSIZE_RELAXED(keys->dk_nentries, nentries)
|
|
|
|
#define STORE_USED(mp, used) FT_ATOMIC_STORE_SSIZE_RELAXED(mp->ma_used, used)
|
|
|
|
|
2001-06-02 02:27:19 -03:00
|
|
|
#define PERTURB_SHIFT 5
|
|
|
|
|
1997-01-27 20:00:11 -04:00
|
|
|
/*
|
2001-06-02 02:27:19 -03:00
|
|
|
Major subtleties ahead: Most hash schemes depend on having a "good" hash
|
|
|
|
function, in the sense of simulating randomness. Python doesn't: its most
|
2016-07-10 13:33:18 -03:00
|
|
|
important hash functions (for ints) are very regular in common
|
2001-06-02 02:27:19 -03:00
|
|
|
cases:
|
|
|
|
|
2016-07-10 13:33:18 -03:00
|
|
|
>>>[hash(i) for i in range(4)]
|
2006-08-24 18:29:26 -03:00
|
|
|
[0, 1, 2, 3]
|
2001-06-02 02:27:19 -03:00
|
|
|
|
|
|
|
This isn't necessarily bad! To the contrary, in a table of size 2**i, taking
|
|
|
|
the low-order i bits as the initial table index is extremely fast, and there
|
2016-07-10 13:33:18 -03:00
|
|
|
are no collisions at all for dicts indexed by a contiguous range of ints. So
|
|
|
|
this gives better-than-random behavior in common cases, and that's very
|
|
|
|
desirable.
|
2001-06-02 02:27:19 -03:00
|
|
|
|
|
|
|
OTOH, when collisions occur, the tendency to fill contiguous slices of the
|
|
|
|
hash table makes a good collision resolution strategy crucial. Taking only
|
|
|
|
the last i bits of the hash code is also vulnerable: for example, consider
|
2010-05-09 12:52:27 -03:00
|
|
|
the list [i << 16 for i in range(20000)] as a set of keys. Since ints are
|
2006-08-24 18:29:26 -03:00
|
|
|
their own hash codes, and this fits in a dict of size 2**15, the last 15 bits
|
|
|
|
of every hash code are all 0: they *all* map to the same table index.
|
2001-06-02 02:27:19 -03:00
|
|
|
|
|
|
|
But catering to unusual cases should not slow the usual ones, so we just take
|
|
|
|
the last i bits anyway. It's up to collision resolution to do the rest. If
|
|
|
|
we *usually* find the key we're looking for on the first try (and, it turns
|
|
|
|
out, we usually do -- the table load factor is kept under 2/3, so the odds
|
|
|
|
are solidly in our favor), then it makes best sense to keep the initial index
|
|
|
|
computation dirt cheap.
|
|
|
|
|
|
|
|
The first half of collision resolution is to visit table indices via this
|
|
|
|
recurrence:
|
|
|
|
|
|
|
|
j = ((5*j) + 1) mod 2**i
|
|
|
|
|
|
|
|
For any initial j in range(2**i), repeating that 2**i times generates each
|
|
|
|
int in range(2**i) exactly once (see any text on random-number generation for
|
|
|
|
proof). By itself, this doesn't help much: like linear probing (setting
|
|
|
|
j += 1, or j -= 1, on each loop trip), it scans the table entries in a fixed
|
|
|
|
order. This would be bad, except that's not the only thing we do, and it's
|
|
|
|
actually *good* in the common cases where hash keys are consecutive. In an
|
|
|
|
example that's really too small to make this entirely clear, for a table of
|
|
|
|
size 2**3 the order of indices is:
|
|
|
|
|
|
|
|
0 -> 1 -> 6 -> 7 -> 4 -> 5 -> 2 -> 3 -> 0 [and here it's repeating]
|
|
|
|
|
|
|
|
If two things come in at index 5, the first place we look after is index 2,
|
|
|
|
not 6, so if another comes in at index 6 the collision at 5 didn't hurt it.
|
|
|
|
Linear probing is deadly in this case because there the fixed probe order
|
|
|
|
is the *same* as the order consecutive keys are likely to arrive. But it's
|
|
|
|
extremely unlikely hash codes will follow a 5*j+1 recurrence by accident,
|
|
|
|
and certain that consecutive hash codes do not.
|
|
|
|
|
|
|
|
The other half of the strategy is to get the other bits of the hash code
|
|
|
|
into play. This is done by initializing a (unsigned) vrbl "perturb" to the
|
|
|
|
full hash code, and changing the recurrence to:
|
|
|
|
|
|
|
|
perturb >>= PERTURB_SHIFT;
|
2016-10-06 03:19:07 -03:00
|
|
|
j = (5*j) + 1 + perturb;
|
2001-06-02 02:27:19 -03:00
|
|
|
use j % 2**i as the next table index;
|
|
|
|
|
|
|
|
Now the probe sequence depends (eventually) on every bit in the hash code,
|
|
|
|
and the pseudo-scrambling property of recurring on 5*j+1 is more valuable,
|
|
|
|
because it quickly magnifies small differences in the bits that didn't affect
|
|
|
|
the initial index. Note that because perturb is unsigned, if the recurrence
|
|
|
|
is executed often enough perturb eventually becomes and remains 0. At that
|
|
|
|
point (very rarely reached) the recurrence is on (just) 5*j+1 again, and
|
|
|
|
that's certain to find an empty slot eventually (since it generates every int
|
|
|
|
in range(2**i), and we make sure there's always at least one empty slot).
|
|
|
|
|
|
|
|
Selecting a good value for PERTURB_SHIFT is a balancing act. You want it
|
|
|
|
small so that the high bits of the hash code continue to affect the probe
|
|
|
|
sequence across iterations; but you want it large so that in really bad cases
|
|
|
|
the high-order hash bits have an effect on early iterations. 5 was "the
|
|
|
|
best" in minimizing total collisions across experiments Tim Peters ran (on
|
|
|
|
both normal and pathological cases), but 4 and 6 weren't significantly worse.
|
|
|
|
|
2006-08-24 18:29:26 -03:00
|
|
|
Historical: Reimer Behrends contributed the idea of using a polynomial-based
|
2001-06-02 02:27:19 -03:00
|
|
|
approach, using repeated multiplication by x in GF(2**n) where an irreducible
|
|
|
|
polynomial for each table size was chosen such that x was a primitive root.
|
|
|
|
Christian Tismer later extended that to use division by x instead, as an
|
|
|
|
efficient way to get the high bits of the hash code into play. This scheme
|
Merged revisions 58221-58741 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r58221 | georg.brandl | 2007-09-20 10:57:59 -0700 (Thu, 20 Sep 2007) | 2 lines
Patch #1181: add os.environ.clear() method.
........
r58225 | sean.reifschneider | 2007-09-20 23:33:28 -0700 (Thu, 20 Sep 2007) | 3 lines
Issue1704287: "make install" fails unless you do "make" first. Make
oldsharedmods and sharedmods in "libinstall".
........
r58232 | guido.van.rossum | 2007-09-22 13:18:03 -0700 (Sat, 22 Sep 2007) | 4 lines
Patch # 188 by Philip Jenvey.
Make tell() mark CRLF as a newline.
With unit test.
........
r58242 | georg.brandl | 2007-09-24 10:55:47 -0700 (Mon, 24 Sep 2007) | 2 lines
Fix typo and double word.
........
r58245 | georg.brandl | 2007-09-24 10:59:28 -0700 (Mon, 24 Sep 2007) | 2 lines
#1196: document default radix for int().
........
r58247 | georg.brandl | 2007-09-24 11:08:24 -0700 (Mon, 24 Sep 2007) | 2 lines
#1177: accept 2xx responses for https too, not only http.
........
r58249 | andrew.kuchling | 2007-09-24 16:45:51 -0700 (Mon, 24 Sep 2007) | 1 line
Remove stray odd character; grammar fix
........
r58250 | andrew.kuchling | 2007-09-24 16:46:28 -0700 (Mon, 24 Sep 2007) | 1 line
Typo fix
........
r58251 | andrew.kuchling | 2007-09-24 17:09:42 -0700 (Mon, 24 Sep 2007) | 1 line
Add various items
........
r58268 | vinay.sajip | 2007-09-26 22:34:45 -0700 (Wed, 26 Sep 2007) | 1 line
Change to flush and close logic to fix #1760556.
........
r58269 | vinay.sajip | 2007-09-26 22:38:51 -0700 (Wed, 26 Sep 2007) | 1 line
Change to basicConfig() to fix #1021.
........
r58270 | georg.brandl | 2007-09-26 23:26:58 -0700 (Wed, 26 Sep 2007) | 2 lines
#1208: document match object's boolean value.
........
r58271 | vinay.sajip | 2007-09-26 23:56:13 -0700 (Wed, 26 Sep 2007) | 1 line
Minor date change.
........
r58272 | vinay.sajip | 2007-09-27 00:35:10 -0700 (Thu, 27 Sep 2007) | 1 line
Change to LogRecord.__init__() to fix #1206. Note that archaic use of type(x) == types.DictType is because of keeping 1.5.2 compatibility. While this is much less relevant these days, there probably needs to be a separate commit for removing all archaic constructs at the same time.
........
r58288 | brett.cannon | 2007-09-30 12:45:10 -0700 (Sun, 30 Sep 2007) | 9 lines
tuple.__repr__ did not consider a reference loop as it is not possible from
Python code; but it is possible from C. object.__str__ had the issue of not
expecting a type to doing something within it's tp_str implementation that
could trigger an infinite recursion, but it could in C code.. Both found
thanks to BaseException and how it handles its repr.
Closes issue #1686386. Thanks to Thomas Herve for taking an initial stab at
coming up with a solution.
........
r58289 | brett.cannon | 2007-09-30 13:37:19 -0700 (Sun, 30 Sep 2007) | 3 lines
Fix error introduced by r58288; if a tuple is length 0 return its repr and
don't worry about any self-referring tuples.
........
r58294 | facundo.batista | 2007-10-02 10:01:24 -0700 (Tue, 02 Oct 2007) | 11 lines
Made the various is_* operations return booleans. This was discussed
with Cawlishaw by mail, and he basically confirmed that to these is_*
operations, there's no need to return Decimal(0) and Decimal(1) if
the language supports the False and True booleans.
Also added a few tests for the these functions in extra.decTest, since
they are mostly untested (apart from the doctests).
Thanks Mark Dickinson
........
r58295 | facundo.batista | 2007-10-02 11:21:18 -0700 (Tue, 02 Oct 2007) | 4 lines
Added a class to store the digits of log(10), so that they can be made
available when necessary without recomputing. Thanks Mark Dickinson
........
r58299 | mark.summerfield | 2007-10-03 01:53:21 -0700 (Wed, 03 Oct 2007) | 4 lines
Added note in footnote about string comparisons about
unicodedata.normalize().
........
r58304 | raymond.hettinger | 2007-10-03 14:18:11 -0700 (Wed, 03 Oct 2007) | 1 line
enumerate() is no longer bounded to using sequences shorter than LONG_MAX. The possibility of overflow was sending some newsgroup posters into a tizzy.
........
r58305 | raymond.hettinger | 2007-10-03 17:20:27 -0700 (Wed, 03 Oct 2007) | 1 line
itertools.count() no longer limited to sys.maxint.
........
r58306 | kurt.kaiser | 2007-10-03 18:49:54 -0700 (Wed, 03 Oct 2007) | 3 lines
Assume that the user knows when he wants to end the line; don't insert
something he didn't select or complete.
........
r58307 | kurt.kaiser | 2007-10-03 19:07:50 -0700 (Wed, 03 Oct 2007) | 2 lines
Remove unused theme that was causing a fault in p3k.
........
r58308 | kurt.kaiser | 2007-10-03 19:09:17 -0700 (Wed, 03 Oct 2007) | 2 lines
Clean up EditorWindow close.
........
r58309 | kurt.kaiser | 2007-10-03 19:53:07 -0700 (Wed, 03 Oct 2007) | 7 lines
textView cleanup. Patch 1718043 Tal Einat.
M idlelib/EditorWindow.py
M idlelib/aboutDialog.py
M idlelib/textView.py
M idlelib/NEWS.txt
........
r58310 | kurt.kaiser | 2007-10-03 20:11:12 -0700 (Wed, 03 Oct 2007) | 3 lines
configDialog cleanup. Patch 1730217 Tal Einat.
........
r58311 | neal.norwitz | 2007-10-03 23:00:48 -0700 (Wed, 03 Oct 2007) | 4 lines
Coverity #151: Remove deadcode.
All this code already exists above starting at line 653.
........
r58325 | fred.drake | 2007-10-04 19:46:12 -0700 (Thu, 04 Oct 2007) | 1 line
wrap lines to <80 characters before fixing errors
........
r58326 | raymond.hettinger | 2007-10-04 19:47:07 -0700 (Thu, 04 Oct 2007) | 6 lines
Add __asdict__() to NamedTuple and refine the docs.
Add maxlen support to deque() and fixup docs.
Partially fix __reduce__(). The None as a third arg was no longer supported.
Still needs work on __reduce__() to handle recursive inputs.
........
r58327 | fred.drake | 2007-10-04 19:48:32 -0700 (Thu, 04 Oct 2007) | 3 lines
move descriptions of ac_(in|out)_buffer_size to the right place
http://bugs.python.org/issue1053
........
r58329 | neal.norwitz | 2007-10-04 20:39:17 -0700 (Thu, 04 Oct 2007) | 3 lines
dict could be NULL, so we need to XDECREF.
Fix a compiler warning about passing a PyTypeObject* instead of PyObject*.
........
r58330 | neal.norwitz | 2007-10-04 20:41:19 -0700 (Thu, 04 Oct 2007) | 2 lines
Fix Coverity #158: Check the correct variable.
........
r58332 | neal.norwitz | 2007-10-04 22:01:38 -0700 (Thu, 04 Oct 2007) | 7 lines
Fix Coverity #159.
This code was broken if save() returned a negative number since i contained
a boolean value and then we compared i < 0 which should never be true.
Will backport (assuming it's necessary)
........
r58334 | neal.norwitz | 2007-10-04 22:29:17 -0700 (Thu, 04 Oct 2007) | 1 line
Add a note about fixing some more warnings found by Coverity.
........
r58338 | raymond.hettinger | 2007-10-05 12:07:31 -0700 (Fri, 05 Oct 2007) | 1 line
Restore BEGIN/END THREADS macros which were squashed in the previous checkin
........
r58343 | gregory.p.smith | 2007-10-06 00:48:10 -0700 (Sat, 06 Oct 2007) | 3 lines
Stab in the dark attempt to fix the test_bsddb3 failure on sparc and S-390
ubuntu buildbots.
........
r58344 | gregory.p.smith | 2007-10-06 00:51:59 -0700 (Sat, 06 Oct 2007) | 2 lines
Allows BerkeleyDB 4.6.x >= 4.6.21 for the bsddb module.
........
r58348 | gregory.p.smith | 2007-10-06 08:47:37 -0700 (Sat, 06 Oct 2007) | 3 lines
Use the host the author likely meant in the first place. pop.gmail.com is
reliable. gmail.org is someones personal domain.
........
r58351 | neal.norwitz | 2007-10-06 12:16:28 -0700 (Sat, 06 Oct 2007) | 3 lines
Ensure that this test will pass even if another test left an unwritable TESTFN.
Also use the safe unlink in test_support instead of rolling our own here.
........
r58368 | georg.brandl | 2007-10-08 00:50:24 -0700 (Mon, 08 Oct 2007) | 3 lines
#1123: fix the docs for the str.split(None, sep) case.
Also expand a few other methods' docs, which had more info in the deprecated string module docs.
........
r58369 | georg.brandl | 2007-10-08 01:06:05 -0700 (Mon, 08 Oct 2007) | 2 lines
Update docstring of sched, also remove an unused assignment.
........
r58370 | raymond.hettinger | 2007-10-08 02:14:28 -0700 (Mon, 08 Oct 2007) | 5 lines
Add comments to NamedTuple code.
Let the field spec be either a string or a non-string sequence (suggested by Martin Blais with use cases).
Improve the error message in the case of a SyntaxError (caused by a duplicate field name).
........
r58371 | raymond.hettinger | 2007-10-08 02:56:29 -0700 (Mon, 08 Oct 2007) | 1 line
Missed a line in the docs
........
r58372 | raymond.hettinger | 2007-10-08 03:11:51 -0700 (Mon, 08 Oct 2007) | 1 line
Better variable names
........
r58376 | georg.brandl | 2007-10-08 07:12:47 -0700 (Mon, 08 Oct 2007) | 3 lines
#1199: docs for tp_as_{number,sequence,mapping}, by Amaury Forgeot d'Arc.
No need to merge this to py3k!
........
r58380 | raymond.hettinger | 2007-10-08 14:26:58 -0700 (Mon, 08 Oct 2007) | 1 line
Eliminate camelcase function name
........
r58381 | andrew.kuchling | 2007-10-08 16:23:03 -0700 (Mon, 08 Oct 2007) | 1 line
Eliminate camelcase function name
........
r58382 | raymond.hettinger | 2007-10-08 18:36:23 -0700 (Mon, 08 Oct 2007) | 1 line
Make the error messages more specific
........
r58384 | gregory.p.smith | 2007-10-08 23:02:21 -0700 (Mon, 08 Oct 2007) | 10 lines
Splits Modules/_bsddb.c up into bsddb.h and _bsddb.c and adds a C API
object available as bsddb.db.api. This is based on the patch submitted
by Duncan Grisby here:
http://sourceforge.net/tracker/index.php?func=detail&aid=1551895&group_id=13900&atid=313900
See this thread for additional info:
http://sourceforge.net/mailarchive/forum.php?thread_name=E1GAVDK-0002rk-Iw%40apasphere.com&forum_name=pybsddb-users
It also cleans up the code a little by removing some ifdef/endifs for
python prior to 2.1 and for unsupported Berkeley DB <= 3.2.
........
r58385 | gregory.p.smith | 2007-10-08 23:50:43 -0700 (Mon, 08 Oct 2007) | 5 lines
Fix a double free when positioning a database cursor to a non-existant
string key (and probably a few other situations with string keys).
This was reported with a patch as pybsddb sourceforge bug 1708868 by
jjjhhhlll at gmail.
........
r58386 | gregory.p.smith | 2007-10-09 00:19:11 -0700 (Tue, 09 Oct 2007) | 3 lines
Use the highest cPickle protocol in bsddb.dbshelve. This comes from
sourceforge pybsddb patch 1551443 by w_barnes.
........
r58394 | gregory.p.smith | 2007-10-09 11:26:02 -0700 (Tue, 09 Oct 2007) | 2 lines
remove another sleepycat reference
........
r58396 | kurt.kaiser | 2007-10-09 12:31:30 -0700 (Tue, 09 Oct 2007) | 3 lines
Allow interrupt only when executing user code in subprocess
Patch 1225 Tal Einat modified from IDLE-Spoon.
........
r58399 | brett.cannon | 2007-10-09 17:07:50 -0700 (Tue, 09 Oct 2007) | 5 lines
Remove file-level typedefs that were inconsistently used throughout the file.
Just move over to the public API names.
Closes issue1238.
........
r58401 | raymond.hettinger | 2007-10-09 17:26:46 -0700 (Tue, 09 Oct 2007) | 1 line
Accept Jim Jewett's api suggestion to use None instead of -1 to indicate unbounded deques.
........
r58403 | kurt.kaiser | 2007-10-09 17:55:40 -0700 (Tue, 09 Oct 2007) | 2 lines
Allow cursor color change w/o restart. Patch 1725576 Tal Einat.
........
r58404 | kurt.kaiser | 2007-10-09 18:06:47 -0700 (Tue, 09 Oct 2007) | 2 lines
show paste if > 80 columns. Patch 1659326 Tal Einat.
........
r58415 | thomas.heller | 2007-10-11 12:51:32 -0700 (Thu, 11 Oct 2007) | 5 lines
On OS X, use os.uname() instead of gestalt.sysv(...) to get the
operating system version. This allows to use ctypes when Python
was configured with --disable-toolbox-glue.
........
r58419 | neal.norwitz | 2007-10-11 20:01:01 -0700 (Thu, 11 Oct 2007) | 1 line
Get rid of warning about not being able to create an existing directory.
........
r58420 | neal.norwitz | 2007-10-11 20:01:30 -0700 (Thu, 11 Oct 2007) | 1 line
Get rid of warnings on a bunch of platforms by using a proper prototype.
........
r58421 | neal.norwitz | 2007-10-11 20:01:54 -0700 (Thu, 11 Oct 2007) | 4 lines
Get rid of compiler warning about retval being used (returned) without
being initialized. (gcc warning and Coverity 202)
........
r58422 | neal.norwitz | 2007-10-11 20:03:23 -0700 (Thu, 11 Oct 2007) | 1 line
Fix Coverity 168: Close the file before returning (exiting).
........
r58423 | neal.norwitz | 2007-10-11 20:04:18 -0700 (Thu, 11 Oct 2007) | 4 lines
Fix Coverity 180: Don't overallocate. We don't need structs, but pointers.
Also fix a memory leak.
........
r58424 | neal.norwitz | 2007-10-11 20:05:19 -0700 (Thu, 11 Oct 2007) | 5 lines
Fix Coverity 185-186: If the passed in FILE is NULL, uninitialized memory
would be accessed.
Will backport.
........
r58425 | neal.norwitz | 2007-10-11 20:52:34 -0700 (Thu, 11 Oct 2007) | 1 line
Get this module to compile with bsddb versions prior to 4.3
........
r58430 | martin.v.loewis | 2007-10-12 01:56:52 -0700 (Fri, 12 Oct 2007) | 3 lines
Bug #1216: Restore support for Visual Studio 2002.
Will backport to 2.5.
........
r58433 | raymond.hettinger | 2007-10-12 10:53:11 -0700 (Fri, 12 Oct 2007) | 1 line
Fix test of count.__repr__() to ignore the 'L' if the count is a long
........
r58434 | gregory.p.smith | 2007-10-12 11:44:06 -0700 (Fri, 12 Oct 2007) | 4 lines
Fixes http://bugs.python.org/issue1233 - bsddb.dbshelve.DBShelf.append
was useless due to inverted logic. Also adds a test case for RECNO dbs
to test_dbshelve.
........
r58445 | georg.brandl | 2007-10-13 06:20:03 -0700 (Sat, 13 Oct 2007) | 2 lines
Fix email example.
........
r58450 | gregory.p.smith | 2007-10-13 16:02:05 -0700 (Sat, 13 Oct 2007) | 2 lines
Fix an uncollectable reference leak in bsddb.db.DBShelf.append
........
r58453 | neal.norwitz | 2007-10-13 17:18:40 -0700 (Sat, 13 Oct 2007) | 8 lines
Let the O/S supply a port if none of the default ports can be used.
This should make the tests more robust at the expense of allowing
tests to be sloppier by not requiring them to cleanup after themselves.
(It will legitamitely help when running two test suites simultaneously
or if another process is already using one of the predefined ports.)
Also simplifies (slightLy) the exception handling elsewhere.
........
r58459 | neal.norwitz | 2007-10-14 11:30:21 -0700 (Sun, 14 Oct 2007) | 2 lines
Don't raise a string exception, they don't work anymore.
........
r58460 | neal.norwitz | 2007-10-14 11:40:37 -0700 (Sun, 14 Oct 2007) | 1 line
Use unittest for assertions
........
r58468 | armin.rigo | 2007-10-15 00:48:35 -0700 (Mon, 15 Oct 2007) | 2 lines
test_bigbits was not testing what it seemed to.
........
r58471 | guido.van.rossum | 2007-10-15 08:54:11 -0700 (Mon, 15 Oct 2007) | 3 lines
Change a PyErr_Print() into a PyErr_Clear(),
per discussion in issue 1031213.
........
r58500 | raymond.hettinger | 2007-10-16 12:18:30 -0700 (Tue, 16 Oct 2007) | 1 line
Improve error messages
........
r58506 | raymond.hettinger | 2007-10-16 14:28:32 -0700 (Tue, 16 Oct 2007) | 1 line
More docs, error messages, and tests
........
r58507 | andrew.kuchling | 2007-10-16 15:58:03 -0700 (Tue, 16 Oct 2007) | 1 line
Add items
........
r58508 | brett.cannon | 2007-10-16 16:24:06 -0700 (Tue, 16 Oct 2007) | 3 lines
Remove ``:const:`` notation on None in parameter list. Since the markup is not
rendered for parameters it just showed up as ``:const:`None` `` in the output.
........
r58509 | brett.cannon | 2007-10-16 16:26:45 -0700 (Tue, 16 Oct 2007) | 3 lines
Re-order some functions whose parameters differ between PyObject and const char
* so that they are next to each other.
........
r58522 | armin.rigo | 2007-10-17 11:46:37 -0700 (Wed, 17 Oct 2007) | 5 lines
Fix the overflow checking of list_repeat.
Introduce overflow checking into list_inplace_repeat.
Backport candidate, possibly.
........
r58530 | facundo.batista | 2007-10-17 20:16:03 -0700 (Wed, 17 Oct 2007) | 7 lines
Issue #1580738. When HTTPConnection reads the whole stream with read(),
it closes itself. When the stream is read in several calls to read(n),
it should behave in the same way if HTTPConnection knows where the end
of the stream is (through self.length). Added a test case for this
behaviour.
........
r58531 | facundo.batista | 2007-10-17 20:44:48 -0700 (Wed, 17 Oct 2007) | 3 lines
Issue 1289, just a typo.
........
r58532 | gregory.p.smith | 2007-10-18 00:56:54 -0700 (Thu, 18 Oct 2007) | 4 lines
cleanup test_dbtables to use mkdtemp. cleanup dbtables to pass txn as a
keyword argument whenever possible to avoid bugs and confusion. (dbtables.py
line 447 self.db.get using txn as a non-keyword was an actual bug due to this)
........
r58533 | gregory.p.smith | 2007-10-18 01:34:20 -0700 (Thu, 18 Oct 2007) | 4 lines
Fix a weird bug in dbtables: if it chose a random rowid string that contained
NULL bytes it would cause the database all sorts of problems in the future
leading to very strange random failures and corrupt dbtables.bsdTableDb dbs.
........
r58534 | gregory.p.smith | 2007-10-18 09:32:02 -0700 (Thu, 18 Oct 2007) | 3 lines
A cleaner fix than the one committed last night. Generate random rowids that
do not contain null bytes.
........
r58537 | gregory.p.smith | 2007-10-18 10:17:57 -0700 (Thu, 18 Oct 2007) | 2 lines
mention bsddb fixes.
........
r58538 | raymond.hettinger | 2007-10-18 14:13:06 -0700 (Thu, 18 Oct 2007) | 1 line
Remove useless warning
........
r58539 | gregory.p.smith | 2007-10-19 00:31:20 -0700 (Fri, 19 Oct 2007) | 2 lines
squelch the warning that this test is supposed to trigger.
........
r58542 | georg.brandl | 2007-10-19 05:32:39 -0700 (Fri, 19 Oct 2007) | 2 lines
Clarify wording for apply().
........
r58544 | mark.summerfield | 2007-10-19 05:48:17 -0700 (Fri, 19 Oct 2007) | 3 lines
Added a cross-ref to each other.
........
r58545 | georg.brandl | 2007-10-19 10:38:49 -0700 (Fri, 19 Oct 2007) | 2 lines
#1284: "S" means "seen", not unread.
........
r58548 | thomas.heller | 2007-10-19 11:11:41 -0700 (Fri, 19 Oct 2007) | 4 lines
Fix ctypes on 32-bit systems when Python is configured --with-system-ffi.
See also https://bugs.launchpad.net/bugs/72505.
Ported from release25-maint branch.
........
r58550 | facundo.batista | 2007-10-19 12:25:57 -0700 (Fri, 19 Oct 2007) | 8 lines
The constructor from tuple was way too permissive: it allowed bad
coefficient numbers, floats in the sign, and other details that
generated directly the wrong number in the best case, or triggered
misfunctionality in the alorithms.
Test cases added for these issues. Thanks Mark Dickinson.
........
r58559 | georg.brandl | 2007-10-20 06:22:53 -0700 (Sat, 20 Oct 2007) | 2 lines
Fix code being interpreted as a target.
........
r58561 | georg.brandl | 2007-10-20 06:36:24 -0700 (Sat, 20 Oct 2007) | 2 lines
Document new "cmdoption" directive.
........
r58562 | georg.brandl | 2007-10-20 08:21:22 -0700 (Sat, 20 Oct 2007) | 2 lines
Make a path more Unix-standardy.
........
r58564 | georg.brandl | 2007-10-20 10:51:39 -0700 (Sat, 20 Oct 2007) | 2 lines
Document new directive "envvar".
........
r58567 | georg.brandl | 2007-10-20 11:08:14 -0700 (Sat, 20 Oct 2007) | 6 lines
* Add new toplevel chapter, "Using Python." (how to install,
configure and setup python on different platforms -- at least
in theory.)
* Move the Python on Mac docs in that chapter.
* Add a new chapter about the command line invocation, by stargaming.
........
r58568 | georg.brandl | 2007-10-20 11:33:20 -0700 (Sat, 20 Oct 2007) | 2 lines
Change title, for now.
........
r58569 | georg.brandl | 2007-10-20 11:39:25 -0700 (Sat, 20 Oct 2007) | 2 lines
Add entry to ACKS.
........
r58570 | georg.brandl | 2007-10-20 12:05:45 -0700 (Sat, 20 Oct 2007) | 2 lines
Clarify -E docs.
........
r58571 | georg.brandl | 2007-10-20 12:08:36 -0700 (Sat, 20 Oct 2007) | 2 lines
Even more clarification.
........
r58572 | andrew.kuchling | 2007-10-20 12:25:37 -0700 (Sat, 20 Oct 2007) | 1 line
Fix protocol name
........
r58573 | andrew.kuchling | 2007-10-20 12:35:18 -0700 (Sat, 20 Oct 2007) | 1 line
Various items
........
r58574 | andrew.kuchling | 2007-10-20 12:39:35 -0700 (Sat, 20 Oct 2007) | 1 line
Use correct header line
........
r58576 | armin.rigo | 2007-10-21 02:14:15 -0700 (Sun, 21 Oct 2007) | 3 lines
Add a crasher for the long-standing issue with closing a file
while another thread uses it.
........
r58577 | georg.brandl | 2007-10-21 03:01:56 -0700 (Sun, 21 Oct 2007) | 2 lines
Remove duplicate crasher.
........
r58578 | georg.brandl | 2007-10-21 03:24:20 -0700 (Sun, 21 Oct 2007) | 2 lines
Unify "byte code" to "bytecode". Also sprinkle :term: markup for it.
........
r58579 | georg.brandl | 2007-10-21 03:32:54 -0700 (Sun, 21 Oct 2007) | 2 lines
Add markup to new function descriptions.
........
r58580 | georg.brandl | 2007-10-21 03:45:46 -0700 (Sun, 21 Oct 2007) | 2 lines
Add :term:s for descriptors.
........
r58581 | georg.brandl | 2007-10-21 03:46:24 -0700 (Sun, 21 Oct 2007) | 2 lines
Unify "file-descriptor" to "file descriptor".
........
r58582 | georg.brandl | 2007-10-21 03:52:38 -0700 (Sun, 21 Oct 2007) | 2 lines
Add :term: for generators.
........
r58583 | georg.brandl | 2007-10-21 05:10:28 -0700 (Sun, 21 Oct 2007) | 2 lines
Add :term:s for iterator.
........
r58584 | georg.brandl | 2007-10-21 05:15:05 -0700 (Sun, 21 Oct 2007) | 2 lines
Add :term:s for "new-style class".
........
r58588 | neal.norwitz | 2007-10-21 21:47:54 -0700 (Sun, 21 Oct 2007) | 1 line
Add Chris Monson so he can edit PEPs.
........
r58594 | guido.van.rossum | 2007-10-22 09:27:19 -0700 (Mon, 22 Oct 2007) | 4 lines
Issue #1307, patch by Derek Shockey.
When "MAIL" is received without args, an exception happens instead of
sending a 501 syntax error response.
........
r58598 | travis.oliphant | 2007-10-22 19:40:56 -0700 (Mon, 22 Oct 2007) | 1 line
Add phuang patch from Issue 708374 which adds offset parameter to mmap module.
........
r58601 | neal.norwitz | 2007-10-22 22:44:27 -0700 (Mon, 22 Oct 2007) | 2 lines
Bug #1313, fix typo (wrong variable name) in example.
........
r58609 | georg.brandl | 2007-10-23 11:21:35 -0700 (Tue, 23 Oct 2007) | 2 lines
Update Pygments version from externals.
........
r58618 | guido.van.rossum | 2007-10-23 12:25:41 -0700 (Tue, 23 Oct 2007) | 3 lines
Issue 1307 by Derek Shockey, fox the same bug for RCPT.
Neal: please backport!
........
r58620 | raymond.hettinger | 2007-10-23 13:37:41 -0700 (Tue, 23 Oct 2007) | 1 line
Shorter name for namedtuple()
........
r58621 | andrew.kuchling | 2007-10-23 13:55:47 -0700 (Tue, 23 Oct 2007) | 1 line
Update name
........
r58622 | raymond.hettinger | 2007-10-23 14:23:07 -0700 (Tue, 23 Oct 2007) | 1 line
Fixup news entry
........
r58623 | raymond.hettinger | 2007-10-23 18:28:33 -0700 (Tue, 23 Oct 2007) | 1 line
Optimize sum() for integer and float inputs.
........
r58624 | raymond.hettinger | 2007-10-23 19:05:51 -0700 (Tue, 23 Oct 2007) | 1 line
Fixup error return and add support for intermixed ints and floats/
........
r58628 | vinay.sajip | 2007-10-24 03:47:06 -0700 (Wed, 24 Oct 2007) | 1 line
Bug #1321: Fixed logic error in TimedRotatingFileHandler.__init__()
........
r58641 | facundo.batista | 2007-10-24 12:11:08 -0700 (Wed, 24 Oct 2007) | 4 lines
Issue 1290. CharacterData.__repr__ was constructing a string
in response that keeped having a non-ascii character.
........
r58643 | thomas.heller | 2007-10-24 12:50:45 -0700 (Wed, 24 Oct 2007) | 1 line
Added unittest for calling a function with paramflags (backport from py3k branch).
........
r58645 | matthias.klose | 2007-10-24 13:00:44 -0700 (Wed, 24 Oct 2007) | 2 lines
- Build using system ffi library on arm*-linux*.
........
r58651 | georg.brandl | 2007-10-24 14:40:38 -0700 (Wed, 24 Oct 2007) | 2 lines
Bug #1287: make os.environ.pop() work as expected.
........
r58652 | raymond.hettinger | 2007-10-24 19:26:58 -0700 (Wed, 24 Oct 2007) | 1 line
Missing DECREFs
........
r58653 | matthias.klose | 2007-10-24 23:37:24 -0700 (Wed, 24 Oct 2007) | 2 lines
- Build using system ffi library on arm*-linux*, pass --with-system-ffi to CONFIG_ARGS
........
r58655 | thomas.heller | 2007-10-25 12:47:32 -0700 (Thu, 25 Oct 2007) | 2 lines
ffi_type_longdouble may be already #defined.
See issue 1324.
........
r58656 | kurt.kaiser | 2007-10-25 15:43:45 -0700 (Thu, 25 Oct 2007) | 3 lines
Correct an ancient bug in an unused path by removing that path: register() is
now idempotent.
........
r58660 | kurt.kaiser | 2007-10-25 17:10:09 -0700 (Thu, 25 Oct 2007) | 4 lines
1. Add comments to provide top-level documentation.
2. Refactor to use more descriptive names.
3. Enhance tests in main().
........
r58675 | georg.brandl | 2007-10-26 11:30:41 -0700 (Fri, 26 Oct 2007) | 2 lines
Fix new pop() method on os.environ on ignorecase-platforms.
........
r58696 | neal.norwitz | 2007-10-27 15:32:21 -0700 (Sat, 27 Oct 2007) | 1 line
Update URL for Pygments. 0.8.1 is no longer available
........
r58697 | hyeshik.chang | 2007-10-28 04:19:02 -0700 (Sun, 28 Oct 2007) | 3 lines
- Add support for FreeBSD 8 which is recently forked from FreeBSD 7.
- Regenerate IN module for most recent maintenance tree of FreeBSD 6 and 7.
........
r58698 | hyeshik.chang | 2007-10-28 05:38:09 -0700 (Sun, 28 Oct 2007) | 2 lines
Enable platform-specific tweaks for FreeBSD 8 (exactly same to FreeBSD 7's yet)
........
r58700 | kurt.kaiser | 2007-10-28 12:03:59 -0700 (Sun, 28 Oct 2007) | 2 lines
Add confirmation dialog before printing. Patch 1717170 Tal Einat.
........
r58706 | guido.van.rossum | 2007-10-29 13:52:45 -0700 (Mon, 29 Oct 2007) | 3 lines
Patch 1353 by Jacob Winther.
Add mp4 mapping to mimetypes.py.
........
r58709 | guido.van.rossum | 2007-10-29 15:15:05 -0700 (Mon, 29 Oct 2007) | 6 lines
Backport fixes for the code that decodes octal escapes (and for PyString
also hex escapes) -- this was reaching beyond the end of the input string
buffer, even though it is not supposed to be \0-terminated.
This has no visible effect but is clearly the correct thing to do.
(In 3.0 it had a visible effect after removing ob_sstate from PyString.)
........
r58710 | kurt.kaiser | 2007-10-29 19:38:54 -0700 (Mon, 29 Oct 2007) | 7 lines
check in Tal Einat's update to tabpage.py
Patch 1612746
M configDialog.py
M NEWS.txt
AM tabbedpages.py
........
r58715 | georg.brandl | 2007-10-30 10:51:18 -0700 (Tue, 30 Oct 2007) | 2 lines
Use correct markup.
........
r58716 | georg.brandl | 2007-10-30 10:57:12 -0700 (Tue, 30 Oct 2007) | 2 lines
Make example about hiding None return values at the prompt clearer.
........
r58728 | neal.norwitz | 2007-10-30 23:33:20 -0700 (Tue, 30 Oct 2007) | 1 line
Fix some compiler warnings for signed comparisons on Unix and Windows.
........
r58731 | martin.v.loewis | 2007-10-31 10:19:33 -0700 (Wed, 31 Oct 2007) | 2 lines
Adding Christian Heimes.
........
r58737 | raymond.hettinger | 2007-10-31 14:57:58 -0700 (Wed, 31 Oct 2007) | 1 line
Clarify the reasons why pickle is almost always better than marshal
........
r58739 | raymond.hettinger | 2007-10-31 15:15:49 -0700 (Wed, 31 Oct 2007) | 1 line
Sets are marshalable.
........
2007-11-01 16:42:39 -03:00
|
|
|
also gave excellent collision statistics, but was more expensive: two
|
|
|
|
if-tests were required inside the loop; computing "the next" index took about
|
|
|
|
the same number of operations but without as much potential parallelism
|
|
|
|
(e.g., computing 5*j can go on at the same time as computing 1+perturb in the
|
|
|
|
above, and then shifting perturb can be done while the table index is being
|
|
|
|
masked); and the PyDictObject struct required a member to hold the table's
|
|
|
|
polynomial. In Tim's experiments the current scheme ran faster, produced
|
|
|
|
equally good collision statistics, needed less code & used less memory.
|
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
merge in bad ways, so I'll have to merge that extra-carefully (probably manually.)
Merged revisions 46495-46605 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r46495 | tim.peters | 2006-05-28 03:52:38 +0200 (Sun, 28 May 2006) | 2 lines
Added missing svn:eol-style property to text files.
........
r46497 | tim.peters | 2006-05-28 12:41:29 +0200 (Sun, 28 May 2006) | 3 lines
PyErr_Display(), PyErr_WriteUnraisable(): Coverity found a cut-and-paste
bug in both: `className` was referenced before being checked for NULL.
........
r46499 | fredrik.lundh | 2006-05-28 14:06:46 +0200 (Sun, 28 May 2006) | 5 lines
needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only),
and use it for string copy operations. this gives a 20% speedup on some
string benchmarks.
........
r46501 | michael.hudson | 2006-05-28 17:51:40 +0200 (Sun, 28 May 2006) | 26 lines
Quality control, meet exceptions.c.
Fix a number of problems with the need for speed code:
One is doing this sort of thing:
Py_DECREF(self->field);
self->field = newval;
Py_INCREF(self->field);
without being very sure that self->field doesn't start with a
value that has a __del__, because that almost certainly can lead
to segfaults.
As self->args is constrained to be an exact tuple we may as well
exploit this fact consistently. This leads to quite a lot of
simplification (and, hey, probably better performance).
Add some error checking in places lacking it.
Fix some rather strange indentation in the Unicode code.
Delete some trailing whitespace.
More to come, I haven't fixed all the reference leaks yet...
........
r46502 | george.yoshida | 2006-05-28 18:39:09 +0200 (Sun, 28 May 2006) | 3 lines
Patch #1080727: add "encoding" parameter to doctest.DocFileSuite
Contributed by Bjorn Tillenius.
........
r46503 | martin.v.loewis | 2006-05-28 18:57:38 +0200 (Sun, 28 May 2006) | 4 lines
Rest of patch #1490384: Commit icon source, remove
claim that Erik von Blokland is the author of the
installer picture.
........
r46504 | michael.hudson | 2006-05-28 19:40:29 +0200 (Sun, 28 May 2006) | 16 lines
Quality control, meet exceptions.c, round two.
Make some functions that should have been static static.
Fix a bunch of refleaks by fixing the definition of
MiddlingExtendsException.
Remove all the __new__ implementations apart from
BaseException_new. Rewrite most code that needs it to cope with
NULL fields (such code could get excercised anyway, the
__new__-removal just makes it more likely). This involved
editing the code for WindowsError, which I can't test.
This fixes all the refleaks in at least the start of a regrtest
-R :: run.
........
r46505 | marc-andre.lemburg | 2006-05-28 19:46:58 +0200 (Sun, 28 May 2006) | 10 lines
Initial version of systimes - a module to provide platform dependent
performance measurements.
The module is currently just a proof-of-concept implementation, but
will integrated into pybench once it is stable enough.
License: pybench license.
Author: Marc-Andre Lemburg.
........
r46507 | armin.rigo | 2006-05-28 21:13:17 +0200 (Sun, 28 May 2006) | 15 lines
("Forward-port" of r46506)
Remove various dependencies on dictionary order in the standard library
tests, and one (clearly an oversight, potentially critical) in the
standard library itself - base64.py.
Remaining open issues:
* test_extcall is an output test, messy to make robust
* tarfile.py has a potential bug here, but I'm not familiar
enough with this code. Filed in as SF bug #1496501.
* urllib2.HTTPPasswordMgr() returns a random result if there is more
than one matching root path. I'm asking python-dev for
clarification...
........
r46508 | georg.brandl | 2006-05-28 22:11:45 +0200 (Sun, 28 May 2006) | 4 lines
The empty string is a valid import path.
(fixes #1496539)
........
r46509 | georg.brandl | 2006-05-28 22:23:12 +0200 (Sun, 28 May 2006) | 3 lines
Patch #1496206: urllib2 PasswordMgr ./. default ports
........
r46510 | georg.brandl | 2006-05-28 22:57:09 +0200 (Sun, 28 May 2006) | 3 lines
Fix refleaks in UnicodeError get and set methods.
........
r46511 | michael.hudson | 2006-05-28 23:19:03 +0200 (Sun, 28 May 2006) | 3 lines
use the UnicodeError traversal and clearing functions in UnicodeError
subclasses.
........
r46512 | thomas.wouters | 2006-05-28 23:32:12 +0200 (Sun, 28 May 2006) | 4 lines
Make last patch valid C89 so Windows compilers can deal with it.
........
r46513 | georg.brandl | 2006-05-28 23:42:54 +0200 (Sun, 28 May 2006) | 3 lines
Fix ref-antileak in _struct.c which eventually lead to deallocating None.
........
r46514 | georg.brandl | 2006-05-28 23:57:35 +0200 (Sun, 28 May 2006) | 4 lines
Correct None refcount issue in Mac modules. (Are they
still used?)
........
r46515 | armin.rigo | 2006-05-29 00:07:08 +0200 (Mon, 29 May 2006) | 3 lines
A clearer error message when passing -R to regrtest.py with
release builds of Python.
........
r46516 | georg.brandl | 2006-05-29 00:14:04 +0200 (Mon, 29 May 2006) | 3 lines
Fix C function calling conventions in _sre module.
........
r46517 | georg.brandl | 2006-05-29 00:34:51 +0200 (Mon, 29 May 2006) | 3 lines
Convert audioop over to METH_VARARGS.
........
r46518 | georg.brandl | 2006-05-29 00:38:57 +0200 (Mon, 29 May 2006) | 3 lines
METH_NOARGS functions do get called with two args.
........
r46519 | georg.brandl | 2006-05-29 11:46:51 +0200 (Mon, 29 May 2006) | 4 lines
Fix refleak in socketmodule. Replace bogus Py_BuildValue calls.
Fix refleak in exceptions.
........
r46520 | nick.coghlan | 2006-05-29 14:43:05 +0200 (Mon, 29 May 2006) | 7 lines
Apply modified version of Collin Winter's patch #1478788
Renames functional extension module to _functools and adds a Python
functools module so that utility functions like update_wrapper can be
added easily.
........
r46522 | georg.brandl | 2006-05-29 15:53:16 +0200 (Mon, 29 May 2006) | 3 lines
Convert fmmodule to METH_VARARGS.
........
r46523 | georg.brandl | 2006-05-29 16:13:21 +0200 (Mon, 29 May 2006) | 3 lines
Fix #1494605.
........
r46524 | georg.brandl | 2006-05-29 16:28:05 +0200 (Mon, 29 May 2006) | 3 lines
Handle PyMem_Malloc failure in pystrtod.c. Closes #1494671.
........
r46525 | georg.brandl | 2006-05-29 16:33:55 +0200 (Mon, 29 May 2006) | 3 lines
Fix compiler warning.
........
r46526 | georg.brandl | 2006-05-29 16:39:00 +0200 (Mon, 29 May 2006) | 3 lines
Fix #1494787 (pyclbr counts whitespace as superclass name)
........
r46527 | bob.ippolito | 2006-05-29 17:47:29 +0200 (Mon, 29 May 2006) | 1 line
simplify the struct code a bit (no functional changes)
........
r46528 | armin.rigo | 2006-05-29 19:59:47 +0200 (Mon, 29 May 2006) | 2 lines
Silence a warning.
........
r46529 | georg.brandl | 2006-05-29 21:39:45 +0200 (Mon, 29 May 2006) | 3 lines
Correct some value converting strangenesses.
........
r46530 | nick.coghlan | 2006-05-29 22:27:44 +0200 (Mon, 29 May 2006) | 1 line
When adding a module like functools, it helps to let SVN know about the file.
........
r46531 | georg.brandl | 2006-05-29 22:52:54 +0200 (Mon, 29 May 2006) | 4 lines
Patches #1497027 and #972322: try HTTP digest auth first,
and watch out for handler name collisions.
........
r46532 | georg.brandl | 2006-05-29 22:57:01 +0200 (Mon, 29 May 2006) | 3 lines
Add News entry for last commit.
........
r46533 | georg.brandl | 2006-05-29 23:04:52 +0200 (Mon, 29 May 2006) | 4 lines
Make use of METH_O and METH_NOARGS where possible.
Use Py_UnpackTuple instead of PyArg_ParseTuple where possible.
........
r46534 | georg.brandl | 2006-05-29 23:58:42 +0200 (Mon, 29 May 2006) | 3 lines
Convert more modules to METH_VARARGS.
........
r46535 | georg.brandl | 2006-05-30 00:00:30 +0200 (Tue, 30 May 2006) | 3 lines
Whoops.
........
r46536 | fredrik.lundh | 2006-05-30 00:42:07 +0200 (Tue, 30 May 2006) | 4 lines
fixed "abc".count("", 100) == -96 error (hopefully, nobody's relying on
the current behaviour ;-)
........
r46537 | bob.ippolito | 2006-05-30 00:55:48 +0200 (Tue, 30 May 2006) | 1 line
struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly)
........
r46539 | bob.ippolito | 2006-05-30 02:26:01 +0200 (Tue, 30 May 2006) | 1 line
Add a length check to aifc to ensure it doesn't write a bogus file
........
r46540 | tim.peters | 2006-05-30 04:25:25 +0200 (Tue, 30 May 2006) | 10 lines
deprecated_err(): Stop bizarre warning messages when the tests
are run in the order:
test_genexps (or any other doctest-based test)
test_struct
test_doctest
The `warnings` module needs an advertised way to save/restore
its internal filter list.
........
r46541 | tim.peters | 2006-05-30 04:26:46 +0200 (Tue, 30 May 2006) | 2 lines
Whitespace normalization.
........
r46542 | tim.peters | 2006-05-30 04:30:30 +0200 (Tue, 30 May 2006) | 2 lines
Set a binary svn:mime-type property on this UTF-8 encoded file.
........
r46543 | neal.norwitz | 2006-05-30 05:18:50 +0200 (Tue, 30 May 2006) | 1 line
Simplify further by using AddStringConstant
........
r46544 | tim.peters | 2006-05-30 06:16:25 +0200 (Tue, 30 May 2006) | 6 lines
Convert relevant dict internals to Py_ssize_t.
I don't have a box with nearly enough RAM, or an OS,
that could get close to tickling this, though (requires
a dict w/ at least 2**31 entries).
........
r46545 | neal.norwitz | 2006-05-30 06:19:21 +0200 (Tue, 30 May 2006) | 1 line
Remove stray | in comment
........
r46546 | neal.norwitz | 2006-05-30 06:25:05 +0200 (Tue, 30 May 2006) | 1 line
Use Py_SAFE_DOWNCAST for safety. Fix format strings. Remove 2 more stray | in comment
........
r46547 | neal.norwitz | 2006-05-30 06:43:23 +0200 (Tue, 30 May 2006) | 1 line
No DOWNCAST is required since sizeof(Py_ssize_t) >= sizeof(int) and Py_ReprEntr returns an int
........
r46548 | tim.peters | 2006-05-30 07:04:59 +0200 (Tue, 30 May 2006) | 3 lines
dict_print(): Explicitly narrow the return value
from a (possibly) wider variable.
........
r46549 | tim.peters | 2006-05-30 07:23:59 +0200 (Tue, 30 May 2006) | 5 lines
dict_print(): So that Neal & I don't spend the rest of
our lives taking turns rewriting code that works ;-),
get rid of casting illusions by declaring a new variable
with the obvious type.
........
r46550 | georg.brandl | 2006-05-30 09:04:55 +0200 (Tue, 30 May 2006) | 3 lines
Restore exception pickle support. #1497319.
........
r46551 | georg.brandl | 2006-05-30 09:13:29 +0200 (Tue, 30 May 2006) | 3 lines
Add a test case for exception pickling. args is never NULL.
........
r46552 | neal.norwitz | 2006-05-30 09:21:10 +0200 (Tue, 30 May 2006) | 1 line
Don't fail if the (sub)pkgname already exist.
........
r46553 | georg.brandl | 2006-05-30 09:34:45 +0200 (Tue, 30 May 2006) | 3 lines
Disallow keyword args for exceptions.
........
r46554 | neal.norwitz | 2006-05-30 09:36:54 +0200 (Tue, 30 May 2006) | 5 lines
I'm impatient. I think this will fix a few more problems with the buildbots.
I'm not sure this is the best approach, but I can't think of anything better.
If this creates problems, feel free to revert, but I think it's safe and
should make things a little better.
........
r46555 | georg.brandl | 2006-05-30 10:17:00 +0200 (Tue, 30 May 2006) | 4 lines
Do the check for no keyword arguments in __init__ so that
subclasses of Exception can be supplied keyword args
........
r46556 | georg.brandl | 2006-05-30 10:47:19 +0200 (Tue, 30 May 2006) | 3 lines
Convert test_exceptions to unittest.
........
r46557 | andrew.kuchling | 2006-05-30 14:52:01 +0200 (Tue, 30 May 2006) | 1 line
Add SoC name, and reorganize this section a bit
........
r46559 | tim.peters | 2006-05-30 17:53:34 +0200 (Tue, 30 May 2006) | 11 lines
PyLong_FromString(): Continued fraction analysis (explained in
a new comment) suggests there are almost certainly large input
integers in all non-binary input bases for which one Python digit
too few is initally allocated to hold the final result. Instead
of assert-failing when that happens, allocate more space. Alas,
I estimate it would take a few days to find a specific such case,
so this isn't backed up by a new test (not to mention that such
a case may take hours to run, since conversion time is quadratic
in the number of digits, and preliminary attempts suggested that
the smallest such inputs contain at least a million digits).
........
r46560 | fredrik.lundh | 2006-05-30 19:11:48 +0200 (Tue, 30 May 2006) | 3 lines
changed find/rfind to return -1 for matches outside the source string
........
r46561 | bob.ippolito | 2006-05-30 19:37:54 +0200 (Tue, 30 May 2006) | 1 line
Change wrapping terminology to overflow masking
........
r46562 | fredrik.lundh | 2006-05-30 19:39:58 +0200 (Tue, 30 May 2006) | 3 lines
changed count to return 0 for slices outside the source string
........
r46568 | tim.peters | 2006-05-31 01:28:02 +0200 (Wed, 31 May 2006) | 2 lines
Whitespace normalization.
........
r46569 | brett.cannon | 2006-05-31 04:19:54 +0200 (Wed, 31 May 2006) | 5 lines
Clarify wording on default values for strptime(); defaults are used when better
values cannot be inferred.
Closes bug #1496315.
........
r46572 | neal.norwitz | 2006-05-31 09:43:27 +0200 (Wed, 31 May 2006) | 1 line
Calculate smallest properly (it was off by one) and use proper ssize_t types for Win64
........
r46573 | neal.norwitz | 2006-05-31 10:01:08 +0200 (Wed, 31 May 2006) | 1 line
Revert last checkin, it is better to do make distclean
........
r46574 | neal.norwitz | 2006-05-31 11:02:44 +0200 (Wed, 31 May 2006) | 3 lines
On 64-bit platforms running test_struct after test_tarfile would fail
since the deprecation warning wouldn't be raised.
........
r46575 | thomas.heller | 2006-05-31 13:37:58 +0200 (Wed, 31 May 2006) | 3 lines
PyTuple_Pack is not available in Python 2.3, but ctypes must stay
compatible with that.
........
r46576 | andrew.kuchling | 2006-05-31 15:18:56 +0200 (Wed, 31 May 2006) | 1 line
'functional' module was renamed to 'functools'
........
r46577 | kristjan.jonsson | 2006-05-31 15:35:41 +0200 (Wed, 31 May 2006) | 1 line
Fixup the PCBuild8 project directory. exceptions.c have moved to Objects, and the functionalmodule.c has been replaced with _functoolsmodule.c. Other minor changes to .vcproj files and .sln to fix compilation
........
r46578 | andrew.kuchling | 2006-05-31 16:08:48 +0200 (Wed, 31 May 2006) | 15 lines
[Bug #1473048]
SimpleXMLRPCServer and DocXMLRPCServer don't look at
the path of the HTTP request at all; you can POST or
GET from / or /RPC2 or /blahblahblah with the same results.
Security scanners that look for /cgi-bin/phf will therefore report
lots of vulnerabilities.
Fix: add a .rpc_paths attribute to the SimpleXMLRPCServer class,
and report a 404 error if the path isn't on the allowed list.
Possibly-controversial aspect of this change: the default makes only
'/' and '/RPC2' legal. Maybe this will break people's applications
(though I doubt it). We could just set the default to an empty tuple,
which would exactly match the current behaviour.
........
r46579 | andrew.kuchling | 2006-05-31 16:12:47 +0200 (Wed, 31 May 2006) | 1 line
Mention SimpleXMLRPCServer change
........
r46580 | tim.peters | 2006-05-31 16:28:07 +0200 (Wed, 31 May 2006) | 2 lines
Trimmed trailing whitespace.
........
r46581 | tim.peters | 2006-05-31 17:33:22 +0200 (Wed, 31 May 2006) | 4 lines
_range_error(): Speed and simplify (there's no real need for
loops here). Assert that size_t is actually big enough, and
that f->size is at least one. Wrap a long line.
........
r46582 | tim.peters | 2006-05-31 17:34:37 +0200 (Wed, 31 May 2006) | 2 lines
Repaired error in new comment.
........
r46584 | neal.norwitz | 2006-06-01 07:32:49 +0200 (Thu, 01 Jun 2006) | 4 lines
Remove ; at end of macro. There was a compiler recently that warned
about extra semi-colons. It may have been the HP C compiler.
This file will trigger a bunch of those warnings now.
........
r46585 | georg.brandl | 2006-06-01 08:39:19 +0200 (Thu, 01 Jun 2006) | 3 lines
Correctly unpickle 2.4 exceptions via __setstate__ (patch #1498571)
........
r46586 | georg.brandl | 2006-06-01 10:27:32 +0200 (Thu, 01 Jun 2006) | 3 lines
Correctly allocate complex types with tp_alloc. (bug #1498638)
........
r46587 | georg.brandl | 2006-06-01 14:30:46 +0200 (Thu, 01 Jun 2006) | 2 lines
Correctly dispatch Faults in loads (patch #1498627)
........
r46588 | georg.brandl | 2006-06-01 15:00:49 +0200 (Thu, 01 Jun 2006) | 3 lines
Some code style tweaks, and remove apply.
........
r46589 | armin.rigo | 2006-06-01 15:19:12 +0200 (Thu, 01 Jun 2006) | 5 lines
[ 1497053 ] Let dicts propagate the exceptions in user __eq__().
[ 1456209 ] dictresize() vulnerability ( <- backport candidate ).
........
r46590 | tim.peters | 2006-06-01 15:41:46 +0200 (Thu, 01 Jun 2006) | 2 lines
Whitespace normalization.
........
r46591 | tim.peters | 2006-06-01 15:49:23 +0200 (Thu, 01 Jun 2006) | 2 lines
Record bugs 1275608 and 1456209 as being fixed.
........
r46592 | tim.peters | 2006-06-01 15:56:26 +0200 (Thu, 01 Jun 2006) | 5 lines
Re-enable a new empty-string test added during the NFS sprint,
but disabled then because str and unicode strings gave different
results. The implementations were repaired later during the
sprint, but the new test remained disabled.
........
r46594 | tim.peters | 2006-06-01 17:50:44 +0200 (Thu, 01 Jun 2006) | 7 lines
Armin committed his patch while I was reviewing it (I'm sure
he didn't know this), so merged in some changes I made during
review. Nothing material apart from changing a new `mask` local
from int to Py_ssize_t. Mostly this is repairing comments that
were made incorrect, and adding new comments. Also a few
minor code rewrites for clarity or helpful succinctness.
........
r46599 | neal.norwitz | 2006-06-02 06:45:53 +0200 (Fri, 02 Jun 2006) | 1 line
Convert docstrings to comments so regrtest -v prints method names
........
r46600 | neal.norwitz | 2006-06-02 06:50:49 +0200 (Fri, 02 Jun 2006) | 2 lines
Fix memory leak found by valgrind.
........
r46601 | neal.norwitz | 2006-06-02 06:54:52 +0200 (Fri, 02 Jun 2006) | 1 line
More memory leaks from valgrind
........
r46602 | neal.norwitz | 2006-06-02 08:23:00 +0200 (Fri, 02 Jun 2006) | 11 lines
Patch #1357836:
Prevent an invalid memory read from test_coding in case the done flag is set.
In that case, the loop isn't entered. I wonder if rather than setting
the done flag in the cases before the loop, if they should just exit early.
This code looks like it should be refactored.
Backport candidate (also the early break above if decoding_fgets fails)
........
r46603 | martin.blais | 2006-06-02 15:03:43 +0200 (Fri, 02 Jun 2006) | 1 line
Fixed struct test to not use unittest.
........
r46605 | tim.peters | 2006-06-03 01:22:51 +0200 (Sat, 03 Jun 2006) | 10 lines
pprint functions used to sort a dict (by key) if and only if
the output required more than one line. "Small" dicts got
displayed in seemingly random order (the hash-induced order
produced by dict.__repr__). None of this was documented.
Now pprint functions always sort dicts by key, and the docs
promise it.
This was proposed and agreed to during the PyCon 2006 core
sprint -- I just didn't have time for it before now.
........
2006-06-08 11:42:34 -03:00
|
|
|
|
1993-03-27 14:11:32 -04:00
|
|
|
*/
|
SF patch #425242: Patch which "inlines" small dictionaries.
The idea is Marc-Andre Lemburg's, the implementation is Tim's.
Add a new ma_smalltable member to dictobjects, an embedded vector of
MINSIZE (8) dictentry structs. Short course is that this lets us avoid
additional malloc(s) for dicts with no more than 5 entries.
The changes are widespread but mostly small.
Long course: WRT speed, all scalar operations (getitem, setitem, delitem)
on non-empty dicts benefit from no longer needing NULL-pointer checks
(ma_table is never NULL anymore). Bulk operations (copy, update, resize,
clearing slots during dealloc) benefit in some cases from now looping
on the ma_fill count rather than on ma_size, but that was an unexpected
benefit: the original reason to loop on ma_fill was to let bulk
operations on empty dicts end quickly (since the NULL-pointer checks
went away, empty dicts aren't special-cased any more).
Special considerations:
For dicts that remain empty, this change is a lose on two counts:
the dict object contains 8 new dictentry slots now that weren't
needed before, and dict object creation also spends time memset'ing
these doomed-to-be-unsused slots to NULLs.
For dicts with one or two entries that never get larger than 2, it's
a mix: a malloc()/free() pair is no longer needed, and the 2-entry case
gets to use 8 slots (instead of 4) thus decreasing the chance of
collision. Against that, dict object creation spends time memset'ing
4 slots that aren't strictly needed in this case.
For dicts with 3 through 5 entries that never get larger than 5, it's a
pure win: the dict is created with all the space they need, and they
never need to resize. Before they suffered two malloc()/free() calls,
plus 1 dict resize, to get enough space. In addition, the 8-slot
table they ended with consumed more memory overall, because of the
hidden overhead due to the additional malloc.
For dicts with 6 or more entries, the ma_smalltable member is wasted
space, but then these are large(r) dicts so 8 slots more or less doesn't
make much difference. They still benefit all the time from removing
ubiquitous dynamic null-pointer checks, and get a small benefit (but
relatively smaller the larger the dict) from not having to do two
mallocs, two frees, and a resize on the way *to* getting their sixth
entry.
All in all it appears a small but definite general win, with larger
benefits in specific cases. It's especially nice that it allowed to
get rid of several branches, gotos and labels, and overall made the
code smaller.
2001-05-22 17:40:22 -03:00
|
|
|
|
2023-03-09 11:16:30 -04:00
|
|
|
static int dictresize(PyInterpreterState *interp, PyDictObject *mp,
|
|
|
|
uint8_t log_newsize, int unicode);
|
SF patch #425242: Patch which "inlines" small dictionaries.
The idea is Marc-Andre Lemburg's, the implementation is Tim's.
Add a new ma_smalltable member to dictobjects, an embedded vector of
MINSIZE (8) dictentry structs. Short course is that this lets us avoid
additional malloc(s) for dicts with no more than 5 entries.
The changes are widespread but mostly small.
Long course: WRT speed, all scalar operations (getitem, setitem, delitem)
on non-empty dicts benefit from no longer needing NULL-pointer checks
(ma_table is never NULL anymore). Bulk operations (copy, update, resize,
clearing slots during dealloc) benefit in some cases from now looping
on the ma_fill count rather than on ma_size, but that was an unexpected
benefit: the original reason to loop on ma_fill was to let bulk
operations on empty dicts end quickly (since the NULL-pointer checks
went away, empty dicts aren't special-cased any more).
Special considerations:
For dicts that remain empty, this change is a lose on two counts:
the dict object contains 8 new dictentry slots now that weren't
needed before, and dict object creation also spends time memset'ing
these doomed-to-be-unsused slots to NULLs.
For dicts with one or two entries that never get larger than 2, it's
a mix: a malloc()/free() pair is no longer needed, and the 2-entry case
gets to use 8 slots (instead of 4) thus decreasing the chance of
collision. Against that, dict object creation spends time memset'ing
4 slots that aren't strictly needed in this case.
For dicts with 3 through 5 entries that never get larger than 5, it's a
pure win: the dict is created with all the space they need, and they
never need to resize. Before they suffered two malloc()/free() calls,
plus 1 dict resize, to get enough space. In addition, the 8-slot
table they ended with consumed more memory overall, because of the
hidden overhead due to the additional malloc.
For dicts with 6 or more entries, the ma_smalltable member is wasted
space, but then these are large(r) dicts so 8 slots more or less doesn't
make much difference. They still benefit all the time from removing
ubiquitous dynamic null-pointer checks, and get a small benefit (but
relatively smaller the larger the dict) from not having to do two
mallocs, two frees, and a resize on the way *to* getting their sixth
entry.
All in all it appears a small but definite general win, with larger
benefits in specific cases. It's especially nice that it allowed to
get rid of several branches, gotos and labels, and overall made the
code smaller.
2001-05-22 17:40:22 -03:00
|
|
|
|
2024-01-02 10:32:37 -04:00
|
|
|
static PyObject* dict_iter(PyObject *dict);
|
2018-09-26 00:59:00 -03:00
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
static int
|
|
|
|
setitem_lock_held(PyDictObject *mp, PyObject *key, PyObject *value);
|
|
|
|
static int
|
|
|
|
dict_setdefault_ref_lock_held(PyObject *d, PyObject *key, PyObject *default_value,
|
|
|
|
PyObject **result, int incref_result);
|
|
|
|
|
2024-04-02 07:59:21 -03:00
|
|
|
#ifndef NDEBUG
|
|
|
|
static int _PyObject_InlineValuesConsistencyCheck(PyObject *obj);
|
|
|
|
#endif
|
|
|
|
|
2015-04-03 17:53:51 -03:00
|
|
|
#include "clinic/dictobject.c.h"
|
|
|
|
|
2020-06-23 11:40:40 -03:00
|
|
|
|
2022-03-01 19:09:28 -04:00
|
|
|
static inline Py_hash_t
|
|
|
|
unicode_get_hash(PyObject *o)
|
|
|
|
{
|
|
|
|
assert(PyUnicode_CheckExact(o));
|
2024-07-01 16:11:39 -03:00
|
|
|
return FT_ATOMIC_LOAD_SSIZE_RELAXED(_PyASCIIObject_CAST(o)->hash);
|
2022-03-01 19:09:28 -04:00
|
|
|
}
|
2012-06-22 15:55:41 -03:00
|
|
|
|
2020-06-23 06:33:18 -03:00
|
|
|
/* Print summary info about the state of the optimized allocator */
|
2011-11-14 19:00:12 -04:00
|
|
|
void
|
2020-06-23 06:33:18 -03:00
|
|
|
_PyDict_DebugMallocStats(FILE *out)
|
2011-11-14 19:00:12 -04:00
|
|
|
{
|
2020-06-23 06:33:18 -03:00
|
|
|
_PyDebugAllocatorStats(out, "free PyDictObject",
|
2024-07-22 13:08:27 -03:00
|
|
|
_Py_FREELIST_SIZE(dicts),
|
|
|
|
sizeof(PyDictObject));
|
2024-02-15 21:01:36 -04:00
|
|
|
_PyDebugAllocatorStats(out, "free PyDictKeysObject",
|
2024-07-22 13:08:27 -03:00
|
|
|
_Py_FREELIST_SIZE(dictkeys),
|
|
|
|
sizeof(PyDictKeysObject));
|
Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617-60678 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60618 | walter.doerwald | 2008-02-06 15:31:55 +0100 (Wed, 06 Feb 2008) | 6 lines
Remove month parameter from Calendar.yeardatescalendar(),
Calendar.yeardays2calendar() and Calendar.yeardayscalendar() as the methods
don't have such a parameter. Fixes issue #2017.
Rewrap content to 80 chars.
........
r60622 | facundo.batista | 2008-02-06 20:28:49 +0100 (Wed, 06 Feb 2008) | 4 lines
Fixes issue 1959. Converted tests to unittest.
Thanks Giampaolo Rodola.
........
r60626 | thomas.heller | 2008-02-06 21:29:17 +0100 (Wed, 06 Feb 2008) | 3 lines
Fixed refcounts and error handling.
Should not be merged to py3k branch.
........
r60630 | mark.dickinson | 2008-02-06 23:10:50 +0100 (Wed, 06 Feb 2008) | 4 lines
Issue 1979: Make Decimal comparisons (other than !=, ==) involving NaN
raise InvalidOperation (and return False if InvalidOperation is trapped).
........
r60632 | mark.dickinson | 2008-02-06 23:25:16 +0100 (Wed, 06 Feb 2008) | 2 lines
Remove incorrect usage of :const: in documentation.
........
r60634 | georg.brandl | 2008-02-07 00:45:51 +0100 (Thu, 07 Feb 2008) | 2 lines
Revert accidental changes to test_queue in r60605.
........
r60636 | raymond.hettinger | 2008-02-07 01:54:20 +0100 (Thu, 07 Feb 2008) | 1 line
Issue 2025: Add tuple.count() and tuple.index() to follow the ABC in collections.Sequence.
........
r60637 | mark.dickinson | 2008-02-07 02:14:23 +0100 (Thu, 07 Feb 2008) | 2 lines
Fix broken link in decimal documentation.
........
r60638 | mark.dickinson | 2008-02-07 02:42:06 +0100 (Thu, 07 Feb 2008) | 3 lines
IEEE 754 should be IEEE 854; give precise reference for
comparisons involving NaNs.
........
r60639 | raymond.hettinger | 2008-02-07 03:12:52 +0100 (Thu, 07 Feb 2008) | 1 line
Return ints instead of longs for tuple.count() and tuple.index().
........
r60640 | raymond.hettinger | 2008-02-07 04:10:33 +0100 (Thu, 07 Feb 2008) | 1 line
Merge 60627.
........
r60641 | raymond.hettinger | 2008-02-07 04:25:46 +0100 (Thu, 07 Feb 2008) | 1 line
Merge r60628, r60631, and r60633. Register UserList and UserString will the appropriate ABCs.
........
r60642 | brett.cannon | 2008-02-07 08:47:31 +0100 (Thu, 07 Feb 2008) | 3 lines
Cast a struct to a void pointer so as to do a type-safe pointer comparison
(mistmatch found by clang).
........
r60643 | brett.cannon | 2008-02-07 09:04:07 +0100 (Thu, 07 Feb 2008) | 2 lines
Remove unnecessary curly braces around an int literal.
........
r60644 | andrew.kuchling | 2008-02-07 12:43:47 +0100 (Thu, 07 Feb 2008) | 1 line
Update URL
........
r60645 | facundo.batista | 2008-02-07 17:16:29 +0100 (Thu, 07 Feb 2008) | 4 lines
Fixes issue 2026. Tests converted to unittest. Thanks
Giampaolo Rodola.
........
r60646 | christian.heimes | 2008-02-07 18:15:30 +0100 (Thu, 07 Feb 2008) | 1 line
Added some statistics code to dict and list object code. I wanted to test how a larger freelist affects the reusage of freed objects. Contrary to my gut feelings 80 objects is more than fine for small apps. I haven't profiled a large app yet.
........
r60648 | facundo.batista | 2008-02-07 20:06:52 +0100 (Thu, 07 Feb 2008) | 6 lines
Fixes Issue 1401. When redirected, a possible POST get converted
to GET, so it loses its payload. So, it also must lose the
headers related to the payload (if it has no content any more,
it shouldn't indicate content length and type).
........
r60649 | walter.doerwald | 2008-02-07 20:30:22 +0100 (Thu, 07 Feb 2008) | 3 lines
Clarify that the output of TextCalendar.formatmonth() and
TextCalendar.formatyear() for custom instances won't be influenced by calls
to the module global setfirstweekday() function. Fixes #2018.
........
r60651 | walter.doerwald | 2008-02-07 20:48:34 +0100 (Thu, 07 Feb 2008) | 3 lines
Fix documentation for Calendar.iterweekdays(): firstweekday is a property.
Fixes second part of #2018.
........
r60653 | walter.doerwald | 2008-02-07 20:57:32 +0100 (Thu, 07 Feb 2008) | 2 lines
Fix typo in docstring for Calendar.itermonthdays().
........
r60655 | raymond.hettinger | 2008-02-07 21:04:37 +0100 (Thu, 07 Feb 2008) | 1 line
The float conversion recipe is simpler in Py2.6
........
r60657 | raymond.hettinger | 2008-02-07 21:10:49 +0100 (Thu, 07 Feb 2008) | 1 line
Fix typo
........
r60660 | brett.cannon | 2008-02-07 23:27:10 +0100 (Thu, 07 Feb 2008) | 3 lines
Make sure a switch statement does not have repetitive case statements.
Error found through LLVM post-2.1 svn.
........
r60661 | christian.heimes | 2008-02-08 01:11:31 +0100 (Fri, 08 Feb 2008) | 1 line
Deallocate content of the dict free list on interpreter shutdown
........
r60662 | christian.heimes | 2008-02-08 01:14:34 +0100 (Fri, 08 Feb 2008) | 1 line
Use prefix decrement
........
r60663 | amaury.forgeotdarc | 2008-02-08 01:56:02 +0100 (Fri, 08 Feb 2008) | 5 lines
issue 2045: Infinite recursion when printing a subclass of defaultdict,
if default_factory is set to a bound method.
Will backport.
........
r60667 | jeffrey.yasskin | 2008-02-08 07:45:40 +0100 (Fri, 08 Feb 2008) | 2 lines
Oops! 2.6's Rational.__ne__ didn't work.
........
r60671 | hyeshik.chang | 2008-02-08 18:10:20 +0100 (Fri, 08 Feb 2008) | 2 lines
Update big5hkscs codec to conform to the HKSCS:2004 revision.
........
r60673 | raymond.hettinger | 2008-02-08 23:30:04 +0100 (Fri, 08 Feb 2008) | 4 lines
Remove unnecessary modulo division.
The preceding test guarantees that 0 <= i < len.
........
r60674 | raymond.hettinger | 2008-02-09 00:02:27 +0100 (Sat, 09 Feb 2008) | 1 line
Speed-up __iter__() mixin method.
........
r60675 | raymond.hettinger | 2008-02-09 00:34:21 +0100 (Sat, 09 Feb 2008) | 1 line
Fill-in missing Set comparisons
........
r60677 | raymond.hettinger | 2008-02-09 00:57:06 +0100 (Sat, 09 Feb 2008) | 1 line
Add advice on choosing between DictMixin and MutableMapping
........
2008-02-08 22:18:51 -04:00
|
|
|
}
|
|
|
|
|
2021-05-28 05:54:10 -03:00
|
|
|
#define DK_MASK(dk) (DK_SIZE(dk)-1)
|
2012-04-23 12:24:50 -03:00
|
|
|
|
2024-10-10 14:19:08 -03:00
|
|
|
#define _Py_DICT_IMMORTAL_INITIAL_REFCNT PY_SSIZE_T_MIN
|
|
|
|
|
2024-02-20 21:08:14 -04:00
|
|
|
static void free_keys_object(PyDictKeysObject *keys, bool use_qsbr);
|
2018-11-14 05:39:27 -04:00
|
|
|
|
2023-05-10 10:28:40 -03:00
|
|
|
/* PyDictKeysObject has refcounts like PyObject does, so we have the
|
|
|
|
following two functions to mirror what Py_INCREF() and Py_DECREF() do.
|
|
|
|
(Keep in mind that PyDictKeysObject isn't actually a PyObject.)
|
|
|
|
Likewise a PyDictKeysObject can be immortal (e.g. Py_EMPTY_KEYS),
|
|
|
|
so we apply a naive version of what Py_INCREF() and Py_DECREF() do
|
|
|
|
for immortal objects. */
|
|
|
|
|
2018-11-14 05:39:27 -04:00
|
|
|
static inline void
|
|
|
|
dictkeys_incref(PyDictKeysObject *dk)
|
|
|
|
{
|
2024-10-10 14:19:08 -03:00
|
|
|
if (FT_ATOMIC_LOAD_SSIZE_RELAXED(dk->dk_refcnt) < 0) {
|
|
|
|
assert(FT_ATOMIC_LOAD_SSIZE_RELAXED(dk->dk_refcnt) == _Py_DICT_IMMORTAL_INITIAL_REFCNT);
|
2023-05-10 10:28:40 -03:00
|
|
|
return;
|
|
|
|
}
|
2020-02-03 12:55:05 -04:00
|
|
|
#ifdef Py_REF_DEBUG
|
2024-04-08 13:11:36 -03:00
|
|
|
_Py_IncRefTotal(_PyThreadState_GET());
|
2020-02-03 12:55:05 -04:00
|
|
|
#endif
|
2024-02-20 20:40:37 -04:00
|
|
|
INCREF_KEYS(dk);
|
2018-11-14 05:39:27 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline void
|
2024-02-20 21:08:14 -04:00
|
|
|
dictkeys_decref(PyInterpreterState *interp, PyDictKeysObject *dk, bool use_qsbr)
|
2018-11-14 05:39:27 -04:00
|
|
|
{
|
2024-10-10 14:19:08 -03:00
|
|
|
if (FT_ATOMIC_LOAD_SSIZE_RELAXED(dk->dk_refcnt) < 0) {
|
|
|
|
assert(FT_ATOMIC_LOAD_SSIZE_RELAXED(dk->dk_refcnt) == _Py_DICT_IMMORTAL_INITIAL_REFCNT);
|
2023-05-10 10:28:40 -03:00
|
|
|
return;
|
|
|
|
}
|
2024-05-24 14:39:06 -03:00
|
|
|
assert(FT_ATOMIC_LOAD_SSIZE(dk->dk_refcnt) > 0);
|
2020-02-03 12:55:05 -04:00
|
|
|
#ifdef Py_REF_DEBUG
|
2024-04-08 13:11:36 -03:00
|
|
|
_Py_DecRefTotal(_PyThreadState_GET());
|
2020-02-03 12:55:05 -04:00
|
|
|
#endif
|
2024-02-20 20:40:37 -04:00
|
|
|
if (DECREF_KEYS(dk) == 1) {
|
2024-01-29 13:38:03 -04:00
|
|
|
if (DK_IS_UNICODE(dk)) {
|
|
|
|
PyDictUnicodeEntry *entries = DK_UNICODE_ENTRIES(dk);
|
|
|
|
Py_ssize_t i, n;
|
|
|
|
for (i = 0, n = dk->dk_nentries; i < n; i++) {
|
|
|
|
Py_XDECREF(entries[i].me_key);
|
|
|
|
Py_XDECREF(entries[i].me_value);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
PyDictKeyEntry *entries = DK_ENTRIES(dk);
|
|
|
|
Py_ssize_t i, n;
|
|
|
|
for (i = 0, n = dk->dk_nentries; i < n; i++) {
|
|
|
|
Py_XDECREF(entries[i].me_key);
|
|
|
|
Py_XDECREF(entries[i].me_value);
|
|
|
|
}
|
|
|
|
}
|
2024-02-20 21:08:14 -04:00
|
|
|
free_keys_object(dk, use_qsbr);
|
2018-11-14 05:39:27 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-09-07 21:40:12 -03:00
|
|
|
/* lookup indices. returns DKIX_EMPTY, DKIX_DUMMY, or ix >=0 */
|
2016-09-08 13:58:47 -03:00
|
|
|
static inline Py_ssize_t
|
2020-03-26 01:13:01 -03:00
|
|
|
dictkeys_get_index(const PyDictKeysObject *keys, Py_ssize_t i)
|
2016-09-07 21:40:12 -03:00
|
|
|
{
|
2022-02-19 00:15:20 -04:00
|
|
|
int log2size = DK_LOG_SIZE(keys);
|
2016-09-08 14:52:46 -03:00
|
|
|
Py_ssize_t ix;
|
|
|
|
|
2022-02-19 00:15:20 -04:00
|
|
|
if (log2size < 8) {
|
2024-02-20 21:08:14 -04:00
|
|
|
ix = LOAD_INDEX(keys, 8, i);
|
2016-09-07 21:40:12 -03:00
|
|
|
}
|
2022-02-19 00:15:20 -04:00
|
|
|
else if (log2size < 16) {
|
2024-02-20 21:08:14 -04:00
|
|
|
ix = LOAD_INDEX(keys, 16, i);
|
2016-09-07 21:40:12 -03:00
|
|
|
}
|
2016-09-08 17:16:41 -03:00
|
|
|
#if SIZEOF_VOID_P > 4
|
2022-02-19 00:15:20 -04:00
|
|
|
else if (log2size >= 32) {
|
2024-02-20 21:08:14 -04:00
|
|
|
ix = LOAD_INDEX(keys, 64, i);
|
2016-09-07 21:40:12 -03:00
|
|
|
}
|
2016-09-08 17:16:41 -03:00
|
|
|
#endif
|
2016-09-10 15:34:43 -03:00
|
|
|
else {
|
2024-02-20 21:08:14 -04:00
|
|
|
ix = LOAD_INDEX(keys, 32, i);
|
2016-09-10 15:34:43 -03:00
|
|
|
}
|
2016-09-08 14:52:46 -03:00
|
|
|
assert(ix >= DKIX_DUMMY);
|
|
|
|
return ix;
|
2016-09-07 21:40:12 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* write to indices. */
|
2016-09-08 13:58:47 -03:00
|
|
|
static inline void
|
2018-11-14 05:39:27 -04:00
|
|
|
dictkeys_set_index(PyDictKeysObject *keys, Py_ssize_t i, Py_ssize_t ix)
|
2016-09-07 21:40:12 -03:00
|
|
|
{
|
2022-02-19 00:15:20 -04:00
|
|
|
int log2size = DK_LOG_SIZE(keys);
|
2016-09-08 14:52:46 -03:00
|
|
|
|
|
|
|
assert(ix >= DKIX_DUMMY);
|
2021-05-28 05:54:10 -03:00
|
|
|
assert(keys->dk_version == 0);
|
2016-09-08 14:52:46 -03:00
|
|
|
|
2022-02-19 00:15:20 -04:00
|
|
|
if (log2size < 8) {
|
2016-09-08 14:52:46 -03:00
|
|
|
assert(ix <= 0x7f);
|
2024-02-20 21:08:14 -04:00
|
|
|
STORE_INDEX(keys, 8, i, ix);
|
2016-09-07 21:40:12 -03:00
|
|
|
}
|
2022-02-19 00:15:20 -04:00
|
|
|
else if (log2size < 16) {
|
2016-09-08 14:52:46 -03:00
|
|
|
assert(ix <= 0x7fff);
|
2024-02-20 21:08:14 -04:00
|
|
|
STORE_INDEX(keys, 16, i, ix);
|
2016-09-07 21:40:12 -03:00
|
|
|
}
|
2016-09-08 17:16:41 -03:00
|
|
|
#if SIZEOF_VOID_P > 4
|
2022-02-19 00:15:20 -04:00
|
|
|
else if (log2size >= 32) {
|
2024-02-20 21:08:14 -04:00
|
|
|
STORE_INDEX(keys, 64, i, ix);
|
2016-09-07 21:40:12 -03:00
|
|
|
}
|
2016-09-08 17:16:41 -03:00
|
|
|
#endif
|
2016-09-10 15:34:43 -03:00
|
|
|
else {
|
|
|
|
assert(ix <= 0x7fffffff);
|
2024-02-20 21:08:14 -04:00
|
|
|
STORE_INDEX(keys, 32, i, ix);
|
2016-09-10 15:34:43 -03:00
|
|
|
}
|
2016-09-07 21:40:12 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-06-24 16:03:45 -03:00
|
|
|
/* USABLE_FRACTION is the maximum dictionary load.
|
2016-09-07 21:40:12 -03:00
|
|
|
* Increasing this ratio makes dictionaries more dense resulting in more
|
|
|
|
* collisions. Decreasing it improves sparseness at the expense of spreading
|
|
|
|
* indices over more cache lines and at the cost of total memory consumed.
|
2012-06-24 16:03:45 -03:00
|
|
|
*
|
|
|
|
* USABLE_FRACTION must obey the following:
|
2012-04-23 12:24:50 -03:00
|
|
|
* (0 < USABLE_FRACTION(n) < n) for all n >= 2
|
|
|
|
*
|
2016-09-07 21:40:12 -03:00
|
|
|
* USABLE_FRACTION should be quick to calculate.
|
|
|
|
* Fractions around 1/2 to 2/3 seem to work well in practice.
|
2012-04-23 12:24:50 -03:00
|
|
|
*/
|
2016-09-07 21:40:12 -03:00
|
|
|
#define USABLE_FRACTION(n) (((n) << 1)/3)
|
2012-04-23 12:24:50 -03:00
|
|
|
|
2020-08-07 02:08:55 -03:00
|
|
|
/* Find the smallest dk_size >= minsize. */
|
2021-05-28 05:54:10 -03:00
|
|
|
static inline uint8_t
|
|
|
|
calculate_log2_keysize(Py_ssize_t minsize)
|
2020-08-07 02:08:55 -03:00
|
|
|
{
|
|
|
|
#if SIZEOF_LONG == SIZEOF_SIZE_T
|
|
|
|
minsize = (minsize | PyDict_MINSIZE) - 1;
|
2021-05-28 05:54:10 -03:00
|
|
|
return _Py_bit_length(minsize | (PyDict_MINSIZE-1));
|
2020-08-07 02:08:55 -03:00
|
|
|
#elif defined(_MSC_VER)
|
|
|
|
// On 64bit Windows, sizeof(long) == 4.
|
|
|
|
minsize = (minsize | PyDict_MINSIZE) - 1;
|
|
|
|
unsigned long msb;
|
|
|
|
_BitScanReverse64(&msb, (uint64_t)minsize);
|
2021-05-28 21:40:12 -03:00
|
|
|
return (uint8_t)(msb + 1);
|
2020-08-07 02:08:55 -03:00
|
|
|
#else
|
2021-05-28 05:54:10 -03:00
|
|
|
uint8_t log2_size;
|
|
|
|
for (log2_size = PyDict_LOG_MINSIZE;
|
|
|
|
(((Py_ssize_t)1) << log2_size) < minsize;
|
|
|
|
log2_size++)
|
2020-08-07 02:08:55 -03:00
|
|
|
;
|
2021-05-28 05:54:10 -03:00
|
|
|
return log2_size;
|
2020-08-07 02:08:55 -03:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
/* estimate_keysize is reverse function of USABLE_FRACTION.
|
|
|
|
*
|
2016-09-07 21:40:12 -03:00
|
|
|
* This can be used to reserve enough size to insert n entries without
|
|
|
|
* resizing.
|
|
|
|
*/
|
2021-05-28 05:54:10 -03:00
|
|
|
static inline uint8_t
|
|
|
|
estimate_log2_keysize(Py_ssize_t n)
|
2020-08-07 02:08:55 -03:00
|
|
|
{
|
2021-05-28 05:54:10 -03:00
|
|
|
return calculate_log2_keysize((n*3 + 1) / 2);
|
2020-08-07 02:08:55 -03:00
|
|
|
}
|
2012-04-23 12:24:50 -03:00
|
|
|
|
|
|
|
|
2013-07-16 17:17:26 -03:00
|
|
|
/* GROWTH_RATE. Growth rate upon hitting maximum load.
|
2018-04-17 03:53:34 -03:00
|
|
|
* Currently set to used*3.
|
2013-07-16 17:17:26 -03:00
|
|
|
* This means that dicts double in size when growing without deletions,
|
2013-05-17 07:01:13 -03:00
|
|
|
* but have more head room when the number of deletions is on a par with the
|
2018-04-17 03:53:34 -03:00
|
|
|
* number of insertions. See also bpo-17563 and bpo-33205.
|
|
|
|
*
|
2013-05-17 07:01:13 -03:00
|
|
|
* GROWTH_RATE was set to used*4 up to version 3.2.
|
|
|
|
* GROWTH_RATE was set to used*2 in version 3.3.0
|
2018-04-17 03:53:34 -03:00
|
|
|
* GROWTH_RATE was set to used*2 + capacity/2 in 3.4.0-3.6.0.
|
2012-06-24 16:03:45 -03:00
|
|
|
*/
|
2018-04-17 03:53:34 -03:00
|
|
|
#define GROWTH_RATE(d) ((d)->ma_used*3)
|
2012-04-23 12:24:50 -03:00
|
|
|
|
|
|
|
/* This immutable, empty PyDictKeysObject is used for PyDict_Clear()
|
|
|
|
* (which cannot fail and thus can do no allocation).
|
|
|
|
*/
|
|
|
|
static PyDictKeysObject empty_keys_struct = {
|
2024-10-10 14:19:08 -03:00
|
|
|
_Py_DICT_IMMORTAL_INITIAL_REFCNT, /* dk_refcnt */
|
2021-05-28 05:54:10 -03:00
|
|
|
0, /* dk_log2_size */
|
2022-02-22 07:03:15 -04:00
|
|
|
0, /* dk_log2_index_bytes */
|
2022-03-02 06:05:12 -04:00
|
|
|
DICT_KEYS_UNICODE, /* dk_kind */
|
2024-02-20 20:40:37 -04:00
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
{0}, /* dk_mutex */
|
|
|
|
#endif
|
2021-05-28 05:54:10 -03:00
|
|
|
1, /* dk_version */
|
2012-04-23 12:24:50 -03:00
|
|
|
0, /* dk_usable (immutable) */
|
2016-09-07 21:40:12 -03:00
|
|
|
0, /* dk_nentries */
|
2018-04-20 02:41:19 -03:00
|
|
|
{DKIX_EMPTY, DKIX_EMPTY, DKIX_EMPTY, DKIX_EMPTY,
|
|
|
|
DKIX_EMPTY, DKIX_EMPTY, DKIX_EMPTY, DKIX_EMPTY}, /* dk_indices */
|
2012-04-23 12:24:50 -03:00
|
|
|
};
|
|
|
|
|
|
|
|
#define Py_EMPTY_KEYS &empty_keys_struct
|
|
|
|
|
2016-09-14 10:02:01 -03:00
|
|
|
/* Uncomment to check the dict content in _PyDict_CheckConsistency() */
|
2022-03-01 19:09:28 -04:00
|
|
|
// #define DEBUG_PYDICT
|
2016-09-14 10:02:01 -03:00
|
|
|
|
2019-04-12 16:51:34 -03:00
|
|
|
#ifdef DEBUG_PYDICT
|
|
|
|
# define ASSERT_CONSISTENT(op) assert(_PyDict_CheckConsistency((PyObject *)(op), 1))
|
|
|
|
#else
|
|
|
|
# define ASSERT_CONSISTENT(op) assert(_PyDict_CheckConsistency((PyObject *)(op), 0))
|
|
|
|
#endif
|
2016-09-14 10:02:01 -03:00
|
|
|
|
2021-10-06 09:19:53 -03:00
|
|
|
static inline int
|
|
|
|
get_index_from_order(PyDictObject *mp, Py_ssize_t i)
|
|
|
|
{
|
2022-02-08 07:50:38 -04:00
|
|
|
assert(mp->ma_used <= SHARED_KEYS_MAX_SIZE);
|
2024-04-02 07:59:21 -03:00
|
|
|
assert(i < mp->ma_values->size);
|
|
|
|
uint8_t *array = get_insertion_order_array(mp->ma_values);
|
|
|
|
return array[i];
|
2021-10-06 09:19:53 -03:00
|
|
|
}
|
2019-04-12 16:51:34 -03:00
|
|
|
|
2022-03-01 19:09:28 -04:00
|
|
|
#ifdef DEBUG_PYDICT
|
|
|
|
static void
|
|
|
|
dump_entries(PyDictKeysObject *dk)
|
|
|
|
{
|
|
|
|
for (Py_ssize_t i = 0; i < dk->dk_nentries; i++) {
|
|
|
|
if (DK_IS_UNICODE(dk)) {
|
|
|
|
PyDictUnicodeEntry *ep = &DK_UNICODE_ENTRIES(dk)[i];
|
|
|
|
printf("key=%p value=%p\n", ep->me_key, ep->me_value);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
PyDictKeyEntry *ep = &DK_ENTRIES(dk)[i];
|
|
|
|
printf("key=%p hash=%lx value=%p\n", ep->me_key, ep->me_hash, ep->me_value);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2019-04-12 16:51:34 -03:00
|
|
|
int
|
|
|
|
_PyDict_CheckConsistency(PyObject *op, int check_content)
|
2016-09-14 10:02:01 -03:00
|
|
|
{
|
2024-05-24 14:39:06 -03:00
|
|
|
ASSERT_WORLD_STOPPED_OR_DICT_LOCKED(op);
|
|
|
|
|
2019-10-07 13:42:01 -03:00
|
|
|
#define CHECK(expr) \
|
|
|
|
do { if (!(expr)) { _PyObject_ASSERT_FAILED_MSG(op, Py_STRINGIFY(expr)); } } while (0)
|
|
|
|
|
|
|
|
assert(op != NULL);
|
|
|
|
CHECK(PyDict_Check(op));
|
2019-04-12 16:51:34 -03:00
|
|
|
PyDictObject *mp = (PyDictObject *)op;
|
2018-10-26 13:47:15 -03:00
|
|
|
|
2016-09-14 10:02:01 -03:00
|
|
|
PyDictKeysObject *keys = mp->ma_keys;
|
|
|
|
int splitted = _PyDict_HasSplitTable(mp);
|
2021-05-28 05:54:10 -03:00
|
|
|
Py_ssize_t usable = USABLE_FRACTION(DK_SIZE(keys));
|
2016-09-14 10:02:01 -03:00
|
|
|
|
2024-07-10 15:04:12 -03:00
|
|
|
// In the free-threaded build, shared keys may be concurrently modified,
|
|
|
|
// so use atomic loads.
|
|
|
|
Py_ssize_t dk_usable = FT_ATOMIC_LOAD_SSIZE_ACQUIRE(keys->dk_usable);
|
|
|
|
Py_ssize_t dk_nentries = FT_ATOMIC_LOAD_SSIZE_ACQUIRE(keys->dk_nentries);
|
|
|
|
|
2019-10-07 13:42:01 -03:00
|
|
|
CHECK(0 <= mp->ma_used && mp->ma_used <= usable);
|
2024-07-10 15:04:12 -03:00
|
|
|
CHECK(0 <= dk_usable && dk_usable <= usable);
|
|
|
|
CHECK(0 <= dk_nentries && dk_nentries <= usable);
|
|
|
|
CHECK(dk_usable + dk_nentries <= usable);
|
2016-09-14 10:02:01 -03:00
|
|
|
|
|
|
|
if (!splitted) {
|
|
|
|
/* combined table */
|
2022-03-01 19:09:28 -04:00
|
|
|
CHECK(keys->dk_kind != DICT_KEYS_SPLIT);
|
2022-03-02 06:05:12 -04:00
|
|
|
CHECK(keys->dk_refcnt == 1 || keys == Py_EMPTY_KEYS);
|
2016-09-14 10:02:01 -03:00
|
|
|
}
|
2021-10-06 09:19:53 -03:00
|
|
|
else {
|
2022-03-01 19:09:28 -04:00
|
|
|
CHECK(keys->dk_kind == DICT_KEYS_SPLIT);
|
2021-10-06 09:19:53 -03:00
|
|
|
CHECK(mp->ma_used <= SHARED_KEYS_MAX_SIZE);
|
2024-04-02 07:59:21 -03:00
|
|
|
if (mp->ma_values->embedded) {
|
|
|
|
CHECK(mp->ma_values->embedded == 1);
|
|
|
|
CHECK(mp->ma_values->valid == 1);
|
|
|
|
}
|
2021-10-06 09:19:53 -03:00
|
|
|
}
|
2016-09-14 10:02:01 -03:00
|
|
|
|
2019-04-12 16:51:34 -03:00
|
|
|
if (check_content) {
|
2024-07-10 15:04:12 -03:00
|
|
|
LOCK_KEYS_IF_SPLIT(keys, keys->dk_kind);
|
2021-10-06 09:19:53 -03:00
|
|
|
for (Py_ssize_t i=0; i < DK_SIZE(keys); i++) {
|
2019-04-12 16:51:34 -03:00
|
|
|
Py_ssize_t ix = dictkeys_get_index(keys, i);
|
2019-10-07 13:42:01 -03:00
|
|
|
CHECK(DKIX_DUMMY <= ix && ix <= usable);
|
2019-04-12 16:51:34 -03:00
|
|
|
}
|
2016-09-14 10:02:01 -03:00
|
|
|
|
2022-03-01 19:09:28 -04:00
|
|
|
if (keys->dk_kind == DICT_KEYS_GENERAL) {
|
|
|
|
PyDictKeyEntry *entries = DK_ENTRIES(keys);
|
|
|
|
for (Py_ssize_t i=0; i < usable; i++) {
|
|
|
|
PyDictKeyEntry *entry = &entries[i];
|
|
|
|
PyObject *key = entry->me_key;
|
2016-09-14 10:02:01 -03:00
|
|
|
|
2022-03-01 19:09:28 -04:00
|
|
|
if (key != NULL) {
|
2019-04-12 16:51:34 -03:00
|
|
|
/* test_dict fails if PyObject_Hash() is called again */
|
2019-10-07 13:42:01 -03:00
|
|
|
CHECK(entry->me_hash != -1);
|
|
|
|
CHECK(entry->me_value != NULL);
|
2022-03-01 19:09:28 -04:00
|
|
|
|
|
|
|
if (PyUnicode_CheckExact(key)) {
|
|
|
|
Py_hash_t hash = unicode_get_hash(key);
|
|
|
|
CHECK(entry->me_hash == hash);
|
|
|
|
}
|
2019-04-12 16:51:34 -03:00
|
|
|
}
|
2016-09-14 10:02:01 -03:00
|
|
|
}
|
2022-03-01 19:09:28 -04:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
PyDictUnicodeEntry *entries = DK_UNICODE_ENTRIES(keys);
|
|
|
|
for (Py_ssize_t i=0; i < usable; i++) {
|
|
|
|
PyDictUnicodeEntry *entry = &entries[i];
|
|
|
|
PyObject *key = entry->me_key;
|
|
|
|
|
|
|
|
if (key != NULL) {
|
|
|
|
CHECK(PyUnicode_CheckExact(key));
|
|
|
|
Py_hash_t hash = unicode_get_hash(key);
|
|
|
|
CHECK(hash != -1);
|
|
|
|
if (!splitted) {
|
|
|
|
CHECK(entry->me_value != NULL);
|
|
|
|
}
|
|
|
|
}
|
2019-04-12 16:51:34 -03:00
|
|
|
|
2022-03-01 19:09:28 -04:00
|
|
|
if (splitted) {
|
|
|
|
CHECK(entry->me_value == NULL);
|
|
|
|
}
|
2016-09-14 10:02:01 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (splitted) {
|
2021-10-06 09:19:53 -03:00
|
|
|
CHECK(mp->ma_used <= SHARED_KEYS_MAX_SIZE);
|
2019-04-12 16:51:34 -03:00
|
|
|
/* splitted table */
|
2021-10-06 09:19:53 -03:00
|
|
|
int duplicate_check = 0;
|
|
|
|
for (Py_ssize_t i=0; i < mp->ma_used; i++) {
|
|
|
|
int index = get_index_from_order(mp, i);
|
|
|
|
CHECK((duplicate_check & (1<<index)) == 0);
|
|
|
|
duplicate_check |= (1<<index);
|
|
|
|
CHECK(mp->ma_values->values[index] != NULL);
|
2019-04-12 16:51:34 -03:00
|
|
|
}
|
2016-09-14 10:02:01 -03:00
|
|
|
}
|
2024-07-10 15:04:12 -03:00
|
|
|
UNLOCK_KEYS_IF_SPLIT(keys, keys->dk_kind);
|
2016-09-14 10:02:01 -03:00
|
|
|
}
|
|
|
|
return 1;
|
2019-10-07 13:42:01 -03:00
|
|
|
|
|
|
|
#undef CHECK
|
2016-09-14 10:02:01 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2020-06-23 06:33:18 -03:00
|
|
|
static PyDictKeysObject*
|
2023-03-09 11:16:30 -04:00
|
|
|
new_keys_object(PyInterpreterState *interp, uint8_t log2_size, bool unicode)
|
1993-03-27 14:11:32 -04:00
|
|
|
{
|
2022-02-22 07:03:15 -04:00
|
|
|
Py_ssize_t usable;
|
|
|
|
int log2_bytes;
|
2022-03-01 19:09:28 -04:00
|
|
|
size_t entry_size = unicode ? sizeof(PyDictUnicodeEntry) : sizeof(PyDictKeyEntry);
|
2012-04-23 12:24:50 -03:00
|
|
|
|
2021-05-28 05:54:10 -03:00
|
|
|
assert(log2_size >= PyDict_LOG_MINSIZE);
|
2016-09-07 21:40:12 -03:00
|
|
|
|
2023-03-17 10:39:09 -03:00
|
|
|
usable = USABLE_FRACTION((size_t)1<<log2_size);
|
2022-02-22 07:03:15 -04:00
|
|
|
if (log2_size < 8) {
|
|
|
|
log2_bytes = log2_size;
|
2016-09-07 21:40:12 -03:00
|
|
|
}
|
2022-02-22 07:03:15 -04:00
|
|
|
else if (log2_size < 16) {
|
|
|
|
log2_bytes = log2_size + 1;
|
2016-09-07 21:40:12 -03:00
|
|
|
}
|
|
|
|
#if SIZEOF_VOID_P > 4
|
2022-02-22 07:03:15 -04:00
|
|
|
else if (log2_size >= 32) {
|
|
|
|
log2_bytes = log2_size + 3;
|
2016-09-07 21:40:12 -03:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
else {
|
2022-02-22 07:03:15 -04:00
|
|
|
log2_bytes = log2_size + 2;
|
2016-09-07 21:40:12 -03:00
|
|
|
}
|
|
|
|
|
2024-07-22 13:08:27 -03:00
|
|
|
PyDictKeysObject *dk = NULL;
|
|
|
|
if (log2_size == PyDict_LOG_MINSIZE && unicode) {
|
|
|
|
dk = _Py_FREELIST_POP_MEM(dictkeys);
|
2016-09-07 21:40:12 -03:00
|
|
|
}
|
2024-07-22 13:08:27 -03:00
|
|
|
if (dk == NULL) {
|
2024-01-29 13:38:03 -04:00
|
|
|
dk = PyMem_Malloc(sizeof(PyDictKeysObject)
|
|
|
|
+ ((size_t)1 << log2_bytes)
|
|
|
|
+ entry_size * usable);
|
2016-09-07 21:40:12 -03:00
|
|
|
if (dk == NULL) {
|
|
|
|
PyErr_NoMemory();
|
|
|
|
return NULL;
|
|
|
|
}
|
2012-04-23 12:24:50 -03:00
|
|
|
}
|
2020-02-03 12:55:05 -04:00
|
|
|
#ifdef Py_REF_DEBUG
|
2024-04-08 13:11:36 -03:00
|
|
|
_Py_IncRefTotal(_PyThreadState_GET());
|
2020-02-03 12:55:05 -04:00
|
|
|
#endif
|
2018-11-14 05:39:27 -04:00
|
|
|
dk->dk_refcnt = 1;
|
2021-05-28 05:54:10 -03:00
|
|
|
dk->dk_log2_size = log2_size;
|
2022-02-22 07:03:15 -04:00
|
|
|
dk->dk_log2_index_bytes = log2_bytes;
|
2022-03-01 19:09:28 -04:00
|
|
|
dk->dk_kind = unicode ? DICT_KEYS_UNICODE : DICT_KEYS_GENERAL;
|
2024-02-20 20:40:37 -04:00
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
dk->dk_mutex = (PyMutex){0};
|
|
|
|
#endif
|
2016-09-07 21:40:12 -03:00
|
|
|
dk->dk_nentries = 0;
|
2021-10-06 09:19:53 -03:00
|
|
|
dk->dk_usable = usable;
|
2021-05-28 05:54:10 -03:00
|
|
|
dk->dk_version = 0;
|
2022-02-22 07:03:15 -04:00
|
|
|
memset(&dk->dk_indices[0], 0xff, ((size_t)1 << log2_bytes));
|
2022-03-01 19:09:28 -04:00
|
|
|
memset(&dk->dk_indices[(size_t)1 << log2_bytes], 0, entry_size * usable);
|
2012-04-23 12:24:50 -03:00
|
|
|
return dk;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2024-02-20 21:08:14 -04:00
|
|
|
free_keys_object(PyDictKeysObject *keys, bool use_qsbr)
|
2012-04-23 12:24:50 -03:00
|
|
|
{
|
2024-02-20 21:08:14 -04:00
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
if (use_qsbr) {
|
2024-03-05 05:08:18 -04:00
|
|
|
_PyMem_FreeDelayed(keys);
|
2024-02-20 21:08:14 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
2024-07-22 13:08:27 -03:00
|
|
|
if (DK_LOG_SIZE(keys) == PyDict_LOG_MINSIZE && keys->dk_kind == DICT_KEYS_UNICODE) {
|
|
|
|
_Py_FREELIST_FREE(dictkeys, keys, PyMem_Free);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
PyMem_Free(keys);
|
2016-09-07 21:40:12 -03:00
|
|
|
}
|
2012-04-23 12:24:50 -03:00
|
|
|
}
|
|
|
|
|
2024-04-02 07:59:21 -03:00
|
|
|
static size_t
|
|
|
|
values_size_from_count(size_t count)
|
|
|
|
{
|
|
|
|
assert(count >= 1);
|
|
|
|
size_t suffix_size = _Py_SIZE_ROUND_UP(count, sizeof(PyObject *));
|
|
|
|
assert(suffix_size < 128);
|
|
|
|
assert(suffix_size % sizeof(PyObject *) == 0);
|
|
|
|
return (count + 1) * sizeof(PyObject *) + suffix_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define CACHED_KEYS(tp) (((PyHeapTypeObject*)tp)->ht_cached_keys)
|
|
|
|
|
2021-10-06 09:19:53 -03:00
|
|
|
static inline PyDictValues*
|
2022-11-29 07:12:17 -04:00
|
|
|
new_values(size_t size)
|
2021-10-06 09:19:53 -03:00
|
|
|
{
|
2024-04-02 07:59:21 -03:00
|
|
|
size_t n = values_size_from_count(size);
|
|
|
|
PyDictValues *res = (PyDictValues *)PyMem_Malloc(n);
|
|
|
|
if (res == NULL) {
|
2022-02-08 07:50:38 -04:00
|
|
|
return NULL;
|
|
|
|
}
|
2024-04-02 07:59:21 -03:00
|
|
|
res->embedded = 0;
|
|
|
|
res->size = 0;
|
|
|
|
assert(size < 256);
|
|
|
|
res->capacity = (uint8_t)size;
|
|
|
|
return res;
|
2021-10-06 09:19:53 -03:00
|
|
|
}
|
|
|
|
|
2022-02-08 07:50:38 -04:00
|
|
|
static inline void
|
2024-02-20 21:08:14 -04:00
|
|
|
free_values(PyDictValues *values, bool use_qsbr)
|
2022-02-08 07:50:38 -04:00
|
|
|
{
|
2024-04-02 07:59:21 -03:00
|
|
|
assert(values->embedded == 0);
|
2024-02-20 21:08:14 -04:00
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
if (use_qsbr) {
|
2024-04-02 07:59:21 -03:00
|
|
|
_PyMem_FreeDelayed(values);
|
2024-02-20 21:08:14 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
2024-04-02 07:59:21 -03:00
|
|
|
PyMem_Free(values);
|
2022-02-08 07:50:38 -04:00
|
|
|
}
|
2012-04-23 12:24:50 -03:00
|
|
|
|
|
|
|
/* Consumes a reference to the keys object */
|
|
|
|
static PyObject *
|
2023-03-09 11:16:30 -04:00
|
|
|
new_dict(PyInterpreterState *interp,
|
|
|
|
PyDictKeysObject *keys, PyDictValues *values,
|
|
|
|
Py_ssize_t used, int free_values_on_failure)
|
2012-04-23 12:24:50 -03:00
|
|
|
{
|
2013-07-08 17:19:20 -03:00
|
|
|
assert(keys != NULL);
|
2024-07-22 13:08:27 -03:00
|
|
|
PyDictObject *mp = _Py_FREELIST_POP(PyDictObject, dicts);
|
|
|
|
if (mp == NULL) {
|
2010-05-09 12:52:27 -03:00
|
|
|
mp = PyObject_GC_New(PyDictObject, &PyDict_Type);
|
2012-04-23 12:24:50 -03:00
|
|
|
if (mp == NULL) {
|
2024-02-20 21:08:14 -04:00
|
|
|
dictkeys_decref(interp, keys, false);
|
2021-10-13 10:19:34 -03:00
|
|
|
if (free_values_on_failure) {
|
2024-02-20 21:08:14 -04:00
|
|
|
free_values(values, false);
|
2019-03-23 23:23:29 -03:00
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
return NULL;
|
2012-04-23 12:24:50 -03:00
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2024-07-22 13:08:27 -03:00
|
|
|
assert(Py_IS_TYPE(mp, &PyDict_Type));
|
2012-04-23 12:24:50 -03:00
|
|
|
mp->ma_keys = keys;
|
|
|
|
mp->ma_values = values;
|
2021-10-13 10:19:34 -03:00
|
|
|
mp->ma_used = used;
|
2024-10-01 13:39:56 -03:00
|
|
|
mp->_ma_watcher_tag = 0;
|
2019-04-12 16:51:34 -03:00
|
|
|
ASSERT_CONSISTENT(mp);
|
2024-11-20 12:41:20 -04:00
|
|
|
_PyObject_GC_TRACK(mp);
|
2010-05-09 12:52:27 -03:00
|
|
|
return (PyObject *)mp;
|
1993-03-27 14:11:32 -04:00
|
|
|
}
|
|
|
|
|
2012-04-23 12:24:50 -03:00
|
|
|
static PyObject *
|
2023-03-09 11:16:30 -04:00
|
|
|
new_dict_with_shared_keys(PyInterpreterState *interp, PyDictKeysObject *keys)
|
2012-04-23 12:24:50 -03:00
|
|
|
{
|
2022-11-29 07:12:17 -04:00
|
|
|
size_t size = shared_keys_usable_size(keys);
|
|
|
|
PyDictValues *values = new_values(size);
|
2012-04-23 12:24:50 -03:00
|
|
|
if (values == NULL) {
|
|
|
|
return PyErr_NoMemory();
|
|
|
|
}
|
2024-05-06 20:31:09 -03:00
|
|
|
dictkeys_incref(keys);
|
2022-11-29 07:12:17 -04:00
|
|
|
for (size_t i = 0; i < size; i++) {
|
2021-10-06 09:19:53 -03:00
|
|
|
values->values[i] = NULL;
|
2012-04-23 12:24:50 -03:00
|
|
|
}
|
2023-03-09 11:16:30 -04:00
|
|
|
return new_dict(interp, keys, values, 0, 1);
|
2012-04-23 12:24:50 -03:00
|
|
|
}
|
|
|
|
|
2018-01-22 12:54:41 -04:00
|
|
|
|
2020-08-03 23:08:06 -03:00
|
|
|
static PyDictKeysObject *
|
|
|
|
clone_combined_dict_keys(PyDictObject *orig)
|
2018-01-22 12:54:41 -04:00
|
|
|
{
|
2020-08-03 23:08:06 -03:00
|
|
|
assert(PyDict_Check(orig));
|
2024-01-02 10:32:37 -04:00
|
|
|
assert(Py_TYPE(orig)->tp_iter == dict_iter);
|
2018-01-22 12:54:41 -04:00
|
|
|
assert(orig->ma_values == NULL);
|
2023-05-10 10:28:40 -03:00
|
|
|
assert(orig->ma_keys != Py_EMPTY_KEYS);
|
2018-01-22 12:54:41 -04:00
|
|
|
assert(orig->ma_keys->dk_refcnt == 1);
|
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
ASSERT_DICT_LOCKED(orig);
|
|
|
|
|
2022-11-29 07:12:17 -04:00
|
|
|
size_t keys_size = _PyDict_KeysSize(orig->ma_keys);
|
2024-01-29 13:38:03 -04:00
|
|
|
PyDictKeysObject *keys = PyMem_Malloc(keys_size);
|
2018-01-22 12:54:41 -04:00
|
|
|
if (keys == NULL) {
|
|
|
|
PyErr_NoMemory();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
memcpy(keys, orig->ma_keys, keys_size);
|
|
|
|
|
|
|
|
/* After copying key/value pairs, we need to incref all
|
|
|
|
keys and values and they are about to be co-owned by a
|
|
|
|
new dict object. */
|
2022-03-01 19:09:28 -04:00
|
|
|
PyObject **pkey, **pvalue;
|
|
|
|
size_t offs;
|
|
|
|
if (DK_IS_UNICODE(orig->ma_keys)) {
|
|
|
|
PyDictUnicodeEntry *ep0 = DK_UNICODE_ENTRIES(keys);
|
|
|
|
pkey = &ep0->me_key;
|
|
|
|
pvalue = &ep0->me_value;
|
|
|
|
offs = sizeof(PyDictUnicodeEntry) / sizeof(PyObject*);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
PyDictKeyEntry *ep0 = DK_ENTRIES(keys);
|
|
|
|
pkey = &ep0->me_key;
|
|
|
|
pvalue = &ep0->me_value;
|
|
|
|
offs = sizeof(PyDictKeyEntry) / sizeof(PyObject*);
|
|
|
|
}
|
|
|
|
|
2018-01-22 12:54:41 -04:00
|
|
|
Py_ssize_t n = keys->dk_nentries;
|
|
|
|
for (Py_ssize_t i = 0; i < n; i++) {
|
2022-03-01 19:09:28 -04:00
|
|
|
PyObject *value = *pvalue;
|
2018-01-22 12:54:41 -04:00
|
|
|
if (value != NULL) {
|
|
|
|
Py_INCREF(value);
|
2022-03-01 19:09:28 -04:00
|
|
|
Py_INCREF(*pkey);
|
2018-01-22 12:54:41 -04:00
|
|
|
}
|
2022-03-01 19:09:28 -04:00
|
|
|
pvalue += offs;
|
|
|
|
pkey += offs;
|
2018-01-22 12:54:41 -04:00
|
|
|
}
|
|
|
|
|
2018-07-06 13:20:07 -03:00
|
|
|
/* Since we copied the keys table we now have an extra reference
|
2020-02-03 12:55:05 -04:00
|
|
|
in the system. Manually call increment _Py_RefTotal to signal that
|
2018-11-14 05:39:27 -04:00
|
|
|
we have it now; calling dictkeys_incref would be an error as
|
2018-07-06 13:20:07 -03:00
|
|
|
keys->dk_refcnt is already set to 1 (after memcpy). */
|
2020-02-03 12:55:05 -04:00
|
|
|
#ifdef Py_REF_DEBUG
|
2024-04-08 13:11:36 -03:00
|
|
|
_Py_IncRefTotal(_PyThreadState_GET());
|
2020-02-03 12:55:05 -04:00
|
|
|
#endif
|
2020-08-03 23:08:06 -03:00
|
|
|
return keys;
|
2018-01-22 12:54:41 -04:00
|
|
|
}
|
|
|
|
|
2012-04-23 12:24:50 -03:00
|
|
|
PyObject *
|
|
|
|
PyDict_New(void)
|
|
|
|
{
|
2023-03-09 11:16:30 -04:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
2023-05-10 10:28:40 -03:00
|
|
|
/* We don't incref Py_EMPTY_KEYS here because it is immortal. */
|
2023-03-09 11:16:30 -04:00
|
|
|
return new_dict(interp, Py_EMPTY_KEYS, NULL, 0, 0);
|
2012-04-23 12:24:50 -03:00
|
|
|
}
|
|
|
|
|
2016-09-07 21:40:12 -03:00
|
|
|
/* Search index of hash table from offset of entry table */
|
|
|
|
static Py_ssize_t
|
|
|
|
lookdict_index(PyDictKeysObject *k, Py_hash_t hash, Py_ssize_t index)
|
|
|
|
{
|
|
|
|
size_t mask = DK_MASK(k);
|
2017-06-23 03:22:50 -03:00
|
|
|
size_t perturb = (size_t)hash;
|
|
|
|
size_t i = (size_t)hash & mask;
|
2016-09-07 21:40:12 -03:00
|
|
|
|
2017-06-23 03:22:50 -03:00
|
|
|
for (;;) {
|
2018-11-14 05:39:27 -04:00
|
|
|
Py_ssize_t ix = dictkeys_get_index(k, i);
|
2016-09-07 21:40:12 -03:00
|
|
|
if (ix == index) {
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
if (ix == DKIX_EMPTY) {
|
|
|
|
return DKIX_EMPTY;
|
|
|
|
}
|
2017-06-23 03:22:50 -03:00
|
|
|
perturb >>= PERTURB_SHIFT;
|
|
|
|
i = mask & (i*5 + perturb + 1);
|
2016-09-07 21:40:12 -03:00
|
|
|
}
|
2017-09-14 22:13:16 -03:00
|
|
|
Py_UNREACHABLE();
|
2016-09-07 21:40:12 -03:00
|
|
|
}
|
|
|
|
|
2024-01-30 13:33:36 -04:00
|
|
|
static inline Py_ALWAYS_INLINE Py_ssize_t
|
|
|
|
do_lookup(PyDictObject *mp, PyDictKeysObject *dk, PyObject *key, Py_hash_t hash,
|
2024-07-17 16:52:19 -03:00
|
|
|
int (*check_lookup)(PyDictObject *, PyDictKeysObject *, void *, Py_ssize_t ix, PyObject *key, Py_hash_t))
|
2021-09-17 08:20:51 -03:00
|
|
|
{
|
2024-01-30 13:33:36 -04:00
|
|
|
void *ep0 = _DK_ENTRIES(dk);
|
2021-09-17 08:20:51 -03:00
|
|
|
size_t mask = DK_MASK(dk);
|
|
|
|
size_t perturb = hash;
|
|
|
|
size_t i = (size_t)hash & mask;
|
|
|
|
Py_ssize_t ix;
|
|
|
|
for (;;) {
|
|
|
|
ix = dictkeys_get_index(dk, i);
|
|
|
|
if (ix >= 0) {
|
2024-07-17 16:52:19 -03:00
|
|
|
int cmp = check_lookup(mp, dk, ep0, ix, key, hash);
|
2024-01-30 13:33:36 -04:00
|
|
|
if (cmp < 0) {
|
|
|
|
return cmp;
|
|
|
|
} else if (cmp) {
|
2022-03-01 19:09:28 -04:00
|
|
|
return ix;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (ix == DKIX_EMPTY) {
|
|
|
|
return DKIX_EMPTY;
|
|
|
|
}
|
|
|
|
perturb >>= PERTURB_SHIFT;
|
|
|
|
i = mask & (i*5 + perturb + 1);
|
|
|
|
|
2023-05-21 09:08:28 -03:00
|
|
|
// Manual loop unrolling
|
2021-09-17 08:20:51 -03:00
|
|
|
ix = dictkeys_get_index(dk, i);
|
|
|
|
if (ix >= 0) {
|
2024-07-17 16:52:19 -03:00
|
|
|
int cmp = check_lookup(mp, dk, ep0, ix, key, hash);
|
2024-01-30 13:33:36 -04:00
|
|
|
if (cmp < 0) {
|
|
|
|
return cmp;
|
|
|
|
} else if (cmp) {
|
2021-09-17 08:20:51 -03:00
|
|
|
return ix;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (ix == DKIX_EMPTY) {
|
|
|
|
return DKIX_EMPTY;
|
|
|
|
}
|
|
|
|
perturb >>= PERTURB_SHIFT;
|
|
|
|
i = mask & (i*5 + perturb + 1);
|
|
|
|
}
|
|
|
|
Py_UNREACHABLE();
|
|
|
|
}
|
|
|
|
|
2024-07-18 03:19:32 -03:00
|
|
|
static inline int
|
2024-01-30 13:33:36 -04:00
|
|
|
compare_unicode_generic(PyDictObject *mp, PyDictKeysObject *dk,
|
|
|
|
void *ep0, Py_ssize_t ix, PyObject *key, Py_hash_t hash)
|
|
|
|
{
|
|
|
|
PyDictUnicodeEntry *ep = &((PyDictUnicodeEntry *)ep0)[ix];
|
|
|
|
assert(ep->me_key != NULL);
|
|
|
|
assert(PyUnicode_CheckExact(ep->me_key));
|
|
|
|
assert(!PyUnicode_CheckExact(key));
|
|
|
|
|
|
|
|
if (unicode_get_hash(ep->me_key) == hash) {
|
|
|
|
PyObject *startkey = ep->me_key;
|
|
|
|
Py_INCREF(startkey);
|
|
|
|
int cmp = PyObject_RichCompareBool(startkey, key, Py_EQ);
|
|
|
|
Py_DECREF(startkey);
|
|
|
|
if (cmp < 0) {
|
|
|
|
return DKIX_ERROR;
|
|
|
|
}
|
|
|
|
if (dk == mp->ma_keys && ep->me_key == startkey) {
|
|
|
|
return cmp;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* The dict was mutated, restart */
|
|
|
|
return DKIX_KEY_CHANGED;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Search non-Unicode key from Unicode table
|
2022-03-01 19:09:28 -04:00
|
|
|
static Py_ssize_t
|
2024-01-30 13:33:36 -04:00
|
|
|
unicodekeys_lookup_generic(PyDictObject *mp, PyDictKeysObject* dk, PyObject *key, Py_hash_t hash)
|
2022-03-01 19:09:28 -04:00
|
|
|
{
|
2024-01-30 13:33:36 -04:00
|
|
|
return do_lookup(mp, dk, key, hash, compare_unicode_generic);
|
|
|
|
}
|
|
|
|
|
2024-07-18 03:19:32 -03:00
|
|
|
static inline int
|
2024-01-30 13:33:36 -04:00
|
|
|
compare_unicode_unicode(PyDictObject *mp, PyDictKeysObject *dk,
|
|
|
|
void *ep0, Py_ssize_t ix, PyObject *key, Py_hash_t hash)
|
|
|
|
{
|
|
|
|
PyDictUnicodeEntry *ep = &((PyDictUnicodeEntry *)ep0)[ix];
|
2024-04-25 12:53:29 -03:00
|
|
|
PyObject *ep_key = FT_ATOMIC_LOAD_PTR_RELAXED(ep->me_key);
|
|
|
|
assert(ep_key != NULL);
|
|
|
|
assert(PyUnicode_CheckExact(ep_key));
|
|
|
|
if (ep_key == key ||
|
|
|
|
(unicode_get_hash(ep_key) == hash && unicode_eq(ep_key, key))) {
|
2024-01-30 13:33:36 -04:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static Py_ssize_t _Py_HOT_FUNCTION
|
|
|
|
unicodekeys_lookup_unicode(PyDictKeysObject* dk, PyObject *key, Py_hash_t hash)
|
|
|
|
{
|
|
|
|
return do_lookup(NULL, dk, key, hash, compare_unicode_unicode);
|
|
|
|
}
|
|
|
|
|
2024-07-18 03:19:32 -03:00
|
|
|
static inline int
|
2024-01-30 13:33:36 -04:00
|
|
|
compare_generic(PyDictObject *mp, PyDictKeysObject *dk,
|
|
|
|
void *ep0, Py_ssize_t ix, PyObject *key, Py_hash_t hash)
|
|
|
|
{
|
|
|
|
PyDictKeyEntry *ep = &((PyDictKeyEntry *)ep0)[ix];
|
|
|
|
assert(ep->me_key != NULL);
|
|
|
|
if (ep->me_key == key) {
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
if (ep->me_hash == hash) {
|
|
|
|
PyObject *startkey = ep->me_key;
|
|
|
|
Py_INCREF(startkey);
|
|
|
|
int cmp = PyObject_RichCompareBool(startkey, key, Py_EQ);
|
|
|
|
Py_DECREF(startkey);
|
|
|
|
if (cmp < 0) {
|
|
|
|
return DKIX_ERROR;
|
2022-03-01 19:09:28 -04:00
|
|
|
}
|
2024-01-30 13:33:36 -04:00
|
|
|
if (dk == mp->ma_keys && ep->me_key == startkey) {
|
|
|
|
return cmp;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* The dict was mutated, restart */
|
|
|
|
return DKIX_KEY_CHANGED;
|
2022-03-01 19:09:28 -04:00
|
|
|
}
|
|
|
|
}
|
2024-01-30 13:33:36 -04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static Py_ssize_t
|
|
|
|
dictkeys_generic_lookup(PyDictObject *mp, PyDictKeysObject* dk, PyObject *key, Py_hash_t hash)
|
|
|
|
{
|
|
|
|
return do_lookup(mp, dk, key, hash, compare_generic);
|
2022-03-01 19:09:28 -04:00
|
|
|
}
|
|
|
|
|
2021-09-17 08:20:51 -03:00
|
|
|
/* Lookup a string in a (all unicode) dict keys.
|
|
|
|
* Returns DKIX_ERROR if key is not a string,
|
|
|
|
* or if the dict keys is not all strings.
|
|
|
|
* If the keys is present then return the index of key.
|
|
|
|
* If the key is not present then return DKIX_EMPTY.
|
|
|
|
*/
|
|
|
|
Py_ssize_t
|
|
|
|
_PyDictKeys_StringLookup(PyDictKeysObject* dk, PyObject *key)
|
|
|
|
{
|
|
|
|
DictKeysKind kind = dk->dk_kind;
|
|
|
|
if (!PyUnicode_CheckExact(key) || kind == DICT_KEYS_GENERAL) {
|
|
|
|
return DKIX_ERROR;
|
|
|
|
}
|
2022-03-01 19:09:28 -04:00
|
|
|
Py_hash_t hash = unicode_get_hash(key);
|
2021-09-17 08:20:51 -03:00
|
|
|
if (hash == -1) {
|
|
|
|
hash = PyUnicode_Type.tp_hash(key);
|
|
|
|
if (hash == -1) {
|
|
|
|
PyErr_Clear();
|
|
|
|
return DKIX_ERROR;
|
|
|
|
}
|
|
|
|
}
|
2022-03-01 19:09:28 -04:00
|
|
|
return unicodekeys_lookup_unicode(dk, key, hash);
|
2021-09-17 08:20:51 -03:00
|
|
|
}
|
|
|
|
|
2024-04-25 19:34:05 -03:00
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
|
|
|
|
static Py_ssize_t
|
|
|
|
unicodekeys_lookup_unicode_threadsafe(PyDictKeysObject* dk, PyObject *key,
|
|
|
|
Py_hash_t hash);
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
1993-03-27 14:11:32 -04:00
|
|
|
/*
|
|
|
|
The basic lookup function used by all operations.
|
1997-01-27 20:00:11 -04:00
|
|
|
This is based on Algorithm D from Knuth Vol. 3, Sec. 6.4.
|
1993-03-27 14:11:32 -04:00
|
|
|
Open addressing is preferred over chaining since the link overhead for
|
|
|
|
chaining would be substantial (100% with typical malloc overhead).
|
|
|
|
|
2001-06-02 02:27:19 -03:00
|
|
|
The initial probe index is computed as hash mod the table size. Subsequent
|
|
|
|
probe indices are computed as explained earlier.
|
1999-03-24 15:06:42 -04:00
|
|
|
|
|
|
|
All arithmetic on hash should ignore overflow.
|
1997-01-27 20:00:11 -04:00
|
|
|
|
2021-05-28 05:54:10 -03:00
|
|
|
_Py_dict_lookup() is general-purpose, and may return DKIX_ERROR if (and only if) a
|
2016-09-08 16:01:25 -03:00
|
|
|
comparison raises an exception.
|
2021-05-28 05:54:10 -03:00
|
|
|
When the key isn't found a DKIX_EMPTY is returned.
|
1993-03-27 14:11:32 -04:00
|
|
|
*/
|
2022-03-01 19:09:28 -04:00
|
|
|
Py_ssize_t
|
2021-05-28 05:54:10 -03:00
|
|
|
_Py_dict_lookup(PyDictObject *mp, PyObject *key, Py_hash_t hash, PyObject **value_addr)
|
1993-03-27 14:11:32 -04:00
|
|
|
{
|
2016-09-07 21:40:12 -03:00
|
|
|
PyDictKeysObject *dk;
|
2022-03-01 19:09:28 -04:00
|
|
|
DictKeysKind kind;
|
|
|
|
Py_ssize_t ix;
|
2024-04-04 16:26:07 -03:00
|
|
|
|
|
|
|
_Py_CRITICAL_SECTION_ASSERT_OBJECT_LOCKED(mp);
|
2021-05-28 05:54:10 -03:00
|
|
|
start:
|
2016-09-07 21:40:12 -03:00
|
|
|
dk = mp->ma_keys;
|
2022-03-01 19:09:28 -04:00
|
|
|
kind = dk->dk_kind;
|
|
|
|
|
|
|
|
if (kind != DICT_KEYS_GENERAL) {
|
|
|
|
if (PyUnicode_CheckExact(key)) {
|
2024-04-25 19:34:05 -03:00
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
if (kind == DICT_KEYS_SPLIT) {
|
|
|
|
// A split dictionaries keys can be mutated by other
|
|
|
|
// dictionaries but if we have a unicode key we can avoid
|
|
|
|
// locking the shared keys.
|
|
|
|
ix = unicodekeys_lookup_unicode_threadsafe(dk, key, hash);
|
|
|
|
if (ix == DKIX_KEY_CHANGED) {
|
|
|
|
LOCK_KEYS(dk);
|
|
|
|
ix = unicodekeys_lookup_unicode(dk, key, hash);
|
|
|
|
UNLOCK_KEYS(dk);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
ix = unicodekeys_lookup_unicode(dk, key, hash);
|
|
|
|
}
|
|
|
|
#else
|
2022-03-01 19:09:28 -04:00
|
|
|
ix = unicodekeys_lookup_unicode(dk, key, hash);
|
2024-04-25 19:34:05 -03:00
|
|
|
#endif
|
2021-09-17 08:20:51 -03:00
|
|
|
}
|
|
|
|
else {
|
2024-04-25 19:34:05 -03:00
|
|
|
INCREF_KEYS_FT(dk);
|
|
|
|
LOCK_KEYS_IF_SPLIT(dk, kind);
|
|
|
|
|
2022-03-01 19:09:28 -04:00
|
|
|
ix = unicodekeys_lookup_generic(mp, dk, key, hash);
|
2024-04-25 19:34:05 -03:00
|
|
|
|
|
|
|
UNLOCK_KEYS_IF_SPLIT(dk, kind);
|
|
|
|
DECREF_KEYS_FT(dk, IS_DICT_SHARED(mp));
|
2022-03-01 19:09:28 -04:00
|
|
|
if (ix == DKIX_KEY_CHANGED) {
|
|
|
|
goto start;
|
|
|
|
}
|
2016-09-07 21:40:12 -03:00
|
|
|
}
|
2022-03-01 19:09:28 -04:00
|
|
|
|
2017-08-03 11:45:15 -03:00
|
|
|
if (ix >= 0) {
|
2022-03-01 19:09:28 -04:00
|
|
|
if (kind == DICT_KEYS_SPLIT) {
|
|
|
|
*value_addr = mp->ma_values->values[ix];
|
2012-04-23 12:24:50 -03:00
|
|
|
}
|
2022-03-01 19:09:28 -04:00
|
|
|
else {
|
|
|
|
*value_addr = DK_UNICODE_ENTRIES(dk)[ix].me_value;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
|
|
|
}
|
2022-03-01 19:09:28 -04:00
|
|
|
else {
|
|
|
|
*value_addr = NULL;
|
|
|
|
}
|
2012-04-23 12:24:50 -03:00
|
|
|
}
|
2021-05-28 05:54:10 -03:00
|
|
|
else {
|
2022-03-01 19:09:28 -04:00
|
|
|
ix = dictkeys_generic_lookup(mp, dk, key, hash);
|
|
|
|
if (ix == DKIX_KEY_CHANGED) {
|
|
|
|
goto start;
|
|
|
|
}
|
|
|
|
if (ix >= 0) {
|
|
|
|
*value_addr = DK_ENTRIES(dk)[ix].me_value;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
*value_addr = NULL;
|
|
|
|
}
|
2012-04-23 12:24:50 -03:00
|
|
|
}
|
2022-03-01 19:09:28 -04:00
|
|
|
|
2021-05-28 05:54:10 -03:00
|
|
|
return ix;
|
2012-04-23 12:24:50 -03:00
|
|
|
}
|
|
|
|
|
2024-03-04 23:06:21 -04:00
|
|
|
#ifdef Py_GIL_DISABLED
|
2024-02-20 21:08:14 -04:00
|
|
|
static inline void
|
|
|
|
ensure_shared_on_read(PyDictObject *mp)
|
|
|
|
{
|
|
|
|
if (!_Py_IsOwnedByCurrentThread((PyObject *)mp) && !IS_DICT_SHARED(mp)) {
|
|
|
|
// The first time we access a dict from a non-owning thread we mark it
|
|
|
|
// as shared. This ensures that a concurrent resize operation will
|
|
|
|
// delay freeing the old keys or values using QSBR, which is necessary
|
|
|
|
// to safely allow concurrent reads without locking...
|
|
|
|
Py_BEGIN_CRITICAL_SECTION(mp);
|
|
|
|
if (!IS_DICT_SHARED(mp)) {
|
|
|
|
SET_DICT_SHARED(mp);
|
|
|
|
}
|
|
|
|
Py_END_CRITICAL_SECTION();
|
|
|
|
}
|
|
|
|
}
|
2024-03-04 23:06:21 -04:00
|
|
|
#endif
|
2024-02-20 21:08:14 -04:00
|
|
|
|
|
|
|
static inline void
|
|
|
|
ensure_shared_on_resize(PyDictObject *mp)
|
|
|
|
{
|
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
_Py_CRITICAL_SECTION_ASSERT_OBJECT_LOCKED(mp);
|
|
|
|
|
|
|
|
if (!_Py_IsOwnedByCurrentThread((PyObject *)mp) && !IS_DICT_SHARED(mp)) {
|
|
|
|
// We are writing to the dict from another thread that owns
|
|
|
|
// it and we haven't marked it as shared which will ensure
|
|
|
|
// that when we re-size ma_keys or ma_values that we will
|
|
|
|
// free using QSBR. We need to lock the dictionary to
|
|
|
|
// contend with writes from the owning thread, mark it as
|
|
|
|
// shared, and then we can continue with lock-free reads.
|
|
|
|
// Technically this is a little heavy handed, we could just
|
|
|
|
// free the individual old keys / old-values using qsbr
|
|
|
|
SET_DICT_SHARED(mp);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
|
2024-07-17 16:52:19 -03:00
|
|
|
static inline Py_ALWAYS_INLINE int
|
|
|
|
compare_unicode_generic_threadsafe(PyDictObject *mp, PyDictKeysObject *dk,
|
2024-02-20 21:08:14 -04:00
|
|
|
void *ep0, Py_ssize_t ix, PyObject *key, Py_hash_t hash)
|
|
|
|
{
|
|
|
|
PyDictUnicodeEntry *ep = &((PyDictUnicodeEntry *)ep0)[ix];
|
|
|
|
PyObject *startkey = _Py_atomic_load_ptr_relaxed(&ep->me_key);
|
|
|
|
assert(startkey == NULL || PyUnicode_CheckExact(ep->me_key));
|
|
|
|
assert(!PyUnicode_CheckExact(key));
|
|
|
|
|
|
|
|
if (startkey != NULL) {
|
2024-04-08 11:58:38 -03:00
|
|
|
if (!_Py_TryIncrefCompare(&ep->me_key, startkey)) {
|
2024-02-20 21:08:14 -04:00
|
|
|
return DKIX_KEY_CHANGED;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (unicode_get_hash(startkey) == hash) {
|
|
|
|
int cmp = PyObject_RichCompareBool(startkey, key, Py_EQ);
|
|
|
|
Py_DECREF(startkey);
|
|
|
|
if (cmp < 0) {
|
|
|
|
return DKIX_ERROR;
|
|
|
|
}
|
|
|
|
if (dk == _Py_atomic_load_ptr_relaxed(&mp->ma_keys) &&
|
|
|
|
startkey == _Py_atomic_load_ptr_relaxed(&ep->me_key)) {
|
|
|
|
return cmp;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* The dict was mutated, restart */
|
|
|
|
return DKIX_KEY_CHANGED;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
Py_DECREF(startkey);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Search non-Unicode key from Unicode table
|
|
|
|
static Py_ssize_t
|
|
|
|
unicodekeys_lookup_generic_threadsafe(PyDictObject *mp, PyDictKeysObject* dk, PyObject *key, Py_hash_t hash)
|
|
|
|
{
|
|
|
|
return do_lookup(mp, dk, key, hash, compare_unicode_generic_threadsafe);
|
|
|
|
}
|
|
|
|
|
2024-07-17 16:52:19 -03:00
|
|
|
static inline Py_ALWAYS_INLINE int
|
2024-02-20 21:08:14 -04:00
|
|
|
compare_unicode_unicode_threadsafe(PyDictObject *mp, PyDictKeysObject *dk,
|
|
|
|
void *ep0, Py_ssize_t ix, PyObject *key, Py_hash_t hash)
|
|
|
|
{
|
|
|
|
PyDictUnicodeEntry *ep = &((PyDictUnicodeEntry *)ep0)[ix];
|
|
|
|
PyObject *startkey = _Py_atomic_load_ptr_relaxed(&ep->me_key);
|
|
|
|
assert(startkey == NULL || PyUnicode_CheckExact(startkey));
|
|
|
|
if (startkey == key) {
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
if (startkey != NULL) {
|
|
|
|
if (_Py_IsImmortal(startkey)) {
|
|
|
|
return unicode_get_hash(startkey) == hash && unicode_eq(startkey, key);
|
|
|
|
}
|
|
|
|
else {
|
2024-04-08 11:58:38 -03:00
|
|
|
if (!_Py_TryIncrefCompare(&ep->me_key, startkey)) {
|
2024-02-20 21:08:14 -04:00
|
|
|
return DKIX_KEY_CHANGED;
|
|
|
|
}
|
|
|
|
if (unicode_get_hash(startkey) == hash && unicode_eq(startkey, key)) {
|
|
|
|
Py_DECREF(startkey);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
Py_DECREF(startkey);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static Py_ssize_t _Py_HOT_FUNCTION
|
|
|
|
unicodekeys_lookup_unicode_threadsafe(PyDictKeysObject* dk, PyObject *key, Py_hash_t hash)
|
|
|
|
{
|
|
|
|
return do_lookup(NULL, dk, key, hash, compare_unicode_unicode_threadsafe);
|
|
|
|
}
|
|
|
|
|
2024-07-17 16:52:19 -03:00
|
|
|
static inline Py_ALWAYS_INLINE int
|
|
|
|
compare_generic_threadsafe(PyDictObject *mp, PyDictKeysObject *dk,
|
2024-02-20 21:08:14 -04:00
|
|
|
void *ep0, Py_ssize_t ix, PyObject *key, Py_hash_t hash)
|
|
|
|
{
|
|
|
|
PyDictKeyEntry *ep = &((PyDictKeyEntry *)ep0)[ix];
|
|
|
|
PyObject *startkey = _Py_atomic_load_ptr_relaxed(&ep->me_key);
|
|
|
|
if (startkey == key) {
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
Py_ssize_t ep_hash = _Py_atomic_load_ssize_relaxed(&ep->me_hash);
|
|
|
|
if (ep_hash == hash) {
|
2024-04-08 11:58:38 -03:00
|
|
|
if (startkey == NULL || !_Py_TryIncrefCompare(&ep->me_key, startkey)) {
|
2024-02-20 21:08:14 -04:00
|
|
|
return DKIX_KEY_CHANGED;
|
|
|
|
}
|
|
|
|
int cmp = PyObject_RichCompareBool(startkey, key, Py_EQ);
|
|
|
|
Py_DECREF(startkey);
|
|
|
|
if (cmp < 0) {
|
|
|
|
return DKIX_ERROR;
|
|
|
|
}
|
|
|
|
if (dk == _Py_atomic_load_ptr_relaxed(&mp->ma_keys) &&
|
|
|
|
startkey == _Py_atomic_load_ptr_relaxed(&ep->me_key)) {
|
|
|
|
return cmp;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* The dict was mutated, restart */
|
|
|
|
return DKIX_KEY_CHANGED;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static Py_ssize_t
|
|
|
|
dictkeys_generic_lookup_threadsafe(PyDictObject *mp, PyDictKeysObject* dk, PyObject *key, Py_hash_t hash)
|
|
|
|
{
|
|
|
|
return do_lookup(mp, dk, key, hash, compare_generic_threadsafe);
|
|
|
|
}
|
|
|
|
|
2024-04-04 16:26:07 -03:00
|
|
|
Py_ssize_t
|
2024-02-20 21:08:14 -04:00
|
|
|
_Py_dict_lookup_threadsafe(PyDictObject *mp, PyObject *key, Py_hash_t hash, PyObject **value_addr)
|
|
|
|
{
|
|
|
|
PyDictKeysObject *dk;
|
|
|
|
DictKeysKind kind;
|
|
|
|
Py_ssize_t ix;
|
|
|
|
PyObject *value;
|
|
|
|
|
|
|
|
ensure_shared_on_read(mp);
|
|
|
|
|
|
|
|
dk = _Py_atomic_load_ptr(&mp->ma_keys);
|
|
|
|
kind = dk->dk_kind;
|
|
|
|
|
|
|
|
if (kind != DICT_KEYS_GENERAL) {
|
|
|
|
if (PyUnicode_CheckExact(key)) {
|
|
|
|
ix = unicodekeys_lookup_unicode_threadsafe(dk, key, hash);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
ix = unicodekeys_lookup_generic_threadsafe(mp, dk, key, hash);
|
|
|
|
}
|
|
|
|
if (ix == DKIX_KEY_CHANGED) {
|
|
|
|
goto read_failed;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ix >= 0) {
|
|
|
|
if (kind == DICT_KEYS_SPLIT) {
|
|
|
|
PyDictValues *values = _Py_atomic_load_ptr(&mp->ma_values);
|
|
|
|
if (values == NULL)
|
|
|
|
goto read_failed;
|
|
|
|
|
2024-04-02 07:59:21 -03:00
|
|
|
uint8_t capacity = _Py_atomic_load_uint8_relaxed(&values->capacity);
|
2024-02-20 21:08:14 -04:00
|
|
|
if (ix >= (Py_ssize_t)capacity)
|
|
|
|
goto read_failed;
|
|
|
|
|
|
|
|
value = _Py_TryXGetRef(&values->values[ix]);
|
|
|
|
if (value == NULL)
|
|
|
|
goto read_failed;
|
|
|
|
|
|
|
|
if (values != _Py_atomic_load_ptr(&mp->ma_values)) {
|
|
|
|
Py_DECREF(value);
|
|
|
|
goto read_failed;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
value = _Py_TryXGetRef(&DK_UNICODE_ENTRIES(dk)[ix].me_value);
|
|
|
|
if (value == NULL) {
|
|
|
|
goto read_failed;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (dk != _Py_atomic_load_ptr(&mp->ma_keys)) {
|
|
|
|
Py_DECREF(value);
|
|
|
|
goto read_failed;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
value = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
ix = dictkeys_generic_lookup_threadsafe(mp, dk, key, hash);
|
|
|
|
if (ix == DKIX_KEY_CHANGED) {
|
|
|
|
goto read_failed;
|
|
|
|
}
|
|
|
|
if (ix >= 0) {
|
|
|
|
value = _Py_TryXGetRef(&DK_ENTRIES(dk)[ix].me_value);
|
|
|
|
if (value == NULL)
|
|
|
|
goto read_failed;
|
|
|
|
|
|
|
|
if (dk != _Py_atomic_load_ptr(&mp->ma_keys)) {
|
|
|
|
Py_DECREF(value);
|
|
|
|
goto read_failed;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
value = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
*value_addr = value;
|
|
|
|
return ix;
|
|
|
|
|
|
|
|
read_failed:
|
|
|
|
// In addition to the normal races of the dict being modified the _Py_TryXGetRef
|
|
|
|
// can all fail if they don't yet have a shared ref count. That can happen here
|
|
|
|
// or in the *_lookup_* helper. In that case we need to take the lock to avoid
|
|
|
|
// mutation and do a normal incref which will make them shared.
|
|
|
|
Py_BEGIN_CRITICAL_SECTION(mp);
|
|
|
|
ix = _Py_dict_lookup(mp, key, hash, &value);
|
|
|
|
*value_addr = value;
|
|
|
|
if (value != NULL) {
|
|
|
|
assert(ix >= 0);
|
2024-09-30 14:04:32 -03:00
|
|
|
_Py_NewRefWithLock(value);
|
2024-02-20 21:08:14 -04:00
|
|
|
}
|
|
|
|
Py_END_CRITICAL_SECTION();
|
|
|
|
return ix;
|
|
|
|
}
|
|
|
|
|
2024-09-13 13:23:51 -03:00
|
|
|
Py_ssize_t
|
|
|
|
_Py_dict_lookup_threadsafe_stackref(PyDictObject *mp, PyObject *key, Py_hash_t hash, _PyStackRef *value_addr)
|
|
|
|
{
|
|
|
|
PyDictKeysObject *dk = _Py_atomic_load_ptr(&mp->ma_keys);
|
|
|
|
if (dk->dk_kind == DICT_KEYS_UNICODE && PyUnicode_CheckExact(key)) {
|
|
|
|
Py_ssize_t ix = unicodekeys_lookup_unicode_threadsafe(dk, key, hash);
|
|
|
|
if (ix == DKIX_EMPTY) {
|
|
|
|
*value_addr = PyStackRef_NULL;
|
|
|
|
return ix;
|
|
|
|
}
|
|
|
|
else if (ix >= 0) {
|
|
|
|
PyObject **addr_of_value = &DK_UNICODE_ENTRIES(dk)[ix].me_value;
|
|
|
|
PyObject *value = _Py_atomic_load_ptr(addr_of_value);
|
|
|
|
if (value == NULL) {
|
|
|
|
*value_addr = PyStackRef_NULL;
|
|
|
|
return DKIX_EMPTY;
|
|
|
|
}
|
|
|
|
if (_Py_IsImmortal(value) || _PyObject_HasDeferredRefcount(value)) {
|
|
|
|
*value_addr = (_PyStackRef){ .bits = (uintptr_t)value | Py_TAG_DEFERRED };
|
|
|
|
return ix;
|
|
|
|
}
|
|
|
|
if (_Py_TryIncrefCompare(addr_of_value, value)) {
|
|
|
|
*value_addr = PyStackRef_FromPyObjectSteal(value);
|
|
|
|
return ix;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *obj;
|
|
|
|
Py_ssize_t ix = _Py_dict_lookup_threadsafe(mp, key, hash, &obj);
|
|
|
|
if (ix >= 0 && obj != NULL) {
|
|
|
|
*value_addr = PyStackRef_FromPyObjectSteal(obj);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
*value_addr = PyStackRef_NULL;
|
|
|
|
}
|
|
|
|
return ix;
|
|
|
|
}
|
|
|
|
|
2024-04-04 16:26:07 -03:00
|
|
|
#else // Py_GIL_DISABLED
|
|
|
|
|
|
|
|
Py_ssize_t
|
|
|
|
_Py_dict_lookup_threadsafe(PyDictObject *mp, PyObject *key, Py_hash_t hash, PyObject **value_addr)
|
|
|
|
{
|
|
|
|
Py_ssize_t ix = _Py_dict_lookup(mp, key, hash, value_addr);
|
|
|
|
Py_XNewRef(*value_addr);
|
|
|
|
return ix;
|
|
|
|
}
|
|
|
|
|
2024-09-13 13:23:51 -03:00
|
|
|
Py_ssize_t
|
|
|
|
_Py_dict_lookup_threadsafe_stackref(PyDictObject *mp, PyObject *key, Py_hash_t hash, _PyStackRef *value_addr)
|
|
|
|
{
|
|
|
|
PyObject *val;
|
|
|
|
Py_ssize_t ix = _Py_dict_lookup(mp, key, hash, &val);
|
2024-09-14 15:29:55 -03:00
|
|
|
if (val == NULL) {
|
|
|
|
*value_addr = PyStackRef_NULL;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
*value_addr = PyStackRef_FromPyObjectNew(val);
|
|
|
|
}
|
2024-09-13 13:23:51 -03:00
|
|
|
return ix;
|
|
|
|
}
|
|
|
|
|
2024-02-20 21:08:14 -04:00
|
|
|
#endif
|
|
|
|
|
2010-04-24 15:21:17 -03:00
|
|
|
int
|
|
|
|
_PyDict_HasOnlyStringKeys(PyObject *dict)
|
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_ssize_t pos = 0;
|
|
|
|
PyObject *key, *value;
|
2010-11-17 18:33:12 -04:00
|
|
|
assert(PyDict_Check(dict));
|
2010-05-09 12:52:27 -03:00
|
|
|
/* Shortcut */
|
2021-05-28 05:54:10 -03:00
|
|
|
if (((PyDictObject *)dict)->ma_keys->dk_kind != DICT_KEYS_GENERAL)
|
2010-05-09 12:52:27 -03:00
|
|
|
return 1;
|
|
|
|
while (PyDict_Next(dict, &pos, &key, &value))
|
|
|
|
if (!PyUnicode_Check(key))
|
|
|
|
return 0;
|
|
|
|
return 1;
|
2010-04-24 15:21:17 -03:00
|
|
|
}
|
|
|
|
|
2024-10-21 13:51:29 -03:00
|
|
|
void
|
|
|
|
_PyDict_EnablePerThreadRefcounting(PyObject *op)
|
|
|
|
{
|
|
|
|
assert(PyDict_Check(op));
|
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
Py_ssize_t id = _PyObject_AssignUniqueId(op);
|
|
|
|
if ((uint64_t)id >= (uint64_t)DICT_UNIQUE_ID_MAX) {
|
|
|
|
_PyObject_ReleaseUniqueId(id);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyDictObject *mp = (PyDictObject *)op;
|
|
|
|
assert((mp->_ma_watcher_tag >> DICT_UNIQUE_ID_SHIFT) == 0);
|
|
|
|
// Plus 1 so that _ma_watcher_tag=0 represents an unassigned id
|
|
|
|
mp->_ma_watcher_tag += ((uint64_t)id + 1) << DICT_UNIQUE_ID_SHIFT;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2024-02-20 21:08:14 -04:00
|
|
|
static inline int
|
|
|
|
is_unusable_slot(Py_ssize_t ix)
|
|
|
|
{
|
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
return ix >= 0 || ix == DKIX_DUMMY;
|
|
|
|
#else
|
|
|
|
return ix >= 0;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2012-04-23 12:24:50 -03:00
|
|
|
/* Internal function to find slot for an item from its hash
|
2016-09-12 09:17:40 -03:00
|
|
|
when it is known that the key is not present in the dict.
|
2024-02-20 20:40:37 -04:00
|
|
|
*/
|
2016-12-07 07:41:42 -04:00
|
|
|
static Py_ssize_t
|
2017-08-03 11:45:15 -03:00
|
|
|
find_empty_slot(PyDictKeysObject *keys, Py_hash_t hash)
|
2012-04-23 12:24:50 -03:00
|
|
|
{
|
2017-08-03 11:45:15 -03:00
|
|
|
assert(keys != NULL);
|
2016-09-12 09:17:40 -03:00
|
|
|
|
2017-08-03 11:45:15 -03:00
|
|
|
const size_t mask = DK_MASK(keys);
|
|
|
|
size_t i = hash & mask;
|
2018-11-14 05:39:27 -04:00
|
|
|
Py_ssize_t ix = dictkeys_get_index(keys, i);
|
2024-02-20 21:08:14 -04:00
|
|
|
for (size_t perturb = hash; is_unusable_slot(ix);) {
|
2016-10-06 03:19:07 -03:00
|
|
|
perturb >>= PERTURB_SHIFT;
|
2017-08-03 11:45:15 -03:00
|
|
|
i = (i*5 + perturb + 1) & mask;
|
2018-11-14 05:39:27 -04:00
|
|
|
ix = dictkeys_get_index(keys, i);
|
2012-04-23 12:24:50 -03:00
|
|
|
}
|
2017-08-03 11:45:15 -03:00
|
|
|
return i;
|
2012-04-23 12:24:50 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2023-03-09 11:16:30 -04:00
|
|
|
insertion_resize(PyInterpreterState *interp, PyDictObject *mp, int unicode)
|
2012-04-23 12:24:50 -03:00
|
|
|
{
|
2023-03-09 11:16:30 -04:00
|
|
|
return dictresize(interp, mp, calculate_log2_keysize(GROWTH_RATE(mp)), unicode);
|
2012-04-23 12:24:50 -03:00
|
|
|
}
|
2012-02-26 19:45:12 -04:00
|
|
|
|
2024-02-20 20:40:37 -04:00
|
|
|
static inline int
|
|
|
|
insert_combined_dict(PyInterpreterState *interp, PyDictObject *mp,
|
|
|
|
Py_hash_t hash, PyObject *key, PyObject *value)
|
|
|
|
{
|
|
|
|
if (mp->ma_keys->dk_usable <= 0) {
|
|
|
|
/* Need to resize. */
|
|
|
|
if (insertion_resize(interp, mp, 1) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2024-10-01 13:39:56 -03:00
|
|
|
_PyDict_NotifyEvent(interp, PyDict_EVENT_ADDED, mp, key, value);
|
2024-07-24 14:58:28 -03:00
|
|
|
mp->ma_keys->dk_version = 0;
|
|
|
|
|
2024-02-20 20:40:37 -04:00
|
|
|
Py_ssize_t hashpos = find_empty_slot(mp->ma_keys, hash);
|
|
|
|
dictkeys_set_index(mp->ma_keys, hashpos, mp->ma_keys->dk_nentries);
|
|
|
|
|
|
|
|
if (DK_IS_UNICODE(mp->ma_keys)) {
|
|
|
|
PyDictUnicodeEntry *ep;
|
|
|
|
ep = &DK_UNICODE_ENTRIES(mp->ma_keys)[mp->ma_keys->dk_nentries];
|
2024-02-28 18:53:19 -04:00
|
|
|
STORE_KEY(ep, key);
|
|
|
|
STORE_VALUE(ep, value);
|
2024-02-20 20:40:37 -04:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
PyDictKeyEntry *ep;
|
|
|
|
ep = &DK_ENTRIES(mp->ma_keys)[mp->ma_keys->dk_nentries];
|
2024-02-28 18:53:19 -04:00
|
|
|
STORE_KEY(ep, key);
|
|
|
|
STORE_VALUE(ep, value);
|
|
|
|
STORE_HASH(ep, hash);
|
2024-02-20 20:40:37 -04:00
|
|
|
}
|
2024-02-28 18:53:19 -04:00
|
|
|
STORE_KEYS_USABLE(mp->ma_keys, mp->ma_keys->dk_usable - 1);
|
|
|
|
STORE_KEYS_NENTRIES(mp->ma_keys, mp->ma_keys->dk_nentries + 1);
|
2024-02-20 20:40:37 -04:00
|
|
|
assert(mp->ma_keys->dk_usable >= 0);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2024-04-25 19:34:05 -03:00
|
|
|
static Py_ssize_t
|
|
|
|
insert_split_key(PyDictKeysObject *keys, PyObject *key, Py_hash_t hash)
|
2024-02-20 20:40:37 -04:00
|
|
|
{
|
2024-04-25 19:34:05 -03:00
|
|
|
assert(PyUnicode_CheckExact(key));
|
|
|
|
Py_ssize_t ix;
|
2024-02-20 20:40:37 -04:00
|
|
|
|
|
|
|
|
2024-04-25 19:34:05 -03:00
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
ix = unicodekeys_lookup_unicode_threadsafe(keys, key, hash);
|
|
|
|
if (ix >= 0) {
|
|
|
|
return ix;
|
|
|
|
}
|
|
|
|
#endif
|
2024-02-20 20:40:37 -04:00
|
|
|
|
2024-04-25 19:34:05 -03:00
|
|
|
LOCK_KEYS(keys);
|
|
|
|
ix = unicodekeys_lookup_unicode(keys, key, hash);
|
|
|
|
if (ix == DKIX_EMPTY && keys->dk_usable > 0) {
|
|
|
|
// Insert into new slot
|
|
|
|
keys->dk_version = 0;
|
|
|
|
Py_ssize_t hashpos = find_empty_slot(keys, hash);
|
|
|
|
ix = keys->dk_nentries;
|
|
|
|
dictkeys_set_index(keys, hashpos, ix);
|
|
|
|
PyDictUnicodeEntry *ep = &DK_UNICODE_ENTRIES(keys)[ix];
|
|
|
|
STORE_SHARED_KEY(ep->me_key, Py_NewRef(key));
|
|
|
|
split_keys_entry_added(keys);
|
|
|
|
}
|
|
|
|
assert (ix < SHARED_KEYS_MAX_SIZE);
|
2024-02-20 20:40:37 -04:00
|
|
|
UNLOCK_KEYS(keys);
|
2024-04-25 19:34:05 -03:00
|
|
|
return ix;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
insert_split_value(PyInterpreterState *interp, PyDictObject *mp, PyObject *key, PyObject *value, Py_ssize_t ix)
|
|
|
|
{
|
|
|
|
assert(PyUnicode_CheckExact(key));
|
2024-05-24 14:39:06 -03:00
|
|
|
ASSERT_DICT_LOCKED(mp);
|
2024-04-25 19:34:05 -03:00
|
|
|
PyObject *old_value = mp->ma_values->values[ix];
|
|
|
|
if (old_value == NULL) {
|
2024-10-01 13:39:56 -03:00
|
|
|
_PyDict_NotifyEvent(interp, PyDict_EVENT_ADDED, mp, key, value);
|
2024-04-25 19:34:05 -03:00
|
|
|
STORE_SPLIT_VALUE(mp, ix, Py_NewRef(value));
|
|
|
|
_PyDictValues_AddToInsertionOrder(mp->ma_values, ix);
|
2024-05-24 14:39:06 -03:00
|
|
|
STORE_USED(mp, mp->ma_used + 1);
|
2024-04-25 19:34:05 -03:00
|
|
|
}
|
|
|
|
else {
|
2024-10-01 13:39:56 -03:00
|
|
|
_PyDict_NotifyEvent(interp, PyDict_EVENT_MODIFIED, mp, key, value);
|
2024-04-25 19:34:05 -03:00
|
|
|
STORE_SPLIT_VALUE(mp, ix, Py_NewRef(value));
|
2024-08-22 11:49:09 -03:00
|
|
|
// old_value should be DECREFed after GC track checking is done, if not, it could raise a segmentation fault,
|
|
|
|
// when dict only holds the strong reference to value in ep->me_value.
|
2024-04-25 19:34:05 -03:00
|
|
|
Py_DECREF(old_value);
|
|
|
|
}
|
|
|
|
ASSERT_CONSISTENT(mp);
|
2024-02-20 20:40:37 -04:00
|
|
|
}
|
|
|
|
|
2012-02-26 19:45:12 -04:00
|
|
|
/*
|
|
|
|
Internal routine to insert a new item into the table.
|
|
|
|
Used both by the internal resize routine and by the public insert routine.
|
|
|
|
Returns -1 if an error occurred, or 0 on success.
|
2021-11-19 06:30:37 -04:00
|
|
|
Consumes key and value references.
|
2012-02-26 19:45:12 -04:00
|
|
|
*/
|
|
|
|
static int
|
2023-03-09 11:16:30 -04:00
|
|
|
insertdict(PyInterpreterState *interp, PyDictObject *mp,
|
|
|
|
PyObject *key, Py_hash_t hash, PyObject *value)
|
2012-02-26 19:45:12 -04:00
|
|
|
{
|
2012-04-23 12:24:50 -03:00
|
|
|
PyObject *old_value;
|
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
ASSERT_DICT_LOCKED(mp);
|
|
|
|
|
2022-03-01 19:09:28 -04:00
|
|
|
if (DK_IS_UNICODE(mp->ma_keys) && !PyUnicode_CheckExact(key)) {
|
2023-03-09 11:16:30 -04:00
|
|
|
if (insertion_resize(interp, mp, 0) < 0)
|
2017-05-20 06:30:02 -03:00
|
|
|
goto Fail;
|
2022-03-01 19:09:28 -04:00
|
|
|
assert(mp->ma_keys->dk_kind == DICT_KEYS_GENERAL);
|
2012-04-23 12:24:50 -03:00
|
|
|
}
|
2012-02-26 19:45:12 -04:00
|
|
|
|
2024-04-25 19:34:05 -03:00
|
|
|
if (_PyDict_HasSplitTable(mp)) {
|
|
|
|
Py_ssize_t ix = insert_split_key(mp->ma_keys, key, hash);
|
|
|
|
if (ix != DKIX_EMPTY) {
|
|
|
|
insert_split_value(interp, mp, key, value, ix);
|
|
|
|
Py_DECREF(key);
|
|
|
|
Py_DECREF(value);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* No space in shared keys. Resize and continue below. */
|
|
|
|
if (insertion_resize(interp, mp, 1) < 0) {
|
|
|
|
goto Fail;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-05-28 05:54:10 -03:00
|
|
|
Py_ssize_t ix = _Py_dict_lookup(mp, key, hash, &old_value);
|
2017-05-20 06:30:02 -03:00
|
|
|
if (ix == DKIX_ERROR)
|
|
|
|
goto Fail;
|
2016-09-07 21:40:12 -03:00
|
|
|
|
|
|
|
if (ix == DKIX_EMPTY) {
|
2024-04-25 19:34:05 -03:00
|
|
|
assert(!_PyDict_HasSplitTable(mp));
|
2016-09-07 21:40:12 -03:00
|
|
|
/* Insert into new slot. */
|
2016-12-07 07:41:42 -04:00
|
|
|
assert(old_value == NULL);
|
2024-04-25 19:34:05 -03:00
|
|
|
if (insert_combined_dict(interp, mp, hash, key, value) < 0) {
|
|
|
|
goto Fail;
|
2012-04-23 12:24:50 -03:00
|
|
|
}
|
2024-05-24 14:39:06 -03:00
|
|
|
STORE_USED(mp, mp->ma_used + 1);
|
2019-04-12 16:51:34 -03:00
|
|
|
ASSERT_CONSISTENT(mp);
|
2016-09-07 21:40:12 -03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2019-06-03 09:30:58 -03:00
|
|
|
if (old_value != value) {
|
2024-10-01 13:39:56 -03:00
|
|
|
_PyDict_NotifyEvent(interp, PyDict_EVENT_MODIFIED, mp, key, value);
|
2024-04-25 19:34:05 -03:00
|
|
|
assert(old_value != NULL);
|
|
|
|
assert(!_PyDict_HasSplitTable(mp));
|
|
|
|
if (DK_IS_UNICODE(mp->ma_keys)) {
|
|
|
|
PyDictUnicodeEntry *ep = &DK_UNICODE_ENTRIES(mp->ma_keys)[ix];
|
|
|
|
STORE_VALUE(ep, value);
|
2016-12-07 07:41:42 -04:00
|
|
|
}
|
2019-06-03 09:30:58 -03:00
|
|
|
else {
|
2024-04-25 19:34:05 -03:00
|
|
|
PyDictKeyEntry *ep = &DK_ENTRIES(mp->ma_keys)[ix];
|
|
|
|
STORE_VALUE(ep, value);
|
2019-06-03 09:30:58 -03:00
|
|
|
}
|
2016-12-07 07:41:42 -04:00
|
|
|
}
|
|
|
|
Py_XDECREF(old_value); /* which **CAN** re-enter (see issue #22653) */
|
2019-04-12 16:51:34 -03:00
|
|
|
ASSERT_CONSISTENT(mp);
|
2017-05-20 06:30:02 -03:00
|
|
|
Py_DECREF(key);
|
2012-04-23 12:24:50 -03:00
|
|
|
return 0;
|
2017-05-20 06:30:02 -03:00
|
|
|
|
|
|
|
Fail:
|
|
|
|
Py_DECREF(value);
|
|
|
|
Py_DECREF(key);
|
|
|
|
return -1;
|
2012-02-26 19:45:12 -04:00
|
|
|
}
|
|
|
|
|
2024-02-20 21:08:14 -04:00
|
|
|
// Same as insertdict but specialized for ma_keys == Py_EMPTY_KEYS.
|
2021-11-19 06:30:37 -04:00
|
|
|
// Consumes key and value references.
|
2019-03-18 08:38:33 -03:00
|
|
|
static int
|
2023-03-09 11:16:30 -04:00
|
|
|
insert_to_emptydict(PyInterpreterState *interp, PyDictObject *mp,
|
|
|
|
PyObject *key, Py_hash_t hash, PyObject *value)
|
2019-03-18 08:38:33 -03:00
|
|
|
{
|
|
|
|
assert(mp->ma_keys == Py_EMPTY_KEYS);
|
2024-02-06 18:03:43 -04:00
|
|
|
ASSERT_DICT_LOCKED(mp);
|
2019-03-18 08:38:33 -03:00
|
|
|
|
2022-03-01 19:09:28 -04:00
|
|
|
int unicode = PyUnicode_CheckExact(key);
|
2023-03-09 11:16:30 -04:00
|
|
|
PyDictKeysObject *newkeys = new_keys_object(
|
|
|
|
interp, PyDict_LOG_MINSIZE, unicode);
|
2019-03-18 08:38:33 -03:00
|
|
|
if (newkeys == NULL) {
|
2021-11-19 06:30:37 -04:00
|
|
|
Py_DECREF(key);
|
|
|
|
Py_DECREF(value);
|
2019-03-18 08:38:33 -03:00
|
|
|
return -1;
|
|
|
|
}
|
2024-10-01 13:39:56 -03:00
|
|
|
_PyDict_NotifyEvent(interp, PyDict_EVENT_ADDED, mp, key, value);
|
2024-07-24 14:58:28 -03:00
|
|
|
|
2023-05-10 10:28:40 -03:00
|
|
|
/* We don't decref Py_EMPTY_KEYS here because it is immortal. */
|
2024-02-20 21:08:14 -04:00
|
|
|
assert(mp->ma_values == NULL);
|
2019-03-18 08:38:33 -03:00
|
|
|
|
|
|
|
size_t hashpos = (size_t)hash & (PyDict_MINSIZE-1);
|
2024-02-20 21:08:14 -04:00
|
|
|
dictkeys_set_index(newkeys, hashpos, 0);
|
2022-03-01 19:09:28 -04:00
|
|
|
if (unicode) {
|
2024-02-20 21:08:14 -04:00
|
|
|
PyDictUnicodeEntry *ep = DK_UNICODE_ENTRIES(newkeys);
|
2022-03-01 19:09:28 -04:00
|
|
|
ep->me_key = key;
|
2024-04-25 12:53:29 -03:00
|
|
|
STORE_VALUE(ep, value);
|
2022-03-01 19:09:28 -04:00
|
|
|
}
|
|
|
|
else {
|
2024-02-20 21:08:14 -04:00
|
|
|
PyDictKeyEntry *ep = DK_ENTRIES(newkeys);
|
2022-03-01 19:09:28 -04:00
|
|
|
ep->me_key = key;
|
|
|
|
ep->me_hash = hash;
|
2024-04-25 12:53:29 -03:00
|
|
|
STORE_VALUE(ep, value);
|
2022-03-01 19:09:28 -04:00
|
|
|
}
|
2024-05-24 14:39:06 -03:00
|
|
|
STORE_USED(mp, mp->ma_used + 1);
|
2024-02-20 21:08:14 -04:00
|
|
|
newkeys->dk_usable--;
|
|
|
|
newkeys->dk_nentries++;
|
|
|
|
// We store the keys last so no one can see them in a partially inconsistent
|
|
|
|
// state so that we don't need to switch the keys to being shared yet for
|
|
|
|
// the case where we're inserting from the non-owner thread. We don't use
|
|
|
|
// set_keys here because the transition from empty to non-empty is safe
|
|
|
|
// as the empty keys will never be freed.
|
2024-05-24 14:39:06 -03:00
|
|
|
FT_ATOMIC_STORE_PTR_RELEASE(mp->ma_keys, newkeys);
|
2019-03-18 08:38:33 -03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
merge in bad ways, so I'll have to merge that extra-carefully (probably manually.)
Merged revisions 46495-46605 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r46495 | tim.peters | 2006-05-28 03:52:38 +0200 (Sun, 28 May 2006) | 2 lines
Added missing svn:eol-style property to text files.
........
r46497 | tim.peters | 2006-05-28 12:41:29 +0200 (Sun, 28 May 2006) | 3 lines
PyErr_Display(), PyErr_WriteUnraisable(): Coverity found a cut-and-paste
bug in both: `className` was referenced before being checked for NULL.
........
r46499 | fredrik.lundh | 2006-05-28 14:06:46 +0200 (Sun, 28 May 2006) | 5 lines
needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only),
and use it for string copy operations. this gives a 20% speedup on some
string benchmarks.
........
r46501 | michael.hudson | 2006-05-28 17:51:40 +0200 (Sun, 28 May 2006) | 26 lines
Quality control, meet exceptions.c.
Fix a number of problems with the need for speed code:
One is doing this sort of thing:
Py_DECREF(self->field);
self->field = newval;
Py_INCREF(self->field);
without being very sure that self->field doesn't start with a
value that has a __del__, because that almost certainly can lead
to segfaults.
As self->args is constrained to be an exact tuple we may as well
exploit this fact consistently. This leads to quite a lot of
simplification (and, hey, probably better performance).
Add some error checking in places lacking it.
Fix some rather strange indentation in the Unicode code.
Delete some trailing whitespace.
More to come, I haven't fixed all the reference leaks yet...
........
r46502 | george.yoshida | 2006-05-28 18:39:09 +0200 (Sun, 28 May 2006) | 3 lines
Patch #1080727: add "encoding" parameter to doctest.DocFileSuite
Contributed by Bjorn Tillenius.
........
r46503 | martin.v.loewis | 2006-05-28 18:57:38 +0200 (Sun, 28 May 2006) | 4 lines
Rest of patch #1490384: Commit icon source, remove
claim that Erik von Blokland is the author of the
installer picture.
........
r46504 | michael.hudson | 2006-05-28 19:40:29 +0200 (Sun, 28 May 2006) | 16 lines
Quality control, meet exceptions.c, round two.
Make some functions that should have been static static.
Fix a bunch of refleaks by fixing the definition of
MiddlingExtendsException.
Remove all the __new__ implementations apart from
BaseException_new. Rewrite most code that needs it to cope with
NULL fields (such code could get excercised anyway, the
__new__-removal just makes it more likely). This involved
editing the code for WindowsError, which I can't test.
This fixes all the refleaks in at least the start of a regrtest
-R :: run.
........
r46505 | marc-andre.lemburg | 2006-05-28 19:46:58 +0200 (Sun, 28 May 2006) | 10 lines
Initial version of systimes - a module to provide platform dependent
performance measurements.
The module is currently just a proof-of-concept implementation, but
will integrated into pybench once it is stable enough.
License: pybench license.
Author: Marc-Andre Lemburg.
........
r46507 | armin.rigo | 2006-05-28 21:13:17 +0200 (Sun, 28 May 2006) | 15 lines
("Forward-port" of r46506)
Remove various dependencies on dictionary order in the standard library
tests, and one (clearly an oversight, potentially critical) in the
standard library itself - base64.py.
Remaining open issues:
* test_extcall is an output test, messy to make robust
* tarfile.py has a potential bug here, but I'm not familiar
enough with this code. Filed in as SF bug #1496501.
* urllib2.HTTPPasswordMgr() returns a random result if there is more
than one matching root path. I'm asking python-dev for
clarification...
........
r46508 | georg.brandl | 2006-05-28 22:11:45 +0200 (Sun, 28 May 2006) | 4 lines
The empty string is a valid import path.
(fixes #1496539)
........
r46509 | georg.brandl | 2006-05-28 22:23:12 +0200 (Sun, 28 May 2006) | 3 lines
Patch #1496206: urllib2 PasswordMgr ./. default ports
........
r46510 | georg.brandl | 2006-05-28 22:57:09 +0200 (Sun, 28 May 2006) | 3 lines
Fix refleaks in UnicodeError get and set methods.
........
r46511 | michael.hudson | 2006-05-28 23:19:03 +0200 (Sun, 28 May 2006) | 3 lines
use the UnicodeError traversal and clearing functions in UnicodeError
subclasses.
........
r46512 | thomas.wouters | 2006-05-28 23:32:12 +0200 (Sun, 28 May 2006) | 4 lines
Make last patch valid C89 so Windows compilers can deal with it.
........
r46513 | georg.brandl | 2006-05-28 23:42:54 +0200 (Sun, 28 May 2006) | 3 lines
Fix ref-antileak in _struct.c which eventually lead to deallocating None.
........
r46514 | georg.brandl | 2006-05-28 23:57:35 +0200 (Sun, 28 May 2006) | 4 lines
Correct None refcount issue in Mac modules. (Are they
still used?)
........
r46515 | armin.rigo | 2006-05-29 00:07:08 +0200 (Mon, 29 May 2006) | 3 lines
A clearer error message when passing -R to regrtest.py with
release builds of Python.
........
r46516 | georg.brandl | 2006-05-29 00:14:04 +0200 (Mon, 29 May 2006) | 3 lines
Fix C function calling conventions in _sre module.
........
r46517 | georg.brandl | 2006-05-29 00:34:51 +0200 (Mon, 29 May 2006) | 3 lines
Convert audioop over to METH_VARARGS.
........
r46518 | georg.brandl | 2006-05-29 00:38:57 +0200 (Mon, 29 May 2006) | 3 lines
METH_NOARGS functions do get called with two args.
........
r46519 | georg.brandl | 2006-05-29 11:46:51 +0200 (Mon, 29 May 2006) | 4 lines
Fix refleak in socketmodule. Replace bogus Py_BuildValue calls.
Fix refleak in exceptions.
........
r46520 | nick.coghlan | 2006-05-29 14:43:05 +0200 (Mon, 29 May 2006) | 7 lines
Apply modified version of Collin Winter's patch #1478788
Renames functional extension module to _functools and adds a Python
functools module so that utility functions like update_wrapper can be
added easily.
........
r46522 | georg.brandl | 2006-05-29 15:53:16 +0200 (Mon, 29 May 2006) | 3 lines
Convert fmmodule to METH_VARARGS.
........
r46523 | georg.brandl | 2006-05-29 16:13:21 +0200 (Mon, 29 May 2006) | 3 lines
Fix #1494605.
........
r46524 | georg.brandl | 2006-05-29 16:28:05 +0200 (Mon, 29 May 2006) | 3 lines
Handle PyMem_Malloc failure in pystrtod.c. Closes #1494671.
........
r46525 | georg.brandl | 2006-05-29 16:33:55 +0200 (Mon, 29 May 2006) | 3 lines
Fix compiler warning.
........
r46526 | georg.brandl | 2006-05-29 16:39:00 +0200 (Mon, 29 May 2006) | 3 lines
Fix #1494787 (pyclbr counts whitespace as superclass name)
........
r46527 | bob.ippolito | 2006-05-29 17:47:29 +0200 (Mon, 29 May 2006) | 1 line
simplify the struct code a bit (no functional changes)
........
r46528 | armin.rigo | 2006-05-29 19:59:47 +0200 (Mon, 29 May 2006) | 2 lines
Silence a warning.
........
r46529 | georg.brandl | 2006-05-29 21:39:45 +0200 (Mon, 29 May 2006) | 3 lines
Correct some value converting strangenesses.
........
r46530 | nick.coghlan | 2006-05-29 22:27:44 +0200 (Mon, 29 May 2006) | 1 line
When adding a module like functools, it helps to let SVN know about the file.
........
r46531 | georg.brandl | 2006-05-29 22:52:54 +0200 (Mon, 29 May 2006) | 4 lines
Patches #1497027 and #972322: try HTTP digest auth first,
and watch out for handler name collisions.
........
r46532 | georg.brandl | 2006-05-29 22:57:01 +0200 (Mon, 29 May 2006) | 3 lines
Add News entry for last commit.
........
r46533 | georg.brandl | 2006-05-29 23:04:52 +0200 (Mon, 29 May 2006) | 4 lines
Make use of METH_O and METH_NOARGS where possible.
Use Py_UnpackTuple instead of PyArg_ParseTuple where possible.
........
r46534 | georg.brandl | 2006-05-29 23:58:42 +0200 (Mon, 29 May 2006) | 3 lines
Convert more modules to METH_VARARGS.
........
r46535 | georg.brandl | 2006-05-30 00:00:30 +0200 (Tue, 30 May 2006) | 3 lines
Whoops.
........
r46536 | fredrik.lundh | 2006-05-30 00:42:07 +0200 (Tue, 30 May 2006) | 4 lines
fixed "abc".count("", 100) == -96 error (hopefully, nobody's relying on
the current behaviour ;-)
........
r46537 | bob.ippolito | 2006-05-30 00:55:48 +0200 (Tue, 30 May 2006) | 1 line
struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly)
........
r46539 | bob.ippolito | 2006-05-30 02:26:01 +0200 (Tue, 30 May 2006) | 1 line
Add a length check to aifc to ensure it doesn't write a bogus file
........
r46540 | tim.peters | 2006-05-30 04:25:25 +0200 (Tue, 30 May 2006) | 10 lines
deprecated_err(): Stop bizarre warning messages when the tests
are run in the order:
test_genexps (or any other doctest-based test)
test_struct
test_doctest
The `warnings` module needs an advertised way to save/restore
its internal filter list.
........
r46541 | tim.peters | 2006-05-30 04:26:46 +0200 (Tue, 30 May 2006) | 2 lines
Whitespace normalization.
........
r46542 | tim.peters | 2006-05-30 04:30:30 +0200 (Tue, 30 May 2006) | 2 lines
Set a binary svn:mime-type property on this UTF-8 encoded file.
........
r46543 | neal.norwitz | 2006-05-30 05:18:50 +0200 (Tue, 30 May 2006) | 1 line
Simplify further by using AddStringConstant
........
r46544 | tim.peters | 2006-05-30 06:16:25 +0200 (Tue, 30 May 2006) | 6 lines
Convert relevant dict internals to Py_ssize_t.
I don't have a box with nearly enough RAM, or an OS,
that could get close to tickling this, though (requires
a dict w/ at least 2**31 entries).
........
r46545 | neal.norwitz | 2006-05-30 06:19:21 +0200 (Tue, 30 May 2006) | 1 line
Remove stray | in comment
........
r46546 | neal.norwitz | 2006-05-30 06:25:05 +0200 (Tue, 30 May 2006) | 1 line
Use Py_SAFE_DOWNCAST for safety. Fix format strings. Remove 2 more stray | in comment
........
r46547 | neal.norwitz | 2006-05-30 06:43:23 +0200 (Tue, 30 May 2006) | 1 line
No DOWNCAST is required since sizeof(Py_ssize_t) >= sizeof(int) and Py_ReprEntr returns an int
........
r46548 | tim.peters | 2006-05-30 07:04:59 +0200 (Tue, 30 May 2006) | 3 lines
dict_print(): Explicitly narrow the return value
from a (possibly) wider variable.
........
r46549 | tim.peters | 2006-05-30 07:23:59 +0200 (Tue, 30 May 2006) | 5 lines
dict_print(): So that Neal & I don't spend the rest of
our lives taking turns rewriting code that works ;-),
get rid of casting illusions by declaring a new variable
with the obvious type.
........
r46550 | georg.brandl | 2006-05-30 09:04:55 +0200 (Tue, 30 May 2006) | 3 lines
Restore exception pickle support. #1497319.
........
r46551 | georg.brandl | 2006-05-30 09:13:29 +0200 (Tue, 30 May 2006) | 3 lines
Add a test case for exception pickling. args is never NULL.
........
r46552 | neal.norwitz | 2006-05-30 09:21:10 +0200 (Tue, 30 May 2006) | 1 line
Don't fail if the (sub)pkgname already exist.
........
r46553 | georg.brandl | 2006-05-30 09:34:45 +0200 (Tue, 30 May 2006) | 3 lines
Disallow keyword args for exceptions.
........
r46554 | neal.norwitz | 2006-05-30 09:36:54 +0200 (Tue, 30 May 2006) | 5 lines
I'm impatient. I think this will fix a few more problems with the buildbots.
I'm not sure this is the best approach, but I can't think of anything better.
If this creates problems, feel free to revert, but I think it's safe and
should make things a little better.
........
r46555 | georg.brandl | 2006-05-30 10:17:00 +0200 (Tue, 30 May 2006) | 4 lines
Do the check for no keyword arguments in __init__ so that
subclasses of Exception can be supplied keyword args
........
r46556 | georg.brandl | 2006-05-30 10:47:19 +0200 (Tue, 30 May 2006) | 3 lines
Convert test_exceptions to unittest.
........
r46557 | andrew.kuchling | 2006-05-30 14:52:01 +0200 (Tue, 30 May 2006) | 1 line
Add SoC name, and reorganize this section a bit
........
r46559 | tim.peters | 2006-05-30 17:53:34 +0200 (Tue, 30 May 2006) | 11 lines
PyLong_FromString(): Continued fraction analysis (explained in
a new comment) suggests there are almost certainly large input
integers in all non-binary input bases for which one Python digit
too few is initally allocated to hold the final result. Instead
of assert-failing when that happens, allocate more space. Alas,
I estimate it would take a few days to find a specific such case,
so this isn't backed up by a new test (not to mention that such
a case may take hours to run, since conversion time is quadratic
in the number of digits, and preliminary attempts suggested that
the smallest such inputs contain at least a million digits).
........
r46560 | fredrik.lundh | 2006-05-30 19:11:48 +0200 (Tue, 30 May 2006) | 3 lines
changed find/rfind to return -1 for matches outside the source string
........
r46561 | bob.ippolito | 2006-05-30 19:37:54 +0200 (Tue, 30 May 2006) | 1 line
Change wrapping terminology to overflow masking
........
r46562 | fredrik.lundh | 2006-05-30 19:39:58 +0200 (Tue, 30 May 2006) | 3 lines
changed count to return 0 for slices outside the source string
........
r46568 | tim.peters | 2006-05-31 01:28:02 +0200 (Wed, 31 May 2006) | 2 lines
Whitespace normalization.
........
r46569 | brett.cannon | 2006-05-31 04:19:54 +0200 (Wed, 31 May 2006) | 5 lines
Clarify wording on default values for strptime(); defaults are used when better
values cannot be inferred.
Closes bug #1496315.
........
r46572 | neal.norwitz | 2006-05-31 09:43:27 +0200 (Wed, 31 May 2006) | 1 line
Calculate smallest properly (it was off by one) and use proper ssize_t types for Win64
........
r46573 | neal.norwitz | 2006-05-31 10:01:08 +0200 (Wed, 31 May 2006) | 1 line
Revert last checkin, it is better to do make distclean
........
r46574 | neal.norwitz | 2006-05-31 11:02:44 +0200 (Wed, 31 May 2006) | 3 lines
On 64-bit platforms running test_struct after test_tarfile would fail
since the deprecation warning wouldn't be raised.
........
r46575 | thomas.heller | 2006-05-31 13:37:58 +0200 (Wed, 31 May 2006) | 3 lines
PyTuple_Pack is not available in Python 2.3, but ctypes must stay
compatible with that.
........
r46576 | andrew.kuchling | 2006-05-31 15:18:56 +0200 (Wed, 31 May 2006) | 1 line
'functional' module was renamed to 'functools'
........
r46577 | kristjan.jonsson | 2006-05-31 15:35:41 +0200 (Wed, 31 May 2006) | 1 line
Fixup the PCBuild8 project directory. exceptions.c have moved to Objects, and the functionalmodule.c has been replaced with _functoolsmodule.c. Other minor changes to .vcproj files and .sln to fix compilation
........
r46578 | andrew.kuchling | 2006-05-31 16:08:48 +0200 (Wed, 31 May 2006) | 15 lines
[Bug #1473048]
SimpleXMLRPCServer and DocXMLRPCServer don't look at
the path of the HTTP request at all; you can POST or
GET from / or /RPC2 or /blahblahblah with the same results.
Security scanners that look for /cgi-bin/phf will therefore report
lots of vulnerabilities.
Fix: add a .rpc_paths attribute to the SimpleXMLRPCServer class,
and report a 404 error if the path isn't on the allowed list.
Possibly-controversial aspect of this change: the default makes only
'/' and '/RPC2' legal. Maybe this will break people's applications
(though I doubt it). We could just set the default to an empty tuple,
which would exactly match the current behaviour.
........
r46579 | andrew.kuchling | 2006-05-31 16:12:47 +0200 (Wed, 31 May 2006) | 1 line
Mention SimpleXMLRPCServer change
........
r46580 | tim.peters | 2006-05-31 16:28:07 +0200 (Wed, 31 May 2006) | 2 lines
Trimmed trailing whitespace.
........
r46581 | tim.peters | 2006-05-31 17:33:22 +0200 (Wed, 31 May 2006) | 4 lines
_range_error(): Speed and simplify (there's no real need for
loops here). Assert that size_t is actually big enough, and
that f->size is at least one. Wrap a long line.
........
r46582 | tim.peters | 2006-05-31 17:34:37 +0200 (Wed, 31 May 2006) | 2 lines
Repaired error in new comment.
........
r46584 | neal.norwitz | 2006-06-01 07:32:49 +0200 (Thu, 01 Jun 2006) | 4 lines
Remove ; at end of macro. There was a compiler recently that warned
about extra semi-colons. It may have been the HP C compiler.
This file will trigger a bunch of those warnings now.
........
r46585 | georg.brandl | 2006-06-01 08:39:19 +0200 (Thu, 01 Jun 2006) | 3 lines
Correctly unpickle 2.4 exceptions via __setstate__ (patch #1498571)
........
r46586 | georg.brandl | 2006-06-01 10:27:32 +0200 (Thu, 01 Jun 2006) | 3 lines
Correctly allocate complex types with tp_alloc. (bug #1498638)
........
r46587 | georg.brandl | 2006-06-01 14:30:46 +0200 (Thu, 01 Jun 2006) | 2 lines
Correctly dispatch Faults in loads (patch #1498627)
........
r46588 | georg.brandl | 2006-06-01 15:00:49 +0200 (Thu, 01 Jun 2006) | 3 lines
Some code style tweaks, and remove apply.
........
r46589 | armin.rigo | 2006-06-01 15:19:12 +0200 (Thu, 01 Jun 2006) | 5 lines
[ 1497053 ] Let dicts propagate the exceptions in user __eq__().
[ 1456209 ] dictresize() vulnerability ( <- backport candidate ).
........
r46590 | tim.peters | 2006-06-01 15:41:46 +0200 (Thu, 01 Jun 2006) | 2 lines
Whitespace normalization.
........
r46591 | tim.peters | 2006-06-01 15:49:23 +0200 (Thu, 01 Jun 2006) | 2 lines
Record bugs 1275608 and 1456209 as being fixed.
........
r46592 | tim.peters | 2006-06-01 15:56:26 +0200 (Thu, 01 Jun 2006) | 5 lines
Re-enable a new empty-string test added during the NFS sprint,
but disabled then because str and unicode strings gave different
results. The implementations were repaired later during the
sprint, but the new test remained disabled.
........
r46594 | tim.peters | 2006-06-01 17:50:44 +0200 (Thu, 01 Jun 2006) | 7 lines
Armin committed his patch while I was reviewing it (I'm sure
he didn't know this), so merged in some changes I made during
review. Nothing material apart from changing a new `mask` local
from int to Py_ssize_t. Mostly this is repairing comments that
were made incorrect, and adding new comments. Also a few
minor code rewrites for clarity or helpful succinctness.
........
r46599 | neal.norwitz | 2006-06-02 06:45:53 +0200 (Fri, 02 Jun 2006) | 1 line
Convert docstrings to comments so regrtest -v prints method names
........
r46600 | neal.norwitz | 2006-06-02 06:50:49 +0200 (Fri, 02 Jun 2006) | 2 lines
Fix memory leak found by valgrind.
........
r46601 | neal.norwitz | 2006-06-02 06:54:52 +0200 (Fri, 02 Jun 2006) | 1 line
More memory leaks from valgrind
........
r46602 | neal.norwitz | 2006-06-02 08:23:00 +0200 (Fri, 02 Jun 2006) | 11 lines
Patch #1357836:
Prevent an invalid memory read from test_coding in case the done flag is set.
In that case, the loop isn't entered. I wonder if rather than setting
the done flag in the cases before the loop, if they should just exit early.
This code looks like it should be refactored.
Backport candidate (also the early break above if decoding_fgets fails)
........
r46603 | martin.blais | 2006-06-02 15:03:43 +0200 (Fri, 02 Jun 2006) | 1 line
Fixed struct test to not use unittest.
........
r46605 | tim.peters | 2006-06-03 01:22:51 +0200 (Sat, 03 Jun 2006) | 10 lines
pprint functions used to sort a dict (by key) if and only if
the output required more than one line. "Small" dicts got
displayed in seemingly random order (the hash-induced order
produced by dict.__repr__). None of this was documented.
Now pprint functions always sort dicts by key, and the docs
promise it.
This was proposed and agreed to during the PyCon 2006 core
sprint -- I just didn't have time for it before now.
........
2006-06-08 11:42:34 -03:00
|
|
|
/*
|
2017-11-05 09:37:50 -04:00
|
|
|
Internal routine used by dictresize() to build a hashtable of entries.
|
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
merge in bad ways, so I'll have to merge that extra-carefully (probably manually.)
Merged revisions 46495-46605 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r46495 | tim.peters | 2006-05-28 03:52:38 +0200 (Sun, 28 May 2006) | 2 lines
Added missing svn:eol-style property to text files.
........
r46497 | tim.peters | 2006-05-28 12:41:29 +0200 (Sun, 28 May 2006) | 3 lines
PyErr_Display(), PyErr_WriteUnraisable(): Coverity found a cut-and-paste
bug in both: `className` was referenced before being checked for NULL.
........
r46499 | fredrik.lundh | 2006-05-28 14:06:46 +0200 (Sun, 28 May 2006) | 5 lines
needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only),
and use it for string copy operations. this gives a 20% speedup on some
string benchmarks.
........
r46501 | michael.hudson | 2006-05-28 17:51:40 +0200 (Sun, 28 May 2006) | 26 lines
Quality control, meet exceptions.c.
Fix a number of problems with the need for speed code:
One is doing this sort of thing:
Py_DECREF(self->field);
self->field = newval;
Py_INCREF(self->field);
without being very sure that self->field doesn't start with a
value that has a __del__, because that almost certainly can lead
to segfaults.
As self->args is constrained to be an exact tuple we may as well
exploit this fact consistently. This leads to quite a lot of
simplification (and, hey, probably better performance).
Add some error checking in places lacking it.
Fix some rather strange indentation in the Unicode code.
Delete some trailing whitespace.
More to come, I haven't fixed all the reference leaks yet...
........
r46502 | george.yoshida | 2006-05-28 18:39:09 +0200 (Sun, 28 May 2006) | 3 lines
Patch #1080727: add "encoding" parameter to doctest.DocFileSuite
Contributed by Bjorn Tillenius.
........
r46503 | martin.v.loewis | 2006-05-28 18:57:38 +0200 (Sun, 28 May 2006) | 4 lines
Rest of patch #1490384: Commit icon source, remove
claim that Erik von Blokland is the author of the
installer picture.
........
r46504 | michael.hudson | 2006-05-28 19:40:29 +0200 (Sun, 28 May 2006) | 16 lines
Quality control, meet exceptions.c, round two.
Make some functions that should have been static static.
Fix a bunch of refleaks by fixing the definition of
MiddlingExtendsException.
Remove all the __new__ implementations apart from
BaseException_new. Rewrite most code that needs it to cope with
NULL fields (such code could get excercised anyway, the
__new__-removal just makes it more likely). This involved
editing the code for WindowsError, which I can't test.
This fixes all the refleaks in at least the start of a regrtest
-R :: run.
........
r46505 | marc-andre.lemburg | 2006-05-28 19:46:58 +0200 (Sun, 28 May 2006) | 10 lines
Initial version of systimes - a module to provide platform dependent
performance measurements.
The module is currently just a proof-of-concept implementation, but
will integrated into pybench once it is stable enough.
License: pybench license.
Author: Marc-Andre Lemburg.
........
r46507 | armin.rigo | 2006-05-28 21:13:17 +0200 (Sun, 28 May 2006) | 15 lines
("Forward-port" of r46506)
Remove various dependencies on dictionary order in the standard library
tests, and one (clearly an oversight, potentially critical) in the
standard library itself - base64.py.
Remaining open issues:
* test_extcall is an output test, messy to make robust
* tarfile.py has a potential bug here, but I'm not familiar
enough with this code. Filed in as SF bug #1496501.
* urllib2.HTTPPasswordMgr() returns a random result if there is more
than one matching root path. I'm asking python-dev for
clarification...
........
r46508 | georg.brandl | 2006-05-28 22:11:45 +0200 (Sun, 28 May 2006) | 4 lines
The empty string is a valid import path.
(fixes #1496539)
........
r46509 | georg.brandl | 2006-05-28 22:23:12 +0200 (Sun, 28 May 2006) | 3 lines
Patch #1496206: urllib2 PasswordMgr ./. default ports
........
r46510 | georg.brandl | 2006-05-28 22:57:09 +0200 (Sun, 28 May 2006) | 3 lines
Fix refleaks in UnicodeError get and set methods.
........
r46511 | michael.hudson | 2006-05-28 23:19:03 +0200 (Sun, 28 May 2006) | 3 lines
use the UnicodeError traversal and clearing functions in UnicodeError
subclasses.
........
r46512 | thomas.wouters | 2006-05-28 23:32:12 +0200 (Sun, 28 May 2006) | 4 lines
Make last patch valid C89 so Windows compilers can deal with it.
........
r46513 | georg.brandl | 2006-05-28 23:42:54 +0200 (Sun, 28 May 2006) | 3 lines
Fix ref-antileak in _struct.c which eventually lead to deallocating None.
........
r46514 | georg.brandl | 2006-05-28 23:57:35 +0200 (Sun, 28 May 2006) | 4 lines
Correct None refcount issue in Mac modules. (Are they
still used?)
........
r46515 | armin.rigo | 2006-05-29 00:07:08 +0200 (Mon, 29 May 2006) | 3 lines
A clearer error message when passing -R to regrtest.py with
release builds of Python.
........
r46516 | georg.brandl | 2006-05-29 00:14:04 +0200 (Mon, 29 May 2006) | 3 lines
Fix C function calling conventions in _sre module.
........
r46517 | georg.brandl | 2006-05-29 00:34:51 +0200 (Mon, 29 May 2006) | 3 lines
Convert audioop over to METH_VARARGS.
........
r46518 | georg.brandl | 2006-05-29 00:38:57 +0200 (Mon, 29 May 2006) | 3 lines
METH_NOARGS functions do get called with two args.
........
r46519 | georg.brandl | 2006-05-29 11:46:51 +0200 (Mon, 29 May 2006) | 4 lines
Fix refleak in socketmodule. Replace bogus Py_BuildValue calls.
Fix refleak in exceptions.
........
r46520 | nick.coghlan | 2006-05-29 14:43:05 +0200 (Mon, 29 May 2006) | 7 lines
Apply modified version of Collin Winter's patch #1478788
Renames functional extension module to _functools and adds a Python
functools module so that utility functions like update_wrapper can be
added easily.
........
r46522 | georg.brandl | 2006-05-29 15:53:16 +0200 (Mon, 29 May 2006) | 3 lines
Convert fmmodule to METH_VARARGS.
........
r46523 | georg.brandl | 2006-05-29 16:13:21 +0200 (Mon, 29 May 2006) | 3 lines
Fix #1494605.
........
r46524 | georg.brandl | 2006-05-29 16:28:05 +0200 (Mon, 29 May 2006) | 3 lines
Handle PyMem_Malloc failure in pystrtod.c. Closes #1494671.
........
r46525 | georg.brandl | 2006-05-29 16:33:55 +0200 (Mon, 29 May 2006) | 3 lines
Fix compiler warning.
........
r46526 | georg.brandl | 2006-05-29 16:39:00 +0200 (Mon, 29 May 2006) | 3 lines
Fix #1494787 (pyclbr counts whitespace as superclass name)
........
r46527 | bob.ippolito | 2006-05-29 17:47:29 +0200 (Mon, 29 May 2006) | 1 line
simplify the struct code a bit (no functional changes)
........
r46528 | armin.rigo | 2006-05-29 19:59:47 +0200 (Mon, 29 May 2006) | 2 lines
Silence a warning.
........
r46529 | georg.brandl | 2006-05-29 21:39:45 +0200 (Mon, 29 May 2006) | 3 lines
Correct some value converting strangenesses.
........
r46530 | nick.coghlan | 2006-05-29 22:27:44 +0200 (Mon, 29 May 2006) | 1 line
When adding a module like functools, it helps to let SVN know about the file.
........
r46531 | georg.brandl | 2006-05-29 22:52:54 +0200 (Mon, 29 May 2006) | 4 lines
Patches #1497027 and #972322: try HTTP digest auth first,
and watch out for handler name collisions.
........
r46532 | georg.brandl | 2006-05-29 22:57:01 +0200 (Mon, 29 May 2006) | 3 lines
Add News entry for last commit.
........
r46533 | georg.brandl | 2006-05-29 23:04:52 +0200 (Mon, 29 May 2006) | 4 lines
Make use of METH_O and METH_NOARGS where possible.
Use Py_UnpackTuple instead of PyArg_ParseTuple where possible.
........
r46534 | georg.brandl | 2006-05-29 23:58:42 +0200 (Mon, 29 May 2006) | 3 lines
Convert more modules to METH_VARARGS.
........
r46535 | georg.brandl | 2006-05-30 00:00:30 +0200 (Tue, 30 May 2006) | 3 lines
Whoops.
........
r46536 | fredrik.lundh | 2006-05-30 00:42:07 +0200 (Tue, 30 May 2006) | 4 lines
fixed "abc".count("", 100) == -96 error (hopefully, nobody's relying on
the current behaviour ;-)
........
r46537 | bob.ippolito | 2006-05-30 00:55:48 +0200 (Tue, 30 May 2006) | 1 line
struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly)
........
r46539 | bob.ippolito | 2006-05-30 02:26:01 +0200 (Tue, 30 May 2006) | 1 line
Add a length check to aifc to ensure it doesn't write a bogus file
........
r46540 | tim.peters | 2006-05-30 04:25:25 +0200 (Tue, 30 May 2006) | 10 lines
deprecated_err(): Stop bizarre warning messages when the tests
are run in the order:
test_genexps (or any other doctest-based test)
test_struct
test_doctest
The `warnings` module needs an advertised way to save/restore
its internal filter list.
........
r46541 | tim.peters | 2006-05-30 04:26:46 +0200 (Tue, 30 May 2006) | 2 lines
Whitespace normalization.
........
r46542 | tim.peters | 2006-05-30 04:30:30 +0200 (Tue, 30 May 2006) | 2 lines
Set a binary svn:mime-type property on this UTF-8 encoded file.
........
r46543 | neal.norwitz | 2006-05-30 05:18:50 +0200 (Tue, 30 May 2006) | 1 line
Simplify further by using AddStringConstant
........
r46544 | tim.peters | 2006-05-30 06:16:25 +0200 (Tue, 30 May 2006) | 6 lines
Convert relevant dict internals to Py_ssize_t.
I don't have a box with nearly enough RAM, or an OS,
that could get close to tickling this, though (requires
a dict w/ at least 2**31 entries).
........
r46545 | neal.norwitz | 2006-05-30 06:19:21 +0200 (Tue, 30 May 2006) | 1 line
Remove stray | in comment
........
r46546 | neal.norwitz | 2006-05-30 06:25:05 +0200 (Tue, 30 May 2006) | 1 line
Use Py_SAFE_DOWNCAST for safety. Fix format strings. Remove 2 more stray | in comment
........
r46547 | neal.norwitz | 2006-05-30 06:43:23 +0200 (Tue, 30 May 2006) | 1 line
No DOWNCAST is required since sizeof(Py_ssize_t) >= sizeof(int) and Py_ReprEntr returns an int
........
r46548 | tim.peters | 2006-05-30 07:04:59 +0200 (Tue, 30 May 2006) | 3 lines
dict_print(): Explicitly narrow the return value
from a (possibly) wider variable.
........
r46549 | tim.peters | 2006-05-30 07:23:59 +0200 (Tue, 30 May 2006) | 5 lines
dict_print(): So that Neal & I don't spend the rest of
our lives taking turns rewriting code that works ;-),
get rid of casting illusions by declaring a new variable
with the obvious type.
........
r46550 | georg.brandl | 2006-05-30 09:04:55 +0200 (Tue, 30 May 2006) | 3 lines
Restore exception pickle support. #1497319.
........
r46551 | georg.brandl | 2006-05-30 09:13:29 +0200 (Tue, 30 May 2006) | 3 lines
Add a test case for exception pickling. args is never NULL.
........
r46552 | neal.norwitz | 2006-05-30 09:21:10 +0200 (Tue, 30 May 2006) | 1 line
Don't fail if the (sub)pkgname already exist.
........
r46553 | georg.brandl | 2006-05-30 09:34:45 +0200 (Tue, 30 May 2006) | 3 lines
Disallow keyword args for exceptions.
........
r46554 | neal.norwitz | 2006-05-30 09:36:54 +0200 (Tue, 30 May 2006) | 5 lines
I'm impatient. I think this will fix a few more problems with the buildbots.
I'm not sure this is the best approach, but I can't think of anything better.
If this creates problems, feel free to revert, but I think it's safe and
should make things a little better.
........
r46555 | georg.brandl | 2006-05-30 10:17:00 +0200 (Tue, 30 May 2006) | 4 lines
Do the check for no keyword arguments in __init__ so that
subclasses of Exception can be supplied keyword args
........
r46556 | georg.brandl | 2006-05-30 10:47:19 +0200 (Tue, 30 May 2006) | 3 lines
Convert test_exceptions to unittest.
........
r46557 | andrew.kuchling | 2006-05-30 14:52:01 +0200 (Tue, 30 May 2006) | 1 line
Add SoC name, and reorganize this section a bit
........
r46559 | tim.peters | 2006-05-30 17:53:34 +0200 (Tue, 30 May 2006) | 11 lines
PyLong_FromString(): Continued fraction analysis (explained in
a new comment) suggests there are almost certainly large input
integers in all non-binary input bases for which one Python digit
too few is initally allocated to hold the final result. Instead
of assert-failing when that happens, allocate more space. Alas,
I estimate it would take a few days to find a specific such case,
so this isn't backed up by a new test (not to mention that such
a case may take hours to run, since conversion time is quadratic
in the number of digits, and preliminary attempts suggested that
the smallest such inputs contain at least a million digits).
........
r46560 | fredrik.lundh | 2006-05-30 19:11:48 +0200 (Tue, 30 May 2006) | 3 lines
changed find/rfind to return -1 for matches outside the source string
........
r46561 | bob.ippolito | 2006-05-30 19:37:54 +0200 (Tue, 30 May 2006) | 1 line
Change wrapping terminology to overflow masking
........
r46562 | fredrik.lundh | 2006-05-30 19:39:58 +0200 (Tue, 30 May 2006) | 3 lines
changed count to return 0 for slices outside the source string
........
r46568 | tim.peters | 2006-05-31 01:28:02 +0200 (Wed, 31 May 2006) | 2 lines
Whitespace normalization.
........
r46569 | brett.cannon | 2006-05-31 04:19:54 +0200 (Wed, 31 May 2006) | 5 lines
Clarify wording on default values for strptime(); defaults are used when better
values cannot be inferred.
Closes bug #1496315.
........
r46572 | neal.norwitz | 2006-05-31 09:43:27 +0200 (Wed, 31 May 2006) | 1 line
Calculate smallest properly (it was off by one) and use proper ssize_t types for Win64
........
r46573 | neal.norwitz | 2006-05-31 10:01:08 +0200 (Wed, 31 May 2006) | 1 line
Revert last checkin, it is better to do make distclean
........
r46574 | neal.norwitz | 2006-05-31 11:02:44 +0200 (Wed, 31 May 2006) | 3 lines
On 64-bit platforms running test_struct after test_tarfile would fail
since the deprecation warning wouldn't be raised.
........
r46575 | thomas.heller | 2006-05-31 13:37:58 +0200 (Wed, 31 May 2006) | 3 lines
PyTuple_Pack is not available in Python 2.3, but ctypes must stay
compatible with that.
........
r46576 | andrew.kuchling | 2006-05-31 15:18:56 +0200 (Wed, 31 May 2006) | 1 line
'functional' module was renamed to 'functools'
........
r46577 | kristjan.jonsson | 2006-05-31 15:35:41 +0200 (Wed, 31 May 2006) | 1 line
Fixup the PCBuild8 project directory. exceptions.c have moved to Objects, and the functionalmodule.c has been replaced with _functoolsmodule.c. Other minor changes to .vcproj files and .sln to fix compilation
........
r46578 | andrew.kuchling | 2006-05-31 16:08:48 +0200 (Wed, 31 May 2006) | 15 lines
[Bug #1473048]
SimpleXMLRPCServer and DocXMLRPCServer don't look at
the path of the HTTP request at all; you can POST or
GET from / or /RPC2 or /blahblahblah with the same results.
Security scanners that look for /cgi-bin/phf will therefore report
lots of vulnerabilities.
Fix: add a .rpc_paths attribute to the SimpleXMLRPCServer class,
and report a 404 error if the path isn't on the allowed list.
Possibly-controversial aspect of this change: the default makes only
'/' and '/RPC2' legal. Maybe this will break people's applications
(though I doubt it). We could just set the default to an empty tuple,
which would exactly match the current behaviour.
........
r46579 | andrew.kuchling | 2006-05-31 16:12:47 +0200 (Wed, 31 May 2006) | 1 line
Mention SimpleXMLRPCServer change
........
r46580 | tim.peters | 2006-05-31 16:28:07 +0200 (Wed, 31 May 2006) | 2 lines
Trimmed trailing whitespace.
........
r46581 | tim.peters | 2006-05-31 17:33:22 +0200 (Wed, 31 May 2006) | 4 lines
_range_error(): Speed and simplify (there's no real need for
loops here). Assert that size_t is actually big enough, and
that f->size is at least one. Wrap a long line.
........
r46582 | tim.peters | 2006-05-31 17:34:37 +0200 (Wed, 31 May 2006) | 2 lines
Repaired error in new comment.
........
r46584 | neal.norwitz | 2006-06-01 07:32:49 +0200 (Thu, 01 Jun 2006) | 4 lines
Remove ; at end of macro. There was a compiler recently that warned
about extra semi-colons. It may have been the HP C compiler.
This file will trigger a bunch of those warnings now.
........
r46585 | georg.brandl | 2006-06-01 08:39:19 +0200 (Thu, 01 Jun 2006) | 3 lines
Correctly unpickle 2.4 exceptions via __setstate__ (patch #1498571)
........
r46586 | georg.brandl | 2006-06-01 10:27:32 +0200 (Thu, 01 Jun 2006) | 3 lines
Correctly allocate complex types with tp_alloc. (bug #1498638)
........
r46587 | georg.brandl | 2006-06-01 14:30:46 +0200 (Thu, 01 Jun 2006) | 2 lines
Correctly dispatch Faults in loads (patch #1498627)
........
r46588 | georg.brandl | 2006-06-01 15:00:49 +0200 (Thu, 01 Jun 2006) | 3 lines
Some code style tweaks, and remove apply.
........
r46589 | armin.rigo | 2006-06-01 15:19:12 +0200 (Thu, 01 Jun 2006) | 5 lines
[ 1497053 ] Let dicts propagate the exceptions in user __eq__().
[ 1456209 ] dictresize() vulnerability ( <- backport candidate ).
........
r46590 | tim.peters | 2006-06-01 15:41:46 +0200 (Thu, 01 Jun 2006) | 2 lines
Whitespace normalization.
........
r46591 | tim.peters | 2006-06-01 15:49:23 +0200 (Thu, 01 Jun 2006) | 2 lines
Record bugs 1275608 and 1456209 as being fixed.
........
r46592 | tim.peters | 2006-06-01 15:56:26 +0200 (Thu, 01 Jun 2006) | 5 lines
Re-enable a new empty-string test added during the NFS sprint,
but disabled then because str and unicode strings gave different
results. The implementations were repaired later during the
sprint, but the new test remained disabled.
........
r46594 | tim.peters | 2006-06-01 17:50:44 +0200 (Thu, 01 Jun 2006) | 7 lines
Armin committed his patch while I was reviewing it (I'm sure
he didn't know this), so merged in some changes I made during
review. Nothing material apart from changing a new `mask` local
from int to Py_ssize_t. Mostly this is repairing comments that
were made incorrect, and adding new comments. Also a few
minor code rewrites for clarity or helpful succinctness.
........
r46599 | neal.norwitz | 2006-06-02 06:45:53 +0200 (Fri, 02 Jun 2006) | 1 line
Convert docstrings to comments so regrtest -v prints method names
........
r46600 | neal.norwitz | 2006-06-02 06:50:49 +0200 (Fri, 02 Jun 2006) | 2 lines
Fix memory leak found by valgrind.
........
r46601 | neal.norwitz | 2006-06-02 06:54:52 +0200 (Fri, 02 Jun 2006) | 1 line
More memory leaks from valgrind
........
r46602 | neal.norwitz | 2006-06-02 08:23:00 +0200 (Fri, 02 Jun 2006) | 11 lines
Patch #1357836:
Prevent an invalid memory read from test_coding in case the done flag is set.
In that case, the loop isn't entered. I wonder if rather than setting
the done flag in the cases before the loop, if they should just exit early.
This code looks like it should be refactored.
Backport candidate (also the early break above if decoding_fgets fails)
........
r46603 | martin.blais | 2006-06-02 15:03:43 +0200 (Fri, 02 Jun 2006) | 1 line
Fixed struct test to not use unittest.
........
r46605 | tim.peters | 2006-06-03 01:22:51 +0200 (Sat, 03 Jun 2006) | 10 lines
pprint functions used to sort a dict (by key) if and only if
the output required more than one line. "Small" dicts got
displayed in seemingly random order (the hash-induced order
produced by dict.__repr__). None of this was documented.
Now pprint functions always sort dicts by key, and the docs
promise it.
This was proposed and agreed to during the PyCon 2006 core
sprint -- I just didn't have time for it before now.
........
2006-06-08 11:42:34 -03:00
|
|
|
*/
|
|
|
|
static void
|
2022-03-01 19:09:28 -04:00
|
|
|
build_indices_generic(PyDictKeysObject *keys, PyDictKeyEntry *ep, Py_ssize_t n)
|
2010-05-09 12:52:27 -03:00
|
|
|
{
|
2022-02-19 00:15:20 -04:00
|
|
|
size_t mask = DK_MASK(keys);
|
2016-10-29 04:50:00 -03:00
|
|
|
for (Py_ssize_t ix = 0; ix != n; ix++, ep++) {
|
|
|
|
Py_hash_t hash = ep->me_hash;
|
|
|
|
size_t i = hash & mask;
|
2018-11-14 05:39:27 -04:00
|
|
|
for (size_t perturb = hash; dictkeys_get_index(keys, i) != DKIX_EMPTY;) {
|
2016-10-29 04:50:00 -03:00
|
|
|
perturb >>= PERTURB_SHIFT;
|
2017-06-23 21:03:19 -03:00
|
|
|
i = mask & (i*5 + perturb + 1);
|
2016-10-29 04:50:00 -03:00
|
|
|
}
|
2018-11-14 05:39:27 -04:00
|
|
|
dictkeys_set_index(keys, i, ix);
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
1993-03-27 14:11:32 -04:00
|
|
|
}
|
|
|
|
|
2022-03-01 19:09:28 -04:00
|
|
|
static void
|
|
|
|
build_indices_unicode(PyDictKeysObject *keys, PyDictUnicodeEntry *ep, Py_ssize_t n)
|
|
|
|
{
|
|
|
|
size_t mask = DK_MASK(keys);
|
|
|
|
for (Py_ssize_t ix = 0; ix != n; ix++, ep++) {
|
|
|
|
Py_hash_t hash = unicode_get_hash(ep->me_key);
|
|
|
|
assert(hash != -1);
|
|
|
|
size_t i = hash & mask;
|
|
|
|
for (size_t perturb = hash; dictkeys_get_index(keys, i) != DKIX_EMPTY;) {
|
|
|
|
perturb >>= PERTURB_SHIFT;
|
|
|
|
i = mask & (i*5 + perturb + 1);
|
|
|
|
}
|
|
|
|
dictkeys_set_index(keys, i, ix);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1993-03-27 14:11:32 -04:00
|
|
|
/*
|
|
|
|
Restructure the table by allocating a new table and reinserting all
|
|
|
|
items again. When entries have been deleted, the new table may
|
|
|
|
actually be smaller than the old one.
|
2012-04-23 12:24:50 -03:00
|
|
|
If a table is split (its keys and hashes are shared, its values are not),
|
|
|
|
then the values are temporarily copied into the table, it is resized as
|
|
|
|
a combined table, then the me_value slots in the old table are NULLed out.
|
2024-04-19 16:19:12 -03:00
|
|
|
After resizing, a table is always combined.
|
2022-03-01 19:09:28 -04:00
|
|
|
|
|
|
|
This function supports:
|
|
|
|
- Unicode split -> Unicode combined or Generic
|
|
|
|
- Unicode combined -> Unicode combined or Generic
|
|
|
|
- Generic -> Generic
|
1993-03-27 14:11:32 -04:00
|
|
|
*/
|
|
|
|
static int
|
2023-03-09 11:16:30 -04:00
|
|
|
dictresize(PyInterpreterState *interp, PyDictObject *mp,
|
|
|
|
uint8_t log2_newsize, int unicode)
|
1993-03-27 14:11:32 -04:00
|
|
|
{
|
2024-02-20 21:08:14 -04:00
|
|
|
PyDictKeysObject *oldkeys, *newkeys;
|
2021-10-06 09:19:53 -03:00
|
|
|
PyDictValues *oldvalues;
|
2010-05-09 12:52:27 -03:00
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
ASSERT_DICT_LOCKED(mp);
|
|
|
|
|
2021-05-28 05:54:10 -03:00
|
|
|
if (log2_newsize >= SIZEOF_SIZE_T*8) {
|
2010-05-09 12:52:27 -03:00
|
|
|
PyErr_NoMemory();
|
|
|
|
return -1;
|
|
|
|
}
|
2021-05-28 05:54:10 -03:00
|
|
|
assert(log2_newsize >= PyDict_LOG_MINSIZE);
|
2016-10-29 04:50:00 -03:00
|
|
|
|
2012-04-23 12:24:50 -03:00
|
|
|
oldkeys = mp->ma_keys;
|
2022-03-01 19:09:28 -04:00
|
|
|
oldvalues = mp->ma_values;
|
|
|
|
|
|
|
|
if (!DK_IS_UNICODE(oldkeys)) {
|
|
|
|
unicode = 0;
|
|
|
|
}
|
2016-10-29 04:50:00 -03:00
|
|
|
|
2024-02-20 21:08:14 -04:00
|
|
|
ensure_shared_on_resize(mp);
|
2016-10-29 04:50:00 -03:00
|
|
|
/* NOTE: Current odict checks mp->ma_keys to detect resize happen.
|
|
|
|
* So we can't reuse oldkeys even if oldkeys->dk_size == newsize.
|
|
|
|
* TODO: Try reusing oldkeys when reimplement odict.
|
|
|
|
*/
|
|
|
|
|
2012-04-23 12:24:50 -03:00
|
|
|
/* Allocate a new table. */
|
2024-02-20 21:08:14 -04:00
|
|
|
newkeys = new_keys_object(interp, log2_newsize, unicode);
|
|
|
|
if (newkeys == NULL) {
|
2012-04-23 12:24:50 -03:00
|
|
|
return -1;
|
|
|
|
}
|
2016-12-15 12:21:23 -04:00
|
|
|
// New table must be large enough.
|
2024-02-20 21:08:14 -04:00
|
|
|
assert(newkeys->dk_usable >= mp->ma_used);
|
2016-10-29 04:50:00 -03:00
|
|
|
|
2022-03-01 19:09:28 -04:00
|
|
|
Py_ssize_t numentries = mp->ma_used;
|
|
|
|
|
2012-04-23 12:24:50 -03:00
|
|
|
if (oldvalues != NULL) {
|
2024-02-20 20:40:37 -04:00
|
|
|
LOCK_KEYS(oldkeys);
|
|
|
|
PyDictUnicodeEntry *oldentries = DK_UNICODE_ENTRIES(oldkeys);
|
2016-10-29 04:50:00 -03:00
|
|
|
/* Convert split table into new combined table.
|
|
|
|
* We must incref keys; we can transfer values.
|
|
|
|
*/
|
2024-02-20 21:08:14 -04:00
|
|
|
if (newkeys->dk_kind == DICT_KEYS_GENERAL) {
|
2022-03-01 19:09:28 -04:00
|
|
|
// split -> generic
|
2024-02-20 21:08:14 -04:00
|
|
|
PyDictKeyEntry *newentries = DK_ENTRIES(newkeys);
|
2022-03-01 19:09:28 -04:00
|
|
|
|
|
|
|
for (Py_ssize_t i = 0; i < numentries; i++) {
|
|
|
|
int index = get_index_from_order(mp, i);
|
|
|
|
PyDictUnicodeEntry *ep = &oldentries[index];
|
|
|
|
assert(oldvalues->values[index] != NULL);
|
2022-11-10 11:27:53 -04:00
|
|
|
newentries[i].me_key = Py_NewRef(ep->me_key);
|
2022-03-01 19:09:28 -04:00
|
|
|
newentries[i].me_hash = unicode_get_hash(ep->me_key);
|
|
|
|
newentries[i].me_value = oldvalues->values[index];
|
|
|
|
}
|
2024-02-20 21:08:14 -04:00
|
|
|
build_indices_generic(newkeys, newentries, numentries);
|
2022-03-01 19:09:28 -04:00
|
|
|
}
|
|
|
|
else { // split -> combined unicode
|
2024-02-20 21:08:14 -04:00
|
|
|
PyDictUnicodeEntry *newentries = DK_UNICODE_ENTRIES(newkeys);
|
2022-03-01 19:09:28 -04:00
|
|
|
|
|
|
|
for (Py_ssize_t i = 0; i < numentries; i++) {
|
|
|
|
int index = get_index_from_order(mp, i);
|
|
|
|
PyDictUnicodeEntry *ep = &oldentries[index];
|
|
|
|
assert(oldvalues->values[index] != NULL);
|
2022-11-10 11:27:53 -04:00
|
|
|
newentries[i].me_key = Py_NewRef(ep->me_key);
|
2022-03-01 19:09:28 -04:00
|
|
|
newentries[i].me_value = oldvalues->values[index];
|
|
|
|
}
|
2024-02-20 21:08:14 -04:00
|
|
|
build_indices_unicode(newkeys, newentries, numentries);
|
2016-10-31 15:14:05 -03:00
|
|
|
}
|
2024-02-20 20:40:37 -04:00
|
|
|
UNLOCK_KEYS(oldkeys);
|
2024-02-20 21:08:14 -04:00
|
|
|
set_keys(mp, newkeys);
|
|
|
|
dictkeys_decref(interp, oldkeys, IS_DICT_SHARED(mp));
|
|
|
|
set_values(mp, NULL);
|
2024-04-02 07:59:21 -03:00
|
|
|
if (oldvalues->embedded) {
|
|
|
|
assert(oldvalues->embedded == 1);
|
|
|
|
assert(oldvalues->valid == 1);
|
2024-05-22 14:38:56 -03:00
|
|
|
FT_ATOMIC_STORE_UINT8(oldvalues->valid, 0);
|
2024-04-02 07:59:21 -03:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
free_values(oldvalues, IS_DICT_SHARED(mp));
|
|
|
|
}
|
2012-04-23 12:24:50 -03:00
|
|
|
}
|
2022-03-01 19:09:28 -04:00
|
|
|
else { // oldkeys is combined.
|
|
|
|
if (oldkeys->dk_kind == DICT_KEYS_GENERAL) {
|
|
|
|
// generic -> generic
|
2024-02-20 21:08:14 -04:00
|
|
|
assert(newkeys->dk_kind == DICT_KEYS_GENERAL);
|
2022-03-01 19:09:28 -04:00
|
|
|
PyDictKeyEntry *oldentries = DK_ENTRIES(oldkeys);
|
2024-02-20 21:08:14 -04:00
|
|
|
PyDictKeyEntry *newentries = DK_ENTRIES(newkeys);
|
2022-03-01 19:09:28 -04:00
|
|
|
if (oldkeys->dk_nentries == numentries) {
|
|
|
|
memcpy(newentries, oldentries, numentries * sizeof(PyDictKeyEntry));
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
PyDictKeyEntry *ep = oldentries;
|
|
|
|
for (Py_ssize_t i = 0; i < numentries; i++) {
|
|
|
|
while (ep->me_value == NULL)
|
|
|
|
ep++;
|
|
|
|
newentries[i] = *ep++;
|
|
|
|
}
|
|
|
|
}
|
2024-02-20 21:08:14 -04:00
|
|
|
build_indices_generic(newkeys, newentries, numentries);
|
2016-10-29 04:50:00 -03:00
|
|
|
}
|
2022-03-01 19:09:28 -04:00
|
|
|
else { // oldkeys is combined unicode
|
|
|
|
PyDictUnicodeEntry *oldentries = DK_UNICODE_ENTRIES(oldkeys);
|
|
|
|
if (unicode) { // combined unicode -> combined unicode
|
2024-02-20 21:08:14 -04:00
|
|
|
PyDictUnicodeEntry *newentries = DK_UNICODE_ENTRIES(newkeys);
|
2022-03-01 19:09:28 -04:00
|
|
|
if (oldkeys->dk_nentries == numentries && mp->ma_keys->dk_kind == DICT_KEYS_UNICODE) {
|
2022-03-02 06:05:12 -04:00
|
|
|
memcpy(newentries, oldentries, numentries * sizeof(PyDictUnicodeEntry));
|
2022-03-01 19:09:28 -04:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
PyDictUnicodeEntry *ep = oldentries;
|
|
|
|
for (Py_ssize_t i = 0; i < numentries; i++) {
|
|
|
|
while (ep->me_value == NULL)
|
|
|
|
ep++;
|
|
|
|
newentries[i] = *ep++;
|
|
|
|
}
|
|
|
|
}
|
2024-02-20 21:08:14 -04:00
|
|
|
build_indices_unicode(newkeys, newentries, numentries);
|
2022-03-01 19:09:28 -04:00
|
|
|
}
|
|
|
|
else { // combined unicode -> generic
|
2024-02-20 21:08:14 -04:00
|
|
|
PyDictKeyEntry *newentries = DK_ENTRIES(newkeys);
|
2022-03-01 19:09:28 -04:00
|
|
|
PyDictUnicodeEntry *ep = oldentries;
|
|
|
|
for (Py_ssize_t i = 0; i < numentries; i++) {
|
|
|
|
while (ep->me_value == NULL)
|
|
|
|
ep++;
|
|
|
|
newentries[i].me_key = ep->me_key;
|
|
|
|
newentries[i].me_hash = unicode_get_hash(ep->me_key);
|
|
|
|
newentries[i].me_value = ep->me_value;
|
2016-10-29 04:50:00 -03:00
|
|
|
ep++;
|
2022-03-01 19:09:28 -04:00
|
|
|
}
|
2024-02-20 21:08:14 -04:00
|
|
|
build_indices_generic(newkeys, newentries, numentries);
|
2016-10-29 04:50:00 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2024-02-20 21:08:14 -04:00
|
|
|
set_keys(mp, newkeys);
|
|
|
|
|
2023-05-10 10:28:40 -03:00
|
|
|
if (oldkeys != Py_EMPTY_KEYS) {
|
2020-02-03 12:55:05 -04:00
|
|
|
#ifdef Py_REF_DEBUG
|
2024-04-08 13:11:36 -03:00
|
|
|
_Py_DecRefTotal(_PyThreadState_GET());
|
2020-02-03 12:55:05 -04:00
|
|
|
#endif
|
2022-03-03 01:30:58 -04:00
|
|
|
assert(oldkeys->dk_kind != DICT_KEYS_SPLIT);
|
|
|
|
assert(oldkeys->dk_refcnt == 1);
|
2024-02-20 21:08:14 -04:00
|
|
|
free_keys_object(oldkeys, IS_DICT_SHARED(mp));
|
2016-10-29 04:50:00 -03:00
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2016-10-29 04:50:00 -03:00
|
|
|
|
2024-02-28 18:53:19 -04:00
|
|
|
STORE_KEYS_USABLE(mp->ma_keys, mp->ma_keys->dk_usable - numentries);
|
|
|
|
STORE_KEYS_NENTRIES(mp->ma_keys, numentries);
|
2021-10-06 09:19:53 -03:00
|
|
|
ASSERT_CONSISTENT(mp);
|
2021-10-13 10:19:34 -03:00
|
|
|
return 0;
|
1993-03-27 14:11:32 -04:00
|
|
|
}
|
|
|
|
|
2022-03-01 19:09:28 -04:00
|
|
|
static PyObject *
|
2023-03-09 11:16:30 -04:00
|
|
|
dict_new_presized(PyInterpreterState *interp, Py_ssize_t minused, bool unicode)
|
Merged revisions 59541-59561 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59544 | raymond.hettinger | 2007-12-18 01:13:45 +0100 (Tue, 18 Dec 2007) | 1 line
Add more namedtuple() test cases. Neaten the code and comments.
........
r59545 | christian.heimes | 2007-12-18 04:38:03 +0100 (Tue, 18 Dec 2007) | 3 lines
Fixed for #1601: IDLE not working correctly on Windows (Py30a2/IDLE30a1)
Amaury's ideas works great. Should we build the Python core with WINVER=0x0500 and _WIN32_WINNT=0x0500, too?
........
r59546 | christian.heimes | 2007-12-18 10:00:13 +0100 (Tue, 18 Dec 2007) | 1 line
Make it a bit easier to test Tcl/Tk and idle from a build dir.
........
r59547 | christian.heimes | 2007-12-18 10:12:10 +0100 (Tue, 18 Dec 2007) | 1 line
Removed several unused files from the PCbuild9 directory. They are relics from the past.
........
r59548 | raymond.hettinger | 2007-12-18 19:26:18 +0100 (Tue, 18 Dec 2007) | 29 lines
Speed-up dictionary constructor by about 10%.
New opcode, STORE_MAP saves the compiler from awkward stack manipulations
and specializes for dicts using PyDict_SetItem instead of PyObject_SetItem.
Old disassembly:
0 BUILD_MAP 0
3 DUP_TOP
4 LOAD_CONST 1 (1)
7 ROT_TWO
8 LOAD_CONST 2 ('x')
11 STORE_SUBSCR
12 DUP_TOP
13 LOAD_CONST 3 (2)
16 ROT_TWO
17 LOAD_CONST 4 ('y')
20 STORE_SUBSCR
New disassembly:
0 BUILD_MAP 0
3 LOAD_CONST 1 (1)
6 LOAD_CONST 2 ('x')
9 STORE_MAP
10 LOAD_CONST 3 (2)
13 LOAD_CONST 4 ('y')
16 STORE_MAP
........
r59549 | thomas.heller | 2007-12-18 20:00:34 +0100 (Tue, 18 Dec 2007) | 2 lines
Issue #1642: Fix segfault in ctypes when trying to delete attributes.
........
r59551 | guido.van.rossum | 2007-12-18 21:10:42 +0100 (Tue, 18 Dec 2007) | 2 lines
Issue #1645 by Alberto Bertogli. Fix a comment.
........
r59553 | raymond.hettinger | 2007-12-18 22:24:09 +0100 (Tue, 18 Dec 2007) | 12 lines
Give meaning to the oparg for BUILD_MAP: estimated size of the dictionary.
Allows dictionaries to be pre-sized (upto 255 elements) saving time lost
to re-sizes with their attendant mallocs and re-insertions.
Has zero effect on small dictionaries (5 elements or fewer), a slight
benefit for dicts upto 22 elements (because they had to resize once
anyway), and more benefit for dicts upto 255 elements (saving multiple
resizes during the build-up and reducing the number of collisions on
the first insertions). Beyond 255 elements, there is no addional benefit.
........
r59554 | christian.heimes | 2007-12-18 22:56:09 +0100 (Tue, 18 Dec 2007) | 1 line
Fixed #1649: IDLE error: dictionary changed size during iteration
........
r59557 | raymond.hettinger | 2007-12-18 23:21:27 +0100 (Tue, 18 Dec 2007) | 1 line
Simplify and speedup _asdict() for named tuples.
........
r59558 | christian.heimes | 2007-12-19 00:22:54 +0100 (Wed, 19 Dec 2007) | 3 lines
Applied patch #1635: Float patch for inf and nan on Windows (and other platforms).
The patch unifies float("inf") and repr(float("inf")) on all platforms.
........
r59559 | raymond.hettinger | 2007-12-19 00:51:15 +0100 (Wed, 19 Dec 2007) | 1 line
Users demand iterable input for named tuples. The author capitulates.
........
r59560 | raymond.hettinger | 2007-12-19 01:21:06 +0100 (Wed, 19 Dec 2007) | 1 line
Beef-up tests for dict literals
........
r59561 | raymond.hettinger | 2007-12-19 01:27:21 +0100 (Wed, 19 Dec 2007) | 1 line
Zap a duplicate line
........
2007-12-18 22:07:34 -04:00
|
|
|
{
|
2021-05-28 05:54:10 -03:00
|
|
|
const uint8_t log2_max_presize = 17;
|
|
|
|
const Py_ssize_t max_presize = ((Py_ssize_t)1) << log2_max_presize;
|
|
|
|
uint8_t log2_newsize;
|
2012-04-23 12:24:50 -03:00
|
|
|
PyDictKeysObject *new_keys;
|
2016-11-21 11:57:02 -04:00
|
|
|
|
2019-03-18 08:38:33 -03:00
|
|
|
if (minused <= USABLE_FRACTION(PyDict_MINSIZE)) {
|
2019-03-12 05:25:44 -03:00
|
|
|
return PyDict_New();
|
|
|
|
}
|
2016-11-21 11:57:02 -04:00
|
|
|
/* There are no strict guarantee that returned dict can contain minused
|
|
|
|
* items without resize. So we create medium size dict instead of very
|
|
|
|
* large dict or MemoryError.
|
|
|
|
*/
|
|
|
|
if (minused > USABLE_FRACTION(max_presize)) {
|
2021-05-28 05:54:10 -03:00
|
|
|
log2_newsize = log2_max_presize;
|
2016-11-21 11:57:02 -04:00
|
|
|
}
|
|
|
|
else {
|
2021-05-28 05:54:10 -03:00
|
|
|
log2_newsize = estimate_log2_keysize(minused);
|
2016-11-21 11:57:02 -04:00
|
|
|
}
|
|
|
|
|
2023-03-09 11:16:30 -04:00
|
|
|
new_keys = new_keys_object(interp, log2_newsize, unicode);
|
2012-04-23 12:24:50 -03:00
|
|
|
if (new_keys == NULL)
|
2010-05-09 12:52:27 -03:00
|
|
|
return NULL;
|
2023-03-09 11:16:30 -04:00
|
|
|
return new_dict(interp, new_keys, NULL, 0, 0);
|
Merged revisions 59541-59561 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59544 | raymond.hettinger | 2007-12-18 01:13:45 +0100 (Tue, 18 Dec 2007) | 1 line
Add more namedtuple() test cases. Neaten the code and comments.
........
r59545 | christian.heimes | 2007-12-18 04:38:03 +0100 (Tue, 18 Dec 2007) | 3 lines
Fixed for #1601: IDLE not working correctly on Windows (Py30a2/IDLE30a1)
Amaury's ideas works great. Should we build the Python core with WINVER=0x0500 and _WIN32_WINNT=0x0500, too?
........
r59546 | christian.heimes | 2007-12-18 10:00:13 +0100 (Tue, 18 Dec 2007) | 1 line
Make it a bit easier to test Tcl/Tk and idle from a build dir.
........
r59547 | christian.heimes | 2007-12-18 10:12:10 +0100 (Tue, 18 Dec 2007) | 1 line
Removed several unused files from the PCbuild9 directory. They are relics from the past.
........
r59548 | raymond.hettinger | 2007-12-18 19:26:18 +0100 (Tue, 18 Dec 2007) | 29 lines
Speed-up dictionary constructor by about 10%.
New opcode, STORE_MAP saves the compiler from awkward stack manipulations
and specializes for dicts using PyDict_SetItem instead of PyObject_SetItem.
Old disassembly:
0 BUILD_MAP 0
3 DUP_TOP
4 LOAD_CONST 1 (1)
7 ROT_TWO
8 LOAD_CONST 2 ('x')
11 STORE_SUBSCR
12 DUP_TOP
13 LOAD_CONST 3 (2)
16 ROT_TWO
17 LOAD_CONST 4 ('y')
20 STORE_SUBSCR
New disassembly:
0 BUILD_MAP 0
3 LOAD_CONST 1 (1)
6 LOAD_CONST 2 ('x')
9 STORE_MAP
10 LOAD_CONST 3 (2)
13 LOAD_CONST 4 ('y')
16 STORE_MAP
........
r59549 | thomas.heller | 2007-12-18 20:00:34 +0100 (Tue, 18 Dec 2007) | 2 lines
Issue #1642: Fix segfault in ctypes when trying to delete attributes.
........
r59551 | guido.van.rossum | 2007-12-18 21:10:42 +0100 (Tue, 18 Dec 2007) | 2 lines
Issue #1645 by Alberto Bertogli. Fix a comment.
........
r59553 | raymond.hettinger | 2007-12-18 22:24:09 +0100 (Tue, 18 Dec 2007) | 12 lines
Give meaning to the oparg for BUILD_MAP: estimated size of the dictionary.
Allows dictionaries to be pre-sized (upto 255 elements) saving time lost
to re-sizes with their attendant mallocs and re-insertions.
Has zero effect on small dictionaries (5 elements or fewer), a slight
benefit for dicts upto 22 elements (because they had to resize once
anyway), and more benefit for dicts upto 255 elements (saving multiple
resizes during the build-up and reducing the number of collisions on
the first insertions). Beyond 255 elements, there is no addional benefit.
........
r59554 | christian.heimes | 2007-12-18 22:56:09 +0100 (Tue, 18 Dec 2007) | 1 line
Fixed #1649: IDLE error: dictionary changed size during iteration
........
r59557 | raymond.hettinger | 2007-12-18 23:21:27 +0100 (Tue, 18 Dec 2007) | 1 line
Simplify and speedup _asdict() for named tuples.
........
r59558 | christian.heimes | 2007-12-19 00:22:54 +0100 (Wed, 19 Dec 2007) | 3 lines
Applied patch #1635: Float patch for inf and nan on Windows (and other platforms).
The patch unifies float("inf") and repr(float("inf")) on all platforms.
........
r59559 | raymond.hettinger | 2007-12-19 00:51:15 +0100 (Wed, 19 Dec 2007) | 1 line
Users demand iterable input for named tuples. The author capitulates.
........
r59560 | raymond.hettinger | 2007-12-19 01:21:06 +0100 (Wed, 19 Dec 2007) | 1 line
Beef-up tests for dict literals
........
r59561 | raymond.hettinger | 2007-12-19 01:27:21 +0100 (Wed, 19 Dec 2007) | 1 line
Zap a duplicate line
........
2007-12-18 22:07:34 -04:00
|
|
|
}
|
|
|
|
|
2022-03-01 19:09:28 -04:00
|
|
|
PyObject *
|
|
|
|
_PyDict_NewPresized(Py_ssize_t minused)
|
|
|
|
{
|
2023-03-09 11:16:30 -04:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
|
|
|
return dict_new_presized(interp, minused, false);
|
2022-03-01 19:09:28 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *
|
|
|
|
_PyDict_FromItems(PyObject *const *keys, Py_ssize_t keys_offset,
|
|
|
|
PyObject *const *values, Py_ssize_t values_offset,
|
|
|
|
Py_ssize_t length)
|
|
|
|
{
|
|
|
|
bool unicode = true;
|
|
|
|
PyObject *const *ks = keys;
|
2023-03-09 11:16:30 -04:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
2022-03-01 19:09:28 -04:00
|
|
|
|
|
|
|
for (Py_ssize_t i = 0; i < length; i++) {
|
|
|
|
if (!PyUnicode_CheckExact(*ks)) {
|
|
|
|
unicode = false;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
ks += keys_offset;
|
|
|
|
}
|
|
|
|
|
2023-03-09 11:16:30 -04:00
|
|
|
PyObject *dict = dict_new_presized(interp, length, unicode);
|
2022-03-01 19:09:28 -04:00
|
|
|
if (dict == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
ks = keys;
|
|
|
|
PyObject *const *vs = values;
|
|
|
|
|
|
|
|
for (Py_ssize_t i = 0; i < length; i++) {
|
|
|
|
PyObject *key = *ks;
|
|
|
|
PyObject *value = *vs;
|
2024-02-06 18:03:43 -04:00
|
|
|
if (setitem_lock_held((PyDictObject *)dict, key, value) < 0) {
|
2022-03-01 19:09:28 -04:00
|
|
|
Py_DECREF(dict);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
ks += keys_offset;
|
|
|
|
vs += values_offset;
|
|
|
|
}
|
|
|
|
|
|
|
|
return dict;
|
|
|
|
}
|
|
|
|
|
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
merge in bad ways, so I'll have to merge that extra-carefully (probably manually.)
Merged revisions 46495-46605 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r46495 | tim.peters | 2006-05-28 03:52:38 +0200 (Sun, 28 May 2006) | 2 lines
Added missing svn:eol-style property to text files.
........
r46497 | tim.peters | 2006-05-28 12:41:29 +0200 (Sun, 28 May 2006) | 3 lines
PyErr_Display(), PyErr_WriteUnraisable(): Coverity found a cut-and-paste
bug in both: `className` was referenced before being checked for NULL.
........
r46499 | fredrik.lundh | 2006-05-28 14:06:46 +0200 (Sun, 28 May 2006) | 5 lines
needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only),
and use it for string copy operations. this gives a 20% speedup on some
string benchmarks.
........
r46501 | michael.hudson | 2006-05-28 17:51:40 +0200 (Sun, 28 May 2006) | 26 lines
Quality control, meet exceptions.c.
Fix a number of problems with the need for speed code:
One is doing this sort of thing:
Py_DECREF(self->field);
self->field = newval;
Py_INCREF(self->field);
without being very sure that self->field doesn't start with a
value that has a __del__, because that almost certainly can lead
to segfaults.
As self->args is constrained to be an exact tuple we may as well
exploit this fact consistently. This leads to quite a lot of
simplification (and, hey, probably better performance).
Add some error checking in places lacking it.
Fix some rather strange indentation in the Unicode code.
Delete some trailing whitespace.
More to come, I haven't fixed all the reference leaks yet...
........
r46502 | george.yoshida | 2006-05-28 18:39:09 +0200 (Sun, 28 May 2006) | 3 lines
Patch #1080727: add "encoding" parameter to doctest.DocFileSuite
Contributed by Bjorn Tillenius.
........
r46503 | martin.v.loewis | 2006-05-28 18:57:38 +0200 (Sun, 28 May 2006) | 4 lines
Rest of patch #1490384: Commit icon source, remove
claim that Erik von Blokland is the author of the
installer picture.
........
r46504 | michael.hudson | 2006-05-28 19:40:29 +0200 (Sun, 28 May 2006) | 16 lines
Quality control, meet exceptions.c, round two.
Make some functions that should have been static static.
Fix a bunch of refleaks by fixing the definition of
MiddlingExtendsException.
Remove all the __new__ implementations apart from
BaseException_new. Rewrite most code that needs it to cope with
NULL fields (such code could get excercised anyway, the
__new__-removal just makes it more likely). This involved
editing the code for WindowsError, which I can't test.
This fixes all the refleaks in at least the start of a regrtest
-R :: run.
........
r46505 | marc-andre.lemburg | 2006-05-28 19:46:58 +0200 (Sun, 28 May 2006) | 10 lines
Initial version of systimes - a module to provide platform dependent
performance measurements.
The module is currently just a proof-of-concept implementation, but
will integrated into pybench once it is stable enough.
License: pybench license.
Author: Marc-Andre Lemburg.
........
r46507 | armin.rigo | 2006-05-28 21:13:17 +0200 (Sun, 28 May 2006) | 15 lines
("Forward-port" of r46506)
Remove various dependencies on dictionary order in the standard library
tests, and one (clearly an oversight, potentially critical) in the
standard library itself - base64.py.
Remaining open issues:
* test_extcall is an output test, messy to make robust
* tarfile.py has a potential bug here, but I'm not familiar
enough with this code. Filed in as SF bug #1496501.
* urllib2.HTTPPasswordMgr() returns a random result if there is more
than one matching root path. I'm asking python-dev for
clarification...
........
r46508 | georg.brandl | 2006-05-28 22:11:45 +0200 (Sun, 28 May 2006) | 4 lines
The empty string is a valid import path.
(fixes #1496539)
........
r46509 | georg.brandl | 2006-05-28 22:23:12 +0200 (Sun, 28 May 2006) | 3 lines
Patch #1496206: urllib2 PasswordMgr ./. default ports
........
r46510 | georg.brandl | 2006-05-28 22:57:09 +0200 (Sun, 28 May 2006) | 3 lines
Fix refleaks in UnicodeError get and set methods.
........
r46511 | michael.hudson | 2006-05-28 23:19:03 +0200 (Sun, 28 May 2006) | 3 lines
use the UnicodeError traversal and clearing functions in UnicodeError
subclasses.
........
r46512 | thomas.wouters | 2006-05-28 23:32:12 +0200 (Sun, 28 May 2006) | 4 lines
Make last patch valid C89 so Windows compilers can deal with it.
........
r46513 | georg.brandl | 2006-05-28 23:42:54 +0200 (Sun, 28 May 2006) | 3 lines
Fix ref-antileak in _struct.c which eventually lead to deallocating None.
........
r46514 | georg.brandl | 2006-05-28 23:57:35 +0200 (Sun, 28 May 2006) | 4 lines
Correct None refcount issue in Mac modules. (Are they
still used?)
........
r46515 | armin.rigo | 2006-05-29 00:07:08 +0200 (Mon, 29 May 2006) | 3 lines
A clearer error message when passing -R to regrtest.py with
release builds of Python.
........
r46516 | georg.brandl | 2006-05-29 00:14:04 +0200 (Mon, 29 May 2006) | 3 lines
Fix C function calling conventions in _sre module.
........
r46517 | georg.brandl | 2006-05-29 00:34:51 +0200 (Mon, 29 May 2006) | 3 lines
Convert audioop over to METH_VARARGS.
........
r46518 | georg.brandl | 2006-05-29 00:38:57 +0200 (Mon, 29 May 2006) | 3 lines
METH_NOARGS functions do get called with two args.
........
r46519 | georg.brandl | 2006-05-29 11:46:51 +0200 (Mon, 29 May 2006) | 4 lines
Fix refleak in socketmodule. Replace bogus Py_BuildValue calls.
Fix refleak in exceptions.
........
r46520 | nick.coghlan | 2006-05-29 14:43:05 +0200 (Mon, 29 May 2006) | 7 lines
Apply modified version of Collin Winter's patch #1478788
Renames functional extension module to _functools and adds a Python
functools module so that utility functions like update_wrapper can be
added easily.
........
r46522 | georg.brandl | 2006-05-29 15:53:16 +0200 (Mon, 29 May 2006) | 3 lines
Convert fmmodule to METH_VARARGS.
........
r46523 | georg.brandl | 2006-05-29 16:13:21 +0200 (Mon, 29 May 2006) | 3 lines
Fix #1494605.
........
r46524 | georg.brandl | 2006-05-29 16:28:05 +0200 (Mon, 29 May 2006) | 3 lines
Handle PyMem_Malloc failure in pystrtod.c. Closes #1494671.
........
r46525 | georg.brandl | 2006-05-29 16:33:55 +0200 (Mon, 29 May 2006) | 3 lines
Fix compiler warning.
........
r46526 | georg.brandl | 2006-05-29 16:39:00 +0200 (Mon, 29 May 2006) | 3 lines
Fix #1494787 (pyclbr counts whitespace as superclass name)
........
r46527 | bob.ippolito | 2006-05-29 17:47:29 +0200 (Mon, 29 May 2006) | 1 line
simplify the struct code a bit (no functional changes)
........
r46528 | armin.rigo | 2006-05-29 19:59:47 +0200 (Mon, 29 May 2006) | 2 lines
Silence a warning.
........
r46529 | georg.brandl | 2006-05-29 21:39:45 +0200 (Mon, 29 May 2006) | 3 lines
Correct some value converting strangenesses.
........
r46530 | nick.coghlan | 2006-05-29 22:27:44 +0200 (Mon, 29 May 2006) | 1 line
When adding a module like functools, it helps to let SVN know about the file.
........
r46531 | georg.brandl | 2006-05-29 22:52:54 +0200 (Mon, 29 May 2006) | 4 lines
Patches #1497027 and #972322: try HTTP digest auth first,
and watch out for handler name collisions.
........
r46532 | georg.brandl | 2006-05-29 22:57:01 +0200 (Mon, 29 May 2006) | 3 lines
Add News entry for last commit.
........
r46533 | georg.brandl | 2006-05-29 23:04:52 +0200 (Mon, 29 May 2006) | 4 lines
Make use of METH_O and METH_NOARGS where possible.
Use Py_UnpackTuple instead of PyArg_ParseTuple where possible.
........
r46534 | georg.brandl | 2006-05-29 23:58:42 +0200 (Mon, 29 May 2006) | 3 lines
Convert more modules to METH_VARARGS.
........
r46535 | georg.brandl | 2006-05-30 00:00:30 +0200 (Tue, 30 May 2006) | 3 lines
Whoops.
........
r46536 | fredrik.lundh | 2006-05-30 00:42:07 +0200 (Tue, 30 May 2006) | 4 lines
fixed "abc".count("", 100) == -96 error (hopefully, nobody's relying on
the current behaviour ;-)
........
r46537 | bob.ippolito | 2006-05-30 00:55:48 +0200 (Tue, 30 May 2006) | 1 line
struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly)
........
r46539 | bob.ippolito | 2006-05-30 02:26:01 +0200 (Tue, 30 May 2006) | 1 line
Add a length check to aifc to ensure it doesn't write a bogus file
........
r46540 | tim.peters | 2006-05-30 04:25:25 +0200 (Tue, 30 May 2006) | 10 lines
deprecated_err(): Stop bizarre warning messages when the tests
are run in the order:
test_genexps (or any other doctest-based test)
test_struct
test_doctest
The `warnings` module needs an advertised way to save/restore
its internal filter list.
........
r46541 | tim.peters | 2006-05-30 04:26:46 +0200 (Tue, 30 May 2006) | 2 lines
Whitespace normalization.
........
r46542 | tim.peters | 2006-05-30 04:30:30 +0200 (Tue, 30 May 2006) | 2 lines
Set a binary svn:mime-type property on this UTF-8 encoded file.
........
r46543 | neal.norwitz | 2006-05-30 05:18:50 +0200 (Tue, 30 May 2006) | 1 line
Simplify further by using AddStringConstant
........
r46544 | tim.peters | 2006-05-30 06:16:25 +0200 (Tue, 30 May 2006) | 6 lines
Convert relevant dict internals to Py_ssize_t.
I don't have a box with nearly enough RAM, or an OS,
that could get close to tickling this, though (requires
a dict w/ at least 2**31 entries).
........
r46545 | neal.norwitz | 2006-05-30 06:19:21 +0200 (Tue, 30 May 2006) | 1 line
Remove stray | in comment
........
r46546 | neal.norwitz | 2006-05-30 06:25:05 +0200 (Tue, 30 May 2006) | 1 line
Use Py_SAFE_DOWNCAST for safety. Fix format strings. Remove 2 more stray | in comment
........
r46547 | neal.norwitz | 2006-05-30 06:43:23 +0200 (Tue, 30 May 2006) | 1 line
No DOWNCAST is required since sizeof(Py_ssize_t) >= sizeof(int) and Py_ReprEntr returns an int
........
r46548 | tim.peters | 2006-05-30 07:04:59 +0200 (Tue, 30 May 2006) | 3 lines
dict_print(): Explicitly narrow the return value
from a (possibly) wider variable.
........
r46549 | tim.peters | 2006-05-30 07:23:59 +0200 (Tue, 30 May 2006) | 5 lines
dict_print(): So that Neal & I don't spend the rest of
our lives taking turns rewriting code that works ;-),
get rid of casting illusions by declaring a new variable
with the obvious type.
........
r46550 | georg.brandl | 2006-05-30 09:04:55 +0200 (Tue, 30 May 2006) | 3 lines
Restore exception pickle support. #1497319.
........
r46551 | georg.brandl | 2006-05-30 09:13:29 +0200 (Tue, 30 May 2006) | 3 lines
Add a test case for exception pickling. args is never NULL.
........
r46552 | neal.norwitz | 2006-05-30 09:21:10 +0200 (Tue, 30 May 2006) | 1 line
Don't fail if the (sub)pkgname already exist.
........
r46553 | georg.brandl | 2006-05-30 09:34:45 +0200 (Tue, 30 May 2006) | 3 lines
Disallow keyword args for exceptions.
........
r46554 | neal.norwitz | 2006-05-30 09:36:54 +0200 (Tue, 30 May 2006) | 5 lines
I'm impatient. I think this will fix a few more problems with the buildbots.
I'm not sure this is the best approach, but I can't think of anything better.
If this creates problems, feel free to revert, but I think it's safe and
should make things a little better.
........
r46555 | georg.brandl | 2006-05-30 10:17:00 +0200 (Tue, 30 May 2006) | 4 lines
Do the check for no keyword arguments in __init__ so that
subclasses of Exception can be supplied keyword args
........
r46556 | georg.brandl | 2006-05-30 10:47:19 +0200 (Tue, 30 May 2006) | 3 lines
Convert test_exceptions to unittest.
........
r46557 | andrew.kuchling | 2006-05-30 14:52:01 +0200 (Tue, 30 May 2006) | 1 line
Add SoC name, and reorganize this section a bit
........
r46559 | tim.peters | 2006-05-30 17:53:34 +0200 (Tue, 30 May 2006) | 11 lines
PyLong_FromString(): Continued fraction analysis (explained in
a new comment) suggests there are almost certainly large input
integers in all non-binary input bases for which one Python digit
too few is initally allocated to hold the final result. Instead
of assert-failing when that happens, allocate more space. Alas,
I estimate it would take a few days to find a specific such case,
so this isn't backed up by a new test (not to mention that such
a case may take hours to run, since conversion time is quadratic
in the number of digits, and preliminary attempts suggested that
the smallest such inputs contain at least a million digits).
........
r46560 | fredrik.lundh | 2006-05-30 19:11:48 +0200 (Tue, 30 May 2006) | 3 lines
changed find/rfind to return -1 for matches outside the source string
........
r46561 | bob.ippolito | 2006-05-30 19:37:54 +0200 (Tue, 30 May 2006) | 1 line
Change wrapping terminology to overflow masking
........
r46562 | fredrik.lundh | 2006-05-30 19:39:58 +0200 (Tue, 30 May 2006) | 3 lines
changed count to return 0 for slices outside the source string
........
r46568 | tim.peters | 2006-05-31 01:28:02 +0200 (Wed, 31 May 2006) | 2 lines
Whitespace normalization.
........
r46569 | brett.cannon | 2006-05-31 04:19:54 +0200 (Wed, 31 May 2006) | 5 lines
Clarify wording on default values for strptime(); defaults are used when better
values cannot be inferred.
Closes bug #1496315.
........
r46572 | neal.norwitz | 2006-05-31 09:43:27 +0200 (Wed, 31 May 2006) | 1 line
Calculate smallest properly (it was off by one) and use proper ssize_t types for Win64
........
r46573 | neal.norwitz | 2006-05-31 10:01:08 +0200 (Wed, 31 May 2006) | 1 line
Revert last checkin, it is better to do make distclean
........
r46574 | neal.norwitz | 2006-05-31 11:02:44 +0200 (Wed, 31 May 2006) | 3 lines
On 64-bit platforms running test_struct after test_tarfile would fail
since the deprecation warning wouldn't be raised.
........
r46575 | thomas.heller | 2006-05-31 13:37:58 +0200 (Wed, 31 May 2006) | 3 lines
PyTuple_Pack is not available in Python 2.3, but ctypes must stay
compatible with that.
........
r46576 | andrew.kuchling | 2006-05-31 15:18:56 +0200 (Wed, 31 May 2006) | 1 line
'functional' module was renamed to 'functools'
........
r46577 | kristjan.jonsson | 2006-05-31 15:35:41 +0200 (Wed, 31 May 2006) | 1 line
Fixup the PCBuild8 project directory. exceptions.c have moved to Objects, and the functionalmodule.c has been replaced with _functoolsmodule.c. Other minor changes to .vcproj files and .sln to fix compilation
........
r46578 | andrew.kuchling | 2006-05-31 16:08:48 +0200 (Wed, 31 May 2006) | 15 lines
[Bug #1473048]
SimpleXMLRPCServer and DocXMLRPCServer don't look at
the path of the HTTP request at all; you can POST or
GET from / or /RPC2 or /blahblahblah with the same results.
Security scanners that look for /cgi-bin/phf will therefore report
lots of vulnerabilities.
Fix: add a .rpc_paths attribute to the SimpleXMLRPCServer class,
and report a 404 error if the path isn't on the allowed list.
Possibly-controversial aspect of this change: the default makes only
'/' and '/RPC2' legal. Maybe this will break people's applications
(though I doubt it). We could just set the default to an empty tuple,
which would exactly match the current behaviour.
........
r46579 | andrew.kuchling | 2006-05-31 16:12:47 +0200 (Wed, 31 May 2006) | 1 line
Mention SimpleXMLRPCServer change
........
r46580 | tim.peters | 2006-05-31 16:28:07 +0200 (Wed, 31 May 2006) | 2 lines
Trimmed trailing whitespace.
........
r46581 | tim.peters | 2006-05-31 17:33:22 +0200 (Wed, 31 May 2006) | 4 lines
_range_error(): Speed and simplify (there's no real need for
loops here). Assert that size_t is actually big enough, and
that f->size is at least one. Wrap a long line.
........
r46582 | tim.peters | 2006-05-31 17:34:37 +0200 (Wed, 31 May 2006) | 2 lines
Repaired error in new comment.
........
r46584 | neal.norwitz | 2006-06-01 07:32:49 +0200 (Thu, 01 Jun 2006) | 4 lines
Remove ; at end of macro. There was a compiler recently that warned
about extra semi-colons. It may have been the HP C compiler.
This file will trigger a bunch of those warnings now.
........
r46585 | georg.brandl | 2006-06-01 08:39:19 +0200 (Thu, 01 Jun 2006) | 3 lines
Correctly unpickle 2.4 exceptions via __setstate__ (patch #1498571)
........
r46586 | georg.brandl | 2006-06-01 10:27:32 +0200 (Thu, 01 Jun 2006) | 3 lines
Correctly allocate complex types with tp_alloc. (bug #1498638)
........
r46587 | georg.brandl | 2006-06-01 14:30:46 +0200 (Thu, 01 Jun 2006) | 2 lines
Correctly dispatch Faults in loads (patch #1498627)
........
r46588 | georg.brandl | 2006-06-01 15:00:49 +0200 (Thu, 01 Jun 2006) | 3 lines
Some code style tweaks, and remove apply.
........
r46589 | armin.rigo | 2006-06-01 15:19:12 +0200 (Thu, 01 Jun 2006) | 5 lines
[ 1497053 ] Let dicts propagate the exceptions in user __eq__().
[ 1456209 ] dictresize() vulnerability ( <- backport candidate ).
........
r46590 | tim.peters | 2006-06-01 15:41:46 +0200 (Thu, 01 Jun 2006) | 2 lines
Whitespace normalization.
........
r46591 | tim.peters | 2006-06-01 15:49:23 +0200 (Thu, 01 Jun 2006) | 2 lines
Record bugs 1275608 and 1456209 as being fixed.
........
r46592 | tim.peters | 2006-06-01 15:56:26 +0200 (Thu, 01 Jun 2006) | 5 lines
Re-enable a new empty-string test added during the NFS sprint,
but disabled then because str and unicode strings gave different
results. The implementations were repaired later during the
sprint, but the new test remained disabled.
........
r46594 | tim.peters | 2006-06-01 17:50:44 +0200 (Thu, 01 Jun 2006) | 7 lines
Armin committed his patch while I was reviewing it (I'm sure
he didn't know this), so merged in some changes I made during
review. Nothing material apart from changing a new `mask` local
from int to Py_ssize_t. Mostly this is repairing comments that
were made incorrect, and adding new comments. Also a few
minor code rewrites for clarity or helpful succinctness.
........
r46599 | neal.norwitz | 2006-06-02 06:45:53 +0200 (Fri, 02 Jun 2006) | 1 line
Convert docstrings to comments so regrtest -v prints method names
........
r46600 | neal.norwitz | 2006-06-02 06:50:49 +0200 (Fri, 02 Jun 2006) | 2 lines
Fix memory leak found by valgrind.
........
r46601 | neal.norwitz | 2006-06-02 06:54:52 +0200 (Fri, 02 Jun 2006) | 1 line
More memory leaks from valgrind
........
r46602 | neal.norwitz | 2006-06-02 08:23:00 +0200 (Fri, 02 Jun 2006) | 11 lines
Patch #1357836:
Prevent an invalid memory read from test_coding in case the done flag is set.
In that case, the loop isn't entered. I wonder if rather than setting
the done flag in the cases before the loop, if they should just exit early.
This code looks like it should be refactored.
Backport candidate (also the early break above if decoding_fgets fails)
........
r46603 | martin.blais | 2006-06-02 15:03:43 +0200 (Fri, 02 Jun 2006) | 1 line
Fixed struct test to not use unittest.
........
r46605 | tim.peters | 2006-06-03 01:22:51 +0200 (Sat, 03 Jun 2006) | 10 lines
pprint functions used to sort a dict (by key) if and only if
the output required more than one line. "Small" dicts got
displayed in seemingly random order (the hash-induced order
produced by dict.__repr__). None of this was documented.
Now pprint functions always sort dicts by key, and the docs
promise it.
This was proposed and agreed to during the PyCon 2006 core
sprint -- I just didn't have time for it before now.
........
2006-06-08 11:42:34 -03:00
|
|
|
/* Note that, for historical reasons, PyDict_GetItem() suppresses all errors
|
|
|
|
* that may occur (originally dicts supported only string keys, and exceptions
|
|
|
|
* weren't possible). So, while the original intent was that a NULL return
|
Merged revisions 46753-51188 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r46755 | brett.cannon | 2006-06-08 18:23:04 +0200 (Thu, 08 Jun 2006) | 4 lines
Make binascii.hexlify() use s# for its arguments instead of t# to actually
match its documentation stating it accepts any read-only buffer.
........
r46757 | brett.cannon | 2006-06-08 19:00:45 +0200 (Thu, 08 Jun 2006) | 8 lines
Buffer objects would return the read or write buffer for a wrapped object when
the char buffer was requested. Now it actually returns the char buffer if
available or raises a TypeError if it isn't (as is raised for the other buffer
types if they are not present but requested).
Not a backport candidate since it does change semantics of the buffer object
(although it could be argued this is enough of a bug to bother backporting).
........
r46760 | andrew.kuchling | 2006-06-09 03:10:17 +0200 (Fri, 09 Jun 2006) | 1 line
Update functools section
........
r46762 | tim.peters | 2006-06-09 04:11:02 +0200 (Fri, 09 Jun 2006) | 6 lines
Whitespace normalization.
Since test_file is implicated in mysterious test failures
when followed by test_optparse, if I had any brains I'd
look at the checkin that last changed test_file ;-)
........
r46763 | tim.peters | 2006-06-09 05:09:42 +0200 (Fri, 09 Jun 2006) | 5 lines
To boost morale :-), force test_optparse to run immediately
after test_file until we can figure out how to fix it.
(See python-dev; at the moment we don't even know which checkin
caused the problem.)
........
r46764 | tim.peters | 2006-06-09 05:51:41 +0200 (Fri, 09 Jun 2006) | 6 lines
AutoFileTests.tearDown(): Removed mysterious undocumented
try/except. Remove TESTFN.
Throughout: used open() instead of file(), and wrapped
long lines.
........
r46765 | tim.peters | 2006-06-09 06:02:06 +0200 (Fri, 09 Jun 2006) | 8 lines
testUnicodeOpen(): I have no idea why, but making this
test clean up after itself appears to fix the test failures
when test_optparse follows test_file.
test_main(): Get rid of TESTFN no matter what. That's
also enough to fix the mystery failures. Doesn't hurt
to fix them twice :-)
........
r46766 | tim.peters | 2006-06-09 07:12:40 +0200 (Fri, 09 Jun 2006) | 6 lines
Remove the temporary hack to force test_optparse to
run immediately after test_file. At least 8 buildbot
boxes passed since the underlying problem got fixed,
and they all failed before the fix, so there's no point
to this anymore.
........
r46767 | neal.norwitz | 2006-06-09 07:54:18 +0200 (Fri, 09 Jun 2006) | 1 line
Fix grammar and reflow
........
r46769 | andrew.kuchling | 2006-06-09 12:22:35 +0200 (Fri, 09 Jun 2006) | 1 line
Markup fix
........
r46773 | andrew.kuchling | 2006-06-09 15:15:57 +0200 (Fri, 09 Jun 2006) | 1 line
[Bug #1472827] Make saxutils.XMLGenerator handle \r\n\t in attribute values by escaping them properly. 2.4 bugfix candidate.
........
r46778 | kristjan.jonsson | 2006-06-09 18:28:01 +0200 (Fri, 09 Jun 2006) | 2 lines
Turn off warning about deprecated CRT functions on for VisualStudio .NET 2005.
Make the definition #ARRAYSIZE conditional. VisualStudio .NET 2005 already has it defined using a better gimmick.
........
r46779 | phillip.eby | 2006-06-09 18:40:18 +0200 (Fri, 09 Jun 2006) | 2 lines
Import wsgiref into the stdlib, as of the external version 0.1-r2181.
........
r46783 | andrew.kuchling | 2006-06-09 18:44:40 +0200 (Fri, 09 Jun 2006) | 1 line
Add note about XMLGenerator bugfix
........
r46784 | andrew.kuchling | 2006-06-09 18:46:51 +0200 (Fri, 09 Jun 2006) | 1 line
Add note about wsgiref
........
r46785 | brett.cannon | 2006-06-09 19:05:48 +0200 (Fri, 09 Jun 2006) | 2 lines
Fix inconsistency in naming within an enum.
........
r46787 | tim.peters | 2006-06-09 19:47:00 +0200 (Fri, 09 Jun 2006) | 2 lines
Whitespace normalization.
........
r46792 | georg.brandl | 2006-06-09 20:29:52 +0200 (Fri, 09 Jun 2006) | 3 lines
Test file.__exit__.
........
r46794 | brett.cannon | 2006-06-09 20:40:46 +0200 (Fri, 09 Jun 2006) | 2 lines
svn:ignore .pyc and .pyo files.
........
r46795 | georg.brandl | 2006-06-09 20:45:48 +0200 (Fri, 09 Jun 2006) | 3 lines
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
........
r46798 | andrew.kuchling | 2006-06-09 21:03:16 +0200 (Fri, 09 Jun 2006) | 1 line
Describe startswith()/endswiith() change; add reminder about wsgiref
........
r46799 | tim.peters | 2006-06-09 21:24:44 +0200 (Fri, 09 Jun 2006) | 11 lines
Implementing a happy idea from Georg Brandl: make runtest() try to
clean up files and directories the tests often leave behind by
mistake. This is the first time in history I don't have a bogus
"db_home" directory after running the tests ;-)
Also worked on runtest's docstring, to say something about all the
arguments, and to document the non-obvious return values.
New functions runtest_inner() and cleanup_test_droppings() in
support of the above.
........
r46800 | andrew.kuchling | 2006-06-09 21:43:25 +0200 (Fri, 09 Jun 2006) | 1 line
Remove unused variable
........
r46801 | andrew.kuchling | 2006-06-09 21:56:05 +0200 (Fri, 09 Jun 2006) | 1 line
Add some wsgiref text
........
r46803 | thomas.heller | 2006-06-09 21:59:11 +0200 (Fri, 09 Jun 2006) | 1 line
set eol-style svn property
........
r46804 | thomas.heller | 2006-06-09 22:01:01 +0200 (Fri, 09 Jun 2006) | 1 line
set eol-style svn property
........
r46805 | georg.brandl | 2006-06-09 22:43:48 +0200 (Fri, 09 Jun 2006) | 3 lines
Make use of new str.startswith/endswith semantics.
Occurences in email and compiler were ignored due to backwards compat requirements.
........
r46806 | brett.cannon | 2006-06-10 00:31:23 +0200 (Sat, 10 Jun 2006) | 4 lines
An object with __call__ as an attribute, when called, will have that attribute checked for __call__ itself, and will continue to look until it finds an object without the attribute. This can lead to an infinite recursion.
Closes bug #532646, again. Will be backported.
........
r46808 | brett.cannon | 2006-06-10 00:45:54 +0200 (Sat, 10 Jun 2006) | 2 lines
Fix bug introduced in rev. 46806 by not having variable declaration at the top of a block.
........
r46812 | georg.brandl | 2006-06-10 08:40:50 +0200 (Sat, 10 Jun 2006) | 4 lines
Apply perky's fix for #1503157: "/".join([u"", u""]) raising OverflowError.
Also improve error message on overflow.
........
r46817 | martin.v.loewis | 2006-06-10 10:14:03 +0200 (Sat, 10 Jun 2006) | 2 lines
Port cygwin kill_python changes from 2.4 branch.
........
r46818 | armin.rigo | 2006-06-10 12:57:40 +0200 (Sat, 10 Jun 2006) | 4 lines
SF bug #1503294.
PyThreadState_GET() complains if the tstate is NULL, but only in debug mode.
........
r46819 | martin.v.loewis | 2006-06-10 14:23:46 +0200 (Sat, 10 Jun 2006) | 4 lines
Patch #1495999: Part two of Windows CE changes.
- update header checks, using autoconf
- provide dummies for getenv, environ, and GetVersion
- adjust MSC_VER check in socketmodule.c
........
r46820 | skip.montanaro | 2006-06-10 16:09:11 +0200 (Sat, 10 Jun 2006) | 1 line
document the class, not its initializer
........
r46821 | greg.ward | 2006-06-10 18:40:01 +0200 (Sat, 10 Jun 2006) | 4 lines
Sync with Optik docs (rev 518):
* restore "Extending optparse" section
* document ALWAYS_TYPED_ACTIONS (SF #1449311)
........
r46824 | thomas.heller | 2006-06-10 21:51:46 +0200 (Sat, 10 Jun 2006) | 8 lines
Upgrade to ctypes version 0.9.9.7.
Summary of changes:
- support for 'variable sized' data
- support for anonymous structure/union fields
- fix severe bug with certain arrays or structures containing more than 256 fields
........
r46825 | thomas.heller | 2006-06-10 21:55:36 +0200 (Sat, 10 Jun 2006) | 8 lines
Upgrade to ctypes version 0.9.9.7.
Summary of changes:
- support for 'variable sized' data
- support for anonymous structure/union fields
- fix severe bug with certain arrays or structures containing more than 256 fields
........
r46826 | fred.drake | 2006-06-10 22:01:34 +0200 (Sat, 10 Jun 2006) | 4 lines
SF patch #1303595: improve description of __builtins__, explaining how it
varies between __main__ and other modules, and strongly suggest not touching
it but using __builtin__ if absolutely necessary
........
r46827 | fred.drake | 2006-06-10 22:02:58 +0200 (Sat, 10 Jun 2006) | 1 line
credit for SF patch #1303595
........
r46831 | thomas.heller | 2006-06-10 22:29:34 +0200 (Sat, 10 Jun 2006) | 2 lines
New docs for ctypes.
........
r46834 | thomas.heller | 2006-06-10 23:07:19 +0200 (Sat, 10 Jun 2006) | 1 line
Fix a wrong printf format.
........
r46835 | thomas.heller | 2006-06-10 23:17:58 +0200 (Sat, 10 Jun 2006) | 1 line
Fix the second occurrence of the problematic printf format.
........
r46837 | thomas.heller | 2006-06-10 23:56:03 +0200 (Sat, 10 Jun 2006) | 1 line
Don't use C++ comment.
........
r46838 | thomas.heller | 2006-06-11 00:01:50 +0200 (Sun, 11 Jun 2006) | 1 line
Handle failure of PyMem_Realloc.
........
r46839 | skip.montanaro | 2006-06-11 00:38:13 +0200 (Sun, 11 Jun 2006) | 2 lines
Suppress warning on MacOSX about possible use before set of proc.
........
r46840 | tim.peters | 2006-06-11 00:51:45 +0200 (Sun, 11 Jun 2006) | 8 lines
shuffle() doscstring: Removed warning about sequence length
versus generator period. While this was a real weakness of the
older WH generator for lists with just a few dozen elements,
and so could potentially bite the naive ;-), the Twister should
show excellent behavior up to at least 600 elements.
Module docstring: reflowed some jarringly short lines.
........
r46844 | greg.ward | 2006-06-11 02:40:49 +0200 (Sun, 11 Jun 2006) | 4 lines
Bug #1361643: fix textwrap.dedent() so it handles tabs appropriately,
i.e. do *not* expand tabs, but treat them as whitespace that is not
equivalent to spaces. Add a couple of test cases. Clarify docs.
........
r46850 | neal.norwitz | 2006-06-11 07:44:18 +0200 (Sun, 11 Jun 2006) | 5 lines
Fix Coverity # 146. newDBSequenceObject would deref dbobj, so it can't be NULL.
We know it's not NULL from the ParseTuple and DbObject_Check will verify
it's not NULL.
........
r46851 | neal.norwitz | 2006-06-11 07:45:25 +0200 (Sun, 11 Jun 2006) | 4 lines
Wrap some long lines
Top/Bottom factor out some common expressions
Add a XXX comment about widing offset.
........
r46852 | neal.norwitz | 2006-06-11 07:45:47 +0200 (Sun, 11 Jun 2006) | 1 line
Add versionadded to doc
........
r46853 | neal.norwitz | 2006-06-11 07:47:14 +0200 (Sun, 11 Jun 2006) | 3 lines
Update doc to make it agree with code.
Bottom factor out some common code.
........
r46854 | neal.norwitz | 2006-06-11 07:48:14 +0200 (Sun, 11 Jun 2006) | 3 lines
f_code can't be NULL based on Frame_New and other code that derefs it.
So there doesn't seem to be much point to checking here.
........
r46855 | neal.norwitz | 2006-06-11 09:26:27 +0200 (Sun, 11 Jun 2006) | 1 line
Fix errors found by pychecker
........
r46856 | neal.norwitz | 2006-06-11 09:26:50 +0200 (Sun, 11 Jun 2006) | 1 line
warnings was imported at module scope, no need to import again
........
r46857 | neal.norwitz | 2006-06-11 09:27:56 +0200 (Sun, 11 Jun 2006) | 5 lines
Fix errors found by pychecker.
I think these changes are correct, but I'm not sure. Could someone
who knows how this module works test it? It can at least start on
the cmd line.
........
r46858 | neal.norwitz | 2006-06-11 10:35:14 +0200 (Sun, 11 Jun 2006) | 1 line
Fix errors found by pychecker
........
r46859 | ronald.oussoren | 2006-06-11 16:33:36 +0200 (Sun, 11 Jun 2006) | 4 lines
This patch improves the L&F of IDLE on OSX. The changes are conditionalized on
being in an IDLE.app bundle on darwin. This does a slight reorganisation of the
menus and adds support for file-open events.
........
r46860 | greg.ward | 2006-06-11 16:42:41 +0200 (Sun, 11 Jun 2006) | 1 line
SF #1366250: optparse docs: fix inconsistency in variable name; minor tweaks.
........
r46861 | greg.ward | 2006-06-11 18:24:11 +0200 (Sun, 11 Jun 2006) | 3 lines
Bug #1498146: fix optparse to handle Unicode strings in option help,
description, and epilog.
........
r46862 | thomas.heller | 2006-06-11 19:04:22 +0200 (Sun, 11 Jun 2006) | 2 lines
Release the GIL during COM method calls, to avoid deadlocks in
Python coded COM objects.
........
r46863 | tim.peters | 2006-06-11 21:42:51 +0200 (Sun, 11 Jun 2006) | 2 lines
Whitespace normalization.
........
r46864 | tim.peters | 2006-06-11 21:43:49 +0200 (Sun, 11 Jun 2006) | 2 lines
Add missing svn:eol-style property to text files.
........
r46865 | ronald.oussoren | 2006-06-11 21:45:57 +0200 (Sun, 11 Jun 2006) | 2 lines
Remove message about using make frameworkinstall, that's no longer necesssary
........
r46866 | ronald.oussoren | 2006-06-11 22:23:29 +0200 (Sun, 11 Jun 2006) | 2 lines
Use configure to substitute the correct prefix instead of hardcoding
........
r46867 | ronald.oussoren | 2006-06-11 22:24:45 +0200 (Sun, 11 Jun 2006) | 4 lines
- Change fixapplepython23.py to ensure that it will run with /usr/bin/python
on intel macs.
- Fix some minor problems in the installer for OSX
........
r46868 | neal.norwitz | 2006-06-11 22:25:56 +0200 (Sun, 11 Jun 2006) | 5 lines
Try to fix several networking tests. The problem is that if hosts have
a search path setup, some of these hosts resolve to the wrong address.
By appending a period to the hostname, the hostname should only resolve
to what we want it to resolve to. Hopefully this doesn't break different bots.
........
r46869 | neal.norwitz | 2006-06-11 22:42:02 +0200 (Sun, 11 Jun 2006) | 7 lines
Try to fix another networking test. The problem is that if hosts have
a search path setup, some of these hosts resolve to the wrong address.
By appending a period to the hostname, the hostname should only resolve
to what we want it to resolve to. Hopefully this doesn't break different bots.
Also add more info to failure message to aid debugging test failure.
........
r46870 | neal.norwitz | 2006-06-11 22:46:46 +0200 (Sun, 11 Jun 2006) | 4 lines
Fix test on PPC64 buildbot. It raised an IOError (really an URLError which
derives from an IOError). That seems valid. Env Error includes both OSError
and IOError, so this seems like a reasonable fix.
........
r46871 | tim.peters | 2006-06-11 22:52:59 +0200 (Sun, 11 Jun 2006) | 10 lines
compare_generic_iter(): Fixed the failure of test_wsgiref's testFileWrapper
when running with -O.
test_simple_validation_error still fails under -O. That appears to be because
wsgiref's validate.py uses `assert` statements all over the place to check
arguments for sanity. That should all be changed (it's not a logical error
in the software if a user passes bogus arguments, so this isn't a reasonable
use for `assert` -- checking external preconditions should generally raise
ValueError or TypeError instead, as appropriate).
........
r46872 | neal.norwitz | 2006-06-11 23:38:38 +0200 (Sun, 11 Jun 2006) | 1 line
Get test to pass on S/390. Shout if you think this change is incorrect.
........
r46873 | neal.norwitz | 2006-06-12 04:05:55 +0200 (Mon, 12 Jun 2006) | 1 line
Cleanup Py_ssize_t a little (get rid of second #ifdef)
........
r46874 | neal.norwitz | 2006-06-12 04:06:17 +0200 (Mon, 12 Jun 2006) | 1 line
Fix some Py_ssize_t issues
........
r46875 | neal.norwitz | 2006-06-12 04:06:42 +0200 (Mon, 12 Jun 2006) | 1 line
Fix some Py_ssize_t issues
........
r46876 | neal.norwitz | 2006-06-12 04:07:24 +0200 (Mon, 12 Jun 2006) | 2 lines
Cleanup: Remove import of types to get StringTypes, we can just use basestring.
........
r46877 | neal.norwitz | 2006-06-12 04:07:57 +0200 (Mon, 12 Jun 2006) | 1 line
Don't truncate if size_t is bigger than uint
........
r46878 | neal.norwitz | 2006-06-12 04:08:41 +0200 (Mon, 12 Jun 2006) | 1 line
Don't leak the list object if there's an error allocating the item storage. Backport candidate
........
r46879 | neal.norwitz | 2006-06-12 04:09:03 +0200 (Mon, 12 Jun 2006) | 1 line
Fix typo. Backport if anyone cares. :-)
........
r46880 | neal.norwitz | 2006-06-12 04:09:34 +0200 (Mon, 12 Jun 2006) | 1 line
Fix indentation of case and a Py_ssize_t issue.
........
r46881 | neal.norwitz | 2006-06-12 04:11:18 +0200 (Mon, 12 Jun 2006) | 3 lines
Get rid of f_restricted too. Doc the other 4 ints that were already removed
at the NeedForSpeed sprint.
........
r46882 | neal.norwitz | 2006-06-12 04:13:21 +0200 (Mon, 12 Jun 2006) | 1 line
Fix the socket tests so they can be run concurrently. Backport candidate
........
r46883 | neal.norwitz | 2006-06-12 04:16:10 +0200 (Mon, 12 Jun 2006) | 1 line
i and j are initialized below when used. No need to do it twice
........
r46884 | neal.norwitz | 2006-06-12 05:05:03 +0200 (Mon, 12 Jun 2006) | 1 line
Remove unused import
........
r46885 | neal.norwitz | 2006-06-12 05:05:40 +0200 (Mon, 12 Jun 2006) | 1 line
Impl ssize_t
........
r46886 | neal.norwitz | 2006-06-12 05:33:09 +0200 (Mon, 12 Jun 2006) | 6 lines
Patch #1503046, Conditional compilation of zlib.(de)compressobj.copy
copy is only in newer versions of zlib. This should allow zlibmodule
to work with older versions like the Tru64 buildbot.
........
r46887 | phillip.eby | 2006-06-12 06:04:32 +0200 (Mon, 12 Jun 2006) | 2 lines
Sync w/external release 0.1.2. Please see PEP 360 before making changes to external packages.
........
r46888 | martin.v.loewis | 2006-06-12 06:26:31 +0200 (Mon, 12 Jun 2006) | 2 lines
Get rid of function pointer cast.
........
r46889 | thomas.heller | 2006-06-12 08:05:57 +0200 (Mon, 12 Jun 2006) | 3 lines
I don't know how that happend, but the entire file contents was
duplicated. Thanks to Simon Percivall for the heads up.
........
r46890 | nick.coghlan | 2006-06-12 10:19:37 +0200 (Mon, 12 Jun 2006) | 1 line
Fix site module docstring to match the code
........
r46891 | nick.coghlan | 2006-06-12 10:23:02 +0200 (Mon, 12 Jun 2006) | 1 line
Fix site module docstring to match the code for Mac OSX, too
........
r46892 | nick.coghlan | 2006-06-12 10:27:13 +0200 (Mon, 12 Jun 2006) | 1 line
The site module documentation also described the Windows behaviour incorrectly.
........
r46893 | nick.coghlan | 2006-06-12 12:17:11 +0200 (Mon, 12 Jun 2006) | 1 line
Make the -m switch conform to the documentation of sys.path by behaving like the -c switch
........
r46894 | kristjan.jonsson | 2006-06-12 17:45:12 +0200 (Mon, 12 Jun 2006) | 2 lines
Fix the CRT argument error handling for VisualStudio .NET 2005. Install a CRT error handler and disable the assertion for debug builds. This causes CRT to set errno to EINVAL.
This update fixes crash cases in the test suite where the default CRT error handler would cause process exit.
........
r46899 | thomas.heller | 2006-06-12 22:56:48 +0200 (Mon, 12 Jun 2006) | 1 line
Add pep-291 compatibility markers.
........
r46901 | ka-ping.yee | 2006-06-13 01:47:52 +0200 (Tue, 13 Jun 2006) | 5 lines
Add the uuid module.
This module has been tested so far on Windows XP (Python 2.4 and 2.5a2),
Mac OS X (Python 2.3, 2.4, and 2.5a2), and Linux (Python 2.4 and 2.5a2).
........
r46902 | tim.peters | 2006-06-13 02:30:01 +0200 (Tue, 13 Jun 2006) | 2 lines
Whitespace normalization.
........
r46903 | tim.peters | 2006-06-13 02:30:50 +0200 (Tue, 13 Jun 2006) | 2 lines
Added missing svn:eol-style property to text files.
........
r46905 | tim.peters | 2006-06-13 05:30:07 +0200 (Tue, 13 Jun 2006) | 5 lines
get_matching_blocks(): rewrote code & comments so they match; added
more comments about why it's this way at all; and removed what looked
like needless expense (sorting (i, j, k) triples directly should give
exactly the same order as sorting (i, (i, j, k)) pairs).
........
r46906 | neal.norwitz | 2006-06-13 06:08:53 +0200 (Tue, 13 Jun 2006) | 1 line
Don't fail if another process is listening on our port.
........
r46908 | neal.norwitz | 2006-06-13 10:28:19 +0200 (Tue, 13 Jun 2006) | 2 lines
Initialize the type object so pychecker can't crash the interpreter.
........
r46909 | neal.norwitz | 2006-06-13 10:41:06 +0200 (Tue, 13 Jun 2006) | 1 line
Verify the crash due to EncodingMap not initialized does not return
........
r46910 | thomas.heller | 2006-06-13 10:56:14 +0200 (Tue, 13 Jun 2006) | 3 lines
Add some windows datatypes that were missing from this file, and add
the aliases defined in windows header files for the structures.
........
r46911 | thomas.heller | 2006-06-13 11:40:14 +0200 (Tue, 13 Jun 2006) | 3 lines
Add back WCHAR, UINT, DOUBLE, _LARGE_INTEGER, _ULARGE_INTEGER.
VARIANT_BOOL is a special _ctypes data type, not c_short.
........
r46912 | ronald.oussoren | 2006-06-13 13:19:56 +0200 (Tue, 13 Jun 2006) | 4 lines
Linecache contains support for PEP302 loaders, but fails to deal with loaders
that return None to indicate that the module is valid but no source is
available. This patch fixes that.
........
r46913 | andrew.kuchling | 2006-06-13 13:57:04 +0200 (Tue, 13 Jun 2006) | 1 line
Mention uuid module
........
r46915 | walter.doerwald | 2006-06-13 14:02:12 +0200 (Tue, 13 Jun 2006) | 2 lines
Fix passing errors to the encoder and decoder functions.
........
r46917 | walter.doerwald | 2006-06-13 14:04:43 +0200 (Tue, 13 Jun 2006) | 3 lines
errors is an attribute in the incremental decoder
not an argument.
........
r46919 | andrew.macintyre | 2006-06-13 17:04:24 +0200 (Tue, 13 Jun 2006) | 11 lines
Patch #1454481: Make thread stack size runtime tunable.
Heavily revised, comprising revisions:
46640 - original trunk revision (backed out in r46655)
46647 - markup fix (backed out in r46655)
46692:46918 merged from branch aimacintyre-sf1454481
branch tested on buildbots (Windows buildbots had problems
not related to these changes).
........
r46920 | brett.cannon | 2006-06-13 18:06:55 +0200 (Tue, 13 Jun 2006) | 2 lines
Remove unused variable.
........
r46921 | andrew.kuchling | 2006-06-13 18:41:41 +0200 (Tue, 13 Jun 2006) | 1 line
Add ability to set stack size
........
r46923 | marc-andre.lemburg | 2006-06-13 19:04:26 +0200 (Tue, 13 Jun 2006) | 2 lines
Update pybench to version 2.0.
........
r46924 | marc-andre.lemburg | 2006-06-13 19:07:14 +0200 (Tue, 13 Jun 2006) | 2 lines
Revert wrong svn copy.
........
r46925 | andrew.macintyre | 2006-06-13 19:14:36 +0200 (Tue, 13 Jun 2006) | 2 lines
fix exception usage
........
r46927 | tim.peters | 2006-06-13 20:37:07 +0200 (Tue, 13 Jun 2006) | 2 lines
Whitespace normalization.
........
r46928 | marc-andre.lemburg | 2006-06-13 20:56:56 +0200 (Tue, 13 Jun 2006) | 9 lines
Updated to pybench 2.0.
See svn.python.org/external/pybench-2.0 for the original import of that
version.
Note that platform.py was not copied over from pybench-2.0 since
it is already part of Python 2.5.
........
r46929 | andrew.macintyre | 2006-06-13 21:02:35 +0200 (Tue, 13 Jun 2006) | 5 lines
Increase the small thread stack size to get the test
to pass reliably on the one buildbot that insists on
more than 32kB of thread stack.
........
r46930 | marc-andre.lemburg | 2006-06-13 21:20:07 +0200 (Tue, 13 Jun 2006) | 2 lines
Whitespace normalization.
........
r46931 | thomas.heller | 2006-06-13 22:18:43 +0200 (Tue, 13 Jun 2006) | 2 lines
More docs for ctypes.
........
r46932 | brett.cannon | 2006-06-13 23:34:24 +0200 (Tue, 13 Jun 2006) | 2 lines
Ignore .pyc and .pyo files in Pybench.
........
r46933 | brett.cannon | 2006-06-13 23:46:41 +0200 (Tue, 13 Jun 2006) | 7 lines
If a classic class defined a __coerce__() method that just returned its two
arguments in reverse, the interpreter would infinitely recourse trying to get a
coercion that worked. So put in a recursion check after a coercion is made and
the next call to attempt to use the coerced values.
Fixes bug #992017 and closes crashers/coerce.py .
........
r46936 | gerhard.haering | 2006-06-14 00:24:47 +0200 (Wed, 14 Jun 2006) | 3 lines
Merged changes from external pysqlite 2.3.0 release. Documentation updates will
follow in a few hours at the latest. Then we should be ready for beta1.
........
r46937 | brett.cannon | 2006-06-14 00:26:13 +0200 (Wed, 14 Jun 2006) | 2 lines
Missed test for rev. 46933; infinite recursion from __coerce__() returning its arguments reversed.
........
r46938 | gerhard.haering | 2006-06-14 00:53:48 +0200 (Wed, 14 Jun 2006) | 2 lines
Updated documentation for pysqlite 2.3.0 API.
........
r46939 | tim.peters | 2006-06-14 06:09:25 +0200 (Wed, 14 Jun 2006) | 10 lines
SequenceMatcher.get_matching_blocks(): This now guarantees that
adjacent triples in the result list describe non-adjacent matching
blocks. That's _nice_ to have, and Guido said he wanted it.
Not a bugfix candidate: Guido or not ;-), this changes visible
endcase semantics (note that some tests had to change), and
nothing about this was documented before. Since it was working
as designed, and behavior was consistent with the docs, it wasn't
"a bug".
........
r46940 | tim.peters | 2006-06-14 06:13:00 +0200 (Wed, 14 Jun 2006) | 2 lines
Repaired typo in new comment.
........
r46941 | tim.peters | 2006-06-14 06:15:27 +0200 (Wed, 14 Jun 2006) | 2 lines
Whitespace normalization.
........
r46942 | fred.drake | 2006-06-14 06:25:02 +0200 (Wed, 14 Jun 2006) | 3 lines
- make some disabled tests run what they intend when enabled
- remove some over-zealous triple-quoting
........
r46943 | fred.drake | 2006-06-14 07:04:47 +0200 (Wed, 14 Jun 2006) | 3 lines
add tests for two cases that are handled correctly in the current code,
but that SF patch 1504676 as written mis-handles
........
r46944 | fred.drake | 2006-06-14 07:15:51 +0200 (Wed, 14 Jun 2006) | 1 line
explain an XXX in more detail
........
r46945 | martin.v.loewis | 2006-06-14 07:21:04 +0200 (Wed, 14 Jun 2006) | 1 line
Patch #1455898: Incremental mode for "mbcs" codec.
........
r46946 | georg.brandl | 2006-06-14 08:08:31 +0200 (Wed, 14 Jun 2006) | 3 lines
Bug #1339007: Shelf objects now don't raise an exception in their
__del__ method when initialization failed.
........
r46948 | thomas.heller | 2006-06-14 08:18:15 +0200 (Wed, 14 Jun 2006) | 1 line
Fix docstring.
........
r46949 | georg.brandl | 2006-06-14 08:29:07 +0200 (Wed, 14 Jun 2006) | 2 lines
Bug #1501122: mention __gt__ &co in description of comparison order.
........
r46951 | thomas.heller | 2006-06-14 09:08:38 +0200 (Wed, 14 Jun 2006) | 1 line
Write more docs.
........
r46952 | georg.brandl | 2006-06-14 10:31:39 +0200 (Wed, 14 Jun 2006) | 3 lines
Bug #1153163: describe __add__ vs __radd__ behavior when adding
objects of same type/of subclasses of the other.
........
r46954 | georg.brandl | 2006-06-14 10:42:11 +0200 (Wed, 14 Jun 2006) | 3 lines
Bug #1202018: add some common mime.types locations.
........
r46955 | georg.brandl | 2006-06-14 10:50:03 +0200 (Wed, 14 Jun 2006) | 3 lines
Bug #1117556: SimpleHTTPServer now tries to find and use the system's
mime.types file for determining MIME types.
........
r46957 | thomas.heller | 2006-06-14 11:09:08 +0200 (Wed, 14 Jun 2006) | 1 line
Document paramflags.
........
r46958 | thomas.heller | 2006-06-14 11:20:11 +0200 (Wed, 14 Jun 2006) | 1 line
Add an __all__ list, since this module does 'from ctypes import *'.
........
r46959 | andrew.kuchling | 2006-06-14 15:59:15 +0200 (Wed, 14 Jun 2006) | 1 line
Add item
........
r46961 | georg.brandl | 2006-06-14 18:46:43 +0200 (Wed, 14 Jun 2006) | 3 lines
Bug #805015: doc error in PyUnicode_FromEncodedObject.
........
r46962 | gerhard.haering | 2006-06-15 00:28:37 +0200 (Thu, 15 Jun 2006) | 10 lines
- Added version checks in C code to make sure we don't trigger bugs in older
SQLite versions.
- Added version checks in test suite so that we don't execute tests that we
know will fail with older (buggy) SQLite versions.
Now, all tests should run against all SQLite versions from 3.0.8 until 3.3.6
(latest one now). The sqlite3 module can be built against all these SQLite
versions and the sqlite3 module does its best to not trigger bugs in SQLite,
but using SQLite 3.3.3 or later is recommended.
........
r46963 | tim.peters | 2006-06-15 00:38:13 +0200 (Thu, 15 Jun 2006) | 2 lines
Whitespace normalization.
........
r46964 | neal.norwitz | 2006-06-15 06:54:29 +0200 (Thu, 15 Jun 2006) | 9 lines
Speculative checkin (requires approval of Gerhard Haering)
This backs out the test changes in 46962 which prevented crashes
by not running the tests via a version check. All the version checks
added in that rev were removed from the tests.
Code was added to the error handler in connection.c that seems
to work with older versions of sqlite including 3.1.3.
........
r46965 | neal.norwitz | 2006-06-15 07:55:49 +0200 (Thu, 15 Jun 2006) | 1 line
Try to narrow window of failure on slow/busy boxes (ppc64 buildbot)
........
r46966 | martin.v.loewis | 2006-06-15 08:45:05 +0200 (Thu, 15 Jun 2006) | 2 lines
Make import/lookup of mbcs fail on non-Windows systems.
........
r46967 | ronald.oussoren | 2006-06-15 10:14:18 +0200 (Thu, 15 Jun 2006) | 2 lines
Patch #1446489 (zipfile: support for ZIP64)
........
r46968 | neal.norwitz | 2006-06-15 10:16:44 +0200 (Thu, 15 Jun 2006) | 6 lines
Re-revert this change. Install the version check and don't run the test
until Gerhard has time to fully debug the issue. This affects versions
before 3.2.1 (possibly only versions earlier than 3.1.3).
Based on discussion on python-checkins.
........
r46969 | gregory.p.smith | 2006-06-15 10:52:32 +0200 (Thu, 15 Jun 2006) | 6 lines
- bsddb: multithreaded DB access using the simple bsddb module interface
now works reliably. It has been updated to use automatic BerkeleyDB
deadlock detection and the bsddb.dbutils.DeadlockWrap wrapper to retry
database calls that would previously deadlock. [SF python bug #775414]
........
r46970 | gregory.p.smith | 2006-06-15 11:23:52 +0200 (Thu, 15 Jun 2006) | 2 lines
minor documentation cleanup. mention the bsddb.db interface explicitly by name.
........
r46971 | neal.norwitz | 2006-06-15 11:57:03 +0200 (Thu, 15 Jun 2006) | 5 lines
Steal the trick from test_compiler to print out a slow msg.
This will hopefully get the buildbots to pass. Not sure this
test will be feasible or even work. But everything is red now,
so it can't get much worse.
........
r46972 | neal.norwitz | 2006-06-15 12:24:49 +0200 (Thu, 15 Jun 2006) | 1 line
Print some more info to get an idea of how much longer the test will last
........
r46981 | tim.peters | 2006-06-15 20:04:40 +0200 (Thu, 15 Jun 2006) | 6 lines
Try to reduce the extreme peak memory and disk-space use
of this test. It probably still requires more disk space
than most buildbots have, and in any case is still so
intrusive that if we don't find another way to test this I'm
taking my buildbot offline permanently ;-)
........
r46982 | tim.peters | 2006-06-15 20:06:29 +0200 (Thu, 15 Jun 2006) | 2 lines
Whitespace normalization.
........
r46983 | tim.peters | 2006-06-15 20:07:28 +0200 (Thu, 15 Jun 2006) | 2 lines
Add missing svn:eol-style property to text files.
........
r46984 | tim.peters | 2006-06-15 20:38:19 +0200 (Thu, 15 Jun 2006) | 2 lines
Oops -- I introduced an off-by-6436159488 error.
........
r46990 | neal.norwitz | 2006-06-16 06:30:34 +0200 (Fri, 16 Jun 2006) | 1 line
Disable this test until we can determine what to do about it
........
r46991 | neal.norwitz | 2006-06-16 06:31:06 +0200 (Fri, 16 Jun 2006) | 1 line
Param name is dir, not directory. Update docstring. Backport candidate
........
r46992 | neal.norwitz | 2006-06-16 06:31:28 +0200 (Fri, 16 Jun 2006) | 1 line
Add missing period in comment.
........
r46993 | neal.norwitz | 2006-06-16 06:32:43 +0200 (Fri, 16 Jun 2006) | 1 line
Fix whitespace, there are memory leaks in this module.
........
r46995 | fred.drake | 2006-06-17 01:45:06 +0200 (Sat, 17 Jun 2006) | 3 lines
SF patch 1504676: Make sgmllib char and entity references pluggable
(implementation/tests contributed by Sam Ruby)
........
r46996 | fred.drake | 2006-06-17 03:07:54 +0200 (Sat, 17 Jun 2006) | 1 line
fix change that broke the htmllib tests
........
r46998 | martin.v.loewis | 2006-06-17 11:15:14 +0200 (Sat, 17 Jun 2006) | 3 lines
Patch #763580: Add name and value arguments to
Tkinter variable classes.
........
r46999 | martin.v.loewis | 2006-06-17 11:20:41 +0200 (Sat, 17 Jun 2006) | 2 lines
Patch #1096231: Add default argument to wm_iconbitmap.
........
r47000 | martin.v.loewis | 2006-06-17 11:25:15 +0200 (Sat, 17 Jun 2006) | 2 lines
Patch #1494750: Destroy master after deleting children.
........
r47003 | george.yoshida | 2006-06-17 18:31:52 +0200 (Sat, 17 Jun 2006) | 2 lines
markup fix
........
r47005 | george.yoshida | 2006-06-17 18:39:13 +0200 (Sat, 17 Jun 2006) | 4 lines
Update url.
Old url returned status code:301 Moved permanently.
........
r47007 | martin.v.loewis | 2006-06-17 20:44:27 +0200 (Sat, 17 Jun 2006) | 2 lines
Patch #812986: Update the canvas even if not tracing.
........
r47008 | martin.v.loewis | 2006-06-17 21:03:26 +0200 (Sat, 17 Jun 2006) | 2 lines
Patch #815924: Restore ability to pass type= and icon=
........
r47009 | neal.norwitz | 2006-06-18 00:37:45 +0200 (Sun, 18 Jun 2006) | 1 line
Fix typo in docstring
........
r47010 | neal.norwitz | 2006-06-18 00:38:15 +0200 (Sun, 18 Jun 2006) | 1 line
Fix memory leak reported by valgrind while running test_subprocess
........
r47011 | fred.drake | 2006-06-18 04:57:35 +0200 (Sun, 18 Jun 2006) | 1 line
remove unnecessary markup
........
r47013 | neal.norwitz | 2006-06-18 21:35:01 +0200 (Sun, 18 Jun 2006) | 7 lines
Prevent spurious leaks when running regrtest.py -R. There may be more
issues that crop up from time to time, but this change seems to have been
pretty stable (no spurious warnings) for about a week.
Other modules which use threads may require similar use of
threading_setup/threading_cleanup from test_support.
........
r47014 | neal.norwitz | 2006-06-18 21:37:40 +0200 (Sun, 18 Jun 2006) | 9 lines
The hppa ubuntu box sometimes hangs forever in these tests. My guess
is that the wait is failing for some reason. Use WNOHANG, so we won't
wait until the buildbot kills the test suite.
I haven't been able to reproduce the failure, so I'm not sure if
this will help or not. Hopefully, this change will cause the test
to fail, rather than hang. That will be better since we will get
the rest of the test results. It may also help us debug the real problem.
........
r47015 | neal.norwitz | 2006-06-18 22:10:24 +0200 (Sun, 18 Jun 2006) | 1 line
Revert 47014 until it is more robust
........
r47016 | thomas.heller | 2006-06-18 23:27:04 +0200 (Sun, 18 Jun 2006) | 6 lines
Fix typos.
Fix doctest example.
Mention in the tutorial that 'errcheck' is explained in the ref manual.
Use better wording in some places.
Remoce code examples that shouldn't be in the tutorial.
Remove some XXX notices.
........
r47017 | georg.brandl | 2006-06-19 00:17:29 +0200 (Mon, 19 Jun 2006) | 3 lines
Patch #1507676: improve exception messages in abstract.c, object.c and typeobject.c.
........
r47018 | neal.norwitz | 2006-06-19 07:40:44 +0200 (Mon, 19 Jun 2006) | 1 line
Use Py_ssize_t
........
r47019 | georg.brandl | 2006-06-19 08:35:54 +0200 (Mon, 19 Jun 2006) | 3 lines
Add news entry about error msg improvement.
........
r47020 | thomas.heller | 2006-06-19 09:07:49 +0200 (Mon, 19 Jun 2006) | 2 lines
Try to repair the failing test on the OpenBSD buildbot. Trial and error...
........
r47021 | tim.peters | 2006-06-19 09:45:16 +0200 (Mon, 19 Jun 2006) | 2 lines
Whitespace normalization.
........
r47022 | walter.doerwald | 2006-06-19 10:07:50 +0200 (Mon, 19 Jun 2006) | 4 lines
Patch #1506645: add Python wrappers for the curses functions
is_term_resized, resize_term and resizeterm. This uses three
separate configure checks (one for each function).
........
r47023 | walter.doerwald | 2006-06-19 10:14:09 +0200 (Mon, 19 Jun 2006) | 2 lines
Make check order match in configure and configure.in.
........
r47024 | tim.peters | 2006-06-19 10:14:28 +0200 (Mon, 19 Jun 2006) | 3 lines
Repair KeyError when running test_threaded_import under -R,
as reported by Neal on python-dev.
........
r47025 | thomas.heller | 2006-06-19 10:32:46 +0200 (Mon, 19 Jun 2006) | 3 lines
Next try to fix the OpenBSD buildbot tests:
Use ctypes.util.find_library to locate the C runtime library
on platforms where is returns useful results.
........
r47026 | tim.peters | 2006-06-19 11:09:44 +0200 (Mon, 19 Jun 2006) | 13 lines
TestHelp.make_parser(): This was making a permanent change to
os.environ (setting envar COLUMNS), which at least caused
test_float_default() to fail if the tests were run more than once.
This repairs the test_optparse -R failures Neal reported on
python-dev. It also explains some seemingly bizarre test_optparse
failures we saw a couple weeks ago on the buildbots, when
test_optparse failed due to test_file failing to clean up after
itself, and then test_optparse failed in an entirely different
way when regrtest's -w option ran test_optparse a second time.
It's now obvious that make_parser() permanently changing os.environ
was responsible for the second half of that.
........
r47027 | anthony.baxter | 2006-06-19 14:04:15 +0200 (Mon, 19 Jun 2006) | 2 lines
Preparing for 2.5b1.
........
r47029 | fred.drake | 2006-06-19 19:31:16 +0200 (Mon, 19 Jun 2006) | 1 line
remove non-working document formats from edist
........
r47030 | gerhard.haering | 2006-06-19 23:17:35 +0200 (Mon, 19 Jun 2006) | 5 lines
Fixed a memory leak that was introduced with incorrect usage of the Python weak
reference API in pysqlite 2.2.1.
Bumbed pysqlite version number to upcoming pysqlite 2.3.1 release.
........
r47032 | ka-ping.yee | 2006-06-20 00:49:36 +0200 (Tue, 20 Jun 2006) | 2 lines
Remove Python 2.3 compatibility comment.
........
r47033 | trent.mick | 2006-06-20 01:21:25 +0200 (Tue, 20 Jun 2006) | 2 lines
Upgrade pyexpat to expat 2.0.0 (http://python.org/sf/1462338).
........
r47034 | trent.mick | 2006-06-20 01:57:41 +0200 (Tue, 20 Jun 2006) | 3 lines
[ 1295808 ] expat symbols should be namespaced in pyexpat
(http://python.org/sf/1295808)
........
r47039 | andrew.kuchling | 2006-06-20 13:52:16 +0200 (Tue, 20 Jun 2006) | 1 line
Uncomment wsgiref section
........
r47040 | andrew.kuchling | 2006-06-20 14:15:09 +0200 (Tue, 20 Jun 2006) | 1 line
Add four library items
........
r47041 | andrew.kuchling | 2006-06-20 14:19:54 +0200 (Tue, 20 Jun 2006) | 1 line
Terminology and typography fixes
........
r47042 | andrew.kuchling | 2006-06-20 15:05:12 +0200 (Tue, 20 Jun 2006) | 1 line
Add introductory paragraphs summarizing the release; minor edits
........
r47043 | andrew.kuchling | 2006-06-20 15:11:29 +0200 (Tue, 20 Jun 2006) | 1 line
Minor edits and rearrangements; markup fix
........
r47044 | andrew.kuchling | 2006-06-20 15:20:30 +0200 (Tue, 20 Jun 2006) | 1 line
[Bug #1504456] Mention xml -> xmlcore change
........
r47047 | brett.cannon | 2006-06-20 19:30:26 +0200 (Tue, 20 Jun 2006) | 2 lines
Raise TestSkipped when the test socket connection is refused.
........
r47049 | brett.cannon | 2006-06-20 21:20:17 +0200 (Tue, 20 Jun 2006) | 2 lines
Fix typo of exception name.
........
r47053 | brett.cannon | 2006-06-21 18:57:57 +0200 (Wed, 21 Jun 2006) | 5 lines
At the C level, tuple arguments are passed in directly to the exception
constructor, meaning it is treated as *args, not as a single argument. This
means using the 'message' attribute won't work (until Py3K comes around),
and so one must grab from 'arg' to get the error number.
........
r47054 | andrew.kuchling | 2006-06-21 19:10:18 +0200 (Wed, 21 Jun 2006) | 1 line
Link to LibRef module documentation
........
r47055 | andrew.kuchling | 2006-06-21 19:17:10 +0200 (Wed, 21 Jun 2006) | 1 line
Note some of Barry's work
........
r47056 | andrew.kuchling | 2006-06-21 19:17:28 +0200 (Wed, 21 Jun 2006) | 1 line
Bump version
........
r47057 | georg.brandl | 2006-06-21 19:45:17 +0200 (Wed, 21 Jun 2006) | 3 lines
fix [ 1509132 ] compiler module builds incorrect AST for TryExceptFinally
........
r47058 | georg.brandl | 2006-06-21 19:52:36 +0200 (Wed, 21 Jun 2006) | 3 lines
Make test_fcntl aware of netbsd3.
........
r47059 | georg.brandl | 2006-06-21 19:53:17 +0200 (Wed, 21 Jun 2006) | 3 lines
Patch #1509001: expected skips for netbsd3.
........
r47060 | gerhard.haering | 2006-06-21 22:55:04 +0200 (Wed, 21 Jun 2006) | 2 lines
Removed call to enable_callback_tracebacks that slipped in by accident.
........
r47061 | armin.rigo | 2006-06-21 23:58:50 +0200 (Wed, 21 Jun 2006) | 13 lines
Fix for an obscure bug introduced by revs 46806 and 46808, with a test.
The problem of checking too eagerly for recursive calls is the
following: if a RuntimeError is caused by recursion, and if code needs
to normalize it immediately (as in the 2nd test), then
PyErr_NormalizeException() needs a call to the RuntimeError class to
instantiate it, and this hits the recursion limit again... causing
PyErr_NormalizeException() to never finish.
Moved this particular recursion check to slot_tp_call(), which is not
involved in instantiating built-in exceptions.
Backport candidate.
........
r47064 | neal.norwitz | 2006-06-22 08:30:50 +0200 (Thu, 22 Jun 2006) | 3 lines
Copy the wsgiref package during make install.
........
r47065 | neal.norwitz | 2006-06-22 08:35:30 +0200 (Thu, 22 Jun 2006) | 1 line
Reset the doc date to today for the automatic doc builds
........
r47067 | andrew.kuchling | 2006-06-22 15:10:23 +0200 (Thu, 22 Jun 2006) | 1 line
Mention how to suppress warnings
........
r47069 | georg.brandl | 2006-06-22 16:46:17 +0200 (Thu, 22 Jun 2006) | 3 lines
Set lineno correctly on list, tuple and dict literals.
........
r47070 | georg.brandl | 2006-06-22 16:46:46 +0200 (Thu, 22 Jun 2006) | 4 lines
Test for correct compilation of try-except-finally stmt.
Test for correct lineno on list, tuple, dict literals.
........
r47071 | fred.drake | 2006-06-22 17:50:08 +0200 (Thu, 22 Jun 2006) | 1 line
fix markup nit
........
r47072 | brett.cannon | 2006-06-22 18:49:14 +0200 (Thu, 22 Jun 2006) | 6 lines
'warning's was improperly requiring that a command-line Warning category be
both a subclass of Warning and a subclass of types.ClassType. The latter is no
longer true thanks to new-style exceptions.
Closes bug #1510580. Thanks to AMK for the test.
........
r47073 | ronald.oussoren | 2006-06-22 20:33:54 +0200 (Thu, 22 Jun 2006) | 3 lines
MacOSX: Add a message to the first screen of the installer that tells
users how to avoid updates to their shell profile.
........
r47074 | georg.brandl | 2006-06-22 21:02:18 +0200 (Thu, 22 Jun 2006) | 3 lines
Fix my name ;)
........
r47075 | thomas.heller | 2006-06-22 21:07:36 +0200 (Thu, 22 Jun 2006) | 2 lines
Small fixes, mostly in the markup.
........
r47076 | peter.astrand | 2006-06-22 22:06:46 +0200 (Thu, 22 Jun 2006) | 1 line
Make it possible to run test_subprocess.py on Python 2.2, which lacks test_support.is_resource_enabled.
........
r47077 | peter.astrand | 2006-06-22 22:21:26 +0200 (Thu, 22 Jun 2006) | 1 line
Applied patch #1506758: Prevent MemoryErrors with large MAXFD.
........
r47079 | neal.norwitz | 2006-06-23 05:32:44 +0200 (Fri, 23 Jun 2006) | 1 line
Fix refleak
........
r47080 | fred.drake | 2006-06-23 08:03:45 +0200 (Fri, 23 Jun 2006) | 9 lines
- SF bug #853506: IP6 address parsing in sgmllib
('[' and ']' were not accepted in unquoted attribute values)
- cleaned up tests of character and entity reference decoding so the
tests cover the documented relationships among handle_charref,
handle_entityref, convert_charref, convert_codepoint, and
convert_entityref, without bringing up Unicode issues that sgmllib
cannot be involved in
........
r47085 | andrew.kuchling | 2006-06-23 21:23:40 +0200 (Fri, 23 Jun 2006) | 11 lines
Fit Makefile for the Python doc environment better; this is a step toward
including the howtos in the build process.
* Put LaTeX output in ../paper-<whatever>/.
* Put HTML output in ../html/
* Explain some of the Makefile variables
* Remove some cruft dating to my environment (e.g. the 'web' target)
This makefile isn't currently invoked by the documentation build process,
so these changes won't destabilize anything.
........
r47086 | hyeshik.chang | 2006-06-23 23:16:18 +0200 (Fri, 23 Jun 2006) | 5 lines
Bug #1511381: codec_getstreamcodec() in codec.c is corrected to
omit a default "error" argument for NULL pointer. This allows
the parser to take a codec from cjkcodecs again.
(Reported by Taewook Kang and reviewed by Walter Doerwald)
........
r47091 | ronald.oussoren | 2006-06-25 22:44:16 +0200 (Sun, 25 Jun 2006) | 6 lines
Workaround for bug #1512124
Without this patch IDLE will get unresponsive when you open the debugger
window on OSX. This is both using the system Tcl/Tk on Tiger as the latest
universal download from tk-components.sf.net.
........
r47092 | ronald.oussoren | 2006-06-25 23:14:19 +0200 (Sun, 25 Jun 2006) | 3 lines
Drop the calldll demo's for macos, calldll isn't present anymore, no need
to keep the demo's around.
........
r47093 | ronald.oussoren | 2006-06-25 23:15:58 +0200 (Sun, 25 Jun 2006) | 3 lines
Use a path without a double slash to compile the .py files after installation
(macosx, binary installer). This fixes bug #1508369 for python 2.5.
........
r47094 | ronald.oussoren | 2006-06-25 23:19:06 +0200 (Sun, 25 Jun 2006) | 3 lines
Also install the .egg-info files in Lib. This will cause wsgiref.egg-info to
be installed.
........
r47097 | andrew.kuchling | 2006-06-26 14:40:02 +0200 (Mon, 26 Jun 2006) | 1 line
[Bug #1511998] Various comments from Nick Coghlan; thanks!
........
r47098 | andrew.kuchling | 2006-06-26 14:43:43 +0200 (Mon, 26 Jun 2006) | 1 line
Describe workaround for PyRange_New()'s removal
........
r47099 | andrew.kuchling | 2006-06-26 15:08:24 +0200 (Mon, 26 Jun 2006) | 5 lines
[Bug #1512163] Fix typo.
This change will probably break tests on FreeBSD buildbots, but I'll check in
a fix for that next.
........
r47100 | andrew.kuchling | 2006-06-26 15:12:16 +0200 (Mon, 26 Jun 2006) | 9 lines
[Bug #1512163] Use one set of locking methods, lockf();
remove the flock() calls.
On FreeBSD, the two methods lockf() and flock() end up using the same
mechanism and the second one fails. A Linux man page claims that the
two methods are orthogonal (so locks acquired one way don't interact
with locks acquired the other way) but that clearly must be false.
........
r47101 | andrew.kuchling | 2006-06-26 15:23:10 +0200 (Mon, 26 Jun 2006) | 5 lines
Add a test for a conflicting lock.
On slow machines, maybe the time intervals (2 sec, 0.5 sec) will be too tight.
I'll see how the buildbots like it.
........
r47103 | andrew.kuchling | 2006-06-26 16:33:24 +0200 (Mon, 26 Jun 2006) | 1 line
Windows doesn't have os.fork(). I'll just disable this test for now
........
r47106 | andrew.kuchling | 2006-06-26 19:00:35 +0200 (Mon, 26 Jun 2006) | 9 lines
Attempt to fix build failure on OS X and Debian alpha; the symptom is
consistent with os.wait() returning immediately because some other
subprocess had previously exited; the test suite then immediately
tries to lock the mailbox and gets an error saying it's already
locked.
To fix this, do a waitpid() so the test suite only continues once
the intended child process has exited.
........
r47113 | neal.norwitz | 2006-06-27 06:06:46 +0200 (Tue, 27 Jun 2006) | 1 line
Ignore some more warnings in the dynamic linker on an older gentoo
........
r47114 | neal.norwitz | 2006-06-27 06:09:13 +0200 (Tue, 27 Jun 2006) | 6 lines
Instead of doing a make test, run the regression tests out of the installed
copy. This will hopefully catch problems where directories are added
under Lib/ but not to Makefile.pre.in. This breaks out the 2 runs
of the test suite with and without -O which is also nicer.
........
r47115 | neal.norwitz | 2006-06-27 06:12:58 +0200 (Tue, 27 Jun 2006) | 5 lines
Fix SF bug #1513032, 'make install' failure on FreeBSD 5.3.
No need to install lib-old, it's empty in 2.5.
........
r47116 | neal.norwitz | 2006-06-27 06:23:06 +0200 (Tue, 27 Jun 2006) | 1 line
Test unimportant change to verify buildbot does not try to build
........
r47117 | neal.norwitz | 2006-06-27 06:26:30 +0200 (Tue, 27 Jun 2006) | 1 line
Try again: test unimportant change to verify buildbot does not try to build
........
r47118 | neal.norwitz | 2006-06-27 06:28:56 +0200 (Tue, 27 Jun 2006) | 1 line
Verify buildbot picks up these changes (really needs testing after last change to Makefile.pre.in)
........
r47121 | vinay.sajip | 2006-06-27 09:34:37 +0200 (Tue, 27 Jun 2006) | 1 line
Removed buggy exception handling in doRollover of rotating file handlers. Exceptions now propagate to caller.
........
r47123 | ronald.oussoren | 2006-06-27 12:08:25 +0200 (Tue, 27 Jun 2006) | 3 lines
MacOSX: fix rather dumb buglet that made it impossible to create extensions on
OSX 10.3 when using a binary distribution build on 10.4.
........
r47125 | tim.peters | 2006-06-27 13:52:49 +0200 (Tue, 27 Jun 2006) | 2 lines
Whitespace normalization.
........
r47128 | ronald.oussoren | 2006-06-27 14:53:52 +0200 (Tue, 27 Jun 2006) | 8 lines
Use staticly build copies of zlib and bzip2 to build the OSX installer, that
way the resulting binaries have a better change of running on 10.3.
This patch also updates the search logic for sleepycat db3/4, without this
patch you cannot use a sleepycat build with a non-standard prefix; with this
you can (at least on OSX) if you add the prefix to CPPFLAGS/LDFLAGS at
configure-time. This change is needed to build the binary installer for OSX.
........
r47131 | ronald.oussoren | 2006-06-27 17:45:32 +0200 (Tue, 27 Jun 2006) | 5 lines
macosx: Install a libpython2.5.a inside the framework as a symlink to the actual
dylib at the root of the framework, that way tools that expect a unix-like
install (python-config, but more importantly external products like
mod_python) work correctly.
........
r47137 | neal.norwitz | 2006-06-28 07:03:22 +0200 (Wed, 28 Jun 2006) | 4 lines
According to the man pages on Gentoo Linux and Tru64, EACCES or EAGAIN
can be returned if fcntl (lockf) fails. This fixes the test failure
on Tru64 by checking for either error rather than just EAGAIN.
........
r47139 | neal.norwitz | 2006-06-28 08:28:31 +0200 (Wed, 28 Jun 2006) | 5 lines
Fix bug #1512695: cPickle.loads could crash if it was interrupted with
a KeyboardInterrupt since PyTuple_Pack was passed a NULL.
Will backport.
........
r47142 | nick.coghlan | 2006-06-28 12:41:47 +0200 (Wed, 28 Jun 2006) | 1 line
Make full module name available as __module_name__ even when __name__ is set to something else (like '__main__')
........
r47143 | armin.rigo | 2006-06-28 12:49:51 +0200 (Wed, 28 Jun 2006) | 2 lines
A couple of crashers of the "won't fix" kind.
........
r47147 | andrew.kuchling | 2006-06-28 16:25:20 +0200 (Wed, 28 Jun 2006) | 1 line
[Bug #1508766] Add docs for uuid module; docs written by George Yoshida, with minor rearrangements by me.
........
r47148 | andrew.kuchling | 2006-06-28 16:27:21 +0200 (Wed, 28 Jun 2006) | 1 line
[Bug #1508766] Add docs for uuid module; this puts the module in the 'Internet Protocols' section. Arguably this module could also have gone in the chapters on strings or encodings, maybe even the crypto chapter. Fred, please move if you see fit.
........
r47151 | georg.brandl | 2006-06-28 22:23:25 +0200 (Wed, 28 Jun 2006) | 3 lines
Fix end_fill().
........
r47153 | trent.mick | 2006-06-28 22:30:41 +0200 (Wed, 28 Jun 2006) | 2 lines
Mention the expat upgrade and pyexpat fix I put in 2.5b1.
........
r47154 | fred.drake | 2006-06-29 02:51:53 +0200 (Thu, 29 Jun 2006) | 6 lines
SF bug #1504333: sgmlib should allow angle brackets in quoted values
(modified patch by Sam Ruby; changed to use separate REs for start and end
tags to reduce matching cost for end tags; extended tests; updated to avoid
breaking previous changes to support IPv6 addresses in unquoted attribute
values)
........
r47156 | fred.drake | 2006-06-29 04:57:48 +0200 (Thu, 29 Jun 2006) | 1 line
document recent bugfixes in sgmllib
........
r47158 | neal.norwitz | 2006-06-29 06:10:08 +0200 (Thu, 29 Jun 2006) | 10 lines
Add new utility function, reap_children(), to test_support. This should
be called at the end of each test that spawns children (perhaps it
should be called from regrtest instead?). This will hopefully prevent
some of the unexplained failures in the buildbots (hppa and alpha)
during tests that spawn children. The problems were not reproducible.
There were many zombies that remained at the end of several tests.
In the worst case, this shouldn't cause any more problems,
though it may not help either. Time will tell.
........
r47159 | neal.norwitz | 2006-06-29 07:48:14 +0200 (Thu, 29 Jun 2006) | 5 lines
This should fix the buildbot failure on s/390 which can't connect to gmail.org.
It makes the error message consistent and always sends to stderr.
It would be much better for all the networking tests to hit only python.org.
........
r47161 | thomas.heller | 2006-06-29 20:34:15 +0200 (Thu, 29 Jun 2006) | 3 lines
Protect the thread api calls in the _ctypes extension module within
#ifdef WITH_THREADS/#endif blocks. Found by Sam Rushing.
........
r47162 | martin.v.loewis | 2006-06-29 20:58:44 +0200 (Thu, 29 Jun 2006) | 2 lines
Patch #1509163: MS Toolkit Compiler no longer available
........
r47163 | skip.montanaro | 2006-06-29 21:20:09 +0200 (Thu, 29 Jun 2006) | 1 line
add string methods to index
........
r47164 | vinay.sajip | 2006-06-30 02:13:08 +0200 (Fri, 30 Jun 2006) | 1 line
Fixed bug in fileConfig() which failed to clear logging._handlerList
........
r47166 | tim.peters | 2006-06-30 08:18:39 +0200 (Fri, 30 Jun 2006) | 2 lines
Whitespace normalization.
........
r47170 | neal.norwitz | 2006-06-30 09:32:16 +0200 (Fri, 30 Jun 2006) | 1 line
Silence compiler warning
........
r47171 | neal.norwitz | 2006-06-30 09:32:46 +0200 (Fri, 30 Jun 2006) | 1 line
Another problem reported by Coverity. Backport candidate.
........
r47175 | thomas.heller | 2006-06-30 19:44:54 +0200 (Fri, 30 Jun 2006) | 2 lines
Revert the use of PY_FORMAT_SIZE_T in PyErr_Format.
........
r47176 | tim.peters | 2006-06-30 20:34:51 +0200 (Fri, 30 Jun 2006) | 2 lines
Remove now-unused fidding with PY_FORMAT_SIZE_T.
........
r47177 | georg.brandl | 2006-06-30 20:47:56 +0200 (Fri, 30 Jun 2006) | 3 lines
Document decorator usage of property.
........
r47181 | fred.drake | 2006-06-30 21:29:25 +0200 (Fri, 30 Jun 2006) | 4 lines
- consistency nit: always include "()" in \function and \method
(*should* be done by the presentation, but that requires changes all over)
- avoid spreading the __name meme
........
r47188 | vinay.sajip | 2006-07-01 12:45:20 +0200 (Sat, 01 Jul 2006) | 1 line
Added entry for fileConfig() bugfix.
........
r47189 | vinay.sajip | 2006-07-01 12:47:20 +0200 (Sat, 01 Jul 2006) | 1 line
Added duplicate call to fileConfig() to ensure that it cleans up after itself correctly.
........
r47190 | martin.v.loewis | 2006-07-01 17:33:37 +0200 (Sat, 01 Jul 2006) | 2 lines
Release all forwarded functions in .close. Fixes #1513223.
........
r47191 | fred.drake | 2006-07-01 18:28:20 +0200 (Sat, 01 Jul 2006) | 7 lines
SF bug #1296433 (Expat bug #1515266): Unchecked calls to character data
handler would cause a segfault. This merges in Expat's lib/xmlparse.c
revisions 1.154 and 1.155, which fix this and a closely related problem
(the later does not affect Python).
Moved the crasher test to the tests for xml.parsers.expat.
........
r47197 | gerhard.haering | 2006-07-02 19:48:30 +0200 (Sun, 02 Jul 2006) | 4 lines
The sqlite3 module did cut off data from the SQLite database at the first null
character before sending it to a custom converter. This has been fixed now.
........
r47198 | martin.v.loewis | 2006-07-02 20:44:00 +0200 (Sun, 02 Jul 2006) | 1 line
Correct arithmetic in access on Win32. Fixes #1513646.
........
r47203 | thomas.heller | 2006-07-03 09:58:09 +0200 (Mon, 03 Jul 2006) | 1 line
Cleanup: Remove commented out code.
........
r47204 | thomas.heller | 2006-07-03 09:59:50 +0200 (Mon, 03 Jul 2006) | 1 line
Don't run the doctests with Python 2.3 because it doesn't have the ELLIPSIS flag.
........
r47205 | thomas.heller | 2006-07-03 10:04:05 +0200 (Mon, 03 Jul 2006) | 7 lines
Fixes so that _ctypes can be compiled with the MingW compiler.
It seems that the definition of '__attribute__(x)' was responsible for
the compiler ignoring the '__fastcall' attribute on the
ffi_closure_SYSV function in libffi_msvc/ffi.c, took me quite some
time to figure this out.
........
r47206 | thomas.heller | 2006-07-03 10:08:14 +0200 (Mon, 03 Jul 2006) | 11 lines
Add a new function uses_seh() to the _ctypes extension module. This
will return True if Windows Structured Exception handling (SEH) is
used when calling functions, False otherwise.
Currently, only MSVC supports SEH.
Fix the test so that it doesn't crash when run with MingW compiled
_ctypes. Note that two tests are still failing when mingw is used, I
suspect structure layout differences and function calling conventions
between MSVC and MingW.
........
r47207 | tim.peters | 2006-07-03 10:23:19 +0200 (Mon, 03 Jul 2006) | 2 lines
Whitespace normalization.
........
r47208 | martin.v.loewis | 2006-07-03 11:44:00 +0200 (Mon, 03 Jul 2006) | 3 lines
Only setup canvas when it is first created.
Fixes #1514703
........
r47209 | martin.v.loewis | 2006-07-03 12:05:30 +0200 (Mon, 03 Jul 2006) | 3 lines
Reimplement turtle.circle using a polyline, to allow correct
filling of arcs. Also fixes #1514693.
........
r47210 | martin.v.loewis | 2006-07-03 12:19:49 +0200 (Mon, 03 Jul 2006) | 3 lines
Bug #1514693: Update turtle's heading when switching between
degrees and radians.
........
r47211 | martin.v.loewis | 2006-07-03 13:12:06 +0200 (Mon, 03 Jul 2006) | 2 lines
Document functions added in 2.3 and 2.5.
........
r47212 | martin.v.loewis | 2006-07-03 14:19:50 +0200 (Mon, 03 Jul 2006) | 3 lines
Bug #1417699: Reject locale-specific decimal point in float()
and atof().
........
r47213 | martin.v.loewis | 2006-07-03 14:28:58 +0200 (Mon, 03 Jul 2006) | 3 lines
Bug #1267547: Put proper recursive setup.py call into the
spec file generated by bdist_rpm.
........
r47215 | martin.v.loewis | 2006-07-03 15:01:35 +0200 (Mon, 03 Jul 2006) | 3 lines
Patch #825417: Fix timeout processing in expect,
read_until. Will backport to 2.4.
........
r47218 | martin.v.loewis | 2006-07-03 15:47:40 +0200 (Mon, 03 Jul 2006) | 2 lines
Put method-wrappers into trashcan. Fixes #927248.
........
r47219 | andrew.kuchling | 2006-07-03 16:07:30 +0200 (Mon, 03 Jul 2006) | 1 line
[Bug #1515932] Clarify description of slice assignment
........
r47220 | andrew.kuchling | 2006-07-03 16:16:09 +0200 (Mon, 03 Jul 2006) | 4 lines
[Bug #1511911] Clarify description of optional arguments to sorted()
by improving the xref to the section on lists, and by
copying the explanations of the arguments (with a slight modification).
........
r47223 | kristjan.jonsson | 2006-07-03 16:59:05 +0200 (Mon, 03 Jul 2006) | 1 line
Fix build problems with the platform SDK on windows. It is not sufficient to test for the C compiler version when determining if we have the secure CRT from microsoft. Must test with an undocumented macro, __STDC_SECURE_LIB__ too.
........
r47224 | ronald.oussoren | 2006-07-04 14:30:22 +0200 (Tue, 04 Jul 2006) | 7 lines
Sync the darwin/x86 port libffi with the copy in PyObjC. This fixes a number
of bugs in that port. The most annoying ones were due to some subtle differences
between the document ABI and the actual implementation :-(
(there are no python unittests that fail without this patch, but without it
some of libffi's unittests fail).
........
r47234 | georg.brandl | 2006-07-05 10:21:00 +0200 (Wed, 05 Jul 2006) | 3 lines
Remove remaining references to OverflowWarning.
........
r47236 | thomas.heller | 2006-07-05 11:13:56 +0200 (Wed, 05 Jul 2006) | 3 lines
Fix the bitfield test when _ctypes is compiled with MingW. Structures
containing bitfields may have different layout on MSVC and MingW .
........
r47237 | thomas.wouters | 2006-07-05 13:03:49 +0200 (Wed, 05 Jul 2006) | 15 lines
Fix bug in passing tuples to string.Template. All other values (with working
str() or repr()) would work, just not multi-value tuples. Probably not a
backport candidate, since it changes the behaviour of passing a
single-element tuple:
>>> string.Template("$foo").substitute(dict(foo=(1,)))
'(1,)'
versus
'1'
........
r47241 | georg.brandl | 2006-07-05 16:18:45 +0200 (Wed, 05 Jul 2006) | 2 lines
Patch #1517490: fix glitches in filter() docs.
........
r47244 | georg.brandl | 2006-07-05 17:50:05 +0200 (Wed, 05 Jul 2006) | 2 lines
no need to elaborate "string".
........
r47251 | neal.norwitz | 2006-07-06 06:28:59 +0200 (Thu, 06 Jul 2006) | 3 lines
Fix refleaks reported by Shane Hathaway in SF patch #1515361. This change
contains only the changes related to leaking the copy variable.
........
r47253 | fred.drake | 2006-07-06 07:13:22 +0200 (Thu, 06 Jul 2006) | 4 lines
- back out Expat change; the final fix to Expat will be different
- change the pyexpat wrapper to not be so sensitive to this detail of the
Expat implementation (the ex-crasher test still passes)
........
r47257 | neal.norwitz | 2006-07-06 08:45:08 +0200 (Thu, 06 Jul 2006) | 1 line
Add a NEWS entry for a recent pyexpat fix
........
r47258 | martin.v.loewis | 2006-07-06 08:55:58 +0200 (Thu, 06 Jul 2006) | 2 lines
Add sqlite3.dll to the DLLs component, not to the TkDLLs component.
Fixes #1517388.
........
r47259 | martin.v.loewis | 2006-07-06 09:05:21 +0200 (Thu, 06 Jul 2006) | 1 line
Properly quote compileall and Lib paths in case TARGETDIR has a space.
........
r47260 | thomas.heller | 2006-07-06 09:50:18 +0200 (Thu, 06 Jul 2006) | 5 lines
Revert the change done in svn revision 47206:
Add a new function uses_seh() to the _ctypes extension module. This
will return True if Windows Structured Exception handling (SEH) is
used when calling functions, False otherwise.
........
r47261 | armin.rigo | 2006-07-06 09:58:18 +0200 (Thu, 06 Jul 2006) | 3 lines
A couple of examples about how to attack the fact that _PyType_Lookup()
returns a borrowed ref. Many of the calls are open to attack.
........
r47262 | thomas.heller | 2006-07-06 10:28:14 +0200 (Thu, 06 Jul 2006) | 2 lines
The test that calls a function with invalid arguments and catches the
resulting Windows access violation will not be run by default.
........
r47263 | thomas.heller | 2006-07-06 10:48:35 +0200 (Thu, 06 Jul 2006) | 5 lines
Patch #1517790: It is now possible to use custom objects in the ctypes
foreign function argtypes sequence as long as they provide a
from_param method, no longer is it required that the object is a
ctypes type.
........
r47264 | thomas.heller | 2006-07-06 10:58:40 +0200 (Thu, 06 Jul 2006) | 2 lines
Document the Struture and Union constructors.
........
r47265 | thomas.heller | 2006-07-06 11:11:22 +0200 (Thu, 06 Jul 2006) | 2 lines
Document the changes in svn revision 47263, from patch #1517790.
........
r47267 | ronald.oussoren | 2006-07-06 12:13:35 +0200 (Thu, 06 Jul 2006) | 7 lines
This patch solves the problem Skip was seeing with zlib, this patch ensures that
configure uses similar compiler flags as setup.py when doing the zlib test.
Without this patch configure would use the first shared library on the linker
path, with this patch it uses the first shared or static library on that path
just like setup.py.
........
r47268 | thomas.wouters | 2006-07-06 12:48:28 +0200 (Thu, 06 Jul 2006) | 4 lines
NEWS entry for r47267: fixing configure's zlib probing.
........
r47269 | fredrik.lundh | 2006-07-06 14:29:24 +0200 (Thu, 06 Jul 2006) | 3 lines
added XMLParser alias for cElementTree compatibility
........
r47271 | nick.coghlan | 2006-07-06 14:53:04 +0200 (Thu, 06 Jul 2006) | 1 line
Revert the __module_name__ changes made in rev 47142. We'll revisit this in Python 2.6
........
r47272 | nick.coghlan | 2006-07-06 15:04:56 +0200 (Thu, 06 Jul 2006) | 1 line
Update the tutorial section on relative imports
........
r47273 | nick.coghlan | 2006-07-06 15:35:27 +0200 (Thu, 06 Jul 2006) | 1 line
Ignore ImportWarning by default
........
r47274 | nick.coghlan | 2006-07-06 15:41:34 +0200 (Thu, 06 Jul 2006) | 1 line
Cover ImportWarning, PendingDeprecationWarning and simplefilter() in the warnings module docs
........
r47275 | nick.coghlan | 2006-07-06 15:47:18 +0200 (Thu, 06 Jul 2006) | 1 line
Add NEWS entries for the ImportWarning change and documentation update
........
r47276 | andrew.kuchling | 2006-07-06 15:57:28 +0200 (Thu, 06 Jul 2006) | 1 line
ImportWarning is now silent by default
........
r47277 | thomas.heller | 2006-07-06 17:06:05 +0200 (Thu, 06 Jul 2006) | 2 lines
Document the correct return type of PyLong_AsUnsignedLongLongMask.
........
r47278 | hyeshik.chang | 2006-07-06 17:21:52 +0200 (Thu, 06 Jul 2006) | 2 lines
Add a testcase for r47086 which fixed a bug in codec_getstreamcodec().
........
r47279 | hyeshik.chang | 2006-07-06 17:39:24 +0200 (Thu, 06 Jul 2006) | 3 lines
Test using all CJK encodings for the testcases which don't require
specific encodings.
........
r47280 | martin.v.loewis | 2006-07-06 21:28:03 +0200 (Thu, 06 Jul 2006) | 2 lines
Properly generate logical file ids. Fixes #1515998.
Also correct typo in Control.mapping.
........
r47287 | neal.norwitz | 2006-07-07 08:03:15 +0200 (Fri, 07 Jul 2006) | 17 lines
Restore rev 47014:
The hppa ubuntu box sometimes hangs forever in these tests. My guess
is that the wait is failing for some reason. Use WNOHANG, so we won't
wait until the buildbot kills the test suite.
I haven't been able to reproduce the failure, so I'm not sure if
this will help or not. Hopefully, this change will cause the test
to fail, rather than hang. That will be better since we will get
the rest of the test results. It may also help us debug the real problem.
*** The reason this originally failed was because there were many
zombie children outstanding before rev 47158 cleaned them up.
There are still hangs in test_subprocess that need to be addressed,
but that will take more work. This should close some holes.
........
r47289 | georg.brandl | 2006-07-07 10:15:12 +0200 (Fri, 07 Jul 2006) | 3 lines
Fix RFC number.
........
r50489 | neal.norwitz | 2006-07-08 07:31:37 +0200 (Sat, 08 Jul 2006) | 1 line
Fix SF bug #1519018: 'as' is now validated properly in import statements
........
r50490 | georg.brandl | 2006-07-08 14:15:27 +0200 (Sat, 08 Jul 2006) | 3 lines
Add an additional test for bug #1519018.
........
r50491 | tim.peters | 2006-07-08 21:55:05 +0200 (Sat, 08 Jul 2006) | 2 lines
Whitespace normalization.
........
r50493 | neil.schemenauer | 2006-07-09 18:16:34 +0200 (Sun, 09 Jul 2006) | 2 lines
Fix AST compiler bug #1501934: incorrect LOAD/STORE_GLOBAL generation.
........
r50495 | neil.schemenauer | 2006-07-09 23:19:29 +0200 (Sun, 09 Jul 2006) | 2 lines
Fix SF bug 1441486: bad unary minus folding in compiler.
........
r50497 | neal.norwitz | 2006-07-10 00:14:42 +0200 (Mon, 10 Jul 2006) | 4 lines
On 64 bit systems, int literals that use less than 64 bits are now ints
rather than longs. This also fixes the test for eval(-sys.maxint - 1).
........
r50500 | neal.norwitz | 2006-07-10 02:04:44 +0200 (Mon, 10 Jul 2006) | 4 lines
Bug #1512814, Fix incorrect lineno's when code at module scope
started after line 256.
........
r50501 | neal.norwitz | 2006-07-10 02:05:34 +0200 (Mon, 10 Jul 2006) | 1 line
Fix doco. Backport candidate.
........
r50503 | neal.norwitz | 2006-07-10 02:23:17 +0200 (Mon, 10 Jul 2006) | 5 lines
Part of SF patch #1484695. This removes dead code. The chksum was
already verified in .frombuf() on the lines above. If there was
a problem an exception is raised, so there was no way this condition
could have been true.
........
r50504 | neal.norwitz | 2006-07-10 03:18:57 +0200 (Mon, 10 Jul 2006) | 3 lines
Patch #1516912: improve Modules support for OpenVMS.
........
r50506 | neal.norwitz | 2006-07-10 04:36:41 +0200 (Mon, 10 Jul 2006) | 7 lines
Patch #1504046: Add documentation for xml.etree.
/F wrote the text docs, Englebert Gruber massaged it to latex and I
did some more massaging to try and improve the consistency and
fix some name mismatches between the declaration and text.
........
r50509 | martin.v.loewis | 2006-07-10 09:23:48 +0200 (Mon, 10 Jul 2006) | 2 lines
Introduce DISTUTILS_USE_SDK as a flag to determine whether the
SDK environment should be used. Fixes #1508010.
........
r50510 | martin.v.loewis | 2006-07-10 09:26:41 +0200 (Mon, 10 Jul 2006) | 1 line
Change error message to indicate that VS2003 is necessary to build extension modules, not the .NET SDK.
........
r50511 | martin.v.loewis | 2006-07-10 09:29:41 +0200 (Mon, 10 Jul 2006) | 1 line
Add svn:ignore.
........
r50512 | anthony.baxter | 2006-07-10 09:41:04 +0200 (Mon, 10 Jul 2006) | 1 line
preparing for 2.5b2
........
r50513 | thomas.heller | 2006-07-10 11:10:28 +0200 (Mon, 10 Jul 2006) | 2 lines
Fix bug #1518190: accept any integer or long value in the
ctypes.c_void_p constructor.
........
r50514 | thomas.heller | 2006-07-10 11:31:06 +0200 (Mon, 10 Jul 2006) | 3 lines
Fixed a segfault when ctypes.wintypes were imported on
non-Windows machines.
........
r50516 | thomas.heller | 2006-07-10 13:11:10 +0200 (Mon, 10 Jul 2006) | 3 lines
Assigning None to pointer type structure fields possible overwrote
wrong fields.
........
r50517 | thomas.heller | 2006-07-10 13:17:37 +0200 (Mon, 10 Jul 2006) | 5 lines
Moved the ctypes news entries from the 'Library' section into the
'Extension Modules' section where they belong, probably.
This destroyes the original order of the news entries, don't know
if that is important or not.
........
r50526 | phillip.eby | 2006-07-10 21:03:29 +0200 (Mon, 10 Jul 2006) | 2 lines
Fix SF#1516184 and add a test to prevent regression.
........
r50528 | phillip.eby | 2006-07-10 21:18:35 +0200 (Mon, 10 Jul 2006) | 2 lines
Fix SF#1457312: bad socket error handling in distutils "upload" command.
........
r50537 | peter.astrand | 2006-07-10 22:39:49 +0200 (Mon, 10 Jul 2006) | 1 line
Make it possible to run test_subprocess.py with Python 2.2, which lacks test_support.reap_children().
........
r50541 | tim.peters | 2006-07-10 23:08:24 +0200 (Mon, 10 Jul 2006) | 5 lines
After approval from Anthony, merge the tim-current_frames
branch into the trunk. This adds a new sys._current_frames()
function, which returns a dict mapping thread id to topmost
thread stack frame.
........
r50542 | tim.peters | 2006-07-10 23:11:49 +0200 (Mon, 10 Jul 2006) | 2 lines
Whitespace normalization.
........
r50553 | martin.v.loewis | 2006-07-11 00:11:28 +0200 (Tue, 11 Jul 2006) | 4 lines
Patch #1519566: Remove unused _tofill member.
Make begin_fill idempotent.
Update demo2 to demonstrate filling of concave shapes.
........
r50567 | anthony.baxter | 2006-07-11 04:04:09 +0200 (Tue, 11 Jul 2006) | 4 lines
#1494314: Fix a regression with high-numbered sockets in 2.4.3. This
means that select() on sockets > FD_SETSIZE (typically 1024) work again.
The patch makes sockets use poll() internally where available.
........
r50568 | tim.peters | 2006-07-11 04:17:48 +0200 (Tue, 11 Jul 2006) | 2 lines
Whitespace normalization.
........
r50575 | thomas.heller | 2006-07-11 18:42:05 +0200 (Tue, 11 Jul 2006) | 1 line
Add missing Py_DECREF.
........
r50576 | thomas.heller | 2006-07-11 18:44:25 +0200 (Tue, 11 Jul 2006) | 1 line
Add missing Py_DECREFs.
........
r50579 | andrew.kuchling | 2006-07-11 19:20:16 +0200 (Tue, 11 Jul 2006) | 1 line
Bump version number; add sys._current_frames
........
r50582 | thomas.heller | 2006-07-11 20:28:35 +0200 (Tue, 11 Jul 2006) | 3 lines
When a foreign function is retrived by calling __getitem__ on a ctypes
library instance, do not set it as attribute.
........
r50583 | thomas.heller | 2006-07-11 20:40:50 +0200 (Tue, 11 Jul 2006) | 2 lines
Change the ctypes version number to 1.0.0.
........
r50597 | neal.norwitz | 2006-07-12 07:26:17 +0200 (Wed, 12 Jul 2006) | 3 lines
Bug #1520864: unpacking singleton tuples in for loop (for x, in) work again.
........
r50598 | neal.norwitz | 2006-07-12 07:26:35 +0200 (Wed, 12 Jul 2006) | 1 line
Fix function name in error msg
........
r50599 | neal.norwitz | 2006-07-12 07:27:46 +0200 (Wed, 12 Jul 2006) | 4 lines
Fix uninitialized memory read reported by Valgrind when running doctest.
This could happen if size == 0.
........
r50600 | neal.norwitz | 2006-07-12 09:28:29 +0200 (Wed, 12 Jul 2006) | 1 line
Actually change the MAGIC #. Create a new section for 2.5c1 and mention the impact of changing the MAGIC #.
........
r50601 | thomas.heller | 2006-07-12 10:43:47 +0200 (Wed, 12 Jul 2006) | 3 lines
Fix #1467450: ctypes now uses RTLD_GLOBAL by default on OSX 10.3 to
load shared libraries.
........
r50604 | thomas.heller | 2006-07-12 16:25:18 +0200 (Wed, 12 Jul 2006) | 3 lines
Fix the wrong description of LibraryLoader.LoadLibrary, and document
the DEFAULT_MODE constant.
........
r50607 | georg.brandl | 2006-07-12 17:31:17 +0200 (Wed, 12 Jul 2006) | 3 lines
Accept long options "--help" and "--version".
........
r50617 | thomas.heller | 2006-07-13 11:53:47 +0200 (Thu, 13 Jul 2006) | 3 lines
A misspelled preprocessor symbol caused ctypes to be always compiled
without thread support. Replaced WITH_THREADS with WITH_THREAD.
........
r50619 | thomas.heller | 2006-07-13 19:01:14 +0200 (Thu, 13 Jul 2006) | 3 lines
Fix #1521375. When running with root priviledges, 'gcc -o /dev/null'
did overwrite /dev/null. Use a temporary file instead of /dev/null.
........
r50620 | thomas.heller | 2006-07-13 19:05:13 +0200 (Thu, 13 Jul 2006) | 2 lines
Fix misleading words.
........
r50622 | andrew.kuchling | 2006-07-13 19:37:26 +0200 (Thu, 13 Jul 2006) | 1 line
Typo fix
........
r50629 | georg.brandl | 2006-07-14 09:12:54 +0200 (Fri, 14 Jul 2006) | 3 lines
Patch #1521874: grammar errors in doanddont.tex.
........
r50630 | neal.norwitz | 2006-07-14 09:20:04 +0200 (Fri, 14 Jul 2006) | 1 line
Try to improve grammar further.
........
r50631 | martin.v.loewis | 2006-07-14 11:58:55 +0200 (Fri, 14 Jul 2006) | 1 line
Extend build_ssl to Win64, using VSExtComp.
........
r50632 | martin.v.loewis | 2006-07-14 14:10:09 +0200 (Fri, 14 Jul 2006) | 1 line
Add debug output to analyse buildbot failure.
........
r50633 | martin.v.loewis | 2006-07-14 14:31:05 +0200 (Fri, 14 Jul 2006) | 1 line
Fix Debug build of _ssl.
........
r50636 | andrew.kuchling | 2006-07-14 15:32:38 +0200 (Fri, 14 Jul 2006) | 1 line
Mention new options
........
r50638 | peter.astrand | 2006-07-14 16:04:45 +0200 (Fri, 14 Jul 2006) | 1 line
Bug #1223937: CalledProcessError.errno -> CalledProcessError.returncode.
........
r50640 | thomas.heller | 2006-07-14 17:01:05 +0200 (Fri, 14 Jul 2006) | 4 lines
Make the prototypes of our private PyUnicode_FromWideChar and
PyUnicode_AsWideChar replacement functions compatible to the official
functions by using Py_ssize_t instead of int.
........
r50643 | thomas.heller | 2006-07-14 19:51:14 +0200 (Fri, 14 Jul 2006) | 3 lines
Patch #1521817: The index range checking on ctypes arrays containing
exactly one element is enabled again.
........
r50647 | thomas.heller | 2006-07-14 20:22:50 +0200 (Fri, 14 Jul 2006) | 2 lines
Updates for the ctypes documentation.
........
r50655 | fredrik.lundh | 2006-07-14 23:45:48 +0200 (Fri, 14 Jul 2006) | 3 lines
typo
........
r50664 | george.yoshida | 2006-07-15 18:03:49 +0200 (Sat, 15 Jul 2006) | 2 lines
Bug #15187702 : ext/win-cookbook.html has a broken link to distutils
........
r50667 | bob.ippolito | 2006-07-15 18:53:15 +0200 (Sat, 15 Jul 2006) | 1 line
Patch #1220874: Update the binhex module for Mach-O.
........
r50671 | fred.drake | 2006-07-16 03:21:20 +0200 (Sun, 16 Jul 2006) | 1 line
clean up some link markup
........
r50673 | neal.norwitz | 2006-07-16 03:50:38 +0200 (Sun, 16 Jul 2006) | 4 lines
Bug #1512814, Fix incorrect lineno's when code within a function
had more than 255 blank lines. Byte codes need to go first, line #s second.
........
r50674 | neal.norwitz | 2006-07-16 04:00:32 +0200 (Sun, 16 Jul 2006) | 5 lines
a & b were dereffed above, so they are known to be valid pointers.
z is known to be NULL, nothing to DECREF.
Reported by Klockwork, #107.
........
r50675 | neal.norwitz | 2006-07-16 04:02:57 +0200 (Sun, 16 Jul 2006) | 5 lines
self is dereffed (and passed as first arg), so it's known to be good.
func is returned from PyArg_ParseTuple and also dereffed.
Reported by Klocwork, #30 (self one at least).
........
r50676 | neal.norwitz | 2006-07-16 04:05:35 +0200 (Sun, 16 Jul 2006) | 4 lines
proto was dereffed above and is known to be good. No need for X.
Reported by Klocwork, #39.
........
r50677 | neal.norwitz | 2006-07-16 04:15:27 +0200 (Sun, 16 Jul 2006) | 5 lines
Fix memory leaks in some conditions.
Reported by Klocwork #152.
........
r50678 | neal.norwitz | 2006-07-16 04:17:36 +0200 (Sun, 16 Jul 2006) | 4 lines
Fix memory leak under some conditions.
Reported by Klocwork, #98.
........
r50679 | neal.norwitz | 2006-07-16 04:22:30 +0200 (Sun, 16 Jul 2006) | 8 lines
Use sizeof(buffer) instead of duplicating the constants to ensure they won't
be wrong.
The real change is to pass (bufsz - 1) to PyOS_ascii_formatd and 1
to strncat. strncat copies n+1 bytes from src (not dest).
Reported by Klocwork #58.
........
r50680 | neal.norwitz | 2006-07-16 04:32:03 +0200 (Sun, 16 Jul 2006) | 5 lines
Handle a NULL name properly.
Reported by Klocwork #67
........
r50681 | neal.norwitz | 2006-07-16 04:35:47 +0200 (Sun, 16 Jul 2006) | 6 lines
PyFunction_SetDefaults() is documented as taking None or a tuple.
A NULL would crash the PyTuple_Check(). Now make NULL return a SystemError.
Reported by Klocwork #73.
........
r50683 | neal.norwitz | 2006-07-17 02:55:45 +0200 (Mon, 17 Jul 2006) | 5 lines
Stop INCREFing name, then checking if it's NULL. name (f_name) should never
be NULL so assert it. Fix one place where we could have passed NULL.
Reported by Klocwork #66.
........
r50684 | neal.norwitz | 2006-07-17 02:57:15 +0200 (Mon, 17 Jul 2006) | 5 lines
otherset is known to be non-NULL based on checks before and DECREF after.
DECREF otherset rather than XDECREF in error conditions too.
Reported by Klockwork #154.
........
r50685 | neal.norwitz | 2006-07-17 02:59:04 +0200 (Mon, 17 Jul 2006) | 7 lines
Reported by Klocwork #151.
v2 can be NULL if exception2 is NULL. I don't think that condition can happen,
but I'm not sure it can't either. Now the code will protect against either
being NULL.
........
r50686 | neal.norwitz | 2006-07-17 03:00:16 +0200 (Mon, 17 Jul 2006) | 1 line
Add NEWS entry for a bunch of fixes due to warnings produced by Klocworks static analysis tool.
........
r50687 | fred.drake | 2006-07-17 07:47:52 +0200 (Mon, 17 Jul 2006) | 3 lines
document xmlcore (still minimal; needs mention in each of the xml.* modules)
SF bug #1504456 (partial)
........
r50688 | georg.brandl | 2006-07-17 15:23:46 +0200 (Mon, 17 Jul 2006) | 3 lines
Remove usage of sets module (patch #1500609).
........
r50689 | georg.brandl | 2006-07-17 15:26:33 +0200 (Mon, 17 Jul 2006) | 3 lines
Add missing NEWS item (#1522771)
........
r50690 | andrew.kuchling | 2006-07-17 18:47:54 +0200 (Mon, 17 Jul 2006) | 1 line
Attribute more features
........
r50692 | kurt.kaiser | 2006-07-17 23:59:27 +0200 (Mon, 17 Jul 2006) | 8 lines
Patch 1479219 - Tal Einat
1. 'as' highlighted as builtin in comment string on import line
2. Comments such as "#False identity" which start with a keyword immediately
after the '#' character aren't colored as comments.
3. u or U beginning unicode string not correctly highlighted
Closes bug 1325071
........
r50693 | barry.warsaw | 2006-07-18 01:07:51 +0200 (Tue, 18 Jul 2006) | 16 lines
decode_rfc2231(): Be more robust against buggy RFC 2231 encodings.
Specifically, instead of raising a ValueError when there is a single tick in
the parameter, simply return that the entire string unquoted, with None for
both the charset and the language. Also, if there are more than 2 ticks in
the parameter, interpret the first three parts as the standard RFC 2231 parts,
then the rest of the parts as the encoded string.
Test cases added.
Original fewer-than-3-parts fix by Tokio Kikuchi.
Resolves SF bug # 1218081. I will back port the fix and tests to Python 2.4
(email 3.0) and Python 2.3 (email 2.5).
Also, bump the version number to email 4.0.1, removing the 'alpha' moniker.
........
r50695 | kurt.kaiser | 2006-07-18 06:03:16 +0200 (Tue, 18 Jul 2006) | 2 lines
Rebinding Tab key was inserting 'tab' instead of 'Tab'. Bug 1179168.
........
r50696 | brett.cannon | 2006-07-18 06:41:36 +0200 (Tue, 18 Jul 2006) | 6 lines
Fix bug #1520914. Starting in 2.4, time.strftime() began to check the bounds
of values in the time tuple passed in. Unfortunately people came to rely on
undocumented behaviour of setting unneeded values to 0, regardless of if it was
within the valid range. Now those values force the value internally to the
minimum value when 0 is passed in.
........
r50697 | facundo.batista | 2006-07-18 14:16:13 +0200 (Tue, 18 Jul 2006) | 1 line
Comments and docs cleanups, and some little fixes, provided by Santiágo Peresón
........
r50704 | martin.v.loewis | 2006-07-18 19:46:31 +0200 (Tue, 18 Jul 2006) | 2 lines
Patch #1524429: Use repr instead of backticks again.
........
r50706 | tim.peters | 2006-07-18 23:55:15 +0200 (Tue, 18 Jul 2006) | 2 lines
Whitespace normalization.
........
r50708 | tim.peters | 2006-07-19 02:03:19 +0200 (Wed, 19 Jul 2006) | 18 lines
SF bug 1524317: configure --without-threads fails to build
Moved the code for _PyThread_CurrentFrames() up, so it's no longer
in a huge "#ifdef WITH_THREAD" block (I didn't realize it /was/ in
one).
Changed test_sys's test_current_frames() so it passes with or without
thread supported compiled in.
Note that test_sys fails when Python is compiled without threads,
but for an unrelated reason (the old test_exit() fails with an
indirect ImportError on the `thread` module). There are also
other unrelated compilation failures without threads, in extension
modules (like ctypes); at least the core compiles again.
Do we really support --without-threads? If so, there are several
problems remaining.
........
r50713 | thomas.heller | 2006-07-19 11:09:32 +0200 (Wed, 19 Jul 2006) | 4 lines
Make sure the _ctypes extension can be compiled when WITH_THREAD is
not defined on Windows, even if that configuration is probably not
supported at all.
........
r50715 | martin.v.loewis | 2006-07-19 19:18:32 +0200 (Wed, 19 Jul 2006) | 4 lines
Revert r50706 (Whitespace normalization) and
r50697: Comments and docs cleanups, and some little fixes
per recommendation from Raymond Hettinger.
........
r50719 | phillip.eby | 2006-07-20 17:54:16 +0200 (Thu, 20 Jul 2006) | 4 lines
Fix SF#1516184 (again) and add a test to prevent regression.
(There was a problem with empty filenames still causing recursion)
........
r50720 | georg.brandl | 2006-07-20 18:28:39 +0200 (Thu, 20 Jul 2006) | 3 lines
Guard for _active being None in __del__ method.
........
r50721 | vinay.sajip | 2006-07-20 18:28:39 +0200 (Thu, 20 Jul 2006) | 1 line
Updated documentation for TimedRotatingFileHandler relating to how rollover files are named. The previous documentation was wrongly the same as for RotatingFileHandler.
........
r50731 | fred.drake | 2006-07-20 22:11:57 +0200 (Thu, 20 Jul 2006) | 1 line
markup fix
........
r50739 | kurt.kaiser | 2006-07-21 00:22:52 +0200 (Fri, 21 Jul 2006) | 7 lines
Avoid occasional failure to detect closing paren properly.
Patch 1407280 Tal Einat
M ParenMatch.py
M NEWS.txt
M CREDITS.txt
........
r50740 | vinay.sajip | 2006-07-21 01:20:12 +0200 (Fri, 21 Jul 2006) | 1 line
Addressed SF#1524081 by using a dictionary to map level names to syslog priority names, rather than a string.lower().
........
r50741 | neal.norwitz | 2006-07-21 07:29:58 +0200 (Fri, 21 Jul 2006) | 1 line
Add some asserts that we got good params passed
........
r50742 | neal.norwitz | 2006-07-21 07:31:02 +0200 (Fri, 21 Jul 2006) | 5 lines
Move the initialization of some pointers earlier. The problem is
that if we call Py_DECREF(frame) like we do if allocating locals fails,
frame_dealloc() will try to use these bogus values and crash.
........
r50743 | neal.norwitz | 2006-07-21 07:32:28 +0200 (Fri, 21 Jul 2006) | 4 lines
Handle allocation failures gracefully. Found with failmalloc.
Many (all?) of these could be backported.
........
r50745 | neal.norwitz | 2006-07-21 09:59:02 +0200 (Fri, 21 Jul 2006) | 1 line
Speel initialise write. Tanks Anthony.
........
r50746 | neal.norwitz | 2006-07-21 09:59:47 +0200 (Fri, 21 Jul 2006) | 2 lines
Handle more memory allocation failures without crashing.
........
r50754 | barry.warsaw | 2006-07-21 16:51:07 +0200 (Fri, 21 Jul 2006) | 23 lines
More RFC 2231 improvements for the email 4.0 package. As Mark Sapiro rightly
points out there are really two types of continued headers defined in this
RFC (i.e. "encoded" parameters with the form "name*0*=" and unencoded
parameters with the form "name*0="), but we were were handling them both the
same way and that isn't correct.
This patch should be much more RFC compliant in that only encoded params are
%-decoded and the charset/language information is only extract if there are
any encoded params in the segments. If there are no encoded params then the
RFC says that there will be no charset/language parts.
Note however that this will change the return value for Message.get_param() in
some cases. For example, whereas before if you had all unencoded param
continuations you would have still gotten a 3-tuple back from this method
(with charset and language == None), you will now get just a string. I don't
believe this is a backward incompatible change though because the
documentation for this method already indicates that either return value is
possible and that you must do an isinstance(val, tuple) check to discriminate
between the two. (Yeah that API kind of sucks but we can't change /that/
without breaking code.)
Test cases, some documentation updates, and a NEWS item accompany this patch.
........
r50759 | georg.brandl | 2006-07-21 19:36:31 +0200 (Fri, 21 Jul 2006) | 3 lines
Fix check for empty list (vs. None).
........
r50771 | brett.cannon | 2006-07-22 00:44:07 +0200 (Sat, 22 Jul 2006) | 2 lines
Remove an XXX marker in a comment.
........
r50773 | neal.norwitz | 2006-07-22 18:20:49 +0200 (Sat, 22 Jul 2006) | 1 line
Fix more memory allocation issues found with failmalloc.
........
r50774 | neal.norwitz | 2006-07-22 19:00:57 +0200 (Sat, 22 Jul 2006) | 1 line
Don't fail if the directory already exists
........
r50775 | greg.ward | 2006-07-23 04:25:53 +0200 (Sun, 23 Jul 2006) | 6 lines
Be a lot smarter about whether this test passes: instead of assuming
that a 2.93 sec audio file will always take 3.1 sec (as it did on the
hardware I had when I first wrote the test), expect that it will take
2.93 sec +/- 10%, and only fail if it's outside of that range.
Compute the expected
........
r50776 | kurt.kaiser | 2006-07-23 06:19:49 +0200 (Sun, 23 Jul 2006) | 2 lines
Tooltips failed on new-syle class __init__ args. Bug 1027566 Loren Guthrie
........
r50777 | neal.norwitz | 2006-07-23 09:50:36 +0200 (Sun, 23 Jul 2006) | 1 line
Handle more mem alloc issues found with failmalloc
........
r50778 | neal.norwitz | 2006-07-23 09:51:58 +0200 (Sun, 23 Jul 2006) | 5 lines
If the for loop isn't entered, entryblock will be NULL. If passed
to stackdepth_walk it will be dereffed.
Not sure if I found with failmalloc or Klockwork #55.
........
r50779 | neal.norwitz | 2006-07-23 09:53:14 +0200 (Sun, 23 Jul 2006) | 4 lines
Move the initialization of size_a down below the check for a being NULL.
Reported by Klocwork #106
........
r50780 | neal.norwitz | 2006-07-23 09:55:55 +0200 (Sun, 23 Jul 2006) | 9 lines
Check the allocation of b_objects and return if there was a failure.
Also fix a few memory leaks in other failure scenarios.
It seems that if b_objects == Py_None, we will have an extra ref to
b_objects. Add XXX comment so hopefully someone documents why the
else isn't necessary or adds it in.
Reported by Klocwork #20
........
r50781 | neal.norwitz | 2006-07-23 09:57:11 +0200 (Sun, 23 Jul 2006) | 2 lines
Fix memory leaks spotted by Klocwork #37.
........
r50782 | neal.norwitz | 2006-07-23 09:59:00 +0200 (Sun, 23 Jul 2006) | 5 lines
nextlink can be NULL if teedataobject_new fails, so use XINCREF.
Ensure that dataobj is never NULL.
Reported by Klocwork #102
........
r50783 | neal.norwitz | 2006-07-23 10:01:43 +0200 (Sun, 23 Jul 2006) | 8 lines
Ensure we don't write beyond errText. I think I got this right, but
it definitely could use some review to ensure I'm not off by one
and there's no possible overflow/wrap-around of bytes_left.
Reported by Klocwork #1.
Fix a problem if there is a failure allocating self->db.
Found with failmalloc.
........
r50784 | ronald.oussoren | 2006-07-23 11:41:09 +0200 (Sun, 23 Jul 2006) | 3 lines
Without this patch CMD-W won't close EditorWindows on MacOS X. This solves
part of bug #1517990.
........
r50785 | ronald.oussoren | 2006-07-23 11:46:11 +0200 (Sun, 23 Jul 2006) | 5 lines
Fix for bug #1517996: Class and Path browsers show Tk menu
This patch replaces the menubar that is used by AquaTk for windows without a
menubar of their own by one that is more appropriate for IDLE.
........
r50786 | andrew.macintyre | 2006-07-23 14:57:02 +0200 (Sun, 23 Jul 2006) | 2 lines
Build updates for OS/2 EMX port
........
r50787 | andrew.macintyre | 2006-07-23 15:00:04 +0200 (Sun, 23 Jul 2006) | 3 lines
bugfix: PyThread_start_new_thread() returns the thread ID, not a flag;
will backport.
........
r50789 | andrew.macintyre | 2006-07-23 15:04:00 +0200 (Sun, 23 Jul 2006) | 2 lines
Get mailbox module working on OS/2 EMX port.
........
r50791 | greg.ward | 2006-07-23 18:05:51 +0200 (Sun, 23 Jul 2006) | 1 line
Resync optparse with Optik 1.5.3: minor tweaks for/to tests.
........
r50794 | martin.v.loewis | 2006-07-24 07:05:22 +0200 (Mon, 24 Jul 2006) | 2 lines
Update list of unsupported systems. Fixes #1510853.
........
r50795 | martin.v.loewis | 2006-07-24 12:26:33 +0200 (Mon, 24 Jul 2006) | 1 line
Patch #1448199: Release GIL around ConnectRegistry.
........
r50796 | martin.v.loewis | 2006-07-24 13:54:53 +0200 (Mon, 24 Jul 2006) | 3 lines
Patch #1232023: Don't include empty path component from registry,
so that the current directory does not get added to sys.path.
Also fixes #1526785.
........
r50797 | martin.v.loewis | 2006-07-24 14:54:17 +0200 (Mon, 24 Jul 2006) | 3 lines
Bug #1524310: Properly report errors from FindNextFile in os.listdir.
Will backport to 2.4.
........
r50800 | georg.brandl | 2006-07-24 15:28:57 +0200 (Mon, 24 Jul 2006) | 7 lines
Patch #1523356: fix determining include dirs in python-config.
Also don't install "python-config" when doing altinstall, but
always install "python-config2.x" and make a link to it like
with the main executable.
........
r50802 | georg.brandl | 2006-07-24 15:46:47 +0200 (Mon, 24 Jul 2006) | 3 lines
Patch #1527744: right order of includes in order to have HAVE_CONIO_H defined properly.
........
r50803 | georg.brandl | 2006-07-24 16:09:56 +0200 (Mon, 24 Jul 2006) | 3 lines
Patch #1515343: Fix printing of deprecated string exceptions with a
value in the traceback module.
........
r50804 | kurt.kaiser | 2006-07-24 19:13:23 +0200 (Mon, 24 Jul 2006) | 7 lines
EditorWindow failed when used stand-alone if sys.ps1 not set.
Bug 1010370 Dave Florek
M EditorWindow.py
M PyShell.py
M NEWS.txt
........
r50805 | kurt.kaiser | 2006-07-24 20:05:51 +0200 (Mon, 24 Jul 2006) | 6 lines
- EditorWindow.test() was failing. Bug 1417598
M EditorWindow.py
M ScriptBinding.py
M NEWS.txt
........
r50808 | georg.brandl | 2006-07-24 22:11:35 +0200 (Mon, 24 Jul 2006) | 3 lines
Repair accidental NameError.
........
r50809 | tim.peters | 2006-07-24 23:02:15 +0200 (Mon, 24 Jul 2006) | 2 lines
Whitespace normalization.
........
r50810 | greg.ward | 2006-07-25 04:11:12 +0200 (Tue, 25 Jul 2006) | 3 lines
Don't use standard assert: want tests to fail even when run with -O.
Delete cruft.
........
r50811 | tim.peters | 2006-07-25 06:07:22 +0200 (Tue, 25 Jul 2006) | 10 lines
current_frames_with_threads(): There's actually no way
to guess /which/ line the spawned thread is in at the time
sys._current_frames() is called: we know it finished
enter_g.set(), but can't know whether the instruction
counter has advanced to the following leave_g.wait().
The latter is overwhelming most likely, but not guaranteed,
and I see that the "x86 Ubuntu dapper (icc) trunk" buildbot
found it on the other line once. Changed the test so it
passes in either case.
........
r50815 | martin.v.loewis | 2006-07-25 11:53:12 +0200 (Tue, 25 Jul 2006) | 2 lines
Bug #1525817: Don't truncate short lines in IDLE's tool tips.
........
r50816 | martin.v.loewis | 2006-07-25 12:05:47 +0200 (Tue, 25 Jul 2006) | 3 lines
Bug #978833: Really close underlying socket in _socketobject.close.
Will backport to 2.4.
........
r50817 | martin.v.loewis | 2006-07-25 12:11:14 +0200 (Tue, 25 Jul 2006) | 1 line
Revert incomplete checkin.
........
r50819 | georg.brandl | 2006-07-25 12:22:34 +0200 (Tue, 25 Jul 2006) | 4 lines
Patch #1525766: correctly pass onerror arg to recursive calls
of pkg.walk_packages. Also improve the docstrings.
........
r50825 | brett.cannon | 2006-07-25 19:32:20 +0200 (Tue, 25 Jul 2006) | 2 lines
Add comment for changes to test_ossaudiodev.
........
r50826 | brett.cannon | 2006-07-25 19:34:36 +0200 (Tue, 25 Jul 2006) | 3 lines
Fix a bug in the messages for an assert failure where not enough arguments to a string
were being converted in the format.
........
r50828 | armin.rigo | 2006-07-25 20:09:57 +0200 (Tue, 25 Jul 2006) | 2 lines
Document why is and is not a good way to fix the gc_inspection crasher.
........
r50829 | armin.rigo | 2006-07-25 20:11:07 +0200 (Tue, 25 Jul 2006) | 5 lines
Added another crasher, which hit me today (I was not intentionally
writing such code, of course, but it took some gdb time to figure out
what my bug was).
........
r50830 | armin.rigo | 2006-07-25 20:38:39 +0200 (Tue, 25 Jul 2006) | 3 lines
Document the crashers that will not go away soon as "won't fix",
and explain why.
........
r50831 | ronald.oussoren | 2006-07-25 21:13:35 +0200 (Tue, 25 Jul 2006) | 3 lines
Install the compatibility symlink to libpython.a on OSX using 'ln -sf' instead
of 'ln -s', this avoid problems when reinstalling python.
........
r50832 | ronald.oussoren | 2006-07-25 21:20:54 +0200 (Tue, 25 Jul 2006) | 7 lines
Fix for bug #1525447 (renaming to MacOSmodule.c would also work, but not
without causing problems for anyone that is on a case-insensitive filesystem).
Setup.py tries to compile the MacOS extension from MacOSmodule.c, while the
actual file is named macosmodule.c. This is no problem on the (default)
case-insensitive filesystem, but doesn't work on case-sensitive filesystems.
........
r50833 | ronald.oussoren | 2006-07-25 22:28:55 +0200 (Tue, 25 Jul 2006) | 7 lines
Fix bug #1517990: IDLE keybindings on OSX
This adds a new key definition for OSX, which is slightly different from the
classic mac definition.
Also add NEWS item for a couple of bugfixes I added recently.
........
r50834 | tim.peters | 2006-07-26 00:30:24 +0200 (Wed, 26 Jul 2006) | 2 lines
Whitespace normalization.
........
r50839 | neal.norwitz | 2006-07-26 06:00:18 +0200 (Wed, 26 Jul 2006) | 1 line
Hmm, only python2.x is installed, not plain python. Did that change recently?
........
r50840 | barry.warsaw | 2006-07-26 07:54:46 +0200 (Wed, 26 Jul 2006) | 6 lines
Forward port some fixes that were in email 2.5 but for some reason didn't make
it into email 4.0. Specifically, in Message.get_content_charset(), handle RFC
2231 headers that contain an encoding not known to Python, or a character in
the data that isn't in the charset encoding. Also forward port the
appropriate unit tests.
........
r50841 | georg.brandl | 2006-07-26 09:23:32 +0200 (Wed, 26 Jul 2006) | 3 lines
NEWS entry for #1525766.
........
r50842 | georg.brandl | 2006-07-26 09:40:17 +0200 (Wed, 26 Jul 2006) | 3 lines
Bug #1459963: properly capitalize HTTP header names.
........
r50843 | georg.brandl | 2006-07-26 10:03:10 +0200 (Wed, 26 Jul 2006) | 6 lines
Part of bug #1523610: fix miscalculation of buffer length.
Also add a guard against NULL in converttuple and add a test case
(that previously would have crashed).
........
r50844 | martin.v.loewis | 2006-07-26 14:12:56 +0200 (Wed, 26 Jul 2006) | 3 lines
Bug #978833: Really close underlying socket in _socketobject.close.
Fix httplib.HTTPConnection.getresponse to not close the
socket if it is still needed for the response.
........
r50845 | andrew.kuchling | 2006-07-26 19:16:52 +0200 (Wed, 26 Jul 2006) | 1 line
[Bug #1471938] Fix build problem on Solaris 8 by conditionalizing the use of mvwgetnstr(); it was conditionalized a few lines below. Fix from Paul Eggert. I also tried out the STRICT_SYSV_CURSES case and am therefore removing the 'untested' comment.
........
r50846 | andrew.kuchling | 2006-07-26 19:18:01 +0200 (Wed, 26 Jul 2006) | 1 line
Correct error message
........
r50847 | andrew.kuchling | 2006-07-26 19:19:39 +0200 (Wed, 26 Jul 2006) | 1 line
Minor grammar fix
........
r50848 | andrew.kuchling | 2006-07-26 19:22:21 +0200 (Wed, 26 Jul 2006) | 1 line
Put news item in right section
........
r50850 | andrew.kuchling | 2006-07-26 20:03:12 +0200 (Wed, 26 Jul 2006) | 1 line
Use sys.exc_info()
........
r50851 | andrew.kuchling | 2006-07-26 20:15:45 +0200 (Wed, 26 Jul 2006) | 1 line
Use sys.exc_info()
........
r50852 | phillip.eby | 2006-07-26 21:48:27 +0200 (Wed, 26 Jul 2006) | 4 lines
Allow the 'onerror' argument to walk_packages() to catch any Exception, not
just ImportError. This allows documentation tools to better skip unimportable
packages.
........
r50854 | tim.peters | 2006-07-27 01:23:15 +0200 (Thu, 27 Jul 2006) | 2 lines
Whitespace normalization.
........
r50855 | tim.peters | 2006-07-27 03:14:53 +0200 (Thu, 27 Jul 2006) | 21 lines
Bug #1521947: possible bug in mystrtol.c with recent gcc.
In general, C doesn't define anything about what happens when
an operation on a signed integral type overflows, and PyOS_strtol()
did several formally undefined things of that nature on signed
longs. Some version of gcc apparently tries to exploit that now,
and PyOS_strtol() could fail to detect overflow then.
Tried to repair all that, although it seems at least as likely to me
that we'll get screwed by bad platform definitions for LONG_MIN
and/or LONG_MAX now. For that reason, I don't recommend backporting
this.
Note that I have no box on which this makes a lick of difference --
can't really test it, except to note that it didn't break anything
on my boxes.
Silent change: PyOS_strtol() used to return the hard-coded 0x7fffffff
in case of overflow. Now it returns LONG_MAX. They're the same only on
32-bit boxes (although C doesn't guarantee that either ...).
........
r50856 | neal.norwitz | 2006-07-27 05:51:58 +0200 (Thu, 27 Jul 2006) | 6 lines
Don't kill a normal instance of python running on windows when checking
to kill a cygwin instance. build\\python.exe was matching a normal windows
instance. Prefix that with a \\ to ensure build is a directory and not
PCbuild. As discussed on python-dev.
........
r50857 | neal.norwitz | 2006-07-27 05:55:39 +0200 (Thu, 27 Jul 2006) | 5 lines
Closure can't be NULL at this point since we know it's a tuple.
Reported by Klocwork # 74.
........
r50858 | neal.norwitz | 2006-07-27 06:04:50 +0200 (Thu, 27 Jul 2006) | 1 line
No functional change. Add comment and assert to describe why there cannot be overflow which was reported by Klocwork. Discussed on python-dev
........
r50859 | martin.v.loewis | 2006-07-27 08:38:16 +0200 (Thu, 27 Jul 2006) | 3 lines
Bump distutils version to 2.5, as several new features
have been introduced since 2.4.
........
r50860 | andrew.kuchling | 2006-07-27 14:18:20 +0200 (Thu, 27 Jul 2006) | 1 line
Reformat docstring; fix typo
........
r50861 | georg.brandl | 2006-07-27 17:05:36 +0200 (Thu, 27 Jul 2006) | 6 lines
Add test_main() methods. These three tests were never run
by regrtest.py.
We really need a simpler testing framework.
........
r50862 | tim.peters | 2006-07-27 17:09:20 +0200 (Thu, 27 Jul 2006) | 2 lines
News for patch #1529686.
........
r50863 | tim.peters | 2006-07-27 17:11:00 +0200 (Thu, 27 Jul 2006) | 2 lines
Whitespace normalization.
........
r50864 | georg.brandl | 2006-07-27 17:38:33 +0200 (Thu, 27 Jul 2006) | 3 lines
Amend news entry.
........
r50865 | georg.brandl | 2006-07-27 18:08:15 +0200 (Thu, 27 Jul 2006) | 3 lines
Make uuid test suite pass on this box by requesting output with LC_ALL=C.
........
r50866 | andrew.kuchling | 2006-07-27 20:37:33 +0200 (Thu, 27 Jul 2006) | 1 line
Add example
........
r50867 | thomas.heller | 2006-07-27 20:39:55 +0200 (Thu, 27 Jul 2006) | 9 lines
Remove code that is no longer used (ctypes.com).
Fix the DllGetClassObject and DllCanUnloadNow so that they forward the
call to the comtypes.server.inprocserver module.
The latter was never documented, never used by published code, and
didn't work anyway, so I think it does not deserve a NEWS entry (but I
might be wrong).
........
r50868 | andrew.kuchling | 2006-07-27 20:41:21 +0200 (Thu, 27 Jul 2006) | 1 line
Typo fix ('publically' is rare, poss. non-standard)
........
r50869 | andrew.kuchling | 2006-07-27 20:42:41 +0200 (Thu, 27 Jul 2006) | 1 line
Add missing word
........
r50870 | andrew.kuchling | 2006-07-27 20:44:10 +0200 (Thu, 27 Jul 2006) | 1 line
Repair typos
........
r50872 | andrew.kuchling | 2006-07-27 20:53:33 +0200 (Thu, 27 Jul 2006) | 1 line
Update URL; add example
........
r50873 | andrew.kuchling | 2006-07-27 21:07:29 +0200 (Thu, 27 Jul 2006) | 1 line
Add punctuation mark; add some examples
........
r50874 | andrew.kuchling | 2006-07-27 21:11:07 +0200 (Thu, 27 Jul 2006) | 1 line
Mention base64 module; rewrite last sentence to be more positive
........
r50875 | andrew.kuchling | 2006-07-27 21:12:49 +0200 (Thu, 27 Jul 2006) | 1 line
If binhex is higher-level than binascii, it should come first in the chapter
........
r50876 | tim.peters | 2006-07-27 22:47:24 +0200 (Thu, 27 Jul 2006) | 28 lines
check_node(): stop spraying mystery output to stderr.
When a node number disagrees, keep track of all sources & the
node numbers they reported, and stick all that in the error message.
Changed all callers to supply a non-empty "source" argument; made
the "source" argument non-optional.
On my box, test_uuid still fails, but with the less confusing output:
AssertionError: different sources disagree on node:
from source 'getnode1', node was 00038a000015
from source 'getnode2', node was 00038a000015
from source 'ipconfig', node was 001111b2b7bf
Only the last one appears to be correct; e.g.,
C:\Code\python\PCbuild>getmac
Physical Address Transport Name
=================== ==========================================================
00-11-11-B2-B7-BF \Device\Tcpip_{190FB163-5AFD-4483-86A1-2FE16AC61FF1}
62-A1-AC-6C-FD-BE \Device\Tcpip_{8F77DF5A-EA3D-4F1D-975E-D472CEE6438A}
E2-1F-01-C6-5D-88 \Device\Tcpip_{CD18F76B-2EF3-409F-9B8A-6481EE70A1E4}
I can't find anything on my box with MAC 00-03-8a-00-00-15, and am
not clear on where that comes from.
........
r50878 | andrew.kuchling | 2006-07-28 00:40:05 +0200 (Fri, 28 Jul 2006) | 1 line
Reword paragraph
........
r50879 | andrew.kuchling | 2006-07-28 00:49:38 +0200 (Fri, 28 Jul 2006) | 1 line
Add example
........
r50880 | andrew.kuchling | 2006-07-28 00:49:54 +0200 (Fri, 28 Jul 2006) | 1 line
Add example
........
r50881 | barry.warsaw | 2006-07-28 01:43:15 +0200 (Fri, 28 Jul 2006) | 27 lines
Patch #1520294: Support for getset and member descriptors in types.py,
inspect.py, and pydoc.py. Specifically, this allows for querying the type of
an object against these built-in C types and more importantly, for getting
their docstrings printed in the interactive interpreter's help() function.
This patch includes a new built-in module called _types which provides
definitions of getset and member descriptors for use by the types.py module.
These types are exposed as types.GetSetDescriptorType and
types.MemberDescriptorType. Query functions are provided as
inspect.isgetsetdescriptor() and inspect.ismemberdescriptor(). The
implementations of these are robust enough to work with Python implementations
other than CPython, which may not have these fundamental types.
The patch also includes documentation and test suite updates.
I commit these changes now under these guiding principles:
1. Silence is assent. The release manager has not said "no", and of the few
people that cared enough to respond to the thread, the worst vote was "0".
2. It's easier to ask for forgiveness than permission.
3. It's so dang easy to revert stuff in svn, that you could view this as a
forcing function. :)
Windows build patches will follow.
........
r50882 | tim.peters | 2006-07-28 01:44:37 +0200 (Fri, 28 Jul 2006) | 4 lines
Bug #1529297: The rewrite of doctest for Python 2.4 unintentionally
lost that tests are sorted by name before being run. ``DocTestFinder``
has been changed to sort the list of tests it returns.
........
r50883 | tim.peters | 2006-07-28 01:45:48 +0200 (Fri, 28 Jul 2006) | 2 lines
Whitespace normalization.
........
r50884 | tim.peters | 2006-07-28 01:46:36 +0200 (Fri, 28 Jul 2006) | 2 lines
Add missing svn:eol-style property to text files.
........
r50885 | barry.warsaw | 2006-07-28 01:50:40 +0200 (Fri, 28 Jul 2006) | 4 lines
Enable the building of the _types module on Windows.
Note that this has only been tested for VS 2003 since that's all I have.
........
r50887 | tim.peters | 2006-07-28 02:23:15 +0200 (Fri, 28 Jul 2006) | 7 lines
defdict_reduce(): Plug leaks.
We didn't notice these before because test_defaultdict didn't
actually do anything before Georg fixed that earlier today.
Neal's next refleak run then showed test_defaultdict leaking
9 references on each run. That's repaired by this checkin.
........
r50888 | tim.peters | 2006-07-28 02:30:00 +0200 (Fri, 28 Jul 2006) | 2 lines
News about the repaired memory leak in defaultdict.
........
r50889 | gregory.p.smith | 2006-07-28 03:35:25 +0200 (Fri, 28 Jul 2006) | 7 lines
- pybsddb Bug #1527939: bsddb module DBEnv dbremove and dbrename
methods now allow their database parameter to be None as the
sleepycat API allows.
Also adds an appropriate test case for DBEnv.dbrename and dbremove.
........
r50895 | neal.norwitz | 2006-07-28 06:22:34 +0200 (Fri, 28 Jul 2006) | 1 line
Ensure the actual number matches the expected count
........
r50896 | tim.peters | 2006-07-28 06:51:59 +0200 (Fri, 28 Jul 2006) | 6 lines
Live with that "the hardware address" is an ill-defined
concept, and that different ways of trying to find "the
hardware address" may return different results. Certainly
true on both of my Windows boxes, and in different ways
(see whining on python-dev).
........
r50897 | neal.norwitz | 2006-07-28 09:21:27 +0200 (Fri, 28 Jul 2006) | 3 lines
Try to find the MAC addr on various flavours of Unix. This seems hopeless.
The reduces the test_uuid failures, but there's still another method failing.
........
r50898 | martin.v.loewis | 2006-07-28 09:45:49 +0200 (Fri, 28 Jul 2006) | 2 lines
Add UUID for upcoming 2.5b3.
........
r50899 | matt.fleming | 2006-07-28 13:27:27 +0200 (Fri, 28 Jul 2006) | 3 lines
Allow socketmodule to compile on NetBSD -current, whose bluetooth API
differs from both Linux and FreeBSD. Accepted by Neal Norwitz.
........
r50900 | andrew.kuchling | 2006-07-28 14:07:12 +0200 (Fri, 28 Jul 2006) | 1 line
[Patch #1529811] Correction to description of r|* mode
........
r50901 | andrew.kuchling | 2006-07-28 14:18:22 +0200 (Fri, 28 Jul 2006) | 1 line
Typo fix
........
r50902 | andrew.kuchling | 2006-07-28 14:32:43 +0200 (Fri, 28 Jul 2006) | 1 line
Add example
........
r50903 | andrew.kuchling | 2006-07-28 14:33:19 +0200 (Fri, 28 Jul 2006) | 1 line
Add example
........
r50904 | andrew.kuchling | 2006-07-28 14:45:55 +0200 (Fri, 28 Jul 2006) | 1 line
Don't overwrite built-in name; add some blank lines for readability
........
r50905 | andrew.kuchling | 2006-07-28 14:48:07 +0200 (Fri, 28 Jul 2006) | 1 line
Add example. Should I propagate this example to all the other DBM-ish modules, too?
........
r50912 | georg.brandl | 2006-07-28 20:31:39 +0200 (Fri, 28 Jul 2006) | 3 lines
Patch #1529686: also run test_email_codecs with regrtest.py.
........
r50913 | georg.brandl | 2006-07-28 20:36:01 +0200 (Fri, 28 Jul 2006) | 3 lines
Fix spelling.
........
r50915 | thomas.heller | 2006-07-28 21:42:40 +0200 (Fri, 28 Jul 2006) | 3 lines
Remove a useless XXX comment.
Cosmetic changes to the code so that the #ifdef _UNICODE block
doesn't mess emacs code formatting.
........
r50916 | phillip.eby | 2006-07-28 23:12:07 +0200 (Fri, 28 Jul 2006) | 5 lines
Bug #1529871: The speed enhancement patch #921466 broke Python's compliance
with PEP 302. This was fixed by adding an ``imp.NullImporter`` type that is
used in ``sys.path_importer_cache`` to cache non-directory paths and avoid
excessive filesystem operations during imports.
........
r50917 | phillip.eby | 2006-07-28 23:31:54 +0200 (Fri, 28 Jul 2006) | 2 lines
Fix svn merge spew.
........
r50918 | thomas.heller | 2006-07-28 23:43:20 +0200 (Fri, 28 Jul 2006) | 4 lines
Patch #1529514: More openbsd platforms for ctypes.
Regenerated Modules/_ctypes/libffi/configure with autoconf 2.59.
Approved by Neal.
........
r50922 | georg.brandl | 2006-07-29 10:51:21 +0200 (Sat, 29 Jul 2006) | 2 lines
Bug #835255: The "closure" argument to new.function() is now documented.
........
r50924 | georg.brandl | 2006-07-29 11:33:26 +0200 (Sat, 29 Jul 2006) | 3 lines
Bug #1441397: The compiler module now recognizes module and function
docstrings correctly as it did in Python 2.4.
........
r50925 | georg.brandl | 2006-07-29 12:25:46 +0200 (Sat, 29 Jul 2006) | 4 lines
Revert rev 42617, it was introduced to work around bug #1441397.
test_compiler now passes again.
........
r50926 | fred.drake | 2006-07-29 15:22:49 +0200 (Sat, 29 Jul 2006) | 1 line
update target version number
........
r50927 | andrew.kuchling | 2006-07-29 15:56:48 +0200 (Sat, 29 Jul 2006) | 1 line
Add example
........
r50928 | andrew.kuchling | 2006-07-29 16:04:47 +0200 (Sat, 29 Jul 2006) | 1 line
Update URL
........
r50930 | andrew.kuchling | 2006-07-29 16:08:15 +0200 (Sat, 29 Jul 2006) | 1 line
Reword paragraph to match the order of the subsequent sections
........
r50931 | andrew.kuchling | 2006-07-29 16:21:15 +0200 (Sat, 29 Jul 2006) | 1 line
[Bug #1529157] Mention raw_input() and input(); while I'm at it, reword the description a bit
........
r50932 | andrew.kuchling | 2006-07-29 16:42:48 +0200 (Sat, 29 Jul 2006) | 1 line
[Bug #1519571] Document some missing functions: setup(), title(), done()
........
r50933 | andrew.kuchling | 2006-07-29 16:43:55 +0200 (Sat, 29 Jul 2006) | 1 line
Fix docstring punctuation
........
r50934 | andrew.kuchling | 2006-07-29 17:10:32 +0200 (Sat, 29 Jul 2006) | 1 line
[Bug #1414697] Change docstring of set/frozenset types to specify that the contents are unique. Raymond, please feel free to edit or revert.
........
r50935 | andrew.kuchling | 2006-07-29 17:35:21 +0200 (Sat, 29 Jul 2006) | 1 line
[Bug #1530382] Document SSL.server(), .issuer() methods
........
r50936 | andrew.kuchling | 2006-07-29 17:42:46 +0200 (Sat, 29 Jul 2006) | 1 line
Typo fix
........
r50937 | andrew.kuchling | 2006-07-29 17:43:13 +0200 (Sat, 29 Jul 2006) | 1 line
Tweak wording
........
r50938 | matt.fleming | 2006-07-29 17:55:30 +0200 (Sat, 29 Jul 2006) | 2 lines
Fix typo
........
r50939 | andrew.kuchling | 2006-07-29 17:57:08 +0200 (Sat, 29 Jul 2006) | 6 lines
[Bug #1528258] Mention that the 'data' argument can be None.
The constructor docs referred the reader to the add_data() method's docs,
but they weren't very helpful. I've simply copied an earlier explanation
of 'data' that's more useful.
........
r50940 | andrew.kuchling | 2006-07-29 18:08:40 +0200 (Sat, 29 Jul 2006) | 1 line
Set bug/patch count. Take a bow, everyone!
........
r50941 | fred.drake | 2006-07-29 18:56:15 +0200 (Sat, 29 Jul 2006) | 18 lines
expunge the xmlcore changes:
41667, 41668 - initial switch to xmlcore
47044 - mention of xmlcore in What's New
50687 - mention of xmlcore in the library reference
re-apply xmlcore changes to xml:
41674 - line ending changes (re-applied manually), directory props
41677 - add cElementTree wrapper
41678 - PSF licensing for etree
41812 - whitespace normalization
42724 - fix svn:eol-style settings
43681, 43682 - remove Python version-compatibility cruft from minidom
46773 - fix encoding of \r\n\t in attr values in saxutils
47269 - added XMLParser alias for cElementTree compatibility
additional tests were added in Lib/test/test_sax.py that failed with
the xmlcore changes; these relate to SF bugs #1511497, #1513611
........
r50942 | andrew.kuchling | 2006-07-29 20:14:07 +0200 (Sat, 29 Jul 2006) | 17 lines
Reorganize the docs for 'file' and 'open()' after some discussion with Fred.
We want to encourage users to write open() when opening a file, but
open() was described with a single paragraph and
'file' had lots of explanation of the mode and bufsize arguments.
I've shrunk the description of 'file' to cross-reference to the 'File
objects' section, and to open() for an explanation of the arguments.
open() now has all the paragraphs about the mode string. The bufsize
argument was moved up so that it isn't buried at the end; now there's
1 paragraph on mode, 1 on bufsize, and then 3 more on mode. Various
other edits and rearrangements were made in the process.
It's probably best to read the final text and not to try to make sense
of the diffs.
........
r50943 | fred.drake | 2006-07-29 20:19:19 +0200 (Sat, 29 Jul 2006) | 1 line
restore test un-intentionally removed in the xmlcore purge (revision 50941)
........
r50944 | fred.drake | 2006-07-29 20:33:29 +0200 (Sat, 29 Jul 2006) | 3 lines
make the reference to older versions of the documentation a link
to the right page on python.org
........
r50945 | fred.drake | 2006-07-29 21:09:01 +0200 (Sat, 29 Jul 2006) | 1 line
document the footnote usage pattern
........
r50947 | fred.drake | 2006-07-29 21:14:10 +0200 (Sat, 29 Jul 2006) | 1 line
emphasize and oddball nuance of LaTeX comment syntax
........
r50948 | andrew.kuchling | 2006-07-29 21:24:04 +0200 (Sat, 29 Jul 2006) | 1 line
[Patch #1490989 from Skip Montanaro] Mention debugging builds in the API documentation. I've changed Skip's patch to point to Misc/SpecialBuilds and fiddled with the markup a bit.
........
r50949 | neal.norwitz | 2006-07-29 21:29:35 +0200 (Sat, 29 Jul 2006) | 6 lines
Disable these tests until they are reliable across platforms.
These problems may mask more important, real problems.
One or both methods are known to fail on: Solaris, OpenBSD, Debian, Ubuntu.
They pass on Windows and some Linux boxes.
........
r50950 | andrew.kuchling | 2006-07-29 21:50:37 +0200 (Sat, 29 Jul 2006) | 1 line
[Patch #1068277] Clarify that os.path.exists() can return False depending on permissions. Fred approved committing this patch in December 2004!
........
r50952 | fred.drake | 2006-07-29 22:04:42 +0200 (Sat, 29 Jul 2006) | 6 lines
SF bug #1193966: Weakref types documentation misplaced
The information about supporting weakrefs with types defined in C extensions
is moved to the Extending & Embedding manual. Py_TPFLAGS_HAVE_WEAKREFS is
no longer mentioned since it is part of Py_TPFLAGS_DEFAULT.
........
r50953 | skip.montanaro | 2006-07-29 22:06:05 +0200 (Sat, 29 Jul 2006) | 4 lines
Add a comment to the csv reader documentation that explains why the
treatment of newlines changed in 2.5. Pulled almost verbatim from a comment
by Andrew McNamara in <http://python.org/sf/1465014>.
........
r50954 | neal.norwitz | 2006-07-29 22:20:52 +0200 (Sat, 29 Jul 2006) | 3 lines
If the executable doesn't exist, there's no reason to try to start it.
This prevents garbage about command not found being printed on Solaris.
........
r50955 | fred.drake | 2006-07-29 22:21:25 +0200 (Sat, 29 Jul 2006) | 1 line
fix minor markup error that introduced extra punctuation
........
r50957 | neal.norwitz | 2006-07-29 22:37:08 +0200 (Sat, 29 Jul 2006) | 3 lines
Disable test_getnode too, since this is also unreliable.
........
r50958 | andrew.kuchling | 2006-07-29 23:27:12 +0200 (Sat, 29 Jul 2006) | 1 line
Follow TeX's conventions for hyphens
........
r50959 | andrew.kuchling | 2006-07-29 23:30:21 +0200 (Sat, 29 Jul 2006) | 1 line
Fix case for 'Unix'
........
r50960 | fred.drake | 2006-07-30 01:34:57 +0200 (Sun, 30 Jul 2006) | 1 line
markup cleanups
........
r50961 | andrew.kuchling | 2006-07-30 02:27:34 +0200 (Sun, 30 Jul 2006) | 1 line
Minor typo fixes
........
r50962 | andrew.kuchling | 2006-07-30 02:37:56 +0200 (Sun, 30 Jul 2006) | 1 line
[Bug #793553] Correct description of keyword arguments for SSL authentication
........
r50963 | tim.peters | 2006-07-30 02:58:15 +0200 (Sun, 30 Jul 2006) | 2 lines
Whitespace normalization.
........
r50964 | fred.drake | 2006-07-30 05:03:43 +0200 (Sun, 30 Jul 2006) | 1 line
lots of markup nits, most commonly Unix/unix --> \UNIX
........
r50965 | fred.drake | 2006-07-30 07:41:28 +0200 (Sun, 30 Jul 2006) | 1 line
update information on wxPython, from Robin Dunn
........
r50966 | fred.drake | 2006-07-30 07:49:49 +0200 (Sun, 30 Jul 2006) | 4 lines
remove possibly-outdated comment on what GUI toolkit is most commonly used;
it is hard to know whether this is right, and it does not add valuable reference information
at any rate
........
r50967 | fred.drake | 2006-07-30 07:55:39 +0200 (Sun, 30 Jul 2006) | 3 lines
- remove yet another reference to how commonly Tkinter is (thought to be) used
- fix an internal section reference
........
r50968 | neal.norwitz | 2006-07-30 08:53:31 +0200 (Sun, 30 Jul 2006) | 4 lines
Patch #1531113: Fix augmented assignment with yield expressions.
Also fix a SystemError when trying to assign to yield expressions.
........
r50969 | neal.norwitz | 2006-07-30 08:55:48 +0200 (Sun, 30 Jul 2006) | 5 lines
Add PyErr_WarnEx() so C code can pass the stacklevel to warnings.warn().
This provides the proper warning for struct.pack().
PyErr_Warn() is now deprecated in favor of PyErr_WarnEx().
As mentioned by Tim Peters on python-dev.
........
r50970 | neal.norwitz | 2006-07-30 08:57:04 +0200 (Sun, 30 Jul 2006) | 3 lines
Bug #1515471: string.replace() accepts character buffers again.
Pass the char* and size around rather than PyObject's.
........
r50971 | neal.norwitz | 2006-07-30 08:59:13 +0200 (Sun, 30 Jul 2006) | 1 line
Whitespace normalization
........
r50973 | georg.brandl | 2006-07-30 12:53:32 +0200 (Sun, 30 Jul 2006) | 3 lines
Clarify that __op__ methods must return NotImplemented if they don't support the operation.
........
r50974 | georg.brandl | 2006-07-30 13:07:23 +0200 (Sun, 30 Jul 2006) | 3 lines
Bug #1002398: The documentation for os.path.sameopenfile now correctly
refers to file descriptors, not file objects.
........
r50977 | martin.v.loewis | 2006-07-30 15:00:31 +0200 (Sun, 30 Jul 2006) | 3 lines
Don't copy directory stat times in shutil.copytree on Windows
Fixes #1525866.
........
r50978 | martin.v.loewis | 2006-07-30 15:14:05 +0200 (Sun, 30 Jul 2006) | 3 lines
Base __version__ on sys.version_info, as distutils is
no longer maintained separatedly.
........
r50979 | martin.v.loewis | 2006-07-30 15:27:31 +0200 (Sun, 30 Jul 2006) | 3 lines
Mention Cygwin in distutils error message about a missing VS 2003.
Fixes #1257728.
........
r50982 | martin.v.loewis | 2006-07-30 16:09:47 +0200 (Sun, 30 Jul 2006) | 5 lines
Drop usage of test -e in configure as it is not portable.
Fixes #1439538
Will backport to 2.4
Also regenerate pyconfig.h.in.
........
r50984 | georg.brandl | 2006-07-30 18:20:10 +0200 (Sun, 30 Jul 2006) | 3 lines
Fix makefile changes for python-config.
........
r50985 | george.yoshida | 2006-07-30 18:37:37 +0200 (Sun, 30 Jul 2006) | 2 lines
Rename struct.pack_to to struct.pack_into as changed in revision 46642.
........
r50986 | george.yoshida | 2006-07-30 18:41:30 +0200 (Sun, 30 Jul 2006) | 2 lines
Typo fix
........
r50987 | neal.norwitz | 2006-07-30 21:18:13 +0200 (Sun, 30 Jul 2006) | 1 line
Add some asserts and update comments
........
r50988 | neal.norwitz | 2006-07-30 21:18:38 +0200 (Sun, 30 Jul 2006) | 1 line
Verify that the signal handlers were really called
........
r50989 | neal.norwitz | 2006-07-30 21:20:42 +0200 (Sun, 30 Jul 2006) | 3 lines
Try to prevent hangs on Tru64/Alpha buildbot. I'm not certain this will help
and may need to be reverted if it causes problems.
........
r50990 | georg.brandl | 2006-07-30 22:18:51 +0200 (Sun, 30 Jul 2006) | 2 lines
Bug #1531349: right <-> left glitch in __rop__ description.
........
r50992 | tim.peters | 2006-07-31 03:46:03 +0200 (Mon, 31 Jul 2006) | 2 lines
Whitespace normalization.
........
r50993 | andrew.mcnamara | 2006-07-31 04:27:48 +0200 (Mon, 31 Jul 2006) | 2 lines
Redo the comment about the 2.5 change in quoted-newline handling.
........
r50994 | tim.peters | 2006-07-31 04:40:23 +0200 (Mon, 31 Jul 2006) | 10 lines
ZipFile.close(): Killed one of the struct.pack deprecation
warnings on Win32.
Also added an XXX about the line:
pos3 = self.fp.tell()
`pos3` is never referenced, and I have no idea what the code
intended to do instead.
........
r50996 | tim.peters | 2006-07-31 04:53:03 +0200 (Mon, 31 Jul 2006) | 8 lines
ZipFile.close(): Kill the other struct.pack deprecation
warning on Windows.
Afraid I can't detect a pattern to when the pack formats decide
to use a signed or unsigned format code -- appears nearly
arbitrary to my eyes. So I left all the pack formats alone and
changed the special-case data values instead.
........
r50997 | skip.montanaro | 2006-07-31 05:09:45 +0200 (Mon, 31 Jul 2006) | 1 line
minor tweaks
........
r50998 | skip.montanaro | 2006-07-31 05:11:11 +0200 (Mon, 31 Jul 2006) | 1 line
minor tweaks
........
r50999 | andrew.kuchling | 2006-07-31 14:20:24 +0200 (Mon, 31 Jul 2006) | 1 line
Add refcounts for PyErr_WarnEx
........
r51000 | andrew.kuchling | 2006-07-31 14:39:05 +0200 (Mon, 31 Jul 2006) | 9 lines
Document PyErr_WarnEx. (Bad Neal! No biscuit!)
Is the explanation of the 'stacklevel' parameter clear? Please feel free
to edit it.
I don't have LaTeX installed on this machine, so haven't verified that the
markup is correct. Will check tonight, or maybe the automatic doc build will
tell me.
........
r51001 | andrew.kuchling | 2006-07-31 14:52:26 +0200 (Mon, 31 Jul 2006) | 1 line
Add PyErr_WarnEx()
........
r51002 | andrew.kuchling | 2006-07-31 15:18:27 +0200 (Mon, 31 Jul 2006) | 1 line
Mention csv newline changes
........
r51003 | andrew.kuchling | 2006-07-31 17:22:58 +0200 (Mon, 31 Jul 2006) | 1 line
Typo fix
........
r51004 | andrew.kuchling | 2006-07-31 17:23:43 +0200 (Mon, 31 Jul 2006) | 1 line
Remove reference to notation
........
r51005 | georg.brandl | 2006-07-31 18:00:34 +0200 (Mon, 31 Jul 2006) | 3 lines
Fix function name.
........
r51006 | andrew.kuchling | 2006-07-31 18:10:24 +0200 (Mon, 31 Jul 2006) | 1 line
[Bug #1514540] Instead of putting the standard types in a section, put them in a chapter of their own. This means string methods will now show up in the ToC. (Should the types come before or after the functions+exceptions+constants chapter? I've put them after, for now.)
........
r51007 | andrew.kuchling | 2006-07-31 18:22:05 +0200 (Mon, 31 Jul 2006) | 1 line
[Bug #848556] Remove \d* from second alternative to avoid exponential case when repeating match
........
r51008 | andrew.kuchling | 2006-07-31 18:27:57 +0200 (Mon, 31 Jul 2006) | 1 line
Update list of files; fix a typo
........
r51013 | andrew.kuchling | 2006-08-01 18:24:30 +0200 (Tue, 01 Aug 2006) | 1 line
typo fix
........
r51018 | thomas.heller | 2006-08-01 18:54:43 +0200 (Tue, 01 Aug 2006) | 2 lines
Fix a potential segfault and various potentail refcount leaks
in the cast() function.
........
r51020 | thomas.heller | 2006-08-01 19:46:10 +0200 (Tue, 01 Aug 2006) | 1 line
Minimal useful docstring for CopyComPointer.
........
r51021 | andrew.kuchling | 2006-08-01 20:16:15 +0200 (Tue, 01 Aug 2006) | 8 lines
[Patch #1520905] Attempt to suppress core file created by test_subprocess.py.
Patch by Douglas Greiman.
The test_run_abort() testcase produces a core file on Unix systems,
even though the test is successful. This can be confusing or alarming
to someone who runs 'make test' and then finds that the Python
interpreter apparently crashed.
........
r51023 | georg.brandl | 2006-08-01 20:49:24 +0200 (Tue, 01 Aug 2006) | 3 lines
os.urandom no longer masks unrelated exceptions like SystemExit or
KeyboardInterrupt.
........
r51025 | thomas.heller | 2006-08-01 21:14:15 +0200 (Tue, 01 Aug 2006) | 2 lines
Speed up PyType_stgdict and PyObject_stgdict.
........
r51027 | ronald.oussoren | 2006-08-01 22:30:31 +0200 (Tue, 01 Aug 2006) | 3 lines
Make sure the postinstall action that optionally updates the user's profile
on MacOS X actually works correctly in all cases.
........
r51028 | ronald.oussoren | 2006-08-01 23:00:57 +0200 (Tue, 01 Aug 2006) | 4 lines
This fixes bug #1527397: PythonLauncher runs scripts with the wrong working
directory. It also fixes a bug where PythonLauncher failed to launch scripts
when the scriptname (or the path to the script) contains quotes.
........
r51031 | tim.peters | 2006-08-02 05:27:46 +0200 (Wed, 02 Aug 2006) | 2 lines
Whitespace normalization.
........
r51032 | tim.peters | 2006-08-02 06:12:36 +0200 (Wed, 02 Aug 2006) | 19 lines
Try to squash struct.pack warnings on the "amd64 gentoo trunk"
buildbot (& possibly other 64-bit boxes) during test_gzip.
The native zlib crc32 function returns an unsigned 32-bit integer,
which the Python wrapper implicitly casts to C long. Therefore the
same crc can "look negative" on a 32-bit box but "look positive" on
a 64-bit box. This patch papers over that platform difference when
writing the crc to file.
It may be better to change the Python wrapper, either to make
the result "look positive" on all platforms (which means it may
have to return a Python long at times on a 32-bit box), or to
keep the sign the same across boxes. But that would be a visible
change in what users see, while the current hack changes no
visible behavior (well, apart from stopping the struct deprecation
warning).
Note that the module-level write32() function is no longer used.
........
r51033 | neal.norwitz | 2006-08-02 06:27:11 +0200 (Wed, 02 Aug 2006) | 4 lines
Prevent memory leak on error.
Reported by Klocwork #36
........
r51034 | tim.peters | 2006-08-02 07:20:08 +0200 (Wed, 02 Aug 2006) | 9 lines
_Stream.close(): Try to kill struct.pack() warnings when
writing the crc to file on the "PPC64 Debian trunk" buildbot
when running test_tarfile.
This is again a case where the native zlib crc is an unsigned
32-bit int, but the Python wrapper implicitly casts it to
signed C long, so that "the sign bit looks different" on
different platforms.
........
r51035 | ronald.oussoren | 2006-08-02 08:10:10 +0200 (Wed, 02 Aug 2006) | 2 lines
Updated documentation for the script that builds the OSX installer.
........
r51036 | neal.norwitz | 2006-08-02 08:14:22 +0200 (Wed, 02 Aug 2006) | 2 lines
_PyWeakref_GetWeakrefCount() now returns a Py_ssize_t instead of long.
........
r51037 | neal.norwitz | 2006-08-02 08:15:10 +0200 (Wed, 02 Aug 2006) | 1 line
v is already checked for NULL, so just DECREF it
........
r51038 | neal.norwitz | 2006-08-02 08:19:19 +0200 (Wed, 02 Aug 2006) | 1 line
Let us know when there was a problem and the child had to kill the parent
........
r51039 | neal.norwitz | 2006-08-02 08:46:21 +0200 (Wed, 02 Aug 2006) | 5 lines
Patch #1519025 and bug #926423: If a KeyboardInterrupt occurs during
a socket operation on a socket with a timeout, the exception will be
caught correctly. Previously, the exception was not caught.
........
r51040 | neal.norwitz | 2006-08-02 09:09:32 +0200 (Wed, 02 Aug 2006) | 1 line
Add some explanation about Klocwork and Coverity static analysis
........
r51041 | anthony.baxter | 2006-08-02 09:43:09 +0200 (Wed, 02 Aug 2006) | 1 line
pre-release machinations
........
r51043 | thomas.heller | 2006-08-02 13:35:31 +0200 (Wed, 02 Aug 2006) | 4 lines
A few nore words about what ctypes does.
Document that using the wrong calling convention can also raise
'ValueError: Procedure called with the wrong number of arguments'.
........
r51045 | thomas.heller | 2006-08-02 14:00:13 +0200 (Wed, 02 Aug 2006) | 1 line
Fix a mistake.
........
r51046 | martin.v.loewis | 2006-08-02 15:53:55 +0200 (Wed, 02 Aug 2006) | 3 lines
Correction of patch #1455898: In the mbcs decoder, set final=False
for stream decoder, but final=True for the decode function.
........
r51049 | tim.peters | 2006-08-02 20:19:35 +0200 (Wed, 02 Aug 2006) | 2 lines
Add missing svn:eol-style property to text files.
........
r51079 | neal.norwitz | 2006-08-04 06:50:21 +0200 (Fri, 04 Aug 2006) | 3 lines
Bug #1531405, format_exception no longer raises an exception if
str(exception) raised an exception.
........
r51080 | neal.norwitz | 2006-08-04 06:58:47 +0200 (Fri, 04 Aug 2006) | 11 lines
Bug #1191458: tracing over for loops now produces a line event
on each iteration. I'm not positive this is the best way to handle
this. I'm also not sure that there aren't other cases where
the lnotab is generated incorrectly. It would be great if people
that use pdb or tracing could test heavily.
Also:
* Remove dead/duplicated code that wasn't used/necessary
because we already handled the docstring prior to entering the loop.
* add some debugging code into the compiler (#if 0'd out).
........
r51081 | neal.norwitz | 2006-08-04 07:09:28 +0200 (Fri, 04 Aug 2006) | 4 lines
Bug #1333982: string/number constants were inappropriately stored
in the byte code and co_consts even if they were not used, ie
immediately popped off the stack.
........
r51082 | neal.norwitz | 2006-08-04 07:12:19 +0200 (Fri, 04 Aug 2006) | 1 line
There were really two issues
........
r51084 | fred.drake | 2006-08-04 07:17:21 +0200 (Fri, 04 Aug 2006) | 1 line
SF patch #1534048 (bug #1531003): fix typo in error message
........
r51085 | gregory.p.smith | 2006-08-04 07:17:47 +0200 (Fri, 04 Aug 2006) | 3 lines
fix typos
........
r51087 | georg.brandl | 2006-08-04 08:03:53 +0200 (Fri, 04 Aug 2006) | 3 lines
Fix bug caused by first decrefing, then increfing.
........
r51109 | neil.schemenauer | 2006-08-04 18:20:30 +0200 (Fri, 04 Aug 2006) | 5 lines
Fix the 'compiler' package to generate correct code for MAKE_CLOSURE.
In the 2.5 development cycle, MAKE_CLOSURE as changed to take free
variables as a tuple rather than as individual items on the stack.
Closes patch #1534084.
........
r51110 | georg.brandl | 2006-08-04 20:03:37 +0200 (Fri, 04 Aug 2006) | 3 lines
Change fix for segfaulting property(), add a NEWS entry and a test.
........
r51111 | georg.brandl | 2006-08-04 20:07:34 +0200 (Fri, 04 Aug 2006) | 3 lines
Better fix for bug #1531405, not executing str(value) twice.
........
r51112 | thomas.heller | 2006-08-04 20:17:40 +0200 (Fri, 04 Aug 2006) | 1 line
On Windows, make PyErr_Warn an exported function again.
........
r51113 | thomas.heller | 2006-08-04 20:57:34 +0200 (Fri, 04 Aug 2006) | 4 lines
Fix #1530448 - fix ctypes build failure on solaris 10.
The '-mimpure-text' linker flag is required when linking _ctypes.so.
........
r51114 | thomas.heller | 2006-08-04 21:49:31 +0200 (Fri, 04 Aug 2006) | 3 lines
Fix #1534738: win32 debug version of _msi must be _msi_d.pyd, not _msi.pyd.
Fix the name of the pdb file as well.
........
r51115 | andrew.kuchling | 2006-08-04 22:37:43 +0200 (Fri, 04 Aug 2006) | 1 line
Typo fixes
........
r51116 | andrew.kuchling | 2006-08-04 23:10:03 +0200 (Fri, 04 Aug 2006) | 1 line
Fix mangled sentence
........
r51118 | tim.peters | 2006-08-05 00:00:35 +0200 (Sat, 05 Aug 2006) | 2 lines
Whitespace normalization.
........
r51119 | bob.ippolito | 2006-08-05 01:59:21 +0200 (Sat, 05 Aug 2006) | 5 lines
Fix #1530559, struct.pack raises TypeError where it used to convert.
Passing float arguments to struct.pack when integers are expected
now triggers a DeprecationWarning.
........
r51123 | georg.brandl | 2006-08-05 08:10:54 +0200 (Sat, 05 Aug 2006) | 3 lines
Patch #1534922: correct and enhance unittest docs.
........
r51126 | georg.brandl | 2006-08-06 09:06:33 +0200 (Sun, 06 Aug 2006) | 2 lines
Bug #1535182: really test the xreadlines() method of bz2 objects.
........
r51128 | georg.brandl | 2006-08-06 09:26:21 +0200 (Sun, 06 Aug 2006) | 4 lines
Bug #1535081: A leading underscore has been added to the names of
the md5 and sha modules, so add it in Modules/Setup.dist too.
........
r51129 | georg.brandl | 2006-08-06 10:23:54 +0200 (Sun, 06 Aug 2006) | 3 lines
Bug #1535165: fixed a segfault in input() and raw_input() when
sys.stdin is closed.
........
r51131 | georg.brandl | 2006-08-06 11:17:16 +0200 (Sun, 06 Aug 2006) | 2 lines
Don't produce output in test_builtin.
........
r51133 | andrew.macintyre | 2006-08-06 14:37:03 +0200 (Sun, 06 Aug 2006) | 4 lines
test_threading now skips testing alternate thread stack sizes on
platforms that don't support changing thread stack size.
........
r51134 | andrew.kuchling | 2006-08-07 00:07:04 +0200 (Mon, 07 Aug 2006) | 2 lines
[Patch #1464056] Ensure that we use the panelw library when linking with ncursesw.
Once I see how the buildbots react, I'll backport this to 2.4.
........
r51137 | georg.brandl | 2006-08-08 13:52:34 +0200 (Tue, 08 Aug 2006) | 3 lines
webbrowser: Silence stderr output if no gconftool or gnome browser found
........
r51138 | georg.brandl | 2006-08-08 13:56:21 +0200 (Tue, 08 Aug 2006) | 7 lines
Remove "non-mapping" and "non-sequence" from TypeErrors raised by
PyMapping_Size and PySequence_Size.
Because len() tries first sequence, then mapping size, it will always
raise a "non-mapping object has no len" error which is confusing.
........
r51139 | thomas.heller | 2006-08-08 19:37:00 +0200 (Tue, 08 Aug 2006) | 3 lines
memcmp() can return values other than -1, 0, and +1 but tp_compare
must not.
........
r51140 | thomas.heller | 2006-08-08 19:39:20 +0200 (Tue, 08 Aug 2006) | 1 line
Remove accidently committed, duplicated test.
........
r51147 | andrew.kuchling | 2006-08-08 20:50:14 +0200 (Tue, 08 Aug 2006) | 1 line
Reword paragraph to clarify
........
r51148 | andrew.kuchling | 2006-08-08 20:56:08 +0200 (Tue, 08 Aug 2006) | 1 line
Move obmalloc item into C API section
........
r51149 | andrew.kuchling | 2006-08-08 21:00:14 +0200 (Tue, 08 Aug 2006) | 1 line
'Other changes' section now has only one item; move the item elsewhere and remove the section
........
r51150 | andrew.kuchling | 2006-08-08 21:00:34 +0200 (Tue, 08 Aug 2006) | 1 line
Bump version number
........
r51151 | georg.brandl | 2006-08-08 22:11:22 +0200 (Tue, 08 Aug 2006) | 2 lines
Bug #1536828: typo: TypeType should have been StringType.
........
r51153 | georg.brandl | 2006-08-08 22:13:13 +0200 (Tue, 08 Aug 2006) | 2 lines
Bug #1536660: separate two words.
........
r51155 | georg.brandl | 2006-08-08 22:48:10 +0200 (Tue, 08 Aug 2006) | 3 lines
``str`` is now the same object as ``types.StringType``.
........
r51156 | tim.peters | 2006-08-09 02:52:26 +0200 (Wed, 09 Aug 2006) | 2 lines
Whitespace normalization.
........
r51158 | georg.brandl | 2006-08-09 09:03:22 +0200 (Wed, 09 Aug 2006) | 4 lines
Introduce an upper bound on tuple nesting depth in
C argument format strings; fixes rest of #1523610.
........
r51160 | martin.v.loewis | 2006-08-09 09:57:39 +0200 (Wed, 09 Aug 2006) | 4 lines
__hash__ may now return long int; the final hash
value is obtained by invoking hash on the long int.
Fixes #1536021.
........
r51168 | andrew.kuchling | 2006-08-09 15:03:41 +0200 (Wed, 09 Aug 2006) | 1 line
[Bug #1536021] Mention __hash__ change
........
r51169 | andrew.kuchling | 2006-08-09 15:57:05 +0200 (Wed, 09 Aug 2006) | 1 line
[Patch #1534027] Add notes on locale module changes
........
r51170 | andrew.kuchling | 2006-08-09 16:05:35 +0200 (Wed, 09 Aug 2006) | 1 line
Add missing 'self' parameters
........
r51171 | andrew.kuchling | 2006-08-09 16:06:19 +0200 (Wed, 09 Aug 2006) | 1 line
Reindent code
........
r51172 | armin.rigo | 2006-08-09 16:55:26 +0200 (Wed, 09 Aug 2006) | 2 lines
Fix and test for an infinite C recursion.
........
r51173 | ronald.oussoren | 2006-08-09 16:56:33 +0200 (Wed, 09 Aug 2006) | 2 lines
It's unlikely that future versions will require _POSIX_C_SOURCE
........
r51178 | armin.rigo | 2006-08-09 17:37:26 +0200 (Wed, 09 Aug 2006) | 2 lines
Concatenation on a long string breaks (SF #1526585).
........
r51180 | kurt.kaiser | 2006-08-09 18:46:15 +0200 (Wed, 09 Aug 2006) | 8 lines
1. When used w/o subprocess, all exceptions were preceeded by an error
message claiming they were IDLE internal errors (since 1.2a1).
2. Add Ronald Oussoren to CREDITS
M NEWS.txt
M PyShell.py
M CREDITS.txt
........
r51181 | kurt.kaiser | 2006-08-09 19:47:15 +0200 (Wed, 09 Aug 2006) | 4 lines
As a slight enhancement to the previous checkin, improve the
internal error reporting by moving message to IDLE console.
........
r51182 | andrew.kuchling | 2006-08-09 20:23:14 +0200 (Wed, 09 Aug 2006) | 1 line
Typo fix
........
r51183 | kurt.kaiser | 2006-08-09 22:34:46 +0200 (Wed, 09 Aug 2006) | 2 lines
ToggleTab dialog was setting indent to 8 even if cancelled (since 1.2a1).
........
r51184 | martin.v.loewis | 2006-08-10 01:42:18 +0200 (Thu, 10 Aug 2006) | 2 lines
Add some commentary on -mimpure-text.
........
r51185 | tim.peters | 2006-08-10 02:58:49 +0200 (Thu, 10 Aug 2006) | 2 lines
Add missing svn:eol-style property to text files.
........
r51186 | kurt.kaiser | 2006-08-10 03:41:17 +0200 (Thu, 10 Aug 2006) | 2 lines
Changing tokenize (39046) to detect dedent broke tabnanny check (since 1.2a1)
........
r51187 | tim.peters | 2006-08-10 05:01:26 +0200 (Thu, 10 Aug 2006) | 13 lines
test_copytree_simple(): This was leaving behind two new temp
directories each time it ran, at least on Windows.
Several changes: explicitly closed all files; wrapped long
lines; stopped suppressing errors when removing a file or
directory fails (removing /shouldn't/ fail!); and changed
what appeared to be incorrect usage of os.removedirs() (that
doesn't remove empty directories at and /under/ the given
path, instead it must be given an empty leaf directory and
then deletes empty directories moving /up/ the path -- could
be that the conceptually simpler shutil.rmtree() was really
actually intended here).
........
2006-08-11 11:57:12 -03:00
|
|
|
* meant the key wasn't present, in reality it can mean that, or that an error
|
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
merge in bad ways, so I'll have to merge that extra-carefully (probably manually.)
Merged revisions 46495-46605 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r46495 | tim.peters | 2006-05-28 03:52:38 +0200 (Sun, 28 May 2006) | 2 lines
Added missing svn:eol-style property to text files.
........
r46497 | tim.peters | 2006-05-28 12:41:29 +0200 (Sun, 28 May 2006) | 3 lines
PyErr_Display(), PyErr_WriteUnraisable(): Coverity found a cut-and-paste
bug in both: `className` was referenced before being checked for NULL.
........
r46499 | fredrik.lundh | 2006-05-28 14:06:46 +0200 (Sun, 28 May 2006) | 5 lines
needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only),
and use it for string copy operations. this gives a 20% speedup on some
string benchmarks.
........
r46501 | michael.hudson | 2006-05-28 17:51:40 +0200 (Sun, 28 May 2006) | 26 lines
Quality control, meet exceptions.c.
Fix a number of problems with the need for speed code:
One is doing this sort of thing:
Py_DECREF(self->field);
self->field = newval;
Py_INCREF(self->field);
without being very sure that self->field doesn't start with a
value that has a __del__, because that almost certainly can lead
to segfaults.
As self->args is constrained to be an exact tuple we may as well
exploit this fact consistently. This leads to quite a lot of
simplification (and, hey, probably better performance).
Add some error checking in places lacking it.
Fix some rather strange indentation in the Unicode code.
Delete some trailing whitespace.
More to come, I haven't fixed all the reference leaks yet...
........
r46502 | george.yoshida | 2006-05-28 18:39:09 +0200 (Sun, 28 May 2006) | 3 lines
Patch #1080727: add "encoding" parameter to doctest.DocFileSuite
Contributed by Bjorn Tillenius.
........
r46503 | martin.v.loewis | 2006-05-28 18:57:38 +0200 (Sun, 28 May 2006) | 4 lines
Rest of patch #1490384: Commit icon source, remove
claim that Erik von Blokland is the author of the
installer picture.
........
r46504 | michael.hudson | 2006-05-28 19:40:29 +0200 (Sun, 28 May 2006) | 16 lines
Quality control, meet exceptions.c, round two.
Make some functions that should have been static static.
Fix a bunch of refleaks by fixing the definition of
MiddlingExtendsException.
Remove all the __new__ implementations apart from
BaseException_new. Rewrite most code that needs it to cope with
NULL fields (such code could get excercised anyway, the
__new__-removal just makes it more likely). This involved
editing the code for WindowsError, which I can't test.
This fixes all the refleaks in at least the start of a regrtest
-R :: run.
........
r46505 | marc-andre.lemburg | 2006-05-28 19:46:58 +0200 (Sun, 28 May 2006) | 10 lines
Initial version of systimes - a module to provide platform dependent
performance measurements.
The module is currently just a proof-of-concept implementation, but
will integrated into pybench once it is stable enough.
License: pybench license.
Author: Marc-Andre Lemburg.
........
r46507 | armin.rigo | 2006-05-28 21:13:17 +0200 (Sun, 28 May 2006) | 15 lines
("Forward-port" of r46506)
Remove various dependencies on dictionary order in the standard library
tests, and one (clearly an oversight, potentially critical) in the
standard library itself - base64.py.
Remaining open issues:
* test_extcall is an output test, messy to make robust
* tarfile.py has a potential bug here, but I'm not familiar
enough with this code. Filed in as SF bug #1496501.
* urllib2.HTTPPasswordMgr() returns a random result if there is more
than one matching root path. I'm asking python-dev for
clarification...
........
r46508 | georg.brandl | 2006-05-28 22:11:45 +0200 (Sun, 28 May 2006) | 4 lines
The empty string is a valid import path.
(fixes #1496539)
........
r46509 | georg.brandl | 2006-05-28 22:23:12 +0200 (Sun, 28 May 2006) | 3 lines
Patch #1496206: urllib2 PasswordMgr ./. default ports
........
r46510 | georg.brandl | 2006-05-28 22:57:09 +0200 (Sun, 28 May 2006) | 3 lines
Fix refleaks in UnicodeError get and set methods.
........
r46511 | michael.hudson | 2006-05-28 23:19:03 +0200 (Sun, 28 May 2006) | 3 lines
use the UnicodeError traversal and clearing functions in UnicodeError
subclasses.
........
r46512 | thomas.wouters | 2006-05-28 23:32:12 +0200 (Sun, 28 May 2006) | 4 lines
Make last patch valid C89 so Windows compilers can deal with it.
........
r46513 | georg.brandl | 2006-05-28 23:42:54 +0200 (Sun, 28 May 2006) | 3 lines
Fix ref-antileak in _struct.c which eventually lead to deallocating None.
........
r46514 | georg.brandl | 2006-05-28 23:57:35 +0200 (Sun, 28 May 2006) | 4 lines
Correct None refcount issue in Mac modules. (Are they
still used?)
........
r46515 | armin.rigo | 2006-05-29 00:07:08 +0200 (Mon, 29 May 2006) | 3 lines
A clearer error message when passing -R to regrtest.py with
release builds of Python.
........
r46516 | georg.brandl | 2006-05-29 00:14:04 +0200 (Mon, 29 May 2006) | 3 lines
Fix C function calling conventions in _sre module.
........
r46517 | georg.brandl | 2006-05-29 00:34:51 +0200 (Mon, 29 May 2006) | 3 lines
Convert audioop over to METH_VARARGS.
........
r46518 | georg.brandl | 2006-05-29 00:38:57 +0200 (Mon, 29 May 2006) | 3 lines
METH_NOARGS functions do get called with two args.
........
r46519 | georg.brandl | 2006-05-29 11:46:51 +0200 (Mon, 29 May 2006) | 4 lines
Fix refleak in socketmodule. Replace bogus Py_BuildValue calls.
Fix refleak in exceptions.
........
r46520 | nick.coghlan | 2006-05-29 14:43:05 +0200 (Mon, 29 May 2006) | 7 lines
Apply modified version of Collin Winter's patch #1478788
Renames functional extension module to _functools and adds a Python
functools module so that utility functions like update_wrapper can be
added easily.
........
r46522 | georg.brandl | 2006-05-29 15:53:16 +0200 (Mon, 29 May 2006) | 3 lines
Convert fmmodule to METH_VARARGS.
........
r46523 | georg.brandl | 2006-05-29 16:13:21 +0200 (Mon, 29 May 2006) | 3 lines
Fix #1494605.
........
r46524 | georg.brandl | 2006-05-29 16:28:05 +0200 (Mon, 29 May 2006) | 3 lines
Handle PyMem_Malloc failure in pystrtod.c. Closes #1494671.
........
r46525 | georg.brandl | 2006-05-29 16:33:55 +0200 (Mon, 29 May 2006) | 3 lines
Fix compiler warning.
........
r46526 | georg.brandl | 2006-05-29 16:39:00 +0200 (Mon, 29 May 2006) | 3 lines
Fix #1494787 (pyclbr counts whitespace as superclass name)
........
r46527 | bob.ippolito | 2006-05-29 17:47:29 +0200 (Mon, 29 May 2006) | 1 line
simplify the struct code a bit (no functional changes)
........
r46528 | armin.rigo | 2006-05-29 19:59:47 +0200 (Mon, 29 May 2006) | 2 lines
Silence a warning.
........
r46529 | georg.brandl | 2006-05-29 21:39:45 +0200 (Mon, 29 May 2006) | 3 lines
Correct some value converting strangenesses.
........
r46530 | nick.coghlan | 2006-05-29 22:27:44 +0200 (Mon, 29 May 2006) | 1 line
When adding a module like functools, it helps to let SVN know about the file.
........
r46531 | georg.brandl | 2006-05-29 22:52:54 +0200 (Mon, 29 May 2006) | 4 lines
Patches #1497027 and #972322: try HTTP digest auth first,
and watch out for handler name collisions.
........
r46532 | georg.brandl | 2006-05-29 22:57:01 +0200 (Mon, 29 May 2006) | 3 lines
Add News entry for last commit.
........
r46533 | georg.brandl | 2006-05-29 23:04:52 +0200 (Mon, 29 May 2006) | 4 lines
Make use of METH_O and METH_NOARGS where possible.
Use Py_UnpackTuple instead of PyArg_ParseTuple where possible.
........
r46534 | georg.brandl | 2006-05-29 23:58:42 +0200 (Mon, 29 May 2006) | 3 lines
Convert more modules to METH_VARARGS.
........
r46535 | georg.brandl | 2006-05-30 00:00:30 +0200 (Tue, 30 May 2006) | 3 lines
Whoops.
........
r46536 | fredrik.lundh | 2006-05-30 00:42:07 +0200 (Tue, 30 May 2006) | 4 lines
fixed "abc".count("", 100) == -96 error (hopefully, nobody's relying on
the current behaviour ;-)
........
r46537 | bob.ippolito | 2006-05-30 00:55:48 +0200 (Tue, 30 May 2006) | 1 line
struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly)
........
r46539 | bob.ippolito | 2006-05-30 02:26:01 +0200 (Tue, 30 May 2006) | 1 line
Add a length check to aifc to ensure it doesn't write a bogus file
........
r46540 | tim.peters | 2006-05-30 04:25:25 +0200 (Tue, 30 May 2006) | 10 lines
deprecated_err(): Stop bizarre warning messages when the tests
are run in the order:
test_genexps (or any other doctest-based test)
test_struct
test_doctest
The `warnings` module needs an advertised way to save/restore
its internal filter list.
........
r46541 | tim.peters | 2006-05-30 04:26:46 +0200 (Tue, 30 May 2006) | 2 lines
Whitespace normalization.
........
r46542 | tim.peters | 2006-05-30 04:30:30 +0200 (Tue, 30 May 2006) | 2 lines
Set a binary svn:mime-type property on this UTF-8 encoded file.
........
r46543 | neal.norwitz | 2006-05-30 05:18:50 +0200 (Tue, 30 May 2006) | 1 line
Simplify further by using AddStringConstant
........
r46544 | tim.peters | 2006-05-30 06:16:25 +0200 (Tue, 30 May 2006) | 6 lines
Convert relevant dict internals to Py_ssize_t.
I don't have a box with nearly enough RAM, or an OS,
that could get close to tickling this, though (requires
a dict w/ at least 2**31 entries).
........
r46545 | neal.norwitz | 2006-05-30 06:19:21 +0200 (Tue, 30 May 2006) | 1 line
Remove stray | in comment
........
r46546 | neal.norwitz | 2006-05-30 06:25:05 +0200 (Tue, 30 May 2006) | 1 line
Use Py_SAFE_DOWNCAST for safety. Fix format strings. Remove 2 more stray | in comment
........
r46547 | neal.norwitz | 2006-05-30 06:43:23 +0200 (Tue, 30 May 2006) | 1 line
No DOWNCAST is required since sizeof(Py_ssize_t) >= sizeof(int) and Py_ReprEntr returns an int
........
r46548 | tim.peters | 2006-05-30 07:04:59 +0200 (Tue, 30 May 2006) | 3 lines
dict_print(): Explicitly narrow the return value
from a (possibly) wider variable.
........
r46549 | tim.peters | 2006-05-30 07:23:59 +0200 (Tue, 30 May 2006) | 5 lines
dict_print(): So that Neal & I don't spend the rest of
our lives taking turns rewriting code that works ;-),
get rid of casting illusions by declaring a new variable
with the obvious type.
........
r46550 | georg.brandl | 2006-05-30 09:04:55 +0200 (Tue, 30 May 2006) | 3 lines
Restore exception pickle support. #1497319.
........
r46551 | georg.brandl | 2006-05-30 09:13:29 +0200 (Tue, 30 May 2006) | 3 lines
Add a test case for exception pickling. args is never NULL.
........
r46552 | neal.norwitz | 2006-05-30 09:21:10 +0200 (Tue, 30 May 2006) | 1 line
Don't fail if the (sub)pkgname already exist.
........
r46553 | georg.brandl | 2006-05-30 09:34:45 +0200 (Tue, 30 May 2006) | 3 lines
Disallow keyword args for exceptions.
........
r46554 | neal.norwitz | 2006-05-30 09:36:54 +0200 (Tue, 30 May 2006) | 5 lines
I'm impatient. I think this will fix a few more problems with the buildbots.
I'm not sure this is the best approach, but I can't think of anything better.
If this creates problems, feel free to revert, but I think it's safe and
should make things a little better.
........
r46555 | georg.brandl | 2006-05-30 10:17:00 +0200 (Tue, 30 May 2006) | 4 lines
Do the check for no keyword arguments in __init__ so that
subclasses of Exception can be supplied keyword args
........
r46556 | georg.brandl | 2006-05-30 10:47:19 +0200 (Tue, 30 May 2006) | 3 lines
Convert test_exceptions to unittest.
........
r46557 | andrew.kuchling | 2006-05-30 14:52:01 +0200 (Tue, 30 May 2006) | 1 line
Add SoC name, and reorganize this section a bit
........
r46559 | tim.peters | 2006-05-30 17:53:34 +0200 (Tue, 30 May 2006) | 11 lines
PyLong_FromString(): Continued fraction analysis (explained in
a new comment) suggests there are almost certainly large input
integers in all non-binary input bases for which one Python digit
too few is initally allocated to hold the final result. Instead
of assert-failing when that happens, allocate more space. Alas,
I estimate it would take a few days to find a specific such case,
so this isn't backed up by a new test (not to mention that such
a case may take hours to run, since conversion time is quadratic
in the number of digits, and preliminary attempts suggested that
the smallest such inputs contain at least a million digits).
........
r46560 | fredrik.lundh | 2006-05-30 19:11:48 +0200 (Tue, 30 May 2006) | 3 lines
changed find/rfind to return -1 for matches outside the source string
........
r46561 | bob.ippolito | 2006-05-30 19:37:54 +0200 (Tue, 30 May 2006) | 1 line
Change wrapping terminology to overflow masking
........
r46562 | fredrik.lundh | 2006-05-30 19:39:58 +0200 (Tue, 30 May 2006) | 3 lines
changed count to return 0 for slices outside the source string
........
r46568 | tim.peters | 2006-05-31 01:28:02 +0200 (Wed, 31 May 2006) | 2 lines
Whitespace normalization.
........
r46569 | brett.cannon | 2006-05-31 04:19:54 +0200 (Wed, 31 May 2006) | 5 lines
Clarify wording on default values for strptime(); defaults are used when better
values cannot be inferred.
Closes bug #1496315.
........
r46572 | neal.norwitz | 2006-05-31 09:43:27 +0200 (Wed, 31 May 2006) | 1 line
Calculate smallest properly (it was off by one) and use proper ssize_t types for Win64
........
r46573 | neal.norwitz | 2006-05-31 10:01:08 +0200 (Wed, 31 May 2006) | 1 line
Revert last checkin, it is better to do make distclean
........
r46574 | neal.norwitz | 2006-05-31 11:02:44 +0200 (Wed, 31 May 2006) | 3 lines
On 64-bit platforms running test_struct after test_tarfile would fail
since the deprecation warning wouldn't be raised.
........
r46575 | thomas.heller | 2006-05-31 13:37:58 +0200 (Wed, 31 May 2006) | 3 lines
PyTuple_Pack is not available in Python 2.3, but ctypes must stay
compatible with that.
........
r46576 | andrew.kuchling | 2006-05-31 15:18:56 +0200 (Wed, 31 May 2006) | 1 line
'functional' module was renamed to 'functools'
........
r46577 | kristjan.jonsson | 2006-05-31 15:35:41 +0200 (Wed, 31 May 2006) | 1 line
Fixup the PCBuild8 project directory. exceptions.c have moved to Objects, and the functionalmodule.c has been replaced with _functoolsmodule.c. Other minor changes to .vcproj files and .sln to fix compilation
........
r46578 | andrew.kuchling | 2006-05-31 16:08:48 +0200 (Wed, 31 May 2006) | 15 lines
[Bug #1473048]
SimpleXMLRPCServer and DocXMLRPCServer don't look at
the path of the HTTP request at all; you can POST or
GET from / or /RPC2 or /blahblahblah with the same results.
Security scanners that look for /cgi-bin/phf will therefore report
lots of vulnerabilities.
Fix: add a .rpc_paths attribute to the SimpleXMLRPCServer class,
and report a 404 error if the path isn't on the allowed list.
Possibly-controversial aspect of this change: the default makes only
'/' and '/RPC2' legal. Maybe this will break people's applications
(though I doubt it). We could just set the default to an empty tuple,
which would exactly match the current behaviour.
........
r46579 | andrew.kuchling | 2006-05-31 16:12:47 +0200 (Wed, 31 May 2006) | 1 line
Mention SimpleXMLRPCServer change
........
r46580 | tim.peters | 2006-05-31 16:28:07 +0200 (Wed, 31 May 2006) | 2 lines
Trimmed trailing whitespace.
........
r46581 | tim.peters | 2006-05-31 17:33:22 +0200 (Wed, 31 May 2006) | 4 lines
_range_error(): Speed and simplify (there's no real need for
loops here). Assert that size_t is actually big enough, and
that f->size is at least one. Wrap a long line.
........
r46582 | tim.peters | 2006-05-31 17:34:37 +0200 (Wed, 31 May 2006) | 2 lines
Repaired error in new comment.
........
r46584 | neal.norwitz | 2006-06-01 07:32:49 +0200 (Thu, 01 Jun 2006) | 4 lines
Remove ; at end of macro. There was a compiler recently that warned
about extra semi-colons. It may have been the HP C compiler.
This file will trigger a bunch of those warnings now.
........
r46585 | georg.brandl | 2006-06-01 08:39:19 +0200 (Thu, 01 Jun 2006) | 3 lines
Correctly unpickle 2.4 exceptions via __setstate__ (patch #1498571)
........
r46586 | georg.brandl | 2006-06-01 10:27:32 +0200 (Thu, 01 Jun 2006) | 3 lines
Correctly allocate complex types with tp_alloc. (bug #1498638)
........
r46587 | georg.brandl | 2006-06-01 14:30:46 +0200 (Thu, 01 Jun 2006) | 2 lines
Correctly dispatch Faults in loads (patch #1498627)
........
r46588 | georg.brandl | 2006-06-01 15:00:49 +0200 (Thu, 01 Jun 2006) | 3 lines
Some code style tweaks, and remove apply.
........
r46589 | armin.rigo | 2006-06-01 15:19:12 +0200 (Thu, 01 Jun 2006) | 5 lines
[ 1497053 ] Let dicts propagate the exceptions in user __eq__().
[ 1456209 ] dictresize() vulnerability ( <- backport candidate ).
........
r46590 | tim.peters | 2006-06-01 15:41:46 +0200 (Thu, 01 Jun 2006) | 2 lines
Whitespace normalization.
........
r46591 | tim.peters | 2006-06-01 15:49:23 +0200 (Thu, 01 Jun 2006) | 2 lines
Record bugs 1275608 and 1456209 as being fixed.
........
r46592 | tim.peters | 2006-06-01 15:56:26 +0200 (Thu, 01 Jun 2006) | 5 lines
Re-enable a new empty-string test added during the NFS sprint,
but disabled then because str and unicode strings gave different
results. The implementations were repaired later during the
sprint, but the new test remained disabled.
........
r46594 | tim.peters | 2006-06-01 17:50:44 +0200 (Thu, 01 Jun 2006) | 7 lines
Armin committed his patch while I was reviewing it (I'm sure
he didn't know this), so merged in some changes I made during
review. Nothing material apart from changing a new `mask` local
from int to Py_ssize_t. Mostly this is repairing comments that
were made incorrect, and adding new comments. Also a few
minor code rewrites for clarity or helpful succinctness.
........
r46599 | neal.norwitz | 2006-06-02 06:45:53 +0200 (Fri, 02 Jun 2006) | 1 line
Convert docstrings to comments so regrtest -v prints method names
........
r46600 | neal.norwitz | 2006-06-02 06:50:49 +0200 (Fri, 02 Jun 2006) | 2 lines
Fix memory leak found by valgrind.
........
r46601 | neal.norwitz | 2006-06-02 06:54:52 +0200 (Fri, 02 Jun 2006) | 1 line
More memory leaks from valgrind
........
r46602 | neal.norwitz | 2006-06-02 08:23:00 +0200 (Fri, 02 Jun 2006) | 11 lines
Patch #1357836:
Prevent an invalid memory read from test_coding in case the done flag is set.
In that case, the loop isn't entered. I wonder if rather than setting
the done flag in the cases before the loop, if they should just exit early.
This code looks like it should be refactored.
Backport candidate (also the early break above if decoding_fgets fails)
........
r46603 | martin.blais | 2006-06-02 15:03:43 +0200 (Fri, 02 Jun 2006) | 1 line
Fixed struct test to not use unittest.
........
r46605 | tim.peters | 2006-06-03 01:22:51 +0200 (Sat, 03 Jun 2006) | 10 lines
pprint functions used to sort a dict (by key) if and only if
the output required more than one line. "Small" dicts got
displayed in seemingly random order (the hash-induced order
produced by dict.__repr__). None of this was documented.
Now pprint functions always sort dicts by key, and the docs
promise it.
This was proposed and agreed to during the PyCon 2006 core
sprint -- I just didn't have time for it before now.
........
2006-06-08 11:42:34 -03:00
|
|
|
* (suppressed) occurred while computing the key's hash, or that some error
|
|
|
|
* (suppressed) occurred when comparing keys in the dict's internal probe
|
|
|
|
* sequence. A nasty example of the latter is when a Python-coded comparison
|
|
|
|
* function hits a stack-depth error, which can cause this to return NULL
|
|
|
|
* even if the key is present.
|
|
|
|
*/
|
2023-11-07 09:58:04 -04:00
|
|
|
static PyObject *
|
|
|
|
dict_getitem(PyObject *op, PyObject *key, const char *warnmsg)
|
1993-03-27 14:11:32 -04:00
|
|
|
{
|
2020-06-02 09:03:25 -03:00
|
|
|
if (!PyDict_Check(op)) {
|
|
|
|
return NULL;
|
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
PyDictObject *mp = (PyDictObject *)op;
|
2012-04-23 12:24:50 -03:00
|
|
|
|
2024-07-01 16:11:39 -03:00
|
|
|
Py_hash_t hash = _PyObject_HashFast(key);
|
|
|
|
if (hash == -1) {
|
|
|
|
PyErr_FormatUnraisable(warnmsg);
|
|
|
|
return NULL;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
|
|
|
|
2020-06-02 09:03:25 -03:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
|
|
|
#ifdef Py_DEBUG
|
|
|
|
// bpo-40839: Before Python 3.10, it was possible to call PyDict_GetItem()
|
|
|
|
// with the GIL released.
|
|
|
|
_Py_EnsureTstateNotNULL(tstate);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Preserve the existing exception */
|
|
|
|
PyObject *value;
|
2021-05-28 20:14:33 -03:00
|
|
|
Py_ssize_t ix; (void)ix;
|
2020-06-02 09:03:25 -03:00
|
|
|
|
2023-02-08 05:31:12 -04:00
|
|
|
PyObject *exc = _PyErr_GetRaisedException(tstate);
|
2024-02-20 21:08:14 -04:00
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
ix = _Py_dict_lookup_threadsafe(mp, key, hash, &value);
|
|
|
|
Py_XDECREF(value);
|
|
|
|
#else
|
2021-05-28 05:54:10 -03:00
|
|
|
ix = _Py_dict_lookup(mp, key, hash, &value);
|
2024-02-20 21:08:14 -04:00
|
|
|
#endif
|
2020-06-02 09:03:25 -03:00
|
|
|
|
|
|
|
/* Ignore any exception raised by the lookup */
|
2023-11-07 09:58:04 -04:00
|
|
|
PyObject *exc2 = _PyErr_Occurred(tstate);
|
|
|
|
if (exc2 && !PyErr_GivenExceptionMatches(exc2, PyExc_KeyError)) {
|
|
|
|
PyErr_FormatUnraisable(warnmsg);
|
|
|
|
}
|
2023-02-08 05:31:12 -04:00
|
|
|
_PyErr_SetRaisedException(tstate, exc);
|
2020-06-02 09:03:25 -03:00
|
|
|
|
2021-05-28 05:54:10 -03:00
|
|
|
assert(ix >= 0 || value == NULL);
|
2023-07-21 18:10:51 -03:00
|
|
|
return value; // borrowed reference
|
1993-03-27 14:11:32 -04:00
|
|
|
}
|
|
|
|
|
2023-11-07 09:58:04 -04:00
|
|
|
PyObject *
|
|
|
|
PyDict_GetItem(PyObject *op, PyObject *key)
|
|
|
|
{
|
|
|
|
return dict_getitem(op, key,
|
|
|
|
"Exception ignored in PyDict_GetItem(); consider using "
|
|
|
|
"PyDict_GetItemRef() or PyDict_GetItemWithError()");
|
|
|
|
}
|
|
|
|
|
2020-10-20 02:22:44 -03:00
|
|
|
Py_ssize_t
|
2022-08-18 06:19:21 -03:00
|
|
|
_PyDict_LookupIndex(PyDictObject *mp, PyObject *key)
|
2020-10-20 02:22:44 -03:00
|
|
|
{
|
2024-02-06 18:03:43 -04:00
|
|
|
// TODO: Thread safety
|
2022-08-18 06:19:21 -03:00
|
|
|
PyObject *value;
|
2020-10-20 02:22:44 -03:00
|
|
|
assert(PyDict_CheckExact((PyObject*)mp));
|
|
|
|
assert(PyUnicode_CheckExact(key));
|
|
|
|
|
2024-07-01 16:11:39 -03:00
|
|
|
Py_hash_t hash = _PyObject_HashFast(key);
|
2021-02-21 07:02:04 -04:00
|
|
|
if (hash == -1) {
|
2024-07-01 16:11:39 -03:00
|
|
|
return -1;
|
2020-10-20 02:22:44 -03:00
|
|
|
}
|
|
|
|
|
2022-08-18 06:19:21 -03:00
|
|
|
return _Py_dict_lookup(mp, key, hash, &value);
|
2020-10-20 02:22:44 -03:00
|
|
|
}
|
|
|
|
|
2016-11-06 07:18:24 -04:00
|
|
|
/* Same as PyDict_GetItemWithError() but with hash supplied by caller.
|
|
|
|
This returns NULL *with* an exception set if an exception occurred.
|
|
|
|
It returns NULL *without* an exception set if the key wasn't present.
|
|
|
|
*/
|
2014-05-03 20:32:11 -03:00
|
|
|
PyObject *
|
|
|
|
_PyDict_GetItem_KnownHash(PyObject *op, PyObject *key, Py_hash_t hash)
|
|
|
|
{
|
2021-05-28 20:14:33 -03:00
|
|
|
Py_ssize_t ix; (void)ix;
|
2014-05-03 20:32:11 -03:00
|
|
|
PyDictObject *mp = (PyDictObject *)op;
|
2016-12-07 07:41:42 -04:00
|
|
|
PyObject *value;
|
2014-05-03 20:32:11 -03:00
|
|
|
|
2016-11-06 07:18:24 -04:00
|
|
|
if (!PyDict_Check(op)) {
|
|
|
|
PyErr_BadInternalCall();
|
2014-05-03 20:32:11 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
2016-11-06 07:18:24 -04:00
|
|
|
|
2024-02-20 21:08:14 -04:00
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
ix = _Py_dict_lookup_threadsafe(mp, key, hash, &value);
|
|
|
|
Py_XDECREF(value);
|
|
|
|
#else
|
2021-05-28 05:54:10 -03:00
|
|
|
ix = _Py_dict_lookup(mp, key, hash, &value);
|
2024-02-20 21:08:14 -04:00
|
|
|
#endif
|
2021-05-28 05:54:10 -03:00
|
|
|
assert(ix >= 0 || value == NULL);
|
2023-07-21 18:10:51 -03:00
|
|
|
return value; // borrowed reference
|
2014-05-03 20:32:11 -03:00
|
|
|
}
|
|
|
|
|
2024-08-02 10:32:08 -03:00
|
|
|
/* Gets an item and provides a new reference if the value is present.
|
|
|
|
* Returns 1 if the key is present, 0 if the key is missing, and -1 if an
|
|
|
|
* exception occurred.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
_PyDict_GetItemRef_KnownHash_LockHeld(PyDictObject *op, PyObject *key,
|
|
|
|
Py_hash_t hash, PyObject **result)
|
|
|
|
{
|
|
|
|
PyObject *value;
|
|
|
|
Py_ssize_t ix = _Py_dict_lookup(op, key, hash, &value);
|
|
|
|
assert(ix >= 0 || value == NULL);
|
|
|
|
if (ix == DKIX_ERROR) {
|
|
|
|
*result = NULL;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (value == NULL) {
|
|
|
|
*result = NULL;
|
|
|
|
return 0; // missing key
|
|
|
|
}
|
|
|
|
*result = Py_NewRef(value);
|
|
|
|
return 1; // key is present
|
|
|
|
}
|
|
|
|
|
2024-02-20 21:08:14 -04:00
|
|
|
/* Gets an item and provides a new reference if the value is present.
|
|
|
|
* Returns 1 if the key is present, 0 if the key is missing, and -1 if an
|
|
|
|
* exception occurred.
|
|
|
|
*/
|
|
|
|
int
|
2024-05-06 14:50:35 -03:00
|
|
|
_PyDict_GetItemRef_KnownHash(PyDictObject *op, PyObject *key, Py_hash_t hash, PyObject **result)
|
2024-02-20 21:08:14 -04:00
|
|
|
{
|
|
|
|
PyObject *value;
|
|
|
|
#ifdef Py_GIL_DISABLED
|
2024-05-06 14:50:35 -03:00
|
|
|
Py_ssize_t ix = _Py_dict_lookup_threadsafe(op, key, hash, &value);
|
2024-02-20 21:08:14 -04:00
|
|
|
#else
|
2024-05-06 14:50:35 -03:00
|
|
|
Py_ssize_t ix = _Py_dict_lookup(op, key, hash, &value);
|
2024-02-20 21:08:14 -04:00
|
|
|
#endif
|
|
|
|
assert(ix >= 0 || value == NULL);
|
|
|
|
if (ix == DKIX_ERROR) {
|
|
|
|
*result = NULL;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (value == NULL) {
|
|
|
|
*result = NULL;
|
|
|
|
return 0; // missing key
|
|
|
|
}
|
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
*result = value;
|
|
|
|
#else
|
|
|
|
*result = Py_NewRef(value);
|
|
|
|
#endif
|
|
|
|
return 1; // key is present
|
|
|
|
}
|
2023-07-21 18:10:51 -03:00
|
|
|
|
|
|
|
int
|
|
|
|
PyDict_GetItemRef(PyObject *op, PyObject *key, PyObject **result)
|
|
|
|
{
|
|
|
|
if (!PyDict_Check(op)) {
|
|
|
|
PyErr_BadInternalCall();
|
|
|
|
*result = NULL;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2024-07-01 16:11:39 -03:00
|
|
|
Py_hash_t hash = _PyObject_HashFast(key);
|
|
|
|
if (hash == -1) {
|
|
|
|
*result = NULL;
|
|
|
|
return -1;
|
2023-07-21 18:10:51 -03:00
|
|
|
}
|
|
|
|
|
2024-05-06 14:50:35 -03:00
|
|
|
return _PyDict_GetItemRef_KnownHash((PyDictObject *)op, key, hash, result);
|
2023-07-21 18:10:51 -03:00
|
|
|
}
|
|
|
|
|
2024-05-06 14:50:35 -03:00
|
|
|
int
|
|
|
|
_PyDict_GetItemRef_Unicode_LockHeld(PyDictObject *op, PyObject *key, PyObject **result)
|
|
|
|
{
|
|
|
|
ASSERT_DICT_LOCKED(op);
|
|
|
|
assert(PyUnicode_CheckExact(key));
|
|
|
|
|
2024-07-01 16:11:39 -03:00
|
|
|
Py_hash_t hash = _PyObject_HashFast(key);
|
|
|
|
if (hash == -1) {
|
|
|
|
*result = NULL;
|
|
|
|
return -1;
|
2024-05-06 14:50:35 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *value;
|
|
|
|
Py_ssize_t ix = _Py_dict_lookup(op, key, hash, &value);
|
|
|
|
assert(ix >= 0 || value == NULL);
|
|
|
|
if (ix == DKIX_ERROR) {
|
|
|
|
*result = NULL;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (value == NULL) {
|
|
|
|
*result = NULL;
|
|
|
|
return 0; // missing key
|
|
|
|
}
|
|
|
|
*result = Py_NewRef(value);
|
|
|
|
return 1; // key is present
|
|
|
|
}
|
2023-07-21 18:10:51 -03:00
|
|
|
|
2006-08-23 21:41:19 -03:00
|
|
|
/* Variant of PyDict_GetItem() that doesn't suppress exceptions.
|
|
|
|
This returns NULL *with* an exception set if an exception occurred.
|
|
|
|
It returns NULL *without* an exception set if the key wasn't present.
|
|
|
|
*/
|
|
|
|
PyObject *
|
|
|
|
PyDict_GetItemWithError(PyObject *op, PyObject *key)
|
|
|
|
{
|
2021-05-28 20:14:33 -03:00
|
|
|
Py_ssize_t ix; (void)ix;
|
2010-10-17 17:54:53 -03:00
|
|
|
Py_hash_t hash;
|
2010-05-09 12:52:27 -03:00
|
|
|
PyDictObject*mp = (PyDictObject *)op;
|
2016-12-07 07:41:42 -04:00
|
|
|
PyObject *value;
|
2010-05-09 12:52:27 -03:00
|
|
|
|
|
|
|
if (!PyDict_Check(op)) {
|
|
|
|
PyErr_BadInternalCall();
|
|
|
|
return NULL;
|
|
|
|
}
|
2024-07-01 16:11:39 -03:00
|
|
|
hash = _PyObject_HashFast(key);
|
|
|
|
if (hash == -1) {
|
|
|
|
return NULL;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
|
|
|
|
2024-02-20 21:08:14 -04:00
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
ix = _Py_dict_lookup_threadsafe(mp, key, hash, &value);
|
|
|
|
Py_XDECREF(value);
|
|
|
|
#else
|
2021-05-28 05:54:10 -03:00
|
|
|
ix = _Py_dict_lookup(mp, key, hash, &value);
|
2024-02-20 21:08:14 -04:00
|
|
|
#endif
|
2021-05-28 05:54:10 -03:00
|
|
|
assert(ix >= 0 || value == NULL);
|
2023-07-21 18:10:51 -03:00
|
|
|
return value; // borrowed reference
|
2006-08-23 21:41:19 -03:00
|
|
|
}
|
|
|
|
|
2022-02-08 16:39:07 -04:00
|
|
|
PyObject *
|
|
|
|
_PyDict_GetItemWithError(PyObject *dp, PyObject *kv)
|
|
|
|
{
|
|
|
|
assert(PyUnicode_CheckExact(kv));
|
2024-06-17 05:34:29 -03:00
|
|
|
Py_hash_t hash = Py_TYPE(kv)->tp_hash(kv);
|
2022-02-08 16:39:07 -04:00
|
|
|
if (hash == -1) {
|
|
|
|
return NULL;
|
|
|
|
}
|
2023-07-21 18:10:51 -03:00
|
|
|
return _PyDict_GetItem_KnownHash(dp, kv, hash); // borrowed reference
|
2022-02-08 16:39:07 -04:00
|
|
|
}
|
|
|
|
|
2012-04-14 15:10:13 -03:00
|
|
|
PyObject *
|
2022-02-24 12:51:59 -04:00
|
|
|
_PyDict_GetItemIdWithError(PyObject *dp, _Py_Identifier *key)
|
2012-04-14 15:10:13 -03:00
|
|
|
{
|
|
|
|
PyObject *kv;
|
|
|
|
kv = _PyUnicode_FromId(key); /* borrowed */
|
|
|
|
if (kv == NULL)
|
|
|
|
return NULL;
|
2022-03-01 19:09:28 -04:00
|
|
|
Py_hash_t hash = unicode_get_hash(kv);
|
2020-05-11 01:04:31 -03:00
|
|
|
assert (hash != -1); /* interned strings have their hash value initialised */
|
2023-07-21 18:10:51 -03:00
|
|
|
return _PyDict_GetItem_KnownHash(dp, kv, hash); // borrowed reference
|
2012-04-14 15:10:13 -03:00
|
|
|
}
|
|
|
|
|
2023-11-15 13:10:06 -04:00
|
|
|
PyObject *
|
|
|
|
_PyDict_GetItemStringWithError(PyObject *v, const char *key)
|
|
|
|
{
|
|
|
|
PyObject *kv, *rv;
|
|
|
|
kv = PyUnicode_FromString(key);
|
|
|
|
if (kv == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
rv = PyDict_GetItemWithError(v, kv);
|
|
|
|
Py_DECREF(kv);
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
2015-11-20 04:24:02 -04:00
|
|
|
/* Fast version of global value lookup (LOAD_GLOBAL).
|
2012-04-23 12:24:50 -03:00
|
|
|
* Lookup in globals, then builtins.
|
2015-11-20 04:24:02 -04:00
|
|
|
*
|
2021-10-13 10:19:34 -03:00
|
|
|
*
|
|
|
|
*
|
|
|
|
*
|
2015-11-20 04:24:02 -04:00
|
|
|
* Raise an exception and return NULL if an error occurred (ex: computing the
|
|
|
|
* key hash failed, key comparison failed, ...). Return NULL if the key doesn't
|
|
|
|
* exist. Return the value if the key exists.
|
2024-04-04 16:26:07 -03:00
|
|
|
*
|
|
|
|
* Returns a new reference.
|
2012-04-23 12:24:50 -03:00
|
|
|
*/
|
|
|
|
PyObject *
|
|
|
|
_PyDict_LoadGlobal(PyDictObject *globals, PyDictObject *builtins, PyObject *key)
|
1993-03-27 14:11:32 -04:00
|
|
|
{
|
2016-09-07 21:40:12 -03:00
|
|
|
Py_ssize_t ix;
|
2015-11-20 04:24:02 -04:00
|
|
|
Py_hash_t hash;
|
2016-12-07 07:41:42 -04:00
|
|
|
PyObject *value;
|
2015-11-20 04:24:02 -04:00
|
|
|
|
2024-07-01 16:11:39 -03:00
|
|
|
hash = _PyObject_HashFast(key);
|
|
|
|
if (hash == -1) {
|
|
|
|
return NULL;
|
2012-02-26 19:45:12 -04:00
|
|
|
}
|
2015-11-20 04:24:02 -04:00
|
|
|
|
|
|
|
/* namespace 1: globals */
|
2024-04-04 16:26:07 -03:00
|
|
|
ix = _Py_dict_lookup_threadsafe(globals, key, hash, &value);
|
2016-09-07 21:40:12 -03:00
|
|
|
if (ix == DKIX_ERROR)
|
2012-04-23 12:24:50 -03:00
|
|
|
return NULL;
|
2016-12-07 07:41:42 -04:00
|
|
|
if (ix != DKIX_EMPTY && value != NULL)
|
|
|
|
return value;
|
2015-11-20 04:24:02 -04:00
|
|
|
|
|
|
|
/* namespace 2: builtins */
|
2024-04-04 16:26:07 -03:00
|
|
|
ix = _Py_dict_lookup_threadsafe(builtins, key, hash, &value);
|
2021-05-28 05:54:10 -03:00
|
|
|
assert(ix >= 0 || value == NULL);
|
2016-12-07 07:41:42 -04:00
|
|
|
return value;
|
1993-03-27 14:11:32 -04:00
|
|
|
}
|
|
|
|
|
2024-09-13 13:23:51 -03:00
|
|
|
void
|
|
|
|
_PyDict_LoadGlobalStackRef(PyDictObject *globals, PyDictObject *builtins, PyObject *key, _PyStackRef *res)
|
|
|
|
{
|
|
|
|
Py_ssize_t ix;
|
|
|
|
Py_hash_t hash;
|
|
|
|
|
|
|
|
hash = _PyObject_HashFast(key);
|
|
|
|
if (hash == -1) {
|
|
|
|
*res = PyStackRef_NULL;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* namespace 1: globals */
|
|
|
|
ix = _Py_dict_lookup_threadsafe_stackref(globals, key, hash, res);
|
|
|
|
if (ix == DKIX_ERROR) {
|
2024-09-14 15:29:55 -03:00
|
|
|
return;
|
2024-09-13 13:23:51 -03:00
|
|
|
}
|
|
|
|
if (ix != DKIX_EMPTY && !PyStackRef_IsNull(*res)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* namespace 2: builtins */
|
|
|
|
ix = _Py_dict_lookup_threadsafe_stackref(builtins, key, hash, res);
|
|
|
|
assert(ix >= 0 || PyStackRef_IsNull(*res));
|
|
|
|
}
|
|
|
|
|
2024-10-24 13:44:38 -03:00
|
|
|
PyObject *
|
|
|
|
_PyDict_LoadBuiltinsFromGlobals(PyObject *globals)
|
|
|
|
{
|
|
|
|
if (!PyDict_Check(globals)) {
|
|
|
|
PyErr_BadInternalCall();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyDictObject *mp = (PyDictObject *)globals;
|
|
|
|
PyObject *key = &_Py_ID(__builtins__);
|
|
|
|
Py_hash_t hash = unicode_get_hash(key);
|
|
|
|
|
|
|
|
// Use the stackref variant to avoid reference count contention on the
|
|
|
|
// builtins module in the free threading build. It's important not to
|
|
|
|
// make any escaping calls between the lookup and the `PyStackRef_CLOSE()`
|
|
|
|
// because the `ref` is not visible to the GC.
|
|
|
|
_PyStackRef ref;
|
|
|
|
Py_ssize_t ix = _Py_dict_lookup_threadsafe_stackref(mp, key, hash, &ref);
|
|
|
|
if (ix == DKIX_ERROR) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if (PyStackRef_IsNull(ref)) {
|
|
|
|
return Py_NewRef(PyEval_GetBuiltins());
|
|
|
|
}
|
|
|
|
PyObject *builtins = PyStackRef_AsPyObjectBorrow(ref);
|
|
|
|
if (PyModule_Check(builtins)) {
|
|
|
|
builtins = _PyModule_GetDict(builtins);
|
|
|
|
assert(builtins != NULL);
|
|
|
|
}
|
|
|
|
_Py_INCREF_BUILTINS(builtins);
|
|
|
|
PyStackRef_CLOSE(ref);
|
|
|
|
return builtins;
|
|
|
|
}
|
|
|
|
|
2021-11-19 06:30:37 -04:00
|
|
|
/* Consumes references to key and value */
|
2024-02-06 18:03:43 -04:00
|
|
|
static int
|
|
|
|
setitem_take2_lock_held(PyDictObject *mp, PyObject *key, PyObject *value)
|
2012-02-26 19:45:12 -04:00
|
|
|
{
|
2024-02-06 18:03:43 -04:00
|
|
|
ASSERT_DICT_LOCKED(mp);
|
|
|
|
|
2012-02-26 19:45:12 -04:00
|
|
|
assert(key);
|
|
|
|
assert(value);
|
2021-11-19 06:30:37 -04:00
|
|
|
assert(PyDict_Check(mp));
|
2024-07-01 16:11:39 -03:00
|
|
|
Py_hash_t hash = _PyObject_HashFast(key);
|
|
|
|
if (hash == -1) {
|
|
|
|
Py_DECREF(key);
|
|
|
|
Py_DECREF(value);
|
|
|
|
return -1;
|
2012-02-26 19:45:12 -04:00
|
|
|
}
|
2024-02-06 18:03:43 -04:00
|
|
|
|
2023-03-09 11:16:30 -04:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
2024-02-06 18:03:43 -04:00
|
|
|
|
2019-03-18 08:38:33 -03:00
|
|
|
if (mp->ma_keys == Py_EMPTY_KEYS) {
|
2023-03-09 11:16:30 -04:00
|
|
|
return insert_to_emptydict(interp, mp, key, hash, value);
|
2019-03-18 08:38:33 -03:00
|
|
|
}
|
2012-04-23 12:24:50 -03:00
|
|
|
/* insertdict() handles any resizing that might be necessary */
|
2023-03-09 11:16:30 -04:00
|
|
|
return insertdict(interp, mp, key, hash, value);
|
2012-02-26 19:45:12 -04:00
|
|
|
}
|
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
int
|
|
|
|
_PyDict_SetItem_Take2(PyDictObject *mp, PyObject *key, PyObject *value)
|
|
|
|
{
|
|
|
|
int res;
|
|
|
|
Py_BEGIN_CRITICAL_SECTION(mp);
|
|
|
|
res = setitem_take2_lock_held(mp, key, value);
|
|
|
|
Py_END_CRITICAL_SECTION();
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2021-11-19 06:30:37 -04:00
|
|
|
/* CAUTION: PyDict_SetItem() must guarantee that it won't resize the
|
|
|
|
* dictionary if it's merely replacing the value for an existing key.
|
|
|
|
* This means that it's safe to loop over a dictionary with PyDict_Next()
|
|
|
|
* and occasionally replace a value -- but you can't insert new keys or
|
|
|
|
* remove them.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
PyDict_SetItem(PyObject *op, PyObject *key, PyObject *value)
|
|
|
|
{
|
|
|
|
if (!PyDict_Check(op)) {
|
|
|
|
PyErr_BadInternalCall();
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
assert(key);
|
|
|
|
assert(value);
|
2022-11-10 11:27:53 -04:00
|
|
|
return _PyDict_SetItem_Take2((PyDictObject *)op,
|
|
|
|
Py_NewRef(key), Py_NewRef(value));
|
2021-11-19 06:30:37 -04:00
|
|
|
}
|
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
static int
|
|
|
|
setitem_lock_held(PyDictObject *mp, PyObject *key, PyObject *value)
|
|
|
|
{
|
|
|
|
assert(key);
|
|
|
|
assert(value);
|
|
|
|
return setitem_take2_lock_held(mp,
|
|
|
|
Py_NewRef(key), Py_NewRef(value));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-05-03 20:32:11 -03:00
|
|
|
int
|
2024-08-02 10:32:08 -03:00
|
|
|
_PyDict_SetItem_KnownHash_LockHeld(PyDictObject *mp, PyObject *key, PyObject *value,
|
|
|
|
Py_hash_t hash)
|
2014-05-03 20:32:11 -03:00
|
|
|
{
|
2024-08-02 10:32:08 -03:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
|
|
|
if (mp->ma_keys == Py_EMPTY_KEYS) {
|
|
|
|
return insert_to_emptydict(interp, mp, Py_NewRef(key), hash, Py_NewRef(value));
|
|
|
|
}
|
|
|
|
/* insertdict() handles any resizing that might be necessary */
|
|
|
|
return insertdict(interp, mp, Py_NewRef(key), hash, Py_NewRef(value));
|
|
|
|
}
|
2014-05-03 20:32:11 -03:00
|
|
|
|
2024-08-02 10:32:08 -03:00
|
|
|
int
|
|
|
|
_PyDict_SetItem_KnownHash(PyObject *op, PyObject *key, PyObject *value,
|
|
|
|
Py_hash_t hash)
|
|
|
|
{
|
2014-05-03 20:32:11 -03:00
|
|
|
if (!PyDict_Check(op)) {
|
|
|
|
PyErr_BadInternalCall();
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
assert(key);
|
|
|
|
assert(value);
|
2015-10-02 06:47:11 -03:00
|
|
|
assert(hash != -1);
|
2014-05-03 20:32:11 -03:00
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
int res;
|
2024-08-02 10:32:08 -03:00
|
|
|
Py_BEGIN_CRITICAL_SECTION(op);
|
|
|
|
res = _PyDict_SetItem_KnownHash_LockHeld((PyDictObject *)op, key, value, hash);
|
2024-02-06 18:03:43 -04:00
|
|
|
Py_END_CRITICAL_SECTION();
|
|
|
|
return res;
|
2014-05-03 20:32:11 -03:00
|
|
|
}
|
|
|
|
|
2022-02-08 07:50:38 -04:00
|
|
|
static void
|
|
|
|
delete_index_from_values(PyDictValues *values, Py_ssize_t ix)
|
|
|
|
{
|
2024-04-02 07:59:21 -03:00
|
|
|
uint8_t *array = get_insertion_order_array(values);
|
|
|
|
int size = values->size;
|
|
|
|
assert(size <= values->capacity);
|
2022-02-08 07:50:38 -04:00
|
|
|
int i;
|
2024-04-02 07:59:21 -03:00
|
|
|
for (i = 0; array[i] != ix; i++) {
|
|
|
|
assert(i < size);
|
2021-10-13 10:19:34 -03:00
|
|
|
}
|
2024-04-02 07:59:21 -03:00
|
|
|
assert(i < size);
|
|
|
|
size--;
|
2022-02-08 07:50:38 -04:00
|
|
|
for (; i < size; i++) {
|
2024-04-02 07:59:21 -03:00
|
|
|
array[i] = array[i+1];
|
2022-02-08 07:50:38 -04:00
|
|
|
}
|
2024-04-02 07:59:21 -03:00
|
|
|
values->size = size;
|
2021-10-13 10:19:34 -03:00
|
|
|
}
|
|
|
|
|
2024-07-23 14:06:03 -03:00
|
|
|
static void
|
2017-08-03 11:45:15 -03:00
|
|
|
delitem_common(PyDictObject *mp, Py_hash_t hash, Py_ssize_t ix,
|
2024-10-01 13:39:56 -03:00
|
|
|
PyObject *old_value)
|
2016-12-27 09:19:20 -04:00
|
|
|
{
|
2016-12-27 09:34:54 -04:00
|
|
|
PyObject *old_key;
|
2016-12-27 09:19:20 -04:00
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
ASSERT_DICT_LOCKED(mp);
|
|
|
|
|
2017-08-03 11:45:15 -03:00
|
|
|
Py_ssize_t hashpos = lookdict_index(mp->ma_keys, hash, ix);
|
|
|
|
assert(hashpos >= 0);
|
|
|
|
|
2024-05-24 14:39:06 -03:00
|
|
|
STORE_USED(mp, mp->ma_used - 1);
|
2024-02-20 20:40:37 -04:00
|
|
|
if (_PyDict_HasSplitTable(mp)) {
|
2021-10-06 09:19:53 -03:00
|
|
|
assert(old_value == mp->ma_values->values[ix]);
|
2024-04-22 02:57:05 -03:00
|
|
|
STORE_SPLIT_VALUE(mp, ix, NULL);
|
2021-10-06 09:19:53 -03:00
|
|
|
assert(ix < SHARED_KEYS_MAX_SIZE);
|
|
|
|
/* Update order */
|
2022-02-08 07:50:38 -04:00
|
|
|
delete_index_from_values(mp->ma_values, ix);
|
2021-10-13 10:19:34 -03:00
|
|
|
ASSERT_CONSISTENT(mp);
|
2021-10-06 09:19:53 -03:00
|
|
|
}
|
|
|
|
else {
|
2021-10-13 10:19:34 -03:00
|
|
|
mp->ma_keys->dk_version = 0;
|
2021-10-06 09:19:53 -03:00
|
|
|
dictkeys_set_index(mp->ma_keys, hashpos, DKIX_DUMMY);
|
2022-03-01 19:09:28 -04:00
|
|
|
if (DK_IS_UNICODE(mp->ma_keys)) {
|
|
|
|
PyDictUnicodeEntry *ep = &DK_UNICODE_ENTRIES(mp->ma_keys)[ix];
|
|
|
|
old_key = ep->me_key;
|
2024-02-28 18:53:19 -04:00
|
|
|
STORE_KEY(ep, NULL);
|
|
|
|
STORE_VALUE(ep, NULL);
|
2022-03-01 19:09:28 -04:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
PyDictKeyEntry *ep = &DK_ENTRIES(mp->ma_keys)[ix];
|
|
|
|
old_key = ep->me_key;
|
2024-02-28 18:53:19 -04:00
|
|
|
STORE_KEY(ep, NULL);
|
|
|
|
STORE_VALUE(ep, NULL);
|
|
|
|
STORE_HASH(ep, 0);
|
2022-03-01 19:09:28 -04:00
|
|
|
}
|
2021-10-06 09:19:53 -03:00
|
|
|
Py_DECREF(old_key);
|
|
|
|
}
|
2016-12-27 09:19:20 -04:00
|
|
|
Py_DECREF(old_value);
|
2016-12-27 09:23:43 -04:00
|
|
|
|
2019-04-12 16:51:34 -03:00
|
|
|
ASSERT_CONSISTENT(mp);
|
2016-12-27 09:19:20 -04:00
|
|
|
}
|
|
|
|
|
1993-03-27 14:11:32 -04:00
|
|
|
int
|
2000-07-04 14:44:48 -03:00
|
|
|
PyDict_DelItem(PyObject *op, PyObject *key)
|
1993-03-27 14:11:32 -04:00
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
assert(key);
|
2024-07-01 16:11:39 -03:00
|
|
|
Py_hash_t hash = _PyObject_HashFast(key);
|
|
|
|
if (hash == -1) {
|
|
|
|
return -1;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2016-09-07 21:40:12 -03:00
|
|
|
|
|
|
|
return _PyDict_DelItem_KnownHash(op, key, hash);
|
2015-10-02 06:47:11 -03:00
|
|
|
}
|
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
static int
|
|
|
|
delitem_knownhash_lock_held(PyObject *op, PyObject *key, Py_hash_t hash)
|
2015-10-02 06:47:11 -03:00
|
|
|
{
|
2017-08-03 11:45:15 -03:00
|
|
|
Py_ssize_t ix;
|
2015-10-02 06:47:11 -03:00
|
|
|
PyDictObject *mp;
|
2016-12-27 09:34:54 -04:00
|
|
|
PyObject *old_value;
|
2015-10-02 06:47:11 -03:00
|
|
|
|
|
|
|
if (!PyDict_Check(op)) {
|
|
|
|
PyErr_BadInternalCall();
|
|
|
|
return -1;
|
|
|
|
}
|
2024-02-06 18:03:43 -04:00
|
|
|
|
|
|
|
ASSERT_DICT_LOCKED(op);
|
|
|
|
|
2015-10-02 06:47:11 -03:00
|
|
|
assert(key);
|
|
|
|
assert(hash != -1);
|
|
|
|
mp = (PyDictObject *)op;
|
2021-05-28 05:54:10 -03:00
|
|
|
ix = _Py_dict_lookup(mp, key, hash, &old_value);
|
2016-09-07 21:40:12 -03:00
|
|
|
if (ix == DKIX_ERROR)
|
2015-10-02 06:47:11 -03:00
|
|
|
return -1;
|
2016-12-07 07:41:42 -04:00
|
|
|
if (ix == DKIX_EMPTY || old_value == NULL) {
|
2015-10-02 06:47:11 -03:00
|
|
|
_PyErr_SetKeyError(key);
|
|
|
|
return -1;
|
|
|
|
}
|
2016-09-09 23:28:36 -03:00
|
|
|
|
2023-03-09 11:16:30 -04:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
2024-10-01 13:39:56 -03:00
|
|
|
_PyDict_NotifyEvent(interp, PyDict_EVENT_DELETED, mp, key, NULL);
|
|
|
|
delitem_common(mp, hash, ix, old_value);
|
2024-07-23 14:06:03 -03:00
|
|
|
return 0;
|
2016-12-27 09:19:20 -04:00
|
|
|
}
|
2016-09-14 10:02:01 -03:00
|
|
|
|
2016-12-27 09:19:20 -04:00
|
|
|
int
|
2024-02-06 18:03:43 -04:00
|
|
|
_PyDict_DelItem_KnownHash(PyObject *op, PyObject *key, Py_hash_t hash)
|
|
|
|
{
|
|
|
|
int res;
|
|
|
|
Py_BEGIN_CRITICAL_SECTION(op);
|
|
|
|
res = delitem_knownhash_lock_held(op, key, hash);
|
|
|
|
Py_END_CRITICAL_SECTION();
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
delitemif_lock_held(PyObject *op, PyObject *key,
|
2024-07-23 14:06:03 -03:00
|
|
|
int (*predicate)(PyObject *value, void *arg),
|
|
|
|
void *arg)
|
2016-12-27 09:19:20 -04:00
|
|
|
{
|
2024-04-15 02:26:59 -03:00
|
|
|
Py_ssize_t ix;
|
2016-12-27 09:19:20 -04:00
|
|
|
PyDictObject *mp;
|
|
|
|
Py_hash_t hash;
|
2016-12-27 09:34:54 -04:00
|
|
|
PyObject *old_value;
|
2016-12-27 09:19:20 -04:00
|
|
|
int res;
|
2016-09-14 10:02:01 -03:00
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
ASSERT_DICT_LOCKED(op);
|
|
|
|
|
2016-12-27 09:19:20 -04:00
|
|
|
assert(key);
|
|
|
|
hash = PyObject_Hash(key);
|
|
|
|
if (hash == -1)
|
|
|
|
return -1;
|
|
|
|
mp = (PyDictObject *)op;
|
2021-05-28 05:54:10 -03:00
|
|
|
ix = _Py_dict_lookup(mp, key, hash, &old_value);
|
2024-07-23 14:06:03 -03:00
|
|
|
if (ix == DKIX_ERROR) {
|
2016-12-27 09:19:20 -04:00
|
|
|
return -1;
|
2024-07-23 14:06:03 -03:00
|
|
|
}
|
2016-12-27 09:34:54 -04:00
|
|
|
if (ix == DKIX_EMPTY || old_value == NULL) {
|
2024-07-23 14:06:03 -03:00
|
|
|
return 0;
|
2016-12-27 09:19:20 -04:00
|
|
|
}
|
2016-12-27 09:23:43 -04:00
|
|
|
|
2024-07-23 14:06:03 -03:00
|
|
|
res = predicate(old_value, arg);
|
2016-12-27 09:19:20 -04:00
|
|
|
if (res == -1)
|
|
|
|
return -1;
|
2017-08-03 11:45:15 -03:00
|
|
|
|
2022-10-06 21:08:00 -03:00
|
|
|
if (res > 0) {
|
2023-03-09 11:16:30 -04:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
2024-10-01 13:39:56 -03:00
|
|
|
_PyDict_NotifyEvent(interp, PyDict_EVENT_DELETED, mp, key, NULL);
|
|
|
|
delitem_common(mp, hash, ix, old_value);
|
2024-07-23 14:06:03 -03:00
|
|
|
return 1;
|
2022-10-06 21:08:00 -03:00
|
|
|
} else {
|
2016-12-27 09:19:20 -04:00
|
|
|
return 0;
|
2022-10-06 21:08:00 -03:00
|
|
|
}
|
1993-03-27 14:11:32 -04:00
|
|
|
}
|
2024-02-06 18:03:43 -04:00
|
|
|
/* This function promises that the predicate -> deletion sequence is atomic
|
|
|
|
* (i.e. protected by the GIL or the per-dict mutex in free threaded builds),
|
|
|
|
* assuming the predicate itself doesn't release the GIL (or cause re-entrancy
|
|
|
|
* which would release the per-dict mutex)
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
_PyDict_DelItemIf(PyObject *op, PyObject *key,
|
2024-07-23 14:06:03 -03:00
|
|
|
int (*predicate)(PyObject *value, void *arg),
|
|
|
|
void *arg)
|
2024-02-06 18:03:43 -04:00
|
|
|
{
|
2024-07-23 14:06:03 -03:00
|
|
|
assert(PyDict_Check(op));
|
2024-02-06 18:03:43 -04:00
|
|
|
int res;
|
|
|
|
Py_BEGIN_CRITICAL_SECTION(op);
|
2024-07-23 14:06:03 -03:00
|
|
|
res = delitemif_lock_held(op, key, predicate, arg);
|
2024-02-06 18:03:43 -04:00
|
|
|
Py_END_CRITICAL_SECTION();
|
|
|
|
return res;
|
|
|
|
}
|
1993-03-27 14:11:32 -04:00
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
static void
|
|
|
|
clear_lock_held(PyObject *op)
|
1993-03-27 14:11:32 -04:00
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
PyDictObject *mp;
|
2012-04-23 12:24:50 -03:00
|
|
|
PyDictKeysObject *oldkeys;
|
2021-10-06 09:19:53 -03:00
|
|
|
PyDictValues *oldvalues;
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_ssize_t i, n;
|
SF patch #425242: Patch which "inlines" small dictionaries.
The idea is Marc-Andre Lemburg's, the implementation is Tim's.
Add a new ma_smalltable member to dictobjects, an embedded vector of
MINSIZE (8) dictentry structs. Short course is that this lets us avoid
additional malloc(s) for dicts with no more than 5 entries.
The changes are widespread but mostly small.
Long course: WRT speed, all scalar operations (getitem, setitem, delitem)
on non-empty dicts benefit from no longer needing NULL-pointer checks
(ma_table is never NULL anymore). Bulk operations (copy, update, resize,
clearing slots during dealloc) benefit in some cases from now looping
on the ma_fill count rather than on ma_size, but that was an unexpected
benefit: the original reason to loop on ma_fill was to let bulk
operations on empty dicts end quickly (since the NULL-pointer checks
went away, empty dicts aren't special-cased any more).
Special considerations:
For dicts that remain empty, this change is a lose on two counts:
the dict object contains 8 new dictentry slots now that weren't
needed before, and dict object creation also spends time memset'ing
these doomed-to-be-unsused slots to NULLs.
For dicts with one or two entries that never get larger than 2, it's
a mix: a malloc()/free() pair is no longer needed, and the 2-entry case
gets to use 8 slots (instead of 4) thus decreasing the chance of
collision. Against that, dict object creation spends time memset'ing
4 slots that aren't strictly needed in this case.
For dicts with 3 through 5 entries that never get larger than 5, it's a
pure win: the dict is created with all the space they need, and they
never need to resize. Before they suffered two malloc()/free() calls,
plus 1 dict resize, to get enough space. In addition, the 8-slot
table they ended with consumed more memory overall, because of the
hidden overhead due to the additional malloc.
For dicts with 6 or more entries, the ma_smalltable member is wasted
space, but then these are large(r) dicts so 8 slots more or less doesn't
make much difference. They still benefit all the time from removing
ubiquitous dynamic null-pointer checks, and get a small benefit (but
relatively smaller the larger the dict) from not having to do two
mallocs, two frees, and a resize on the way *to* getting their sixth
entry.
All in all it appears a small but definite general win, with larger
benefits in specific cases. It's especially nice that it allowed to
get rid of several branches, gotos and labels, and overall made the
code smaller.
2001-05-22 17:40:22 -03:00
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
ASSERT_DICT_LOCKED(op);
|
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
if (!PyDict_Check(op))
|
|
|
|
return;
|
2012-04-23 12:24:50 -03:00
|
|
|
mp = ((PyDictObject *)op);
|
|
|
|
oldkeys = mp->ma_keys;
|
|
|
|
oldvalues = mp->ma_values;
|
2022-03-02 06:05:12 -04:00
|
|
|
if (oldkeys == Py_EMPTY_KEYS) {
|
2012-04-23 12:24:50 -03:00
|
|
|
return;
|
2022-03-02 06:05:12 -04:00
|
|
|
}
|
2012-04-23 12:24:50 -03:00
|
|
|
/* Empty the dict... */
|
2023-03-09 11:16:30 -04:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
2024-10-01 13:39:56 -03:00
|
|
|
_PyDict_NotifyEvent(interp, PyDict_EVENT_CLEARED, mp, NULL, NULL);
|
2024-02-20 21:08:14 -04:00
|
|
|
// We don't inc ref empty keys because they're immortal
|
|
|
|
ensure_shared_on_resize(mp);
|
2024-05-24 14:39:06 -03:00
|
|
|
STORE_USED(mp, 0);
|
2024-04-15 10:45:05 -03:00
|
|
|
if (oldvalues == NULL) {
|
|
|
|
set_keys(mp, Py_EMPTY_KEYS);
|
2023-05-10 10:28:40 -03:00
|
|
|
assert(oldkeys->dk_refcnt == 1);
|
2024-02-20 21:08:14 -04:00
|
|
|
dictkeys_decref(interp, oldkeys, IS_DICT_SHARED(mp));
|
2012-04-23 12:24:50 -03:00
|
|
|
}
|
2024-04-15 10:45:05 -03:00
|
|
|
else {
|
|
|
|
n = oldkeys->dk_nentries;
|
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
Py_CLEAR(oldvalues->values[i]);
|
|
|
|
}
|
|
|
|
if (oldvalues->embedded) {
|
|
|
|
oldvalues->size = 0;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
set_values(mp, NULL);
|
|
|
|
set_keys(mp, Py_EMPTY_KEYS);
|
|
|
|
free_values(oldvalues, IS_DICT_SHARED(mp));
|
|
|
|
dictkeys_decref(interp, oldkeys, false);
|
|
|
|
}
|
|
|
|
}
|
2019-04-12 16:51:34 -03:00
|
|
|
ASSERT_CONSISTENT(mp);
|
2012-04-23 12:24:50 -03:00
|
|
|
}
|
SF patch #425242: Patch which "inlines" small dictionaries.
The idea is Marc-Andre Lemburg's, the implementation is Tim's.
Add a new ma_smalltable member to dictobjects, an embedded vector of
MINSIZE (8) dictentry structs. Short course is that this lets us avoid
additional malloc(s) for dicts with no more than 5 entries.
The changes are widespread but mostly small.
Long course: WRT speed, all scalar operations (getitem, setitem, delitem)
on non-empty dicts benefit from no longer needing NULL-pointer checks
(ma_table is never NULL anymore). Bulk operations (copy, update, resize,
clearing slots during dealloc) benefit in some cases from now looping
on the ma_fill count rather than on ma_size, but that was an unexpected
benefit: the original reason to loop on ma_fill was to let bulk
operations on empty dicts end quickly (since the NULL-pointer checks
went away, empty dicts aren't special-cased any more).
Special considerations:
For dicts that remain empty, this change is a lose on two counts:
the dict object contains 8 new dictentry slots now that weren't
needed before, and dict object creation also spends time memset'ing
these doomed-to-be-unsused slots to NULLs.
For dicts with one or two entries that never get larger than 2, it's
a mix: a malloc()/free() pair is no longer needed, and the 2-entry case
gets to use 8 slots (instead of 4) thus decreasing the chance of
collision. Against that, dict object creation spends time memset'ing
4 slots that aren't strictly needed in this case.
For dicts with 3 through 5 entries that never get larger than 5, it's a
pure win: the dict is created with all the space they need, and they
never need to resize. Before they suffered two malloc()/free() calls,
plus 1 dict resize, to get enough space. In addition, the 8-slot
table they ended with consumed more memory overall, because of the
hidden overhead due to the additional malloc.
For dicts with 6 or more entries, the ma_smalltable member is wasted
space, but then these are large(r) dicts so 8 slots more or less doesn't
make much difference. They still benefit all the time from removing
ubiquitous dynamic null-pointer checks, and get a small benefit (but
relatively smaller the larger the dict) from not having to do two
mallocs, two frees, and a resize on the way *to* getting their sixth
entry.
All in all it appears a small but definite general win, with larger
benefits in specific cases. It's especially nice that it allowed to
get rid of several branches, gotos and labels, and overall made the
code smaller.
2001-05-22 17:40:22 -03:00
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
void
|
|
|
|
PyDict_Clear(PyObject *op)
|
|
|
|
{
|
|
|
|
Py_BEGIN_CRITICAL_SECTION(op);
|
|
|
|
clear_lock_held(op);
|
|
|
|
Py_END_CRITICAL_SECTION();
|
|
|
|
}
|
|
|
|
|
2016-10-09 17:08:05 -03:00
|
|
|
/* Internal version of PyDict_Next that returns a hash value in addition
|
|
|
|
* to the key and value.
|
|
|
|
* Return 1 on success, return 0 when the reached the end of the dictionary
|
|
|
|
* (or if op is not a dictionary)
|
2012-04-23 12:24:50 -03:00
|
|
|
*/
|
2016-10-09 17:08:05 -03:00
|
|
|
int
|
|
|
|
_PyDict_Next(PyObject *op, Py_ssize_t *ppos, PyObject **pkey,
|
|
|
|
PyObject **pvalue, Py_hash_t *phash)
|
2012-04-23 12:24:50 -03:00
|
|
|
{
|
2016-11-04 04:59:10 -03:00
|
|
|
Py_ssize_t i;
|
2012-04-23 12:24:50 -03:00
|
|
|
PyDictObject *mp;
|
2022-03-01 19:09:28 -04:00
|
|
|
PyObject *key, *value;
|
|
|
|
Py_hash_t hash;
|
2010-05-09 12:52:27 -03:00
|
|
|
|
2012-04-23 12:24:50 -03:00
|
|
|
if (!PyDict_Check(op))
|
2016-10-09 17:08:05 -03:00
|
|
|
return 0;
|
2024-02-06 18:03:43 -04:00
|
|
|
|
2012-04-23 12:24:50 -03:00
|
|
|
mp = (PyDictObject *)op;
|
2016-10-09 17:08:05 -03:00
|
|
|
i = *ppos;
|
2024-02-20 20:40:37 -04:00
|
|
|
if (_PyDict_HasSplitTable(mp)) {
|
2021-10-06 09:19:53 -03:00
|
|
|
assert(mp->ma_used <= SHARED_KEYS_MAX_SIZE);
|
2016-11-04 04:59:10 -03:00
|
|
|
if (i < 0 || i >= mp->ma_used)
|
2016-10-09 17:08:05 -03:00
|
|
|
return 0;
|
2021-10-06 09:19:53 -03:00
|
|
|
int index = get_index_from_order(mp, i);
|
|
|
|
value = mp->ma_values->values[index];
|
2024-02-20 20:40:37 -04:00
|
|
|
key = LOAD_SHARED_KEY(DK_UNICODE_ENTRIES(mp->ma_keys)[index].me_key);
|
2022-03-01 19:09:28 -04:00
|
|
|
hash = unicode_get_hash(key);
|
2016-11-04 04:59:10 -03:00
|
|
|
assert(value != NULL);
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2012-04-23 12:24:50 -03:00
|
|
|
else {
|
2016-11-04 04:59:10 -03:00
|
|
|
Py_ssize_t n = mp->ma_keys->dk_nentries;
|
|
|
|
if (i < 0 || i >= n)
|
|
|
|
return 0;
|
2022-03-01 19:09:28 -04:00
|
|
|
if (DK_IS_UNICODE(mp->ma_keys)) {
|
|
|
|
PyDictUnicodeEntry *entry_ptr = &DK_UNICODE_ENTRIES(mp->ma_keys)[i];
|
|
|
|
while (i < n && entry_ptr->me_value == NULL) {
|
|
|
|
entry_ptr++;
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
if (i >= n)
|
|
|
|
return 0;
|
|
|
|
key = entry_ptr->me_key;
|
|
|
|
hash = unicode_get_hash(entry_ptr->me_key);
|
|
|
|
value = entry_ptr->me_value;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
PyDictKeyEntry *entry_ptr = &DK_ENTRIES(mp->ma_keys)[i];
|
|
|
|
while (i < n && entry_ptr->me_value == NULL) {
|
|
|
|
entry_ptr++;
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
if (i >= n)
|
|
|
|
return 0;
|
|
|
|
key = entry_ptr->me_key;
|
|
|
|
hash = entry_ptr->me_hash;
|
|
|
|
value = entry_ptr->me_value;
|
2016-09-07 21:40:12 -03:00
|
|
|
}
|
2012-04-23 12:24:50 -03:00
|
|
|
}
|
2016-10-09 17:08:05 -03:00
|
|
|
*ppos = i+1;
|
|
|
|
if (pkey)
|
2022-03-01 19:09:28 -04:00
|
|
|
*pkey = key;
|
2012-04-23 12:24:50 -03:00
|
|
|
if (pvalue)
|
2016-10-09 17:08:05 -03:00
|
|
|
*pvalue = value;
|
2022-03-01 19:09:28 -04:00
|
|
|
if (phash)
|
|
|
|
*phash = hash;
|
2016-10-09 17:08:05 -03:00
|
|
|
return 1;
|
1993-03-27 14:11:32 -04:00
|
|
|
}
|
|
|
|
|
2003-02-14 23:01:11 -04:00
|
|
|
/*
|
|
|
|
* Iterate over a dict. Use like so:
|
|
|
|
*
|
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
merge in bad ways, so I'll have to merge that extra-carefully (probably manually.)
Merged revisions 46495-46605 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r46495 | tim.peters | 2006-05-28 03:52:38 +0200 (Sun, 28 May 2006) | 2 lines
Added missing svn:eol-style property to text files.
........
r46497 | tim.peters | 2006-05-28 12:41:29 +0200 (Sun, 28 May 2006) | 3 lines
PyErr_Display(), PyErr_WriteUnraisable(): Coverity found a cut-and-paste
bug in both: `className` was referenced before being checked for NULL.
........
r46499 | fredrik.lundh | 2006-05-28 14:06:46 +0200 (Sun, 28 May 2006) | 5 lines
needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only),
and use it for string copy operations. this gives a 20% speedup on some
string benchmarks.
........
r46501 | michael.hudson | 2006-05-28 17:51:40 +0200 (Sun, 28 May 2006) | 26 lines
Quality control, meet exceptions.c.
Fix a number of problems with the need for speed code:
One is doing this sort of thing:
Py_DECREF(self->field);
self->field = newval;
Py_INCREF(self->field);
without being very sure that self->field doesn't start with a
value that has a __del__, because that almost certainly can lead
to segfaults.
As self->args is constrained to be an exact tuple we may as well
exploit this fact consistently. This leads to quite a lot of
simplification (and, hey, probably better performance).
Add some error checking in places lacking it.
Fix some rather strange indentation in the Unicode code.
Delete some trailing whitespace.
More to come, I haven't fixed all the reference leaks yet...
........
r46502 | george.yoshida | 2006-05-28 18:39:09 +0200 (Sun, 28 May 2006) | 3 lines
Patch #1080727: add "encoding" parameter to doctest.DocFileSuite
Contributed by Bjorn Tillenius.
........
r46503 | martin.v.loewis | 2006-05-28 18:57:38 +0200 (Sun, 28 May 2006) | 4 lines
Rest of patch #1490384: Commit icon source, remove
claim that Erik von Blokland is the author of the
installer picture.
........
r46504 | michael.hudson | 2006-05-28 19:40:29 +0200 (Sun, 28 May 2006) | 16 lines
Quality control, meet exceptions.c, round two.
Make some functions that should have been static static.
Fix a bunch of refleaks by fixing the definition of
MiddlingExtendsException.
Remove all the __new__ implementations apart from
BaseException_new. Rewrite most code that needs it to cope with
NULL fields (such code could get excercised anyway, the
__new__-removal just makes it more likely). This involved
editing the code for WindowsError, which I can't test.
This fixes all the refleaks in at least the start of a regrtest
-R :: run.
........
r46505 | marc-andre.lemburg | 2006-05-28 19:46:58 +0200 (Sun, 28 May 2006) | 10 lines
Initial version of systimes - a module to provide platform dependent
performance measurements.
The module is currently just a proof-of-concept implementation, but
will integrated into pybench once it is stable enough.
License: pybench license.
Author: Marc-Andre Lemburg.
........
r46507 | armin.rigo | 2006-05-28 21:13:17 +0200 (Sun, 28 May 2006) | 15 lines
("Forward-port" of r46506)
Remove various dependencies on dictionary order in the standard library
tests, and one (clearly an oversight, potentially critical) in the
standard library itself - base64.py.
Remaining open issues:
* test_extcall is an output test, messy to make robust
* tarfile.py has a potential bug here, but I'm not familiar
enough with this code. Filed in as SF bug #1496501.
* urllib2.HTTPPasswordMgr() returns a random result if there is more
than one matching root path. I'm asking python-dev for
clarification...
........
r46508 | georg.brandl | 2006-05-28 22:11:45 +0200 (Sun, 28 May 2006) | 4 lines
The empty string is a valid import path.
(fixes #1496539)
........
r46509 | georg.brandl | 2006-05-28 22:23:12 +0200 (Sun, 28 May 2006) | 3 lines
Patch #1496206: urllib2 PasswordMgr ./. default ports
........
r46510 | georg.brandl | 2006-05-28 22:57:09 +0200 (Sun, 28 May 2006) | 3 lines
Fix refleaks in UnicodeError get and set methods.
........
r46511 | michael.hudson | 2006-05-28 23:19:03 +0200 (Sun, 28 May 2006) | 3 lines
use the UnicodeError traversal and clearing functions in UnicodeError
subclasses.
........
r46512 | thomas.wouters | 2006-05-28 23:32:12 +0200 (Sun, 28 May 2006) | 4 lines
Make last patch valid C89 so Windows compilers can deal with it.
........
r46513 | georg.brandl | 2006-05-28 23:42:54 +0200 (Sun, 28 May 2006) | 3 lines
Fix ref-antileak in _struct.c which eventually lead to deallocating None.
........
r46514 | georg.brandl | 2006-05-28 23:57:35 +0200 (Sun, 28 May 2006) | 4 lines
Correct None refcount issue in Mac modules. (Are they
still used?)
........
r46515 | armin.rigo | 2006-05-29 00:07:08 +0200 (Mon, 29 May 2006) | 3 lines
A clearer error message when passing -R to regrtest.py with
release builds of Python.
........
r46516 | georg.brandl | 2006-05-29 00:14:04 +0200 (Mon, 29 May 2006) | 3 lines
Fix C function calling conventions in _sre module.
........
r46517 | georg.brandl | 2006-05-29 00:34:51 +0200 (Mon, 29 May 2006) | 3 lines
Convert audioop over to METH_VARARGS.
........
r46518 | georg.brandl | 2006-05-29 00:38:57 +0200 (Mon, 29 May 2006) | 3 lines
METH_NOARGS functions do get called with two args.
........
r46519 | georg.brandl | 2006-05-29 11:46:51 +0200 (Mon, 29 May 2006) | 4 lines
Fix refleak in socketmodule. Replace bogus Py_BuildValue calls.
Fix refleak in exceptions.
........
r46520 | nick.coghlan | 2006-05-29 14:43:05 +0200 (Mon, 29 May 2006) | 7 lines
Apply modified version of Collin Winter's patch #1478788
Renames functional extension module to _functools and adds a Python
functools module so that utility functions like update_wrapper can be
added easily.
........
r46522 | georg.brandl | 2006-05-29 15:53:16 +0200 (Mon, 29 May 2006) | 3 lines
Convert fmmodule to METH_VARARGS.
........
r46523 | georg.brandl | 2006-05-29 16:13:21 +0200 (Mon, 29 May 2006) | 3 lines
Fix #1494605.
........
r46524 | georg.brandl | 2006-05-29 16:28:05 +0200 (Mon, 29 May 2006) | 3 lines
Handle PyMem_Malloc failure in pystrtod.c. Closes #1494671.
........
r46525 | georg.brandl | 2006-05-29 16:33:55 +0200 (Mon, 29 May 2006) | 3 lines
Fix compiler warning.
........
r46526 | georg.brandl | 2006-05-29 16:39:00 +0200 (Mon, 29 May 2006) | 3 lines
Fix #1494787 (pyclbr counts whitespace as superclass name)
........
r46527 | bob.ippolito | 2006-05-29 17:47:29 +0200 (Mon, 29 May 2006) | 1 line
simplify the struct code a bit (no functional changes)
........
r46528 | armin.rigo | 2006-05-29 19:59:47 +0200 (Mon, 29 May 2006) | 2 lines
Silence a warning.
........
r46529 | georg.brandl | 2006-05-29 21:39:45 +0200 (Mon, 29 May 2006) | 3 lines
Correct some value converting strangenesses.
........
r46530 | nick.coghlan | 2006-05-29 22:27:44 +0200 (Mon, 29 May 2006) | 1 line
When adding a module like functools, it helps to let SVN know about the file.
........
r46531 | georg.brandl | 2006-05-29 22:52:54 +0200 (Mon, 29 May 2006) | 4 lines
Patches #1497027 and #972322: try HTTP digest auth first,
and watch out for handler name collisions.
........
r46532 | georg.brandl | 2006-05-29 22:57:01 +0200 (Mon, 29 May 2006) | 3 lines
Add News entry for last commit.
........
r46533 | georg.brandl | 2006-05-29 23:04:52 +0200 (Mon, 29 May 2006) | 4 lines
Make use of METH_O and METH_NOARGS where possible.
Use Py_UnpackTuple instead of PyArg_ParseTuple where possible.
........
r46534 | georg.brandl | 2006-05-29 23:58:42 +0200 (Mon, 29 May 2006) | 3 lines
Convert more modules to METH_VARARGS.
........
r46535 | georg.brandl | 2006-05-30 00:00:30 +0200 (Tue, 30 May 2006) | 3 lines
Whoops.
........
r46536 | fredrik.lundh | 2006-05-30 00:42:07 +0200 (Tue, 30 May 2006) | 4 lines
fixed "abc".count("", 100) == -96 error (hopefully, nobody's relying on
the current behaviour ;-)
........
r46537 | bob.ippolito | 2006-05-30 00:55:48 +0200 (Tue, 30 May 2006) | 1 line
struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly)
........
r46539 | bob.ippolito | 2006-05-30 02:26:01 +0200 (Tue, 30 May 2006) | 1 line
Add a length check to aifc to ensure it doesn't write a bogus file
........
r46540 | tim.peters | 2006-05-30 04:25:25 +0200 (Tue, 30 May 2006) | 10 lines
deprecated_err(): Stop bizarre warning messages when the tests
are run in the order:
test_genexps (or any other doctest-based test)
test_struct
test_doctest
The `warnings` module needs an advertised way to save/restore
its internal filter list.
........
r46541 | tim.peters | 2006-05-30 04:26:46 +0200 (Tue, 30 May 2006) | 2 lines
Whitespace normalization.
........
r46542 | tim.peters | 2006-05-30 04:30:30 +0200 (Tue, 30 May 2006) | 2 lines
Set a binary svn:mime-type property on this UTF-8 encoded file.
........
r46543 | neal.norwitz | 2006-05-30 05:18:50 +0200 (Tue, 30 May 2006) | 1 line
Simplify further by using AddStringConstant
........
r46544 | tim.peters | 2006-05-30 06:16:25 +0200 (Tue, 30 May 2006) | 6 lines
Convert relevant dict internals to Py_ssize_t.
I don't have a box with nearly enough RAM, or an OS,
that could get close to tickling this, though (requires
a dict w/ at least 2**31 entries).
........
r46545 | neal.norwitz | 2006-05-30 06:19:21 +0200 (Tue, 30 May 2006) | 1 line
Remove stray | in comment
........
r46546 | neal.norwitz | 2006-05-30 06:25:05 +0200 (Tue, 30 May 2006) | 1 line
Use Py_SAFE_DOWNCAST for safety. Fix format strings. Remove 2 more stray | in comment
........
r46547 | neal.norwitz | 2006-05-30 06:43:23 +0200 (Tue, 30 May 2006) | 1 line
No DOWNCAST is required since sizeof(Py_ssize_t) >= sizeof(int) and Py_ReprEntr returns an int
........
r46548 | tim.peters | 2006-05-30 07:04:59 +0200 (Tue, 30 May 2006) | 3 lines
dict_print(): Explicitly narrow the return value
from a (possibly) wider variable.
........
r46549 | tim.peters | 2006-05-30 07:23:59 +0200 (Tue, 30 May 2006) | 5 lines
dict_print(): So that Neal & I don't spend the rest of
our lives taking turns rewriting code that works ;-),
get rid of casting illusions by declaring a new variable
with the obvious type.
........
r46550 | georg.brandl | 2006-05-30 09:04:55 +0200 (Tue, 30 May 2006) | 3 lines
Restore exception pickle support. #1497319.
........
r46551 | georg.brandl | 2006-05-30 09:13:29 +0200 (Tue, 30 May 2006) | 3 lines
Add a test case for exception pickling. args is never NULL.
........
r46552 | neal.norwitz | 2006-05-30 09:21:10 +0200 (Tue, 30 May 2006) | 1 line
Don't fail if the (sub)pkgname already exist.
........
r46553 | georg.brandl | 2006-05-30 09:34:45 +0200 (Tue, 30 May 2006) | 3 lines
Disallow keyword args for exceptions.
........
r46554 | neal.norwitz | 2006-05-30 09:36:54 +0200 (Tue, 30 May 2006) | 5 lines
I'm impatient. I think this will fix a few more problems with the buildbots.
I'm not sure this is the best approach, but I can't think of anything better.
If this creates problems, feel free to revert, but I think it's safe and
should make things a little better.
........
r46555 | georg.brandl | 2006-05-30 10:17:00 +0200 (Tue, 30 May 2006) | 4 lines
Do the check for no keyword arguments in __init__ so that
subclasses of Exception can be supplied keyword args
........
r46556 | georg.brandl | 2006-05-30 10:47:19 +0200 (Tue, 30 May 2006) | 3 lines
Convert test_exceptions to unittest.
........
r46557 | andrew.kuchling | 2006-05-30 14:52:01 +0200 (Tue, 30 May 2006) | 1 line
Add SoC name, and reorganize this section a bit
........
r46559 | tim.peters | 2006-05-30 17:53:34 +0200 (Tue, 30 May 2006) | 11 lines
PyLong_FromString(): Continued fraction analysis (explained in
a new comment) suggests there are almost certainly large input
integers in all non-binary input bases for which one Python digit
too few is initally allocated to hold the final result. Instead
of assert-failing when that happens, allocate more space. Alas,
I estimate it would take a few days to find a specific such case,
so this isn't backed up by a new test (not to mention that such
a case may take hours to run, since conversion time is quadratic
in the number of digits, and preliminary attempts suggested that
the smallest such inputs contain at least a million digits).
........
r46560 | fredrik.lundh | 2006-05-30 19:11:48 +0200 (Tue, 30 May 2006) | 3 lines
changed find/rfind to return -1 for matches outside the source string
........
r46561 | bob.ippolito | 2006-05-30 19:37:54 +0200 (Tue, 30 May 2006) | 1 line
Change wrapping terminology to overflow masking
........
r46562 | fredrik.lundh | 2006-05-30 19:39:58 +0200 (Tue, 30 May 2006) | 3 lines
changed count to return 0 for slices outside the source string
........
r46568 | tim.peters | 2006-05-31 01:28:02 +0200 (Wed, 31 May 2006) | 2 lines
Whitespace normalization.
........
r46569 | brett.cannon | 2006-05-31 04:19:54 +0200 (Wed, 31 May 2006) | 5 lines
Clarify wording on default values for strptime(); defaults are used when better
values cannot be inferred.
Closes bug #1496315.
........
r46572 | neal.norwitz | 2006-05-31 09:43:27 +0200 (Wed, 31 May 2006) | 1 line
Calculate smallest properly (it was off by one) and use proper ssize_t types for Win64
........
r46573 | neal.norwitz | 2006-05-31 10:01:08 +0200 (Wed, 31 May 2006) | 1 line
Revert last checkin, it is better to do make distclean
........
r46574 | neal.norwitz | 2006-05-31 11:02:44 +0200 (Wed, 31 May 2006) | 3 lines
On 64-bit platforms running test_struct after test_tarfile would fail
since the deprecation warning wouldn't be raised.
........
r46575 | thomas.heller | 2006-05-31 13:37:58 +0200 (Wed, 31 May 2006) | 3 lines
PyTuple_Pack is not available in Python 2.3, but ctypes must stay
compatible with that.
........
r46576 | andrew.kuchling | 2006-05-31 15:18:56 +0200 (Wed, 31 May 2006) | 1 line
'functional' module was renamed to 'functools'
........
r46577 | kristjan.jonsson | 2006-05-31 15:35:41 +0200 (Wed, 31 May 2006) | 1 line
Fixup the PCBuild8 project directory. exceptions.c have moved to Objects, and the functionalmodule.c has been replaced with _functoolsmodule.c. Other minor changes to .vcproj files and .sln to fix compilation
........
r46578 | andrew.kuchling | 2006-05-31 16:08:48 +0200 (Wed, 31 May 2006) | 15 lines
[Bug #1473048]
SimpleXMLRPCServer and DocXMLRPCServer don't look at
the path of the HTTP request at all; you can POST or
GET from / or /RPC2 or /blahblahblah with the same results.
Security scanners that look for /cgi-bin/phf will therefore report
lots of vulnerabilities.
Fix: add a .rpc_paths attribute to the SimpleXMLRPCServer class,
and report a 404 error if the path isn't on the allowed list.
Possibly-controversial aspect of this change: the default makes only
'/' and '/RPC2' legal. Maybe this will break people's applications
(though I doubt it). We could just set the default to an empty tuple,
which would exactly match the current behaviour.
........
r46579 | andrew.kuchling | 2006-05-31 16:12:47 +0200 (Wed, 31 May 2006) | 1 line
Mention SimpleXMLRPCServer change
........
r46580 | tim.peters | 2006-05-31 16:28:07 +0200 (Wed, 31 May 2006) | 2 lines
Trimmed trailing whitespace.
........
r46581 | tim.peters | 2006-05-31 17:33:22 +0200 (Wed, 31 May 2006) | 4 lines
_range_error(): Speed and simplify (there's no real need for
loops here). Assert that size_t is actually big enough, and
that f->size is at least one. Wrap a long line.
........
r46582 | tim.peters | 2006-05-31 17:34:37 +0200 (Wed, 31 May 2006) | 2 lines
Repaired error in new comment.
........
r46584 | neal.norwitz | 2006-06-01 07:32:49 +0200 (Thu, 01 Jun 2006) | 4 lines
Remove ; at end of macro. There was a compiler recently that warned
about extra semi-colons. It may have been the HP C compiler.
This file will trigger a bunch of those warnings now.
........
r46585 | georg.brandl | 2006-06-01 08:39:19 +0200 (Thu, 01 Jun 2006) | 3 lines
Correctly unpickle 2.4 exceptions via __setstate__ (patch #1498571)
........
r46586 | georg.brandl | 2006-06-01 10:27:32 +0200 (Thu, 01 Jun 2006) | 3 lines
Correctly allocate complex types with tp_alloc. (bug #1498638)
........
r46587 | georg.brandl | 2006-06-01 14:30:46 +0200 (Thu, 01 Jun 2006) | 2 lines
Correctly dispatch Faults in loads (patch #1498627)
........
r46588 | georg.brandl | 2006-06-01 15:00:49 +0200 (Thu, 01 Jun 2006) | 3 lines
Some code style tweaks, and remove apply.
........
r46589 | armin.rigo | 2006-06-01 15:19:12 +0200 (Thu, 01 Jun 2006) | 5 lines
[ 1497053 ] Let dicts propagate the exceptions in user __eq__().
[ 1456209 ] dictresize() vulnerability ( <- backport candidate ).
........
r46590 | tim.peters | 2006-06-01 15:41:46 +0200 (Thu, 01 Jun 2006) | 2 lines
Whitespace normalization.
........
r46591 | tim.peters | 2006-06-01 15:49:23 +0200 (Thu, 01 Jun 2006) | 2 lines
Record bugs 1275608 and 1456209 as being fixed.
........
r46592 | tim.peters | 2006-06-01 15:56:26 +0200 (Thu, 01 Jun 2006) | 5 lines
Re-enable a new empty-string test added during the NFS sprint,
but disabled then because str and unicode strings gave different
results. The implementations were repaired later during the
sprint, but the new test remained disabled.
........
r46594 | tim.peters | 2006-06-01 17:50:44 +0200 (Thu, 01 Jun 2006) | 7 lines
Armin committed his patch while I was reviewing it (I'm sure
he didn't know this), so merged in some changes I made during
review. Nothing material apart from changing a new `mask` local
from int to Py_ssize_t. Mostly this is repairing comments that
were made incorrect, and adding new comments. Also a few
minor code rewrites for clarity or helpful succinctness.
........
r46599 | neal.norwitz | 2006-06-02 06:45:53 +0200 (Fri, 02 Jun 2006) | 1 line
Convert docstrings to comments so regrtest -v prints method names
........
r46600 | neal.norwitz | 2006-06-02 06:50:49 +0200 (Fri, 02 Jun 2006) | 2 lines
Fix memory leak found by valgrind.
........
r46601 | neal.norwitz | 2006-06-02 06:54:52 +0200 (Fri, 02 Jun 2006) | 1 line
More memory leaks from valgrind
........
r46602 | neal.norwitz | 2006-06-02 08:23:00 +0200 (Fri, 02 Jun 2006) | 11 lines
Patch #1357836:
Prevent an invalid memory read from test_coding in case the done flag is set.
In that case, the loop isn't entered. I wonder if rather than setting
the done flag in the cases before the loop, if they should just exit early.
This code looks like it should be refactored.
Backport candidate (also the early break above if decoding_fgets fails)
........
r46603 | martin.blais | 2006-06-02 15:03:43 +0200 (Fri, 02 Jun 2006) | 1 line
Fixed struct test to not use unittest.
........
r46605 | tim.peters | 2006-06-03 01:22:51 +0200 (Sat, 03 Jun 2006) | 10 lines
pprint functions used to sort a dict (by key) if and only if
the output required more than one line. "Small" dicts got
displayed in seemingly random order (the hash-induced order
produced by dict.__repr__). None of this was documented.
Now pprint functions always sort dicts by key, and the docs
promise it.
This was proposed and agreed to during the PyCon 2006 core
sprint -- I just didn't have time for it before now.
........
2006-06-08 11:42:34 -03:00
|
|
|
* Py_ssize_t i;
|
2003-02-14 23:01:11 -04:00
|
|
|
* PyObject *key, *value;
|
|
|
|
* i = 0; # important! i should not otherwise be changed by you
|
2003-02-15 10:45:12 -04:00
|
|
|
* while (PyDict_Next(yourdict, &i, &key, &value)) {
|
2016-10-09 17:08:05 -03:00
|
|
|
* Refer to borrowed references in key and value.
|
2003-02-14 23:01:11 -04:00
|
|
|
* }
|
|
|
|
*
|
2016-10-09 17:08:05 -03:00
|
|
|
* Return 1 on success, return 0 when the reached the end of the dictionary
|
|
|
|
* (or if op is not a dictionary)
|
|
|
|
*
|
2003-02-14 23:01:11 -04:00
|
|
|
* CAUTION: In general, it isn't safe to use PyDict_Next in a loop that
|
2001-03-21 15:23:56 -04:00
|
|
|
* mutates the dict. One exception: it is safe if the loop merely changes
|
|
|
|
* the values associated with the keys (but doesn't insert new keys or
|
|
|
|
* delete keys), via PyDict_SetItem().
|
|
|
|
*/
|
1993-05-19 11:50:45 -03:00
|
|
|
int
|
2006-02-15 13:27:45 -04:00
|
|
|
PyDict_Next(PyObject *op, Py_ssize_t *ppos, PyObject **pkey, PyObject **pvalue)
|
1993-03-27 14:11:32 -04:00
|
|
|
{
|
2024-06-24 15:15:15 -03:00
|
|
|
return _PyDict_Next(op, ppos, pkey, pvalue, NULL);
|
Merged revisions 53623-53858 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r53624 | peter.astrand | 2007-02-02 20:06:36 +0100 (Fri, 02 Feb 2007) | 1 line
We had several if statements checking the value of a fd. This is unsafe, since valid fds might be zero. We should check for not None instead.
........
r53635 | kurt.kaiser | 2007-02-05 07:03:18 +0100 (Mon, 05 Feb 2007) | 2 lines
Add 'raw' support to configHandler. Patch 1650174 Tal Einat.
........
r53641 | kurt.kaiser | 2007-02-06 00:02:16 +0100 (Tue, 06 Feb 2007) | 5 lines
1. Calltips now 'handle' tuples in the argument list (display '<tuple>' :)
Suggested solution by Christos Georgiou, Bug 791968.
2. Clean up tests, were not failing when they should have been.
4. Remove some camelcase and an unneeded try/except block.
........
r53644 | kurt.kaiser | 2007-02-06 04:21:40 +0100 (Tue, 06 Feb 2007) | 2 lines
Clean up ModifiedInterpreter.runcode() structure
........
r53646 | peter.astrand | 2007-02-06 16:37:50 +0100 (Tue, 06 Feb 2007) | 1 line
Applied patch 1124861.3.patch to solve bug #1124861: Automatically create pipes on Windows, if GetStdHandle fails. Will backport.
........
r53648 | lars.gustaebel | 2007-02-06 19:38:13 +0100 (Tue, 06 Feb 2007) | 4 lines
Patch #1652681: create nonexistent files in append mode and
allow appending to empty files.
........
r53649 | kurt.kaiser | 2007-02-06 20:09:43 +0100 (Tue, 06 Feb 2007) | 4 lines
Updated patch (CodeContext.061217.patch) to
[ 1362975 ] CodeContext - Improved text indentation
Tal Einat 16Dec06
........
r53650 | kurt.kaiser | 2007-02-06 20:21:19 +0100 (Tue, 06 Feb 2007) | 2 lines
narrow exception per [ 1540849 ] except too broad
........
r53653 | kurt.kaiser | 2007-02-07 04:39:41 +0100 (Wed, 07 Feb 2007) | 4 lines
[ 1621265 ] Auto-completion list placement
Move AC window below input line unless not enough space, then put it above.
Patch: Tal Einat
........
r53654 | kurt.kaiser | 2007-02-07 09:07:13 +0100 (Wed, 07 Feb 2007) | 2 lines
Handle AttributeError during calltip lookup
........
r53656 | raymond.hettinger | 2007-02-07 21:08:22 +0100 (Wed, 07 Feb 2007) | 3 lines
SF #1615701: make d.update(m) honor __getitem__() and keys() in dict subclasses
........
r53658 | raymond.hettinger | 2007-02-07 22:04:20 +0100 (Wed, 07 Feb 2007) | 1 line
SF: 1397711 Set docs conflated immutable and hashable
........
r53660 | raymond.hettinger | 2007-02-07 22:42:17 +0100 (Wed, 07 Feb 2007) | 1 line
Check for a common user error with defaultdict().
........
r53662 | raymond.hettinger | 2007-02-07 23:24:07 +0100 (Wed, 07 Feb 2007) | 1 line
Bug #1575169: operator.isSequenceType() now returns False for subclasses of dict.
........
r53664 | raymond.hettinger | 2007-02-08 00:49:03 +0100 (Thu, 08 Feb 2007) | 1 line
Silence compiler warning
........
r53666 | raymond.hettinger | 2007-02-08 01:07:32 +0100 (Thu, 08 Feb 2007) | 1 line
Do not let overflows in enumerate() and count() pass silently.
........
r53668 | raymond.hettinger | 2007-02-08 01:50:39 +0100 (Thu, 08 Feb 2007) | 1 line
Bypass set specific optimizations for set and frozenset subclasses.
........
r53670 | raymond.hettinger | 2007-02-08 02:42:35 +0100 (Thu, 08 Feb 2007) | 1 line
Fix docstring bug
........
r53671 | martin.v.loewis | 2007-02-08 10:13:36 +0100 (Thu, 08 Feb 2007) | 3 lines
Bug #1653736: Complain about keyword arguments to time.isoformat.
Will backport to 2.5.
........
r53679 | kurt.kaiser | 2007-02-08 23:58:18 +0100 (Thu, 08 Feb 2007) | 6 lines
Corrected some bugs in AutoComplete. Also, Page Up/Down in ACW implemented;
mouse and cursor selection in ACWindow implemented; double Tab inserts current
selection and closes ACW (similar to double-click and Return); scroll wheel now
works in ACW. Added AutoComplete instructions to IDLE Help.
........
r53689 | martin.v.loewis | 2007-02-09 13:19:32 +0100 (Fri, 09 Feb 2007) | 3 lines
Bug #1653736: Properly discard third argument to slot_nb_inplace_power.
Will backport.
........
r53691 | martin.v.loewis | 2007-02-09 13:36:48 +0100 (Fri, 09 Feb 2007) | 4 lines
Bug #1600860: Search for shared python library in LIBDIR, not
lib/python/config, on "linux" and "gnu" systems.
Will backport.
........
r53693 | martin.v.loewis | 2007-02-09 13:58:49 +0100 (Fri, 09 Feb 2007) | 2 lines
Update broken link. Will backport to 2.5.
........
r53697 | georg.brandl | 2007-02-09 19:48:41 +0100 (Fri, 09 Feb 2007) | 2 lines
Bug #1656078: typo in in profile docs.
........
r53731 | brett.cannon | 2007-02-11 06:36:00 +0100 (Sun, 11 Feb 2007) | 3 lines
Change a very minor inconsistency (that is purely cosmetic) in the AST
definition.
........
r53735 | skip.montanaro | 2007-02-11 19:24:37 +0100 (Sun, 11 Feb 2007) | 1 line
fix trace.py --ignore-dir
........
r53741 | brett.cannon | 2007-02-11 20:44:41 +0100 (Sun, 11 Feb 2007) | 3 lines
Check in changed Python-ast.c from a cosmetic change to Python.asdl (in
r53731).
........
r53751 | brett.cannon | 2007-02-12 04:51:02 +0100 (Mon, 12 Feb 2007) | 5 lines
Modify Parser/asdl_c.py so that the __version__ number for Python/Python-ast.c
is specified at the top of the file. Also add a note that Python/Python-ast.c
needs to be committed separately after a change to the AST grammar to capture
the revision number of the change (which is what __version__ is set to).
........
r53752 | lars.gustaebel | 2007-02-12 10:25:53 +0100 (Mon, 12 Feb 2007) | 3 lines
Bug #1656581: Point out that external file objects are supposed to be
at position 0.
........
r53754 | martin.v.loewis | 2007-02-12 13:21:10 +0100 (Mon, 12 Feb 2007) | 3 lines
Patch 1463026: Support default namespace in XMLGenerator.
Fixes #847665. Will backport.
........
r53757 | armin.rigo | 2007-02-12 17:23:24 +0100 (Mon, 12 Feb 2007) | 4 lines
Fix the line to what is my guess at the original author's meaning.
(The line has no effect anyway, but is present because it's
customary call the base class __init__).
........
r53763 | martin.v.loewis | 2007-02-13 09:34:45 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #685268: Consider a package's __path__ in imputil.
Will backport.
........
r53765 | martin.v.loewis | 2007-02-13 10:49:38 +0100 (Tue, 13 Feb 2007) | 2 lines
Patch #698833: Support file decryption in zipfile.
........
r53766 | martin.v.loewis | 2007-02-13 11:10:39 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #1517891: Make 'a' create the file if it doesn't exist.
Fixes #1514451.
........
r53767 | martin.v.loewis | 2007-02-13 13:08:24 +0100 (Tue, 13 Feb 2007) | 3 lines
Bug #1658794: Remove extraneous 'this'.
Will backport to 2.5.
........
r53769 | martin.v.loewis | 2007-02-13 13:14:19 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #1657276: Make NETLINK_DNRTMSG conditional.
Will backport.
........
r53771 | lars.gustaebel | 2007-02-13 17:09:24 +0100 (Tue, 13 Feb 2007) | 4 lines
Patch #1647484: Renamed GzipFile's filename attribute to name. The
filename attribute is still accessible as a property that emits a
DeprecationWarning.
........
r53772 | lars.gustaebel | 2007-02-13 17:24:00 +0100 (Tue, 13 Feb 2007) | 3 lines
Strip the '.gz' extension from the filename that is written to the
gzip header.
........
r53774 | martin.v.loewis | 2007-02-14 11:07:37 +0100 (Wed, 14 Feb 2007) | 2 lines
Patch #1432399: Add HCI sockets.
........
r53775 | martin.v.loewis | 2007-02-14 12:30:07 +0100 (Wed, 14 Feb 2007) | 2 lines
Update 1432399 to removal of _BT_SOCKADDR_MEMB.
........
r53776 | martin.v.loewis | 2007-02-14 12:30:56 +0100 (Wed, 14 Feb 2007) | 3 lines
Ignore directory time stamps when considering
whether to rerun libffi configure.
........
r53778 | lars.gustaebel | 2007-02-14 15:45:12 +0100 (Wed, 14 Feb 2007) | 4 lines
A missing binary mode in AppendTest caused failures in Windows
Buildbot.
........
r53782 | martin.v.loewis | 2007-02-15 10:51:35 +0100 (Thu, 15 Feb 2007) | 2 lines
Patch #1397848: add the reasoning behind no-resize-on-shrinkage.
........
r53783 | georg.brandl | 2007-02-15 11:37:59 +0100 (Thu, 15 Feb 2007) | 2 lines
Make functools.wraps() docs a bit clearer.
........
r53785 | georg.brandl | 2007-02-15 12:29:04 +0100 (Thu, 15 Feb 2007) | 2 lines
Patch #1494140: Add documentation for the new struct.Struct object.
........
r53787 | georg.brandl | 2007-02-15 12:29:55 +0100 (Thu, 15 Feb 2007) | 2 lines
Add missing \versionadded.
........
r53800 | brett.cannon | 2007-02-15 23:54:39 +0100 (Thu, 15 Feb 2007) | 11 lines
Update the encoding package's search function to use absolute imports when
calling __import__. This helps make the expected search locations for encoding
modules be more explicit.
One could use an explicit value for __path__ when making the call to __import__
to force the exact location searched for encodings. This would give the most
strict search path possible if one is worried about malicious code being
imported. The unfortunate side-effect of that is that if __path__ was modified
on 'encodings' on purpose in a safe way it would not be picked up in future
__import__ calls.
........
r53801 | brett.cannon | 2007-02-16 20:33:01 +0100 (Fri, 16 Feb 2007) | 2 lines
Make the __import__ call in encodings.__init__ absolute with a level 0 call.
........
r53809 | vinay.sajip | 2007-02-16 23:36:24 +0100 (Fri, 16 Feb 2007) | 1 line
Minor fix for currentframe (SF #1652788).
........
r53818 | raymond.hettinger | 2007-02-19 03:03:19 +0100 (Mon, 19 Feb 2007) | 3 lines
Extend work on revision 52962: Eliminate redundant calls to PyObject_Hash().
........
r53820 | raymond.hettinger | 2007-02-19 05:08:43 +0100 (Mon, 19 Feb 2007) | 1 line
Add merge() function to heapq.
........
r53821 | raymond.hettinger | 2007-02-19 06:28:28 +0100 (Mon, 19 Feb 2007) | 1 line
Add tie-breaker count to preserve sort stability.
........
r53822 | raymond.hettinger | 2007-02-19 07:59:32 +0100 (Mon, 19 Feb 2007) | 1 line
Use C heapreplace() instead of slower _siftup() in pure python.
........
r53823 | raymond.hettinger | 2007-02-19 08:30:21 +0100 (Mon, 19 Feb 2007) | 1 line
Add test for merge stability
........
r53824 | raymond.hettinger | 2007-02-19 10:14:10 +0100 (Mon, 19 Feb 2007) | 1 line
Provide an example of defaultdict with non-zero constant factory function.
........
r53825 | lars.gustaebel | 2007-02-19 10:54:47 +0100 (Mon, 19 Feb 2007) | 2 lines
Moved misplaced news item.
........
r53826 | martin.v.loewis | 2007-02-19 11:55:19 +0100 (Mon, 19 Feb 2007) | 3 lines
Patch #1490190: posixmodule now includes os.chflags() and os.lchflags()
functions on platforms where the underlying system calls are available.
........
r53827 | raymond.hettinger | 2007-02-19 19:15:04 +0100 (Mon, 19 Feb 2007) | 1 line
Fixup docstrings for merge().
........
r53829 | raymond.hettinger | 2007-02-19 21:44:04 +0100 (Mon, 19 Feb 2007) | 1 line
Fixup set/dict interoperability.
........
r53837 | raymond.hettinger | 2007-02-21 06:20:38 +0100 (Wed, 21 Feb 2007) | 1 line
Add itertools.izip_longest().
........
r53838 | raymond.hettinger | 2007-02-21 18:22:05 +0100 (Wed, 21 Feb 2007) | 1 line
Remove filler struct item and fix leak.
........
2007-02-23 11:07:44 -04:00
|
|
|
}
|
|
|
|
|
2023-11-14 08:51:00 -04:00
|
|
|
|
2015-05-30 01:21:39 -03:00
|
|
|
/* Internal version of dict.pop(). */
|
2023-11-14 08:51:00 -04:00
|
|
|
int
|
|
|
|
_PyDict_Pop_KnownHash(PyDictObject *mp, PyObject *key, Py_hash_t hash,
|
|
|
|
PyObject **result)
|
2015-05-30 01:21:39 -03:00
|
|
|
{
|
2023-11-14 08:51:00 -04:00
|
|
|
assert(PyDict_Check(mp));
|
2015-05-30 01:21:39 -03:00
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
ASSERT_DICT_LOCKED(mp);
|
|
|
|
|
2015-05-30 01:21:39 -03:00
|
|
|
if (mp->ma_used == 0) {
|
2023-11-14 08:51:00 -04:00
|
|
|
if (result) {
|
|
|
|
*result = NULL;
|
2015-05-30 01:21:39 -03:00
|
|
|
}
|
2023-11-14 08:51:00 -04:00
|
|
|
return 0;
|
2015-05-30 01:21:39 -03:00
|
|
|
}
|
2023-11-14 08:51:00 -04:00
|
|
|
|
|
|
|
PyObject *old_value;
|
|
|
|
Py_ssize_t ix = _Py_dict_lookup(mp, key, hash, &old_value);
|
|
|
|
if (ix == DKIX_ERROR) {
|
|
|
|
if (result) {
|
|
|
|
*result = NULL;
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2016-12-07 07:41:42 -04:00
|
|
|
if (ix == DKIX_EMPTY || old_value == NULL) {
|
2023-11-14 08:51:00 -04:00
|
|
|
if (result) {
|
|
|
|
*result = NULL;
|
2015-05-30 01:21:39 -03:00
|
|
|
}
|
2023-11-14 08:51:00 -04:00
|
|
|
return 0;
|
2015-05-30 01:21:39 -03:00
|
|
|
}
|
2023-11-14 08:51:00 -04:00
|
|
|
|
2016-09-09 23:28:36 -03:00
|
|
|
assert(old_value != NULL);
|
2023-11-14 08:51:00 -04:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
2024-10-01 13:39:56 -03:00
|
|
|
_PyDict_NotifyEvent(interp, PyDict_EVENT_DELETED, mp, key, NULL);
|
|
|
|
delitem_common(mp, hash, ix, Py_NewRef(old_value));
|
2016-09-14 10:02:01 -03:00
|
|
|
|
2019-04-12 16:51:34 -03:00
|
|
|
ASSERT_CONSISTENT(mp);
|
2023-11-14 08:51:00 -04:00
|
|
|
if (result) {
|
|
|
|
*result = old_value;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
Py_DECREF(old_value);
|
|
|
|
}
|
|
|
|
return 1;
|
2015-05-30 01:21:39 -03:00
|
|
|
}
|
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
static int
|
|
|
|
pop_lock_held(PyObject *op, PyObject *key, PyObject **result)
|
2017-01-12 12:34:33 -04:00
|
|
|
{
|
2024-02-06 18:03:43 -04:00
|
|
|
ASSERT_DICT_LOCKED(op);
|
|
|
|
|
2023-11-14 08:51:00 -04:00
|
|
|
if (!PyDict_Check(op)) {
|
|
|
|
if (result) {
|
|
|
|
*result = NULL;
|
|
|
|
}
|
|
|
|
PyErr_BadInternalCall();
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
PyDictObject *dict = (PyDictObject *)op;
|
2017-01-12 12:34:33 -04:00
|
|
|
|
2023-11-14 08:51:00 -04:00
|
|
|
if (dict->ma_used == 0) {
|
|
|
|
if (result) {
|
|
|
|
*result = NULL;
|
2017-01-12 12:34:33 -04:00
|
|
|
}
|
2023-11-14 08:51:00 -04:00
|
|
|
return 0;
|
2017-01-12 12:34:33 -04:00
|
|
|
}
|
2023-11-14 08:51:00 -04:00
|
|
|
|
2024-07-01 16:11:39 -03:00
|
|
|
Py_hash_t hash = _PyObject_HashFast(key);
|
|
|
|
if (hash == -1) {
|
|
|
|
if (result) {
|
|
|
|
*result = NULL;
|
2023-11-14 08:51:00 -04:00
|
|
|
}
|
2024-07-01 16:11:39 -03:00
|
|
|
return -1;
|
2017-01-12 12:34:33 -04:00
|
|
|
}
|
2023-11-14 08:51:00 -04:00
|
|
|
return _PyDict_Pop_KnownHash(dict, key, hash, result);
|
2017-01-12 12:34:33 -04:00
|
|
|
}
|
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
int
|
|
|
|
PyDict_Pop(PyObject *op, PyObject *key, PyObject **result)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
Py_BEGIN_CRITICAL_SECTION(op);
|
|
|
|
err = pop_lock_held(op, key, result);
|
|
|
|
Py_END_CRITICAL_SECTION();
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2023-11-14 08:51:00 -04:00
|
|
|
|
|
|
|
int
|
|
|
|
PyDict_PopString(PyObject *op, const char *key, PyObject **result)
|
|
|
|
{
|
|
|
|
PyObject *key_obj = PyUnicode_FromString(key);
|
|
|
|
if (key_obj == NULL) {
|
|
|
|
if (result != NULL) {
|
|
|
|
*result = NULL;
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
int res = PyDict_Pop(op, key_obj, result);
|
|
|
|
Py_DECREF(key_obj);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
PyObject *
|
|
|
|
_PyDict_Pop(PyObject *dict, PyObject *key, PyObject *default_value)
|
|
|
|
{
|
|
|
|
PyObject *result;
|
|
|
|
if (PyDict_Pop(dict, key, &result) == 0) {
|
|
|
|
if (default_value != NULL) {
|
|
|
|
return Py_NewRef(default_value);
|
|
|
|
}
|
|
|
|
_PyErr_SetKeyError(key);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
static PyDictObject *
|
|
|
|
dict_dict_fromkeys(PyInterpreterState *interp, PyDictObject *mp,
|
|
|
|
PyObject *iterable, PyObject *value)
|
|
|
|
{
|
|
|
|
PyObject *oldvalue;
|
|
|
|
Py_ssize_t pos = 0;
|
|
|
|
PyObject *key;
|
|
|
|
Py_hash_t hash;
|
|
|
|
int unicode = DK_IS_UNICODE(((PyDictObject*)iterable)->ma_keys);
|
|
|
|
uint8_t new_size = Py_MAX(
|
|
|
|
estimate_log2_keysize(PyDict_GET_SIZE(iterable)),
|
|
|
|
DK_LOG_SIZE(mp->ma_keys));
|
|
|
|
if (dictresize(interp, mp, new_size, unicode)) {
|
|
|
|
Py_DECREF(mp);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
while (_PyDict_Next(iterable, &pos, &key, &oldvalue, &hash)) {
|
|
|
|
if (insertdict(interp, mp,
|
|
|
|
Py_NewRef(key), hash, Py_NewRef(value))) {
|
|
|
|
Py_DECREF(mp);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return mp;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyDictObject *
|
|
|
|
dict_set_fromkeys(PyInterpreterState *interp, PyDictObject *mp,
|
|
|
|
PyObject *iterable, PyObject *value)
|
|
|
|
{
|
|
|
|
Py_ssize_t pos = 0;
|
|
|
|
PyObject *key;
|
|
|
|
Py_hash_t hash;
|
|
|
|
|
|
|
|
if (dictresize(interp, mp,
|
|
|
|
estimate_log2_keysize(PySet_GET_SIZE(iterable)), 0)) {
|
|
|
|
Py_DECREF(mp);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2024-04-18 12:18:22 -03:00
|
|
|
_Py_CRITICAL_SECTION_ASSERT_OBJECT_LOCKED(iterable);
|
|
|
|
while (_PySet_NextEntryRef(iterable, &pos, &key, &hash)) {
|
|
|
|
if (insertdict(interp, mp, key, hash, Py_NewRef(value))) {
|
2024-02-06 18:03:43 -04:00
|
|
|
Py_DECREF(mp);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return mp;
|
|
|
|
}
|
2023-11-14 08:51:00 -04:00
|
|
|
|
2015-05-30 01:21:39 -03:00
|
|
|
/* Internal version of dict.from_keys(). It is subclass-friendly. */
|
|
|
|
PyObject *
|
|
|
|
_PyDict_FromKeys(PyObject *cls, PyObject *iterable, PyObject *value)
|
|
|
|
{
|
|
|
|
PyObject *it; /* iter(iterable) */
|
|
|
|
PyObject *key;
|
|
|
|
PyObject *d;
|
|
|
|
int status;
|
2023-03-09 11:16:30 -04:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
2015-05-30 01:21:39 -03:00
|
|
|
|
2021-10-11 19:42:23 -03:00
|
|
|
d = _PyObject_CallNoArgs(cls);
|
2015-05-30 01:21:39 -03:00
|
|
|
if (d == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
|
|
|
|
if (PyDict_CheckExact(d)) {
|
2015-05-30 01:21:39 -03:00
|
|
|
if (PyDict_CheckExact(iterable)) {
|
|
|
|
PyDictObject *mp = (PyDictObject *)d;
|
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
Py_BEGIN_CRITICAL_SECTION2(d, iterable);
|
|
|
|
d = (PyObject *)dict_dict_fromkeys(interp, mp, iterable, value);
|
|
|
|
Py_END_CRITICAL_SECTION2();
|
2015-05-30 01:21:39 -03:00
|
|
|
return d;
|
|
|
|
}
|
2024-02-06 18:03:43 -04:00
|
|
|
else if (PyAnySet_CheckExact(iterable)) {
|
2015-05-30 01:21:39 -03:00
|
|
|
PyDictObject *mp = (PyDictObject *)d;
|
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
Py_BEGIN_CRITICAL_SECTION2(d, iterable);
|
|
|
|
d = (PyObject *)dict_set_fromkeys(interp, mp, iterable, value);
|
|
|
|
Py_END_CRITICAL_SECTION2();
|
2015-05-30 01:21:39 -03:00
|
|
|
return d;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
it = PyObject_GetIter(iterable);
|
|
|
|
if (it == NULL){
|
|
|
|
Py_DECREF(d);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (PyDict_CheckExact(d)) {
|
2024-02-06 18:03:43 -04:00
|
|
|
Py_BEGIN_CRITICAL_SECTION(d);
|
2015-05-30 01:21:39 -03:00
|
|
|
while ((key = PyIter_Next(it)) != NULL) {
|
2024-02-06 18:03:43 -04:00
|
|
|
status = setitem_lock_held((PyDictObject *)d, key, value);
|
2015-05-30 01:21:39 -03:00
|
|
|
Py_DECREF(key);
|
2024-02-06 18:03:43 -04:00
|
|
|
if (status < 0) {
|
|
|
|
assert(PyErr_Occurred());
|
|
|
|
goto dict_iter_exit;
|
|
|
|
}
|
2015-05-30 01:21:39 -03:00
|
|
|
}
|
2024-06-21 16:50:18 -03:00
|
|
|
dict_iter_exit:;
|
2024-02-06 18:03:43 -04:00
|
|
|
Py_END_CRITICAL_SECTION();
|
2015-05-30 01:21:39 -03:00
|
|
|
} else {
|
|
|
|
while ((key = PyIter_Next(it)) != NULL) {
|
|
|
|
status = PyObject_SetItem(d, key, value);
|
|
|
|
Py_DECREF(key);
|
|
|
|
if (status < 0)
|
|
|
|
goto Fail;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (PyErr_Occurred())
|
|
|
|
goto Fail;
|
|
|
|
Py_DECREF(it);
|
|
|
|
return d;
|
|
|
|
|
|
|
|
Fail:
|
|
|
|
Py_DECREF(it);
|
|
|
|
Py_DECREF(d);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
1993-03-27 14:11:32 -04:00
|
|
|
/* Methods */
|
|
|
|
|
|
|
|
static void
|
2024-01-02 10:32:37 -04:00
|
|
|
dict_dealloc(PyObject *self)
|
1993-03-27 14:11:32 -04:00
|
|
|
{
|
2024-01-02 10:32:37 -04:00
|
|
|
PyDictObject *mp = (PyDictObject *)self;
|
2023-03-09 11:16:30 -04:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
2023-03-07 20:10:58 -04:00
|
|
|
assert(Py_REFCNT(mp) == 0);
|
|
|
|
Py_SET_REFCNT(mp, 1);
|
2023-03-09 11:16:30 -04:00
|
|
|
_PyDict_NotifyEvent(interp, PyDict_EVENT_DEALLOCATED, mp, NULL, NULL);
|
2023-03-07 20:10:58 -04:00
|
|
|
if (Py_REFCNT(mp) > 1) {
|
|
|
|
Py_SET_REFCNT(mp, Py_REFCNT(mp) - 1);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
Py_SET_REFCNT(mp, 0);
|
2021-10-06 09:19:53 -03:00
|
|
|
PyDictValues *values = mp->ma_values;
|
2012-04-23 12:24:50 -03:00
|
|
|
PyDictKeysObject *keys = mp->ma_keys;
|
|
|
|
Py_ssize_t i, n;
|
2017-08-24 02:55:17 -03:00
|
|
|
|
|
|
|
/* bpo-31095: UnTrack is needed before calling any callbacks */
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject_GC_UnTrack(mp);
|
2019-05-10 14:21:11 -03:00
|
|
|
Py_TRASHCAN_BEGIN(mp, dict_dealloc)
|
2012-04-23 12:24:50 -03:00
|
|
|
if (values != NULL) {
|
2024-04-02 07:59:21 -03:00
|
|
|
if (values->embedded == 0) {
|
|
|
|
for (i = 0, n = mp->ma_keys->dk_nentries; i < n; i++) {
|
|
|
|
Py_XDECREF(values->values[i]);
|
|
|
|
}
|
|
|
|
free_values(values, false);
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2024-02-20 21:08:14 -04:00
|
|
|
dictkeys_decref(interp, keys, false);
|
2012-04-23 12:24:50 -03:00
|
|
|
}
|
2013-07-16 17:19:00 -03:00
|
|
|
else if (keys != NULL) {
|
2022-03-02 06:05:12 -04:00
|
|
|
assert(keys->dk_refcnt == 1 || keys == Py_EMPTY_KEYS);
|
2024-02-20 21:08:14 -04:00
|
|
|
dictkeys_decref(interp, keys, false);
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2024-07-22 13:08:27 -03:00
|
|
|
if (Py_IS_TYPE(mp, &PyDict_Type)) {
|
|
|
|
_Py_FREELIST_FREE(dicts, mp, Py_TYPE(mp)->tp_free);
|
2020-06-23 06:33:18 -03:00
|
|
|
}
|
2024-07-22 13:08:27 -03:00
|
|
|
else {
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_TYPE(mp)->tp_free((PyObject *)mp);
|
2020-05-05 14:55:29 -03:00
|
|
|
}
|
2019-05-10 14:21:11 -03:00
|
|
|
Py_TRASHCAN_END
|
1993-03-27 14:11:32 -04:00
|
|
|
}
|
|
|
|
|
2012-04-23 12:24:50 -03:00
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
static PyObject *
|
2024-02-06 18:03:43 -04:00
|
|
|
dict_repr_lock_held(PyObject *self)
|
1993-03-27 14:11:32 -04:00
|
|
|
{
|
2024-01-02 10:32:37 -04:00
|
|
|
PyDictObject *mp = (PyDictObject *)self;
|
2013-11-19 08:07:38 -04:00
|
|
|
PyObject *key = NULL, *value = NULL;
|
2024-05-24 14:39:06 -03:00
|
|
|
ASSERT_DICT_LOCKED(mp);
|
|
|
|
|
2024-10-10 15:41:14 -03:00
|
|
|
int res = Py_ReprEnter((PyObject *)mp);
|
|
|
|
if (res != 0) {
|
|
|
|
return (res > 0 ? PyUnicode_FromString("{...}") : NULL);
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
if (mp->ma_used == 0) {
|
2013-11-19 08:07:38 -04:00
|
|
|
Py_ReprLeave((PyObject *)mp);
|
|
|
|
return PyUnicode_FromString("{}");
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
|
|
|
|
2024-10-10 15:41:14 -03:00
|
|
|
// "{" + "1: 2" + ", 3: 4" * (len - 1) + "}"
|
|
|
|
Py_ssize_t prealloc = 1 + 4 + 6 * (mp->ma_used - 1) + 1;
|
|
|
|
PyUnicodeWriter *writer = PyUnicodeWriter_Create(prealloc);
|
|
|
|
if (writer == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
|
2024-10-10 15:41:14 -03:00
|
|
|
if (PyUnicodeWriter_WriteChar(writer, '{') < 0) {
|
2013-11-19 08:07:38 -04:00
|
|
|
goto error;
|
2024-10-10 15:41:14 -03:00
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
|
|
|
|
/* Do repr() on each key+value pair, and insert ": " between them.
|
|
|
|
Note that repr may mutate the dict. */
|
2024-10-10 15:41:14 -03:00
|
|
|
Py_ssize_t i = 0;
|
|
|
|
int first = 1;
|
2024-02-06 18:03:43 -04:00
|
|
|
while (_PyDict_Next((PyObject *)mp, &i, &key, &value, NULL)) {
|
2024-10-10 15:41:14 -03:00
|
|
|
// Prevent repr from deleting key or value during key format.
|
2012-04-23 12:24:50 -03:00
|
|
|
Py_INCREF(key);
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_INCREF(value);
|
2013-11-19 08:07:38 -04:00
|
|
|
|
|
|
|
if (!first) {
|
2024-10-10 15:41:14 -03:00
|
|
|
// Write ", "
|
|
|
|
if (PyUnicodeWriter_WriteChar(writer, ',') < 0) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
if (PyUnicodeWriter_WriteChar(writer, ' ') < 0) {
|
2013-11-19 08:07:38 -04:00
|
|
|
goto error;
|
2024-10-10 15:41:14 -03:00
|
|
|
}
|
2013-11-19 08:07:38 -04:00
|
|
|
}
|
|
|
|
first = 0;
|
|
|
|
|
2024-10-10 15:41:14 -03:00
|
|
|
// Write repr(key)
|
|
|
|
if (PyUnicodeWriter_WriteRepr(writer, key) < 0) {
|
2013-11-19 08:07:38 -04:00
|
|
|
goto error;
|
2024-10-10 15:41:14 -03:00
|
|
|
}
|
2013-07-17 20:00:45 -03:00
|
|
|
|
2024-10-10 15:41:14 -03:00
|
|
|
// Write ": "
|
|
|
|
if (PyUnicodeWriter_WriteChar(writer, ':') < 0) {
|
2013-11-19 08:07:38 -04:00
|
|
|
goto error;
|
2024-10-10 15:41:14 -03:00
|
|
|
}
|
|
|
|
if (PyUnicodeWriter_WriteChar(writer, ' ') < 0) {
|
2013-11-19 08:07:38 -04:00
|
|
|
goto error;
|
2024-10-10 15:41:14 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
// Write repr(value)
|
|
|
|
if (PyUnicodeWriter_WriteRepr(writer, value) < 0) {
|
2013-11-19 08:07:38 -04:00
|
|
|
goto error;
|
2024-10-10 15:41:14 -03:00
|
|
|
}
|
2013-11-19 08:07:38 -04:00
|
|
|
|
|
|
|
Py_CLEAR(key);
|
|
|
|
Py_CLEAR(value);
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
|
|
|
|
2024-10-10 15:41:14 -03:00
|
|
|
if (PyUnicodeWriter_WriteChar(writer, '}') < 0) {
|
2013-11-19 08:07:38 -04:00
|
|
|
goto error;
|
2024-10-10 15:41:14 -03:00
|
|
|
}
|
2013-11-19 08:07:38 -04:00
|
|
|
|
|
|
|
Py_ReprLeave((PyObject *)mp);
|
|
|
|
|
2024-10-10 15:41:14 -03:00
|
|
|
return PyUnicodeWriter_Finish(writer);
|
2013-11-19 08:07:38 -04:00
|
|
|
|
|
|
|
error:
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_ReprLeave((PyObject *)mp);
|
2024-10-10 15:41:14 -03:00
|
|
|
PyUnicodeWriter_Discard(writer);
|
2013-11-19 08:07:38 -04:00
|
|
|
Py_XDECREF(key);
|
|
|
|
Py_XDECREF(value);
|
|
|
|
return NULL;
|
1993-03-27 14:11:32 -04:00
|
|
|
}
|
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
static PyObject *
|
|
|
|
dict_repr(PyObject *self)
|
|
|
|
{
|
|
|
|
PyObject *res;
|
|
|
|
Py_BEGIN_CRITICAL_SECTION(self);
|
|
|
|
res = dict_repr_lock_held(self);
|
|
|
|
Py_END_CRITICAL_SECTION();
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2006-02-15 13:27:45 -04:00
|
|
|
static Py_ssize_t
|
2024-01-02 10:32:37 -04:00
|
|
|
dict_length(PyObject *self)
|
1993-03-27 14:11:32 -04:00
|
|
|
{
|
2024-05-24 14:39:06 -03:00
|
|
|
return FT_ATOMIC_LOAD_SSIZE_RELAXED(((PyDictObject *)self)->ma_used);
|
1993-03-27 14:11:32 -04:00
|
|
|
}
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
static PyObject *
|
2024-02-20 21:08:14 -04:00
|
|
|
dict_subscript(PyObject *self, PyObject *key)
|
1993-03-27 14:11:32 -04:00
|
|
|
{
|
2024-01-02 10:32:37 -04:00
|
|
|
PyDictObject *mp = (PyDictObject *)self;
|
2016-09-07 21:40:12 -03:00
|
|
|
Py_ssize_t ix;
|
2010-10-17 17:54:53 -03:00
|
|
|
Py_hash_t hash;
|
2016-12-07 07:41:42 -04:00
|
|
|
PyObject *value;
|
2012-04-23 12:24:50 -03:00
|
|
|
|
2024-07-01 16:11:39 -03:00
|
|
|
hash = _PyObject_HashFast(key);
|
|
|
|
if (hash == -1) {
|
|
|
|
return NULL;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2024-02-20 21:08:14 -04:00
|
|
|
ix = _Py_dict_lookup_threadsafe(mp, key, hash, &value);
|
2016-09-07 21:40:12 -03:00
|
|
|
if (ix == DKIX_ERROR)
|
2010-05-09 12:52:27 -03:00
|
|
|
return NULL;
|
2016-12-07 07:41:42 -04:00
|
|
|
if (ix == DKIX_EMPTY || value == NULL) {
|
2010-05-09 12:52:27 -03:00
|
|
|
if (!PyDict_CheckExact(mp)) {
|
|
|
|
/* Look up __missing__ method if we're a subclass. */
|
|
|
|
PyObject *missing, *res;
|
2022-02-08 16:39:07 -04:00
|
|
|
missing = _PyObject_LookupSpecial(
|
|
|
|
(PyObject *)mp, &_Py_ID(__missing__));
|
2010-05-09 12:52:27 -03:00
|
|
|
if (missing != NULL) {
|
2020-02-11 12:46:57 -04:00
|
|
|
res = PyObject_CallOneArg(missing, key);
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_DECREF(missing);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
else if (PyErr_Occurred())
|
|
|
|
return NULL;
|
|
|
|
}
|
2013-09-02 19:59:26 -03:00
|
|
|
_PyErr_SetKeyError(key);
|
2010-05-09 12:52:27 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
2024-02-20 21:08:14 -04:00
|
|
|
return value;
|
2024-02-06 18:03:43 -04:00
|
|
|
}
|
|
|
|
|
1993-03-27 14:11:32 -04:00
|
|
|
static int
|
2024-01-02 10:32:37 -04:00
|
|
|
dict_ass_sub(PyObject *mp, PyObject *v, PyObject *w)
|
1993-03-27 14:11:32 -04:00
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
if (w == NULL)
|
2024-01-02 10:32:37 -04:00
|
|
|
return PyDict_DelItem(mp, v);
|
2010-05-09 12:52:27 -03:00
|
|
|
else
|
2024-01-02 10:32:37 -04:00
|
|
|
return PyDict_SetItem(mp, v, w);
|
1993-03-27 14:11:32 -04:00
|
|
|
}
|
|
|
|
|
1997-05-13 18:02:11 -03:00
|
|
|
static PyMappingMethods dict_as_mapping = {
|
2024-01-02 10:32:37 -04:00
|
|
|
dict_length, /*mp_length*/
|
|
|
|
dict_subscript, /*mp_subscript*/
|
|
|
|
dict_ass_sub, /*mp_ass_subscript*/
|
1993-03-27 14:11:32 -04:00
|
|
|
};
|
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
static PyObject *
|
|
|
|
keys_lock_held(PyObject *dict)
|
1993-03-27 14:11:32 -04:00
|
|
|
{
|
2024-02-06 18:03:43 -04:00
|
|
|
ASSERT_DICT_LOCKED(dict);
|
|
|
|
|
2024-01-23 18:10:04 -04:00
|
|
|
if (dict == NULL || !PyDict_Check(dict)) {
|
|
|
|
PyErr_BadInternalCall();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
PyDictObject *mp = (PyDictObject *)dict;
|
2013-08-13 15:18:52 -03:00
|
|
|
PyObject *v;
|
2022-03-01 19:09:28 -04:00
|
|
|
Py_ssize_t n;
|
Tentative fix for a problem that Tim discovered at the last moment,
and reported to python-dev: because we were calling dict_resize() in
PyDict_Next(), and because GC's dict_traverse() uses PyDict_Next(),
and because PyTuple_New() can cause GC, and because dict_items() calls
PyTuple_New(), it was possible for dict_items() to have the dict
resized right under its nose.
The solution is convoluted, and touches several places: keys(),
values(), items(), popitem(), PyDict_Next(), and PyDict_SetItem().
There are two parts to it. First, we no longer call dict_resize() in
PyDict_Next(), which seems to solve the immediate problem. But then
PyDict_SetItem() must have a different policy about when *it* calls
dict_resize(), because we want to guarantee (e.g. for an algorithm
that Jeremy uses in the compiler) that you can loop over a dict using
PyDict_Next() and make changes to the dict as long as those changes
are only value replacements for existing keys using PyDict_SetItem().
This is done by resizing *after* the insertion instead of before, and
by remembering the size before we insert the item, and if the size is
still the same, we don't bother to even check if we might need to
resize. An additional detail is that if the dict starts out empty, we
must still resize it before the insertion.
That was the first part. :-)
The second part is to make keys(), values(), items(), and popitem()
safe against side effects on the dict caused by allocations, under the
assumption that if the GC can cause arbitrary Python code to run, it
can cause other threads to run, and it's not inconceivable that our
dict could be resized -- it would be insane to write code that relies
on this, but not all code is sane.
Now, I have this nagging feeling that the loops in lookdict probably
are blissfully assuming that doing a simple key comparison does not
change the dict's size. This is not necessarily true (the keys could
be class instances after all). But that's a battle for another day.
2001-04-15 19:16:26 -03:00
|
|
|
|
|
|
|
again:
|
2010-05-09 12:52:27 -03:00
|
|
|
n = mp->ma_used;
|
|
|
|
v = PyList_New(n);
|
|
|
|
if (v == NULL)
|
|
|
|
return NULL;
|
|
|
|
if (n != mp->ma_used) {
|
|
|
|
/* Durnit. The allocations caused the dict to resize.
|
|
|
|
* Just start over, this shouldn't normally happen.
|
|
|
|
*/
|
|
|
|
Py_DECREF(v);
|
|
|
|
goto again;
|
|
|
|
}
|
2022-03-01 19:09:28 -04:00
|
|
|
|
|
|
|
/* Nothing we do below makes any function calls. */
|
|
|
|
Py_ssize_t j = 0, pos = 0;
|
|
|
|
PyObject *key;
|
|
|
|
while (_PyDict_Next((PyObject*)mp, &pos, &key, NULL, NULL)) {
|
|
|
|
assert(j < n);
|
2022-11-10 11:27:53 -04:00
|
|
|
PyList_SET_ITEM(v, j, Py_NewRef(key));
|
2022-03-01 19:09:28 -04:00
|
|
|
j++;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
|
|
|
assert(j == n);
|
|
|
|
return v;
|
1993-03-27 14:11:32 -04:00
|
|
|
}
|
|
|
|
|
2024-01-23 18:10:04 -04:00
|
|
|
PyObject *
|
2024-02-06 18:03:43 -04:00
|
|
|
PyDict_Keys(PyObject *dict)
|
|
|
|
{
|
|
|
|
PyObject *res;
|
|
|
|
Py_BEGIN_CRITICAL_SECTION(dict);
|
|
|
|
res = keys_lock_held(dict);
|
|
|
|
Py_END_CRITICAL_SECTION();
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
values_lock_held(PyObject *dict)
|
1993-05-19 11:50:45 -03:00
|
|
|
{
|
2024-02-06 18:03:43 -04:00
|
|
|
ASSERT_DICT_LOCKED(dict);
|
|
|
|
|
2024-01-23 18:10:04 -04:00
|
|
|
if (dict == NULL || !PyDict_Check(dict)) {
|
|
|
|
PyErr_BadInternalCall();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
PyDictObject *mp = (PyDictObject *)dict;
|
2013-08-13 15:18:52 -03:00
|
|
|
PyObject *v;
|
2022-03-01 19:09:28 -04:00
|
|
|
Py_ssize_t n;
|
Tentative fix for a problem that Tim discovered at the last moment,
and reported to python-dev: because we were calling dict_resize() in
PyDict_Next(), and because GC's dict_traverse() uses PyDict_Next(),
and because PyTuple_New() can cause GC, and because dict_items() calls
PyTuple_New(), it was possible for dict_items() to have the dict
resized right under its nose.
The solution is convoluted, and touches several places: keys(),
values(), items(), popitem(), PyDict_Next(), and PyDict_SetItem().
There are two parts to it. First, we no longer call dict_resize() in
PyDict_Next(), which seems to solve the immediate problem. But then
PyDict_SetItem() must have a different policy about when *it* calls
dict_resize(), because we want to guarantee (e.g. for an algorithm
that Jeremy uses in the compiler) that you can loop over a dict using
PyDict_Next() and make changes to the dict as long as those changes
are only value replacements for existing keys using PyDict_SetItem().
This is done by resizing *after* the insertion instead of before, and
by remembering the size before we insert the item, and if the size is
still the same, we don't bother to even check if we might need to
resize. An additional detail is that if the dict starts out empty, we
must still resize it before the insertion.
That was the first part. :-)
The second part is to make keys(), values(), items(), and popitem()
safe against side effects on the dict caused by allocations, under the
assumption that if the GC can cause arbitrary Python code to run, it
can cause other threads to run, and it's not inconceivable that our
dict could be resized -- it would be insane to write code that relies
on this, but not all code is sane.
Now, I have this nagging feeling that the loops in lookdict probably
are blissfully assuming that doing a simple key comparison does not
change the dict's size. This is not necessarily true (the keys could
be class instances after all). But that's a battle for another day.
2001-04-15 19:16:26 -03:00
|
|
|
|
|
|
|
again:
|
2010-05-09 12:52:27 -03:00
|
|
|
n = mp->ma_used;
|
|
|
|
v = PyList_New(n);
|
|
|
|
if (v == NULL)
|
|
|
|
return NULL;
|
|
|
|
if (n != mp->ma_used) {
|
|
|
|
/* Durnit. The allocations caused the dict to resize.
|
|
|
|
* Just start over, this shouldn't normally happen.
|
|
|
|
*/
|
|
|
|
Py_DECREF(v);
|
|
|
|
goto again;
|
|
|
|
}
|
2022-03-01 19:09:28 -04:00
|
|
|
|
|
|
|
/* Nothing we do below makes any function calls. */
|
|
|
|
Py_ssize_t j = 0, pos = 0;
|
|
|
|
PyObject *value;
|
|
|
|
while (_PyDict_Next((PyObject*)mp, &pos, NULL, &value, NULL)) {
|
|
|
|
assert(j < n);
|
2022-11-10 11:27:53 -04:00
|
|
|
PyList_SET_ITEM(v, j, Py_NewRef(value));
|
2022-03-01 19:09:28 -04:00
|
|
|
j++;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
|
|
|
assert(j == n);
|
|
|
|
return v;
|
1993-05-19 11:50:45 -03:00
|
|
|
}
|
|
|
|
|
2024-01-23 18:10:04 -04:00
|
|
|
PyObject *
|
2024-02-06 18:03:43 -04:00
|
|
|
PyDict_Values(PyObject *dict)
|
|
|
|
{
|
|
|
|
PyObject *res;
|
|
|
|
Py_BEGIN_CRITICAL_SECTION(dict);
|
|
|
|
res = values_lock_held(dict);
|
|
|
|
Py_END_CRITICAL_SECTION();
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
items_lock_held(PyObject *dict)
|
1993-05-19 11:50:45 -03:00
|
|
|
{
|
2024-02-06 18:03:43 -04:00
|
|
|
ASSERT_DICT_LOCKED(dict);
|
|
|
|
|
2024-01-23 18:10:04 -04:00
|
|
|
if (dict == NULL || !PyDict_Check(dict)) {
|
|
|
|
PyErr_BadInternalCall();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
PyDictObject *mp = (PyDictObject *)dict;
|
2013-08-13 15:18:52 -03:00
|
|
|
PyObject *v;
|
2022-03-01 19:09:28 -04:00
|
|
|
Py_ssize_t i, n;
|
|
|
|
PyObject *item;
|
Tentative fix for a problem that Tim discovered at the last moment,
and reported to python-dev: because we were calling dict_resize() in
PyDict_Next(), and because GC's dict_traverse() uses PyDict_Next(),
and because PyTuple_New() can cause GC, and because dict_items() calls
PyTuple_New(), it was possible for dict_items() to have the dict
resized right under its nose.
The solution is convoluted, and touches several places: keys(),
values(), items(), popitem(), PyDict_Next(), and PyDict_SetItem().
There are two parts to it. First, we no longer call dict_resize() in
PyDict_Next(), which seems to solve the immediate problem. But then
PyDict_SetItem() must have a different policy about when *it* calls
dict_resize(), because we want to guarantee (e.g. for an algorithm
that Jeremy uses in the compiler) that you can loop over a dict using
PyDict_Next() and make changes to the dict as long as those changes
are only value replacements for existing keys using PyDict_SetItem().
This is done by resizing *after* the insertion instead of before, and
by remembering the size before we insert the item, and if the size is
still the same, we don't bother to even check if we might need to
resize. An additional detail is that if the dict starts out empty, we
must still resize it before the insertion.
That was the first part. :-)
The second part is to make keys(), values(), items(), and popitem()
safe against side effects on the dict caused by allocations, under the
assumption that if the GC can cause arbitrary Python code to run, it
can cause other threads to run, and it's not inconceivable that our
dict could be resized -- it would be insane to write code that relies
on this, but not all code is sane.
Now, I have this nagging feeling that the loops in lookdict probably
are blissfully assuming that doing a simple key comparison does not
change the dict's size. This is not necessarily true (the keys could
be class instances after all). But that's a battle for another day.
2001-04-15 19:16:26 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
/* Preallocate the list of tuples, to avoid allocations during
|
|
|
|
* the loop over the items, which could trigger GC, which
|
|
|
|
* could resize the dict. :-(
|
|
|
|
*/
|
Tentative fix for a problem that Tim discovered at the last moment,
and reported to python-dev: because we were calling dict_resize() in
PyDict_Next(), and because GC's dict_traverse() uses PyDict_Next(),
and because PyTuple_New() can cause GC, and because dict_items() calls
PyTuple_New(), it was possible for dict_items() to have the dict
resized right under its nose.
The solution is convoluted, and touches several places: keys(),
values(), items(), popitem(), PyDict_Next(), and PyDict_SetItem().
There are two parts to it. First, we no longer call dict_resize() in
PyDict_Next(), which seems to solve the immediate problem. But then
PyDict_SetItem() must have a different policy about when *it* calls
dict_resize(), because we want to guarantee (e.g. for an algorithm
that Jeremy uses in the compiler) that you can loop over a dict using
PyDict_Next() and make changes to the dict as long as those changes
are only value replacements for existing keys using PyDict_SetItem().
This is done by resizing *after* the insertion instead of before, and
by remembering the size before we insert the item, and if the size is
still the same, we don't bother to even check if we might need to
resize. An additional detail is that if the dict starts out empty, we
must still resize it before the insertion.
That was the first part. :-)
The second part is to make keys(), values(), items(), and popitem()
safe against side effects on the dict caused by allocations, under the
assumption that if the GC can cause arbitrary Python code to run, it
can cause other threads to run, and it's not inconceivable that our
dict could be resized -- it would be insane to write code that relies
on this, but not all code is sane.
Now, I have this nagging feeling that the loops in lookdict probably
are blissfully assuming that doing a simple key comparison does not
change the dict's size. This is not necessarily true (the keys could
be class instances after all). But that's a battle for another day.
2001-04-15 19:16:26 -03:00
|
|
|
again:
|
2010-05-09 12:52:27 -03:00
|
|
|
n = mp->ma_used;
|
|
|
|
v = PyList_New(n);
|
|
|
|
if (v == NULL)
|
|
|
|
return NULL;
|
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
item = PyTuple_New(2);
|
|
|
|
if (item == NULL) {
|
|
|
|
Py_DECREF(v);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
PyList_SET_ITEM(v, i, item);
|
|
|
|
}
|
|
|
|
if (n != mp->ma_used) {
|
|
|
|
/* Durnit. The allocations caused the dict to resize.
|
|
|
|
* Just start over, this shouldn't normally happen.
|
|
|
|
*/
|
|
|
|
Py_DECREF(v);
|
|
|
|
goto again;
|
|
|
|
}
|
2022-03-01 19:09:28 -04:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
/* Nothing we do below makes any function calls. */
|
2022-03-01 19:09:28 -04:00
|
|
|
Py_ssize_t j = 0, pos = 0;
|
|
|
|
PyObject *key, *value;
|
|
|
|
while (_PyDict_Next((PyObject*)mp, &pos, &key, &value, NULL)) {
|
|
|
|
assert(j < n);
|
|
|
|
PyObject *item = PyList_GET_ITEM(v, j);
|
2022-11-10 11:27:53 -04:00
|
|
|
PyTuple_SET_ITEM(item, 0, Py_NewRef(key));
|
|
|
|
PyTuple_SET_ITEM(item, 1, Py_NewRef(value));
|
2022-03-01 19:09:28 -04:00
|
|
|
j++;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
|
|
|
assert(j == n);
|
|
|
|
return v;
|
1993-05-19 11:50:45 -03:00
|
|
|
}
|
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
PyObject *
|
|
|
|
PyDict_Items(PyObject *dict)
|
|
|
|
{
|
|
|
|
PyObject *res;
|
|
|
|
Py_BEGIN_CRITICAL_SECTION(dict);
|
|
|
|
res = items_lock_held(dict);
|
|
|
|
Py_END_CRITICAL_SECTION();
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2014-01-24 10:17:25 -04:00
|
|
|
/*[clinic input]
|
|
|
|
@classmethod
|
|
|
|
dict.fromkeys
|
|
|
|
iterable: object
|
|
|
|
value: object=None
|
|
|
|
/
|
|
|
|
|
2017-01-24 18:30:04 -04:00
|
|
|
Create a new dictionary with keys from iterable and values set to value.
|
2014-01-24 10:17:25 -04:00
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
dict_fromkeys_impl(PyTypeObject *type, PyObject *iterable, PyObject *value)
|
2017-01-24 18:30:04 -04:00
|
|
|
/*[clinic end generated code: output=8fb98e4b10384999 input=382ba4855d0f74c3]*/
|
2014-01-24 10:17:25 -04:00
|
|
|
{
|
2015-05-30 01:21:39 -03:00
|
|
|
return _PyDict_FromKeys((PyObject *)type, iterable, value);
|
2002-11-27 03:29:33 -04:00
|
|
|
}
|
|
|
|
|
2020-02-24 23:47:34 -04:00
|
|
|
/* Single-arg dict update; used by dict_update_common and operators. */
|
|
|
|
static int
|
|
|
|
dict_update_arg(PyObject *self, PyObject *arg)
|
|
|
|
{
|
|
|
|
if (PyDict_CheckExact(arg)) {
|
|
|
|
return PyDict_Merge(self, arg, 1);
|
|
|
|
}
|
2023-09-17 08:23:31 -03:00
|
|
|
int has_keys = PyObject_HasAttrWithError(arg, &_Py_ID(keys));
|
|
|
|
if (has_keys < 0) {
|
2020-02-24 23:47:34 -04:00
|
|
|
return -1;
|
|
|
|
}
|
2023-09-17 08:23:31 -03:00
|
|
|
if (has_keys) {
|
2020-02-24 23:47:34 -04:00
|
|
|
return PyDict_Merge(self, arg, 1);
|
|
|
|
}
|
|
|
|
return PyDict_MergeFromSeq2(self, arg, 1);
|
|
|
|
}
|
|
|
|
|
2004-03-04 04:25:44 -04:00
|
|
|
static int
|
2016-09-07 21:40:12 -03:00
|
|
|
dict_update_common(PyObject *self, PyObject *args, PyObject *kwds,
|
|
|
|
const char *methname)
|
2004-03-04 04:25:44 -04:00
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject *arg = NULL;
|
|
|
|
int result = 0;
|
2004-03-04 04:25:44 -04:00
|
|
|
|
2017-11-11 10:19:56 -04:00
|
|
|
if (!PyArg_UnpackTuple(args, methname, 0, 1, &arg)) {
|
2010-05-09 12:52:27 -03:00
|
|
|
result = -1;
|
2017-11-11 10:19:56 -04:00
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
else if (arg != NULL) {
|
2020-02-24 23:47:34 -04:00
|
|
|
result = dict_update_arg(self, arg);
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2017-11-11 10:19:56 -04:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
if (result == 0 && kwds != NULL) {
|
|
|
|
if (PyArg_ValidateKeywordArguments(kwds))
|
|
|
|
result = PyDict_Merge(self, kwds, 1);
|
|
|
|
else
|
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
return result;
|
2004-03-04 04:25:44 -04:00
|
|
|
}
|
|
|
|
|
2017-01-19 07:45:06 -04:00
|
|
|
/* Note: dict.update() uses the METH_VARARGS|METH_KEYWORDS calling convention.
|
2017-07-03 15:20:15 -03:00
|
|
|
Using METH_FASTCALL|METH_KEYWORDS would make dict.update(**dict2) calls
|
|
|
|
slower, see the issue #29312. */
|
1997-05-28 16:15:28 -03:00
|
|
|
static PyObject *
|
2004-03-04 04:25:44 -04:00
|
|
|
dict_update(PyObject *self, PyObject *args, PyObject *kwds)
|
2001-08-02 01:15:00 -03:00
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
if (dict_update_common(self, args, kwds, "update") != -1)
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
return NULL;
|
2001-08-02 01:15:00 -03:00
|
|
|
}
|
|
|
|
|
2001-08-10 17:28:28 -03:00
|
|
|
/* Update unconditionally replaces existing items.
|
|
|
|
Merge has a 3rd argument 'override'; if set, it acts like Update,
|
Generalize dictionary() to accept a sequence of 2-sequences. At the
outer level, the iterator protocol is used for memory-efficiency (the
outer sequence may be very large if fully materialized); at the inner
level, PySequence_Fast() is used for time-efficiency (these should
always be sequences of length 2).
dictobject.c, new functions PyDict_{Merge,Update}FromSeq2. These are
wholly analogous to PyDict_{Merge,Update}, but process a sequence-of-2-
sequences argument instead of a mapping object. For now, I left these
functions file static, so no corresponding doc changes. It's tempting
to change dict.update() to allow a sequence-of-2-seqs argument too.
Also changed the name of dictionary's keyword argument from "mapping"
to "x". Got a better name? "mapping_or_sequence_of_pairs" isn't
attractive, although more so than "mosop" <wink>.
abstract.h, abstract.tex: Added new PySequence_Fast_GET_SIZE function,
much faster than going thru the all-purpose PySequence_Size.
libfuncs.tex:
- Document dictionary().
- Fiddle tuple() and list() to admit that their argument is optional.
- The long-winded repetitions of "a sequence, a container that supports
iteration, or an iterator object" is getting to be a PITA. Many
months ago I suggested factoring this out into "iterable object",
where the definition of that could include being explicit about
generators too (as is, I'm not sure a reader outside of PythonLabs
could guess that "an iterator object" includes a generator call).
- Please check my curly braces -- I'm going blind <0.9 wink>.
abstract.c, PySequence_Tuple(): When PyObject_GetIter() fails, leave
its error msg alone now (the msg it produces has improved since
PySequence_Tuple was generalized to accept iterable objects, and
PySequence_Tuple was also stomping on the msg in cases it shouldn't
have even before PyObject_GetIter grew a better msg).
2001-10-26 02:06:50 -03:00
|
|
|
otherwise it leaves existing items unchanged.
|
|
|
|
|
|
|
|
PyDict_{Update,Merge} update/merge from a mapping object.
|
|
|
|
|
2001-12-11 14:51:08 -04:00
|
|
|
PyDict_MergeFromSeq2 updates/merges from any iterable object
|
Generalize dictionary() to accept a sequence of 2-sequences. At the
outer level, the iterator protocol is used for memory-efficiency (the
outer sequence may be very large if fully materialized); at the inner
level, PySequence_Fast() is used for time-efficiency (these should
always be sequences of length 2).
dictobject.c, new functions PyDict_{Merge,Update}FromSeq2. These are
wholly analogous to PyDict_{Merge,Update}, but process a sequence-of-2-
sequences argument instead of a mapping object. For now, I left these
functions file static, so no corresponding doc changes. It's tempting
to change dict.update() to allow a sequence-of-2-seqs argument too.
Also changed the name of dictionary's keyword argument from "mapping"
to "x". Got a better name? "mapping_or_sequence_of_pairs" isn't
attractive, although more so than "mosop" <wink>.
abstract.h, abstract.tex: Added new PySequence_Fast_GET_SIZE function,
much faster than going thru the all-purpose PySequence_Size.
libfuncs.tex:
- Document dictionary().
- Fiddle tuple() and list() to admit that their argument is optional.
- The long-winded repetitions of "a sequence, a container that supports
iteration, or an iterator object" is getting to be a PITA. Many
months ago I suggested factoring this out into "iterable object",
where the definition of that could include being explicit about
generators too (as is, I'm not sure a reader outside of PythonLabs
could guess that "an iterator object" includes a generator call).
- Please check my curly braces -- I'm going blind <0.9 wink>.
abstract.c, PySequence_Tuple(): When PyObject_GetIter() fails, leave
its error msg alone now (the msg it produces has improved since
PySequence_Tuple was generalized to accept iterable objects, and
PySequence_Tuple was also stomping on the msg in cases it shouldn't
have even before PyObject_GetIter grew a better msg).
2001-10-26 02:06:50 -03:00
|
|
|
producing iterable objects of length 2.
|
|
|
|
*/
|
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
static int
|
|
|
|
merge_from_seq2_lock_held(PyObject *d, PyObject *seq2, int override)
|
Generalize dictionary() to accept a sequence of 2-sequences. At the
outer level, the iterator protocol is used for memory-efficiency (the
outer sequence may be very large if fully materialized); at the inner
level, PySequence_Fast() is used for time-efficiency (these should
always be sequences of length 2).
dictobject.c, new functions PyDict_{Merge,Update}FromSeq2. These are
wholly analogous to PyDict_{Merge,Update}, but process a sequence-of-2-
sequences argument instead of a mapping object. For now, I left these
functions file static, so no corresponding doc changes. It's tempting
to change dict.update() to allow a sequence-of-2-seqs argument too.
Also changed the name of dictionary's keyword argument from "mapping"
to "x". Got a better name? "mapping_or_sequence_of_pairs" isn't
attractive, although more so than "mosop" <wink>.
abstract.h, abstract.tex: Added new PySequence_Fast_GET_SIZE function,
much faster than going thru the all-purpose PySequence_Size.
libfuncs.tex:
- Document dictionary().
- Fiddle tuple() and list() to admit that their argument is optional.
- The long-winded repetitions of "a sequence, a container that supports
iteration, or an iterator object" is getting to be a PITA. Many
months ago I suggested factoring this out into "iterable object",
where the definition of that could include being explicit about
generators too (as is, I'm not sure a reader outside of PythonLabs
could guess that "an iterator object" includes a generator call).
- Please check my curly braces -- I'm going blind <0.9 wink>.
abstract.c, PySequence_Tuple(): When PyObject_GetIter() fails, leave
its error msg alone now (the msg it produces has improved since
PySequence_Tuple was generalized to accept iterable objects, and
PySequence_Tuple was also stomping on the msg in cases it shouldn't
have even before PyObject_GetIter grew a better msg).
2001-10-26 02:06:50 -03:00
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject *it; /* iter(seq2) */
|
|
|
|
Py_ssize_t i; /* index into seq2 of current element */
|
|
|
|
PyObject *item; /* seq2[i] */
|
|
|
|
PyObject *fast; /* item as a 2-tuple or 2-list */
|
|
|
|
|
|
|
|
assert(d != NULL);
|
|
|
|
assert(PyDict_Check(d));
|
|
|
|
assert(seq2 != NULL);
|
|
|
|
|
|
|
|
it = PyObject_GetIter(seq2);
|
|
|
|
if (it == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
for (i = 0; ; ++i) {
|
|
|
|
PyObject *key, *value;
|
|
|
|
Py_ssize_t n;
|
|
|
|
|
|
|
|
fast = NULL;
|
|
|
|
item = PyIter_Next(it);
|
|
|
|
if (item == NULL) {
|
|
|
|
if (PyErr_Occurred())
|
|
|
|
goto Fail;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Convert item to sequence, and verify length 2. */
|
|
|
|
fast = PySequence_Fast(item, "");
|
|
|
|
if (fast == NULL) {
|
|
|
|
if (PyErr_ExceptionMatches(PyExc_TypeError))
|
|
|
|
PyErr_Format(PyExc_TypeError,
|
|
|
|
"cannot convert dictionary update "
|
|
|
|
"sequence element #%zd to a sequence",
|
|
|
|
i);
|
|
|
|
goto Fail;
|
|
|
|
}
|
|
|
|
n = PySequence_Fast_GET_SIZE(fast);
|
|
|
|
if (n != 2) {
|
|
|
|
PyErr_Format(PyExc_ValueError,
|
|
|
|
"dictionary update sequence element #%zd "
|
|
|
|
"has length %zd; 2 is required",
|
|
|
|
i, n);
|
|
|
|
goto Fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Update/merge with this (key, value) pair. */
|
|
|
|
key = PySequence_Fast_GET_ITEM(fast, 0);
|
|
|
|
value = PySequence_Fast_GET_ITEM(fast, 1);
|
2017-05-20 06:30:02 -03:00
|
|
|
Py_INCREF(key);
|
|
|
|
Py_INCREF(value);
|
2019-02-25 11:59:46 -04:00
|
|
|
if (override) {
|
2024-02-06 18:03:43 -04:00
|
|
|
if (setitem_lock_held((PyDictObject *)d, key, value) < 0) {
|
2017-05-20 06:30:02 -03:00
|
|
|
Py_DECREF(key);
|
|
|
|
Py_DECREF(value);
|
2010-05-09 12:52:27 -03:00
|
|
|
goto Fail;
|
2017-05-20 06:30:02 -03:00
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2020-10-26 07:47:57 -03:00
|
|
|
else {
|
2024-02-06 18:03:43 -04:00
|
|
|
if (dict_setdefault_ref_lock_held(d, key, value, NULL, 0) < 0) {
|
2019-02-25 11:59:46 -04:00
|
|
|
Py_DECREF(key);
|
|
|
|
Py_DECREF(value);
|
|
|
|
goto Fail;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-05-20 06:30:02 -03:00
|
|
|
Py_DECREF(key);
|
|
|
|
Py_DECREF(value);
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_DECREF(fast);
|
|
|
|
Py_DECREF(item);
|
|
|
|
}
|
|
|
|
|
|
|
|
i = 0;
|
2019-04-12 16:51:34 -03:00
|
|
|
ASSERT_CONSISTENT(d);
|
2010-05-09 12:52:27 -03:00
|
|
|
goto Return;
|
Generalize dictionary() to accept a sequence of 2-sequences. At the
outer level, the iterator protocol is used for memory-efficiency (the
outer sequence may be very large if fully materialized); at the inner
level, PySequence_Fast() is used for time-efficiency (these should
always be sequences of length 2).
dictobject.c, new functions PyDict_{Merge,Update}FromSeq2. These are
wholly analogous to PyDict_{Merge,Update}, but process a sequence-of-2-
sequences argument instead of a mapping object. For now, I left these
functions file static, so no corresponding doc changes. It's tempting
to change dict.update() to allow a sequence-of-2-seqs argument too.
Also changed the name of dictionary's keyword argument from "mapping"
to "x". Got a better name? "mapping_or_sequence_of_pairs" isn't
attractive, although more so than "mosop" <wink>.
abstract.h, abstract.tex: Added new PySequence_Fast_GET_SIZE function,
much faster than going thru the all-purpose PySequence_Size.
libfuncs.tex:
- Document dictionary().
- Fiddle tuple() and list() to admit that their argument is optional.
- The long-winded repetitions of "a sequence, a container that supports
iteration, or an iterator object" is getting to be a PITA. Many
months ago I suggested factoring this out into "iterable object",
where the definition of that could include being explicit about
generators too (as is, I'm not sure a reader outside of PythonLabs
could guess that "an iterator object" includes a generator call).
- Please check my curly braces -- I'm going blind <0.9 wink>.
abstract.c, PySequence_Tuple(): When PyObject_GetIter() fails, leave
its error msg alone now (the msg it produces has improved since
PySequence_Tuple was generalized to accept iterable objects, and
PySequence_Tuple was also stomping on the msg in cases it shouldn't
have even before PyObject_GetIter grew a better msg).
2001-10-26 02:06:50 -03:00
|
|
|
Fail:
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_XDECREF(item);
|
|
|
|
Py_XDECREF(fast);
|
|
|
|
i = -1;
|
Generalize dictionary() to accept a sequence of 2-sequences. At the
outer level, the iterator protocol is used for memory-efficiency (the
outer sequence may be very large if fully materialized); at the inner
level, PySequence_Fast() is used for time-efficiency (these should
always be sequences of length 2).
dictobject.c, new functions PyDict_{Merge,Update}FromSeq2. These are
wholly analogous to PyDict_{Merge,Update}, but process a sequence-of-2-
sequences argument instead of a mapping object. For now, I left these
functions file static, so no corresponding doc changes. It's tempting
to change dict.update() to allow a sequence-of-2-seqs argument too.
Also changed the name of dictionary's keyword argument from "mapping"
to "x". Got a better name? "mapping_or_sequence_of_pairs" isn't
attractive, although more so than "mosop" <wink>.
abstract.h, abstract.tex: Added new PySequence_Fast_GET_SIZE function,
much faster than going thru the all-purpose PySequence_Size.
libfuncs.tex:
- Document dictionary().
- Fiddle tuple() and list() to admit that their argument is optional.
- The long-winded repetitions of "a sequence, a container that supports
iteration, or an iterator object" is getting to be a PITA. Many
months ago I suggested factoring this out into "iterable object",
where the definition of that could include being explicit about
generators too (as is, I'm not sure a reader outside of PythonLabs
could guess that "an iterator object" includes a generator call).
- Please check my curly braces -- I'm going blind <0.9 wink>.
abstract.c, PySequence_Tuple(): When PyObject_GetIter() fails, leave
its error msg alone now (the msg it produces has improved since
PySequence_Tuple was generalized to accept iterable objects, and
PySequence_Tuple was also stomping on the msg in cases it shouldn't
have even before PyObject_GetIter grew a better msg).
2001-10-26 02:06:50 -03:00
|
|
|
Return:
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_DECREF(it);
|
|
|
|
return Py_SAFE_DOWNCAST(i, Py_ssize_t, int);
|
Generalize dictionary() to accept a sequence of 2-sequences. At the
outer level, the iterator protocol is used for memory-efficiency (the
outer sequence may be very large if fully materialized); at the inner
level, PySequence_Fast() is used for time-efficiency (these should
always be sequences of length 2).
dictobject.c, new functions PyDict_{Merge,Update}FromSeq2. These are
wholly analogous to PyDict_{Merge,Update}, but process a sequence-of-2-
sequences argument instead of a mapping object. For now, I left these
functions file static, so no corresponding doc changes. It's tempting
to change dict.update() to allow a sequence-of-2-seqs argument too.
Also changed the name of dictionary's keyword argument from "mapping"
to "x". Got a better name? "mapping_or_sequence_of_pairs" isn't
attractive, although more so than "mosop" <wink>.
abstract.h, abstract.tex: Added new PySequence_Fast_GET_SIZE function,
much faster than going thru the all-purpose PySequence_Size.
libfuncs.tex:
- Document dictionary().
- Fiddle tuple() and list() to admit that their argument is optional.
- The long-winded repetitions of "a sequence, a container that supports
iteration, or an iterator object" is getting to be a PITA. Many
months ago I suggested factoring this out into "iterable object",
where the definition of that could include being explicit about
generators too (as is, I'm not sure a reader outside of PythonLabs
could guess that "an iterator object" includes a generator call).
- Please check my curly braces -- I'm going blind <0.9 wink>.
abstract.c, PySequence_Tuple(): When PyObject_GetIter() fails, leave
its error msg alone now (the msg it produces has improved since
PySequence_Tuple was generalized to accept iterable objects, and
PySequence_Tuple was also stomping on the msg in cases it shouldn't
have even before PyObject_GetIter grew a better msg).
2001-10-26 02:06:50 -03:00
|
|
|
}
|
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
int
|
|
|
|
PyDict_MergeFromSeq2(PyObject *d, PyObject *seq2, int override)
|
|
|
|
{
|
|
|
|
int res;
|
|
|
|
Py_BEGIN_CRITICAL_SECTION(d);
|
|
|
|
res = merge_from_seq2_lock_held(d, seq2, override);
|
|
|
|
Py_END_CRITICAL_SECTION();
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
dict_dict_merge(PyInterpreterState *interp, PyDictObject *mp, PyDictObject *other, int override)
|
|
|
|
{
|
2024-05-24 14:39:06 -03:00
|
|
|
ASSERT_DICT_LOCKED(mp);
|
|
|
|
ASSERT_DICT_LOCKED(other);
|
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
if (other == mp || other->ma_used == 0)
|
|
|
|
/* a.update(a) or a.update({}); nothing to do */
|
|
|
|
return 0;
|
|
|
|
if (mp->ma_used == 0) {
|
|
|
|
/* Since the target dict is empty, PyDict_GetItem()
|
|
|
|
* always returns NULL. Setting override to 1
|
|
|
|
* skips the unnecessary test.
|
|
|
|
*/
|
|
|
|
override = 1;
|
|
|
|
PyDictKeysObject *okeys = other->ma_keys;
|
|
|
|
|
|
|
|
// If other is clean, combined, and just allocated, just clone it.
|
2024-04-02 07:59:21 -03:00
|
|
|
if (mp->ma_values == NULL &&
|
|
|
|
other->ma_values == NULL &&
|
|
|
|
other->ma_used == okeys->dk_nentries &&
|
|
|
|
(DK_LOG_SIZE(okeys) == PyDict_LOG_MINSIZE ||
|
|
|
|
USABLE_FRACTION(DK_SIZE(okeys)/2) < other->ma_used)
|
|
|
|
) {
|
2024-10-01 13:39:56 -03:00
|
|
|
_PyDict_NotifyEvent(interp, PyDict_EVENT_CLONED, mp, (PyObject *)other, NULL);
|
2024-02-06 18:03:43 -04:00
|
|
|
PyDictKeysObject *keys = clone_combined_dict_keys(other);
|
|
|
|
if (keys == NULL)
|
|
|
|
return -1;
|
|
|
|
|
2024-02-20 21:08:14 -04:00
|
|
|
ensure_shared_on_resize(mp);
|
|
|
|
dictkeys_decref(interp, mp->ma_keys, IS_DICT_SHARED(mp));
|
2024-02-06 18:03:43 -04:00
|
|
|
mp->ma_keys = keys;
|
2024-05-24 14:39:06 -03:00
|
|
|
STORE_USED(mp, other->ma_used);
|
2024-02-06 18:03:43 -04:00
|
|
|
ASSERT_CONSISTENT(mp);
|
|
|
|
|
2024-11-19 05:25:09 -04:00
|
|
|
if (_PyObject_GC_IS_TRACKED(other) && !_PyObject_GC_IS_TRACKED(mp)) {
|
|
|
|
/* Maintain tracking. */
|
|
|
|
_PyObject_GC_TRACK(mp);
|
|
|
|
}
|
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* Do one big resize at the start, rather than
|
|
|
|
* incrementally resizing as we insert new items. Expect
|
|
|
|
* that there will be no (or few) overlapping keys.
|
|
|
|
*/
|
|
|
|
if (USABLE_FRACTION(DK_SIZE(mp->ma_keys)) < other->ma_used) {
|
|
|
|
int unicode = DK_IS_UNICODE(other->ma_keys);
|
|
|
|
if (dictresize(interp, mp,
|
|
|
|
estimate_log2_keysize(mp->ma_used + other->ma_used),
|
|
|
|
unicode)) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Py_ssize_t orig_size = other->ma_keys->dk_nentries;
|
|
|
|
Py_ssize_t pos = 0;
|
|
|
|
Py_hash_t hash;
|
|
|
|
PyObject *key, *value;
|
|
|
|
|
|
|
|
while (_PyDict_Next((PyObject*)other, &pos, &key, &value, &hash)) {
|
|
|
|
int err = 0;
|
|
|
|
Py_INCREF(key);
|
|
|
|
Py_INCREF(value);
|
|
|
|
if (override == 1) {
|
|
|
|
err = insertdict(interp, mp,
|
|
|
|
Py_NewRef(key), hash, Py_NewRef(value));
|
|
|
|
}
|
|
|
|
else {
|
2024-02-20 21:08:14 -04:00
|
|
|
err = _PyDict_Contains_KnownHash((PyObject *)mp, key, hash);
|
2024-02-06 18:03:43 -04:00
|
|
|
if (err == 0) {
|
|
|
|
err = insertdict(interp, mp,
|
|
|
|
Py_NewRef(key), hash, Py_NewRef(value));
|
|
|
|
}
|
|
|
|
else if (err > 0) {
|
|
|
|
if (override != 0) {
|
|
|
|
_PyErr_SetKeyError(key);
|
|
|
|
Py_DECREF(value);
|
|
|
|
Py_DECREF(key);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
err = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Py_DECREF(value);
|
|
|
|
Py_DECREF(key);
|
|
|
|
if (err != 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (orig_size != other->ma_keys->dk_nentries) {
|
|
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
|
|
"dict mutated during update");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-10-11 03:04:02 -03:00
|
|
|
static int
|
2023-03-09 11:16:30 -04:00
|
|
|
dict_merge(PyInterpreterState *interp, PyObject *a, PyObject *b, int override)
|
1997-05-28 16:15:28 -03:00
|
|
|
{
|
2013-08-13 15:18:52 -03:00
|
|
|
PyDictObject *mp, *other;
|
2010-05-09 12:52:27 -03:00
|
|
|
|
2016-10-02 05:06:43 -03:00
|
|
|
assert(0 <= override && override <= 2);
|
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
/* We accept for the argument either a concrete dictionary object,
|
|
|
|
* or an abstract "mapping" object. For the former, we can do
|
|
|
|
* things quite efficiently. For the latter, we only require that
|
|
|
|
* PyMapping_Keys() and PyObject_GetItem() be supported.
|
|
|
|
*/
|
|
|
|
if (a == NULL || !PyDict_Check(a) || b == NULL) {
|
|
|
|
PyErr_BadInternalCall();
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
mp = (PyDictObject*)a;
|
2024-02-06 18:03:43 -04:00
|
|
|
int res = 0;
|
2024-01-02 10:32:37 -04:00
|
|
|
if (PyDict_Check(b) && (Py_TYPE(b)->tp_iter == dict_iter)) {
|
2010-05-09 12:52:27 -03:00
|
|
|
other = (PyDictObject*)b;
|
2024-02-06 18:03:43 -04:00
|
|
|
int res;
|
|
|
|
Py_BEGIN_CRITICAL_SECTION2(a, b);
|
|
|
|
res = dict_dict_merge(interp, (PyDictObject *)a, other, override);
|
|
|
|
ASSERT_CONSISTENT(a);
|
|
|
|
Py_END_CRITICAL_SECTION2();
|
|
|
|
return res;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* Do it the generic, slower way */
|
2024-02-06 18:03:43 -04:00
|
|
|
Py_BEGIN_CRITICAL_SECTION(a);
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject *keys = PyMapping_Keys(b);
|
|
|
|
PyObject *iter;
|
|
|
|
PyObject *key, *value;
|
|
|
|
int status;
|
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
if (keys == NULL) {
|
2010-05-09 12:52:27 -03:00
|
|
|
/* Docstring says this is equivalent to E.keys() so
|
|
|
|
* if E doesn't have a .keys() method we want
|
|
|
|
* AttributeError to percolate up. Might as well
|
|
|
|
* do the same for any other error.
|
|
|
|
*/
|
2024-02-06 18:03:43 -04:00
|
|
|
res = -1;
|
|
|
|
goto slow_exit;
|
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
|
|
|
|
iter = PyObject_GetIter(keys);
|
|
|
|
Py_DECREF(keys);
|
2024-02-06 18:03:43 -04:00
|
|
|
if (iter == NULL) {
|
|
|
|
res = -1;
|
|
|
|
goto slow_exit;
|
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
|
|
|
|
for (key = PyIter_Next(iter); key; key = PyIter_Next(iter)) {
|
2019-02-25 11:59:46 -04:00
|
|
|
if (override != 1) {
|
2024-02-20 21:08:14 -04:00
|
|
|
status = PyDict_Contains(a, key);
|
2020-10-26 07:47:57 -03:00
|
|
|
if (status != 0) {
|
|
|
|
if (status > 0) {
|
|
|
|
if (override == 0) {
|
|
|
|
Py_DECREF(key);
|
|
|
|
continue;
|
|
|
|
}
|
2019-02-25 11:59:46 -04:00
|
|
|
_PyErr_SetKeyError(key);
|
|
|
|
}
|
2016-10-02 05:06:43 -03:00
|
|
|
Py_DECREF(key);
|
|
|
|
Py_DECREF(iter);
|
2024-02-06 18:03:43 -04:00
|
|
|
res = -1;
|
|
|
|
goto slow_exit;
|
2016-10-02 05:06:43 -03:00
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
|
|
|
value = PyObject_GetItem(b, key);
|
|
|
|
if (value == NULL) {
|
|
|
|
Py_DECREF(iter);
|
|
|
|
Py_DECREF(key);
|
2024-02-06 18:03:43 -04:00
|
|
|
res = -1;
|
|
|
|
goto slow_exit;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2024-02-06 18:03:43 -04:00
|
|
|
status = setitem_lock_held(mp, key, value);
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_DECREF(key);
|
|
|
|
Py_DECREF(value);
|
|
|
|
if (status < 0) {
|
|
|
|
Py_DECREF(iter);
|
2024-02-06 18:03:43 -04:00
|
|
|
res = -1;
|
|
|
|
goto slow_exit;
|
2010-05-09 12:52:27 -03:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Py_DECREF(iter);
|
2024-02-06 18:03:43 -04:00
|
|
|
if (PyErr_Occurred()) {
|
2010-05-09 12:52:27 -03:00
|
|
|
/* Iterator completed, via error */
|
2024-02-06 18:03:43 -04:00
|
|
|
res = -1;
|
|
|
|
goto slow_exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
slow_exit:
|
|
|
|
ASSERT_CONSISTENT(a);
|
|
|
|
Py_END_CRITICAL_SECTION();
|
|
|
|
return res;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
1997-05-28 16:15:28 -03:00
|
|
|
}
|
|
|
|
|
2016-10-02 05:06:43 -03:00
|
|
|
int
|
|
|
|
PyDict_Update(PyObject *a, PyObject *b)
|
|
|
|
{
|
2023-03-09 11:16:30 -04:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
|
|
|
return dict_merge(interp, a, b, 1);
|
2016-10-02 05:06:43 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
PyDict_Merge(PyObject *a, PyObject *b, int override)
|
|
|
|
{
|
2023-03-09 11:16:30 -04:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
2016-10-02 05:06:43 -03:00
|
|
|
/* XXX Deprecate override not in (0, 1). */
|
2023-03-09 11:16:30 -04:00
|
|
|
return dict_merge(interp, a, b, override != 0);
|
2016-10-02 05:06:43 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
_PyDict_MergeEx(PyObject *a, PyObject *b, int override)
|
|
|
|
{
|
2023-03-09 11:16:30 -04:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
|
|
|
return dict_merge(interp, a, b, override);
|
2016-10-02 05:06:43 -03:00
|
|
|
}
|
|
|
|
|
2024-01-23 18:10:04 -04:00
|
|
|
/*[clinic input]
|
|
|
|
dict.copy
|
|
|
|
|
|
|
|
Return a shallow copy of the dict.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
1997-05-28 16:15:28 -03:00
|
|
|
static PyObject *
|
2024-01-23 18:10:04 -04:00
|
|
|
dict_copy_impl(PyDictObject *self)
|
|
|
|
/*[clinic end generated code: output=ffb782cf970a5c39 input=73935f042b639de4]*/
|
1997-05-28 16:15:28 -03:00
|
|
|
{
|
2024-01-23 18:10:04 -04:00
|
|
|
return PyDict_Copy((PyObject *)self);
|
2000-03-30 18:27:31 -04:00
|
|
|
}
|
|
|
|
|
2024-04-02 07:59:21 -03:00
|
|
|
/* Copies the values, but does not change the reference
|
2024-09-27 18:51:01 -03:00
|
|
|
* counts of the objects in the array.
|
|
|
|
* Return NULL, but does *not* set an exception on failure */
|
2024-04-02 07:59:21 -03:00
|
|
|
static PyDictValues *
|
|
|
|
copy_values(PyDictValues *values)
|
|
|
|
{
|
|
|
|
PyDictValues *newvalues = new_values(values->capacity);
|
|
|
|
if (newvalues == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
newvalues->size = values->size;
|
|
|
|
uint8_t *values_order = get_insertion_order_array(values);
|
|
|
|
uint8_t *new_values_order = get_insertion_order_array(newvalues);
|
|
|
|
memcpy(new_values_order, values_order, values->capacity);
|
|
|
|
for (int i = 0; i < values->capacity; i++) {
|
|
|
|
newvalues->values[i] = values->values[i];
|
|
|
|
}
|
|
|
|
assert(newvalues->embedded == 0);
|
|
|
|
return newvalues;
|
|
|
|
}
|
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
static PyObject *
|
|
|
|
copy_lock_held(PyObject *o)
|
2000-03-30 18:27:31 -04:00
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject *copy;
|
2012-04-23 12:24:50 -03:00
|
|
|
PyDictObject *mp;
|
2023-03-09 11:16:30 -04:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
2000-03-30 18:27:31 -04:00
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
ASSERT_DICT_LOCKED(o);
|
2018-01-22 12:54:41 -04:00
|
|
|
|
2012-04-23 12:24:50 -03:00
|
|
|
mp = (PyDictObject *)o;
|
2018-01-22 12:54:41 -04:00
|
|
|
if (mp->ma_used == 0) {
|
|
|
|
/* The dict is empty; just return a new dict. */
|
|
|
|
return PyDict_New();
|
|
|
|
}
|
|
|
|
|
2012-04-23 12:24:50 -03:00
|
|
|
if (_PyDict_HasSplitTable(mp)) {
|
|
|
|
PyDictObject *split_copy;
|
2024-04-02 07:59:21 -03:00
|
|
|
PyDictValues *newvalues = copy_values(mp->ma_values);
|
|
|
|
if (newvalues == NULL) {
|
2012-04-23 12:24:50 -03:00
|
|
|
return PyErr_NoMemory();
|
2024-04-02 07:59:21 -03:00
|
|
|
}
|
2012-04-23 12:24:50 -03:00
|
|
|
split_copy = PyObject_GC_New(PyDictObject, &PyDict_Type);
|
|
|
|
if (split_copy == NULL) {
|
2024-02-20 21:08:14 -04:00
|
|
|
free_values(newvalues, false);
|
2012-04-23 12:24:50 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
2024-04-02 07:59:21 -03:00
|
|
|
for (size_t i = 0; i < newvalues->capacity; i++) {
|
|
|
|
Py_XINCREF(newvalues->values[i]);
|
|
|
|
}
|
2012-04-23 12:24:50 -03:00
|
|
|
split_copy->ma_values = newvalues;
|
|
|
|
split_copy->ma_keys = mp->ma_keys;
|
|
|
|
split_copy->ma_used = mp->ma_used;
|
2024-10-01 13:39:56 -03:00
|
|
|
split_copy->_ma_watcher_tag = 0;
|
2018-11-14 05:39:27 -04:00
|
|
|
dictkeys_incref(mp->ma_keys);
|
2024-11-20 12:41:20 -04:00
|
|
|
_PyObject_GC_TRACK(split_copy);
|
2012-04-23 12:24:50 -03:00
|
|
|
return (PyObject *)split_copy;
|
|
|
|
}
|
2018-01-22 12:54:41 -04:00
|
|
|
|
2024-01-02 10:32:37 -04:00
|
|
|
if (Py_TYPE(mp)->tp_iter == dict_iter &&
|
2020-08-03 23:08:06 -03:00
|
|
|
mp->ma_values == NULL &&
|
2018-01-22 12:54:41 -04:00
|
|
|
(mp->ma_used >= (mp->ma_keys->dk_nentries * 2) / 3))
|
|
|
|
{
|
|
|
|
/* Use fast-copy if:
|
|
|
|
|
2020-08-03 23:08:06 -03:00
|
|
|
(1) type(mp) doesn't override tp_iter; and
|
2018-01-22 12:54:41 -04:00
|
|
|
|
|
|
|
(2) 'mp' is not a split-dict; and
|
|
|
|
|
|
|
|
(3) if 'mp' is non-compact ('del' operation does not resize dicts),
|
|
|
|
do fast-copy only if it has at most 1/3 non-used keys.
|
|
|
|
|
2018-04-20 17:08:45 -03:00
|
|
|
The last condition (3) is important to guard against a pathological
|
2018-01-22 12:54:41 -04:00
|
|
|
case when a large dict is almost emptied with multiple del/pop
|
|
|
|
operations and copied after that. In cases like this, we defer to
|
|
|
|
PyDict_Merge, which produces a compacted copy.
|
|
|
|
*/
|
2020-08-03 23:08:06 -03:00
|
|
|
PyDictKeysObject *keys = clone_combined_dict_keys(mp);
|
|
|
|
if (keys == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
2023-03-09 11:16:30 -04:00
|
|
|
PyDictObject *new = (PyDictObject *)new_dict(interp, keys, NULL, 0, 0);
|
2020-08-03 23:08:06 -03:00
|
|
|
if (new == NULL) {
|
|
|
|
/* In case of an error, `new_dict()` takes care of
|
|
|
|
cleaning up `keys`. */
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
new->ma_used = mp->ma_used;
|
|
|
|
ASSERT_CONSISTENT(new);
|
|
|
|
return (PyObject *)new;
|
2018-01-22 12:54:41 -04:00
|
|
|
}
|
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
copy = PyDict_New();
|
|
|
|
if (copy == NULL)
|
|
|
|
return NULL;
|
2023-03-09 11:16:30 -04:00
|
|
|
if (dict_merge(interp, copy, o, 1) == 0)
|
2010-05-09 12:52:27 -03:00
|
|
|
return copy;
|
|
|
|
Py_DECREF(copy);
|
|
|
|
return NULL;
|
1997-05-28 16:15:28 -03:00
|
|
|
}
|
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
PyObject *
|
|
|
|
PyDict_Copy(PyObject *o)
|
|
|
|
{
|
|
|
|
if (o == NULL || !PyDict_Check(o)) {
|
|
|
|
PyErr_BadInternalCall();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *res;
|
|
|
|
Py_BEGIN_CRITICAL_SECTION(o);
|
|
|
|
|
|
|
|
res = copy_lock_held(o);
|
|
|
|
|
|
|
|
Py_END_CRITICAL_SECTION();
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2006-02-15 13:27:45 -04:00
|
|
|
Py_ssize_t
|
2000-07-04 14:44:48 -03:00
|
|
|
PyDict_Size(PyObject *mp)
|
1993-11-05 06:18:44 -04:00
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
if (mp == NULL || !PyDict_Check(mp)) {
|
|
|
|
PyErr_BadInternalCall();
|
|
|
|
return -1;
|
|
|
|
}
|
2024-05-24 14:39:06 -03:00
|
|
|
return FT_ATOMIC_LOAD_SSIZE_RELAXED(((PyDictObject *)mp)->ma_used);
|
1993-11-05 06:18:44 -04:00
|
|
|
}
|
|
|
|
|
2001-05-08 01:38:29 -03:00
|
|
|
/* Return 1 if dicts equal, 0 if not, -1 if error.
|
|
|
|
* Gets out as soon as any difference is detected.
|
|
|
|
* Uses only Py_EQ comparison.
|
|
|
|
*/
|
|
|
|
static int
|
2024-02-06 18:03:43 -04:00
|
|
|
dict_equal_lock_held(PyDictObject *a, PyDictObject *b)
|
2001-05-08 01:38:29 -03:00
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_ssize_t i;
|
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
ASSERT_DICT_LOCKED(a);
|
|
|
|
ASSERT_DICT_LOCKED(b);
|
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
if (a->ma_used != b->ma_used)
|
|
|
|
/* can't be equal if # of entries differ */
|
|
|
|
return 0;
|
|
|
|
/* Same # of entries -- check all of 'em. Exit early on any diff. */
|
2024-07-10 15:04:12 -03:00
|
|
|
for (i = 0; i < LOAD_KEYS_NENTRIES(a->ma_keys); i++) {
|
2022-03-01 19:09:28 -04:00
|
|
|
PyObject *key, *aval;
|
|
|
|
Py_hash_t hash;
|
|
|
|
if (DK_IS_UNICODE(a->ma_keys)) {
|
|
|
|
PyDictUnicodeEntry *ep = &DK_UNICODE_ENTRIES(a->ma_keys)[i];
|
|
|
|
key = ep->me_key;
|
|
|
|
if (key == NULL) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
hash = unicode_get_hash(key);
|
2024-02-20 20:40:37 -04:00
|
|
|
if (_PyDict_HasSplitTable(a))
|
2022-03-01 19:09:28 -04:00
|
|
|
aval = a->ma_values->values[i];
|
|
|
|
else
|
|
|
|
aval = ep->me_value;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
PyDictKeyEntry *ep = &DK_ENTRIES(a->ma_keys)[i];
|
|
|
|
key = ep->me_key;
|
2012-04-23 12:24:50 -03:00
|
|
|
aval = ep->me_value;
|
2022-03-01 19:09:28 -04:00
|
|
|
hash = ep->me_hash;
|
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
if (aval != NULL) {
|
|
|
|
int cmp;
|
|
|
|
PyObject *bval;
|
|
|
|
/* temporarily bump aval's refcount to ensure it stays
|
|
|
|
alive until we're done with it */
|
|
|
|
Py_INCREF(aval);
|
|
|
|
/* ditto for key */
|
|
|
|
Py_INCREF(key);
|
2012-12-02 14:10:07 -04:00
|
|
|
/* reuse the known hash value */
|
2022-03-01 19:09:28 -04:00
|
|
|
_Py_dict_lookup(b, key, hash, &bval);
|
2010-05-09 12:52:27 -03:00
|
|
|
if (bval == NULL) {
|
2017-05-20 06:30:02 -03:00
|
|
|
Py_DECREF(key);
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_DECREF(aval);
|
|
|
|
if (PyErr_Occurred())
|
|
|
|
return -1;
|
|
|
|
return 0;
|
|
|
|
}
|
2019-12-30 21:04:22 -04:00
|
|
|
Py_INCREF(bval);
|
2010-05-09 12:52:27 -03:00
|
|
|
cmp = PyObject_RichCompareBool(aval, bval, Py_EQ);
|
2017-05-20 06:30:02 -03:00
|
|
|
Py_DECREF(key);
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_DECREF(aval);
|
2019-12-30 21:04:22 -04:00
|
|
|
Py_DECREF(bval);
|
2010-05-09 12:52:27 -03:00
|
|
|
if (cmp <= 0) /* error or not equal */
|
|
|
|
return cmp;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 1;
|
2012-04-23 12:24:50 -03:00
|
|
|
}
|
2001-05-08 01:38:29 -03:00
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
static int
|
|
|
|
dict_equal(PyDictObject *a, PyDictObject *b)
|
|
|
|
{
|
|
|
|
int res;
|
|
|
|
Py_BEGIN_CRITICAL_SECTION2(a, b);
|
|
|
|
res = dict_equal_lock_held(a, b);
|
|
|
|
Py_END_CRITICAL_SECTION2();
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2001-05-08 01:38:29 -03:00
|
|
|
static PyObject *
|
|
|
|
dict_richcompare(PyObject *v, PyObject *w, int op)
|
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
int cmp;
|
|
|
|
PyObject *res;
|
|
|
|
|
|
|
|
if (!PyDict_Check(v) || !PyDict_Check(w)) {
|
|
|
|
res = Py_NotImplemented;
|
|
|
|
}
|
|
|
|
else if (op == Py_EQ || op == Py_NE) {
|
|
|
|
cmp = dict_equal((PyDictObject *)v, (PyDictObject *)w);
|
|
|
|
if (cmp < 0)
|
|
|
|
return NULL;
|
|
|
|
res = (cmp == (op == Py_EQ)) ? Py_True : Py_False;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
res = Py_NotImplemented;
|
2022-11-10 11:27:53 -04:00
|
|
|
return Py_NewRef(res);
|
2012-04-23 12:24:50 -03:00
|
|
|
}
|
2001-05-08 01:38:29 -03:00
|
|
|
|
2014-01-07 16:41:53 -04:00
|
|
|
/*[clinic input]
|
2013-10-19 04:09:25 -03:00
|
|
|
|
|
|
|
@coexist
|
|
|
|
dict.__contains__
|
|
|
|
|
|
|
|
key: object
|
|
|
|
/
|
|
|
|
|
2017-01-24 18:30:04 -04:00
|
|
|
True if the dictionary has the specified key, else False.
|
2014-01-07 16:41:53 -04:00
|
|
|
[clinic start generated code]*/
|
2013-10-19 04:09:25 -03:00
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
static PyObject *
|
2024-02-20 21:08:14 -04:00
|
|
|
dict___contains__(PyDictObject *self, PyObject *key)
|
|
|
|
/*[clinic end generated code: output=a3d03db709ed6e6b input=fe1cb42ad831e820]*/
|
1993-03-27 14:11:32 -04:00
|
|
|
{
|
2024-02-20 21:08:14 -04:00
|
|
|
int contains = PyDict_Contains((PyObject *)self, key);
|
|
|
|
if (contains < 0) {
|
2010-05-09 12:52:27 -03:00
|
|
|
return NULL;
|
2024-02-20 21:08:14 -04:00
|
|
|
}
|
|
|
|
if (contains) {
|
|
|
|
Py_RETURN_TRUE;
|
|
|
|
}
|
|
|
|
Py_RETURN_FALSE;
|
1993-03-27 14:11:32 -04:00
|
|
|
}
|
|
|
|
|
2017-01-19 07:37:13 -04:00
|
|
|
/*[clinic input]
|
2024-02-06 18:03:43 -04:00
|
|
|
@critical_section
|
2017-01-19 07:37:13 -04:00
|
|
|
dict.get
|
|
|
|
|
|
|
|
key: object
|
2017-01-19 13:00:30 -04:00
|
|
|
default: object = None
|
2017-01-19 07:37:13 -04:00
|
|
|
/
|
|
|
|
|
2017-01-24 18:30:04 -04:00
|
|
|
Return the value for key if key is in the dictionary, else default.
|
2017-01-19 07:37:13 -04:00
|
|
|
[clinic start generated code]*/
|
|
|
|
|
1997-10-06 14:49:20 -03:00
|
|
|
static PyObject *
|
2017-01-19 13:00:30 -04:00
|
|
|
dict_get_impl(PyDictObject *self, PyObject *key, PyObject *default_value)
|
2024-02-06 18:03:43 -04:00
|
|
|
/*[clinic end generated code: output=bba707729dee05bf input=a631d3f18f584c60]*/
|
1997-10-06 14:49:20 -03:00
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject *val = NULL;
|
2010-10-17 17:54:53 -03:00
|
|
|
Py_hash_t hash;
|
2016-09-07 21:40:12 -03:00
|
|
|
Py_ssize_t ix;
|
1997-10-06 14:49:20 -03:00
|
|
|
|
2024-07-01 16:11:39 -03:00
|
|
|
hash = _PyObject_HashFast(key);
|
|
|
|
if (hash == -1) {
|
|
|
|
return NULL;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2024-02-20 21:08:14 -04:00
|
|
|
ix = _Py_dict_lookup_threadsafe(self, key, hash, &val);
|
2016-09-07 21:40:12 -03:00
|
|
|
if (ix == DKIX_ERROR)
|
2010-05-09 12:52:27 -03:00
|
|
|
return NULL;
|
2024-02-20 21:08:14 -04:00
|
|
|
if (ix == DKIX_EMPTY || val == NULL) {
|
|
|
|
val = Py_NewRef(default_value);
|
|
|
|
}
|
|
|
|
return val;
|
1997-10-06 14:49:20 -03:00
|
|
|
}
|
|
|
|
|
2024-02-06 12:36:23 -04:00
|
|
|
static int
|
2024-02-06 18:03:43 -04:00
|
|
|
dict_setdefault_ref_lock_held(PyObject *d, PyObject *key, PyObject *default_value,
|
2024-02-06 12:36:23 -04:00
|
|
|
PyObject **result, int incref_result)
|
2000-08-08 13:12:54 -03:00
|
|
|
{
|
2013-03-07 23:16:29 -04:00
|
|
|
PyDictObject *mp = (PyDictObject *)d;
|
2016-11-02 06:45:16 -03:00
|
|
|
PyObject *value;
|
2010-10-17 17:54:53 -03:00
|
|
|
Py_hash_t hash;
|
2023-03-09 11:16:30 -04:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
2010-05-09 12:52:27 -03:00
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
ASSERT_DICT_LOCKED(d);
|
|
|
|
|
2013-03-07 23:16:29 -04:00
|
|
|
if (!PyDict_Check(d)) {
|
|
|
|
PyErr_BadInternalCall();
|
2024-02-06 12:36:23 -04:00
|
|
|
if (result) {
|
|
|
|
*result = NULL;
|
|
|
|
}
|
|
|
|
return -1;
|
2013-03-07 23:16:29 -04:00
|
|
|
}
|
2016-11-02 06:45:16 -03:00
|
|
|
|
2024-07-01 16:11:39 -03:00
|
|
|
hash = _PyObject_HashFast(key);
|
|
|
|
if (hash == -1) {
|
|
|
|
if (result) {
|
|
|
|
*result = NULL;
|
2024-02-06 12:36:23 -04:00
|
|
|
}
|
2024-07-01 16:11:39 -03:00
|
|
|
return -1;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2021-11-19 06:30:37 -04:00
|
|
|
|
2019-03-18 08:38:33 -03:00
|
|
|
if (mp->ma_keys == Py_EMPTY_KEYS) {
|
2023-03-09 11:16:30 -04:00
|
|
|
if (insert_to_emptydict(interp, mp, Py_NewRef(key), hash,
|
2024-02-06 12:36:23 -04:00
|
|
|
Py_NewRef(default_value)) < 0) {
|
|
|
|
if (result) {
|
|
|
|
*result = NULL;
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (result) {
|
|
|
|
*result = incref_result ? Py_NewRef(default_value) : default_value;
|
2019-03-18 08:38:33 -03:00
|
|
|
}
|
2024-02-06 12:36:23 -04:00
|
|
|
return 0;
|
2019-03-18 08:38:33 -03:00
|
|
|
}
|
2016-11-02 06:45:16 -03:00
|
|
|
|
2022-03-01 19:09:28 -04:00
|
|
|
if (!PyUnicode_CheckExact(key) && DK_IS_UNICODE(mp->ma_keys)) {
|
2023-03-09 11:16:30 -04:00
|
|
|
if (insertion_resize(interp, mp, 0) < 0) {
|
2024-02-06 12:36:23 -04:00
|
|
|
if (result) {
|
|
|
|
*result = NULL;
|
|
|
|
}
|
|
|
|
return -1;
|
2022-03-01 19:09:28 -04:00
|
|
|
}
|
2016-11-02 06:45:16 -03:00
|
|
|
}
|
|
|
|
|
2024-04-25 19:34:05 -03:00
|
|
|
if (_PyDict_HasSplitTable(mp)) {
|
|
|
|
Py_ssize_t ix = insert_split_key(mp->ma_keys, key, hash);
|
|
|
|
if (ix != DKIX_EMPTY) {
|
|
|
|
PyObject *value = mp->ma_values->values[ix];
|
|
|
|
int already_present = value != NULL;
|
|
|
|
if (!already_present) {
|
|
|
|
insert_split_value(interp, mp, key, default_value, ix);
|
|
|
|
value = default_value;
|
|
|
|
}
|
|
|
|
if (result) {
|
|
|
|
*result = incref_result ? Py_NewRef(value) : value;
|
|
|
|
}
|
|
|
|
return already_present;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* No space in shared keys. Resize and continue below. */
|
|
|
|
if (insertion_resize(interp, mp, 1) < 0) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
assert(!_PyDict_HasSplitTable(mp));
|
|
|
|
|
2021-05-28 05:54:10 -03:00
|
|
|
Py_ssize_t ix = _Py_dict_lookup(mp, key, hash, &value);
|
2024-02-06 12:36:23 -04:00
|
|
|
if (ix == DKIX_ERROR) {
|
|
|
|
if (result) {
|
|
|
|
*result = NULL;
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
2016-11-02 06:45:16 -03:00
|
|
|
|
|
|
|
if (ix == DKIX_EMPTY) {
|
2024-04-25 19:34:05 -03:00
|
|
|
assert(!_PyDict_HasSplitTable(mp));
|
2024-02-06 12:36:23 -04:00
|
|
|
value = default_value;
|
2024-02-20 20:40:37 -04:00
|
|
|
|
2024-04-25 19:34:05 -03:00
|
|
|
if (insert_combined_dict(interp, mp, hash, Py_NewRef(key), Py_NewRef(value)) < 0) {
|
|
|
|
Py_DECREF(key);
|
|
|
|
Py_DECREF(value);
|
|
|
|
if (result) {
|
|
|
|
*result = NULL;
|
2024-02-20 20:40:37 -04:00
|
|
|
}
|
2016-09-07 21:40:12 -03:00
|
|
|
}
|
2024-11-19 05:25:09 -04:00
|
|
|
|
2024-05-24 14:39:06 -03:00
|
|
|
STORE_USED(mp, mp->ma_used + 1);
|
2016-11-02 06:45:16 -03:00
|
|
|
assert(mp->ma_keys->dk_usable >= 0);
|
2024-02-06 12:36:23 -04:00
|
|
|
ASSERT_CONSISTENT(mp);
|
|
|
|
if (result) {
|
|
|
|
*result = incref_result ? Py_NewRef(value) : value;
|
|
|
|
}
|
|
|
|
return 0;
|
2016-11-02 06:45:16 -03:00
|
|
|
}
|
|
|
|
|
2024-04-25 19:34:05 -03:00
|
|
|
assert(value != NULL);
|
2019-04-12 16:51:34 -03:00
|
|
|
ASSERT_CONSISTENT(mp);
|
2024-02-06 12:36:23 -04:00
|
|
|
if (result) {
|
|
|
|
*result = incref_result ? Py_NewRef(value) : value;
|
|
|
|
}
|
|
|
|
return 1;
|
2024-04-25 19:34:05 -03:00
|
|
|
|
|
|
|
error:
|
|
|
|
if (result) {
|
|
|
|
*result = NULL;
|
|
|
|
}
|
|
|
|
return -1;
|
2024-02-06 12:36:23 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
PyDict_SetDefaultRef(PyObject *d, PyObject *key, PyObject *default_value,
|
|
|
|
PyObject **result)
|
|
|
|
{
|
2024-02-06 18:03:43 -04:00
|
|
|
int res;
|
|
|
|
Py_BEGIN_CRITICAL_SECTION(d);
|
|
|
|
res = dict_setdefault_ref_lock_held(d, key, default_value, result, 1);
|
|
|
|
Py_END_CRITICAL_SECTION();
|
|
|
|
return res;
|
2024-02-06 12:36:23 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *
|
|
|
|
PyDict_SetDefault(PyObject *d, PyObject *key, PyObject *defaultobj)
|
|
|
|
{
|
|
|
|
PyObject *result;
|
2024-02-06 18:03:43 -04:00
|
|
|
Py_BEGIN_CRITICAL_SECTION(d);
|
|
|
|
dict_setdefault_ref_lock_held(d, key, defaultobj, &result, 0);
|
|
|
|
Py_END_CRITICAL_SECTION();
|
2024-02-06 12:36:23 -04:00
|
|
|
return result;
|
2000-08-08 13:12:54 -03:00
|
|
|
}
|
|
|
|
|
2017-01-19 07:37:13 -04:00
|
|
|
/*[clinic input]
|
2024-02-06 18:03:43 -04:00
|
|
|
@critical_section
|
2017-01-19 07:37:13 -04:00
|
|
|
dict.setdefault
|
|
|
|
|
|
|
|
key: object
|
2017-01-19 13:00:30 -04:00
|
|
|
default: object = None
|
2017-01-19 07:37:13 -04:00
|
|
|
/
|
|
|
|
|
2017-01-24 18:30:04 -04:00
|
|
|
Insert key with a value of default if key is not in the dictionary.
|
|
|
|
|
|
|
|
Return the value for key if key is in the dictionary, else default.
|
2017-01-19 07:37:13 -04:00
|
|
|
[clinic start generated code]*/
|
|
|
|
|
2013-03-07 23:16:29 -04:00
|
|
|
static PyObject *
|
2017-01-19 13:00:30 -04:00
|
|
|
dict_setdefault_impl(PyDictObject *self, PyObject *key,
|
|
|
|
PyObject *default_value)
|
2024-02-06 18:03:43 -04:00
|
|
|
/*[clinic end generated code: output=f8c1101ebf69e220 input=9237af9a0a224302]*/
|
2013-03-07 23:16:29 -04:00
|
|
|
{
|
2017-01-19 07:37:13 -04:00
|
|
|
PyObject *val;
|
2024-02-06 18:03:43 -04:00
|
|
|
dict_setdefault_ref_lock_held((PyObject *)self, key, default_value, &val, 1);
|
2024-02-06 12:36:23 -04:00
|
|
|
return val;
|
2013-03-07 23:16:29 -04:00
|
|
|
}
|
2000-08-08 13:12:54 -03:00
|
|
|
|
2024-01-23 18:10:04 -04:00
|
|
|
|
|
|
|
/*[clinic input]
|
|
|
|
dict.clear
|
|
|
|
|
|
|
|
Remove all items from the dict.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
static PyObject *
|
2024-01-23 18:10:04 -04:00
|
|
|
dict_clear_impl(PyDictObject *self)
|
|
|
|
/*[clinic end generated code: output=5139a830df00830a input=0bf729baba97a4c2]*/
|
1997-03-21 17:55:12 -04:00
|
|
|
{
|
2024-01-23 18:10:04 -04:00
|
|
|
PyDict_Clear((PyObject *)self);
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_RETURN_NONE;
|
1997-03-21 17:55:12 -04:00
|
|
|
}
|
|
|
|
|
2019-04-12 04:11:28 -03:00
|
|
|
/*[clinic input]
|
|
|
|
dict.pop
|
|
|
|
|
|
|
|
key: object
|
|
|
|
default: object = NULL
|
|
|
|
/
|
|
|
|
|
2019-09-14 06:24:05 -03:00
|
|
|
D.pop(k[,d]) -> v, remove specified key and return the corresponding value.
|
2019-04-12 04:11:28 -03:00
|
|
|
|
2020-07-19 03:18:55 -03:00
|
|
|
If the key is not found, return the default if given; otherwise,
|
|
|
|
raise a KeyError.
|
2019-04-12 04:11:28 -03:00
|
|
|
[clinic start generated code]*/
|
|
|
|
|
2002-04-12 12:11:59 -03:00
|
|
|
static PyObject *
|
2019-04-12 04:11:28 -03:00
|
|
|
dict_pop_impl(PyDictObject *self, PyObject *key, PyObject *default_value)
|
2020-07-19 03:18:55 -03:00
|
|
|
/*[clinic end generated code: output=3abb47b89f24c21c input=e221baa01044c44c]*/
|
2002-04-12 12:11:59 -03:00
|
|
|
{
|
2019-04-12 04:11:28 -03:00
|
|
|
return _PyDict_Pop((PyObject*)self, key, default_value);
|
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
|
2019-04-12 04:11:28 -03:00
|
|
|
/*[clinic input]
|
2024-02-06 18:03:43 -04:00
|
|
|
@critical_section
|
2019-04-12 04:11:28 -03:00
|
|
|
dict.popitem
|
2015-05-30 01:21:39 -03:00
|
|
|
|
2019-04-12 04:11:28 -03:00
|
|
|
Remove and return a (key, value) pair as a 2-tuple.
|
|
|
|
|
|
|
|
Pairs are returned in LIFO (last-in, first-out) order.
|
|
|
|
Raises KeyError if the dict is empty.
|
|
|
|
[clinic start generated code]*/
|
2002-04-12 12:11:59 -03:00
|
|
|
|
2000-12-12 18:02:18 -04:00
|
|
|
static PyObject *
|
2019-04-12 04:11:28 -03:00
|
|
|
dict_popitem_impl(PyDictObject *self)
|
2024-02-06 18:03:43 -04:00
|
|
|
/*[clinic end generated code: output=e65fcb04420d230d input=ef28b4da5f0f762e]*/
|
2000-12-12 18:02:18 -04:00
|
|
|
{
|
2016-09-07 21:40:12 -03:00
|
|
|
Py_ssize_t i, j;
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject *res;
|
2023-03-09 11:16:30 -04:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
2010-05-09 12:52:27 -03:00
|
|
|
|
2024-05-24 14:39:06 -03:00
|
|
|
ASSERT_DICT_LOCKED(self);
|
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
/* Allocate the result tuple before checking the size. Believe it
|
|
|
|
* or not, this allocation could trigger a garbage collection which
|
|
|
|
* could empty the dict, so if we checked the size first and that
|
|
|
|
* happened, the result would be an infinite loop (searching for an
|
|
|
|
* entry that no longer exists). Note that the usual popitem()
|
|
|
|
* idiom is "while d: k, v = d.popitem()". so needing to throw the
|
|
|
|
* tuple away if the dict *is* empty isn't a significant
|
|
|
|
* inefficiency -- possible, but unlikely in practice.
|
|
|
|
*/
|
|
|
|
res = PyTuple_New(2);
|
|
|
|
if (res == NULL)
|
|
|
|
return NULL;
|
2019-04-12 04:11:28 -03:00
|
|
|
if (self->ma_used == 0) {
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_DECREF(res);
|
2019-04-12 04:11:28 -03:00
|
|
|
PyErr_SetString(PyExc_KeyError, "popitem(): dictionary is empty");
|
2010-05-09 12:52:27 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
2012-04-23 12:24:50 -03:00
|
|
|
/* Convert split table to combined table */
|
2024-02-20 20:40:37 -04:00
|
|
|
if (_PyDict_HasSplitTable(self)) {
|
|
|
|
if (dictresize(interp, self, DK_LOG_SIZE(self->ma_keys), 1) < 0) {
|
2012-04-23 12:24:50 -03:00
|
|
|
Py_DECREF(res);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
2021-05-28 05:54:10 -03:00
|
|
|
self->ma_keys->dk_version = 0;
|
2016-09-07 21:40:12 -03:00
|
|
|
|
|
|
|
/* Pop last item */
|
2022-03-01 19:09:28 -04:00
|
|
|
PyObject *key, *value;
|
|
|
|
Py_hash_t hash;
|
|
|
|
if (DK_IS_UNICODE(self->ma_keys)) {
|
|
|
|
PyDictUnicodeEntry *ep0 = DK_UNICODE_ENTRIES(self->ma_keys);
|
|
|
|
i = self->ma_keys->dk_nentries - 1;
|
|
|
|
while (i >= 0 && ep0[i].me_value == NULL) {
|
|
|
|
i--;
|
|
|
|
}
|
|
|
|
assert(i >= 0);
|
|
|
|
|
|
|
|
key = ep0[i].me_key;
|
2024-10-01 13:39:56 -03:00
|
|
|
_PyDict_NotifyEvent(interp, PyDict_EVENT_DELETED, self, key, NULL);
|
2022-03-01 19:09:28 -04:00
|
|
|
hash = unicode_get_hash(key);
|
|
|
|
value = ep0[i].me_value;
|
|
|
|
ep0[i].me_key = NULL;
|
|
|
|
ep0[i].me_value = NULL;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2022-03-01 19:09:28 -04:00
|
|
|
else {
|
|
|
|
PyDictKeyEntry *ep0 = DK_ENTRIES(self->ma_keys);
|
|
|
|
i = self->ma_keys->dk_nentries - 1;
|
|
|
|
while (i >= 0 && ep0[i].me_value == NULL) {
|
|
|
|
i--;
|
|
|
|
}
|
|
|
|
assert(i >= 0);
|
2016-09-07 21:40:12 -03:00
|
|
|
|
2022-03-01 19:09:28 -04:00
|
|
|
key = ep0[i].me_key;
|
2024-10-01 13:39:56 -03:00
|
|
|
_PyDict_NotifyEvent(interp, PyDict_EVENT_DELETED, self, key, NULL);
|
2022-03-01 19:09:28 -04:00
|
|
|
hash = ep0[i].me_hash;
|
|
|
|
value = ep0[i].me_value;
|
|
|
|
ep0[i].me_key = NULL;
|
|
|
|
ep0[i].me_hash = -1;
|
|
|
|
ep0[i].me_value = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
j = lookdict_index(self->ma_keys, hash, i);
|
2016-09-07 21:40:12 -03:00
|
|
|
assert(j >= 0);
|
2019-04-12 04:11:28 -03:00
|
|
|
assert(dictkeys_get_index(self->ma_keys, j) == i);
|
|
|
|
dictkeys_set_index(self->ma_keys, j, DKIX_DUMMY);
|
2016-09-07 21:40:12 -03:00
|
|
|
|
2022-03-01 19:09:28 -04:00
|
|
|
PyTuple_SET_ITEM(res, 0, key);
|
|
|
|
PyTuple_SET_ITEM(res, 1, value);
|
2016-09-07 21:40:12 -03:00
|
|
|
/* We can't dk_usable++ since there is DKIX_DUMMY in indices */
|
2024-02-28 18:53:19 -04:00
|
|
|
STORE_KEYS_NENTRIES(self->ma_keys, i);
|
|
|
|
STORE_USED(self, self->ma_used - 1);
|
2019-04-12 16:51:34 -03:00
|
|
|
ASSERT_CONSISTENT(self);
|
2010-05-09 12:52:27 -03:00
|
|
|
return res;
|
2000-12-12 18:02:18 -04:00
|
|
|
}
|
|
|
|
|
2000-06-23 11:18:11 -03:00
|
|
|
static int
|
|
|
|
dict_traverse(PyObject *op, visitproc visit, void *arg)
|
|
|
|
{
|
2012-04-23 12:24:50 -03:00
|
|
|
PyDictObject *mp = (PyDictObject *)op;
|
2016-09-05 16:12:59 -03:00
|
|
|
PyDictKeysObject *keys = mp->ma_keys;
|
2016-09-07 21:40:12 -03:00
|
|
|
Py_ssize_t i, n = keys->dk_nentries;
|
|
|
|
|
2022-03-01 19:09:28 -04:00
|
|
|
if (DK_IS_UNICODE(keys)) {
|
2024-02-20 20:40:37 -04:00
|
|
|
if (_PyDict_HasSplitTable(mp)) {
|
2024-04-02 07:59:21 -03:00
|
|
|
if (!mp->ma_values->embedded) {
|
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
Py_VISIT(mp->ma_values->values[i]);
|
|
|
|
}
|
2012-04-23 12:24:50 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2022-03-01 19:09:28 -04:00
|
|
|
PyDictUnicodeEntry *entries = DK_UNICODE_ENTRIES(keys);
|
2016-09-05 16:12:59 -03:00
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
Py_VISIT(entries[i].me_value);
|
2012-04-23 12:24:50 -03:00
|
|
|
}
|
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2022-03-01 19:09:28 -04:00
|
|
|
else {
|
|
|
|
PyDictKeyEntry *entries = DK_ENTRIES(keys);
|
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
if (entries[i].me_value != NULL) {
|
|
|
|
Py_VISIT(entries[i].me_value);
|
|
|
|
Py_VISIT(entries[i].me_key);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
return 0;
|
2000-06-23 11:18:11 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
dict_tp_clear(PyObject *op)
|
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
PyDict_Clear(op);
|
|
|
|
return 0;
|
2000-06-23 11:18:11 -03:00
|
|
|
}
|
|
|
|
|
Merged revisions 58221-58741 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r58221 | georg.brandl | 2007-09-20 10:57:59 -0700 (Thu, 20 Sep 2007) | 2 lines
Patch #1181: add os.environ.clear() method.
........
r58225 | sean.reifschneider | 2007-09-20 23:33:28 -0700 (Thu, 20 Sep 2007) | 3 lines
Issue1704287: "make install" fails unless you do "make" first. Make
oldsharedmods and sharedmods in "libinstall".
........
r58232 | guido.van.rossum | 2007-09-22 13:18:03 -0700 (Sat, 22 Sep 2007) | 4 lines
Patch # 188 by Philip Jenvey.
Make tell() mark CRLF as a newline.
With unit test.
........
r58242 | georg.brandl | 2007-09-24 10:55:47 -0700 (Mon, 24 Sep 2007) | 2 lines
Fix typo and double word.
........
r58245 | georg.brandl | 2007-09-24 10:59:28 -0700 (Mon, 24 Sep 2007) | 2 lines
#1196: document default radix for int().
........
r58247 | georg.brandl | 2007-09-24 11:08:24 -0700 (Mon, 24 Sep 2007) | 2 lines
#1177: accept 2xx responses for https too, not only http.
........
r58249 | andrew.kuchling | 2007-09-24 16:45:51 -0700 (Mon, 24 Sep 2007) | 1 line
Remove stray odd character; grammar fix
........
r58250 | andrew.kuchling | 2007-09-24 16:46:28 -0700 (Mon, 24 Sep 2007) | 1 line
Typo fix
........
r58251 | andrew.kuchling | 2007-09-24 17:09:42 -0700 (Mon, 24 Sep 2007) | 1 line
Add various items
........
r58268 | vinay.sajip | 2007-09-26 22:34:45 -0700 (Wed, 26 Sep 2007) | 1 line
Change to flush and close logic to fix #1760556.
........
r58269 | vinay.sajip | 2007-09-26 22:38:51 -0700 (Wed, 26 Sep 2007) | 1 line
Change to basicConfig() to fix #1021.
........
r58270 | georg.brandl | 2007-09-26 23:26:58 -0700 (Wed, 26 Sep 2007) | 2 lines
#1208: document match object's boolean value.
........
r58271 | vinay.sajip | 2007-09-26 23:56:13 -0700 (Wed, 26 Sep 2007) | 1 line
Minor date change.
........
r58272 | vinay.sajip | 2007-09-27 00:35:10 -0700 (Thu, 27 Sep 2007) | 1 line
Change to LogRecord.__init__() to fix #1206. Note that archaic use of type(x) == types.DictType is because of keeping 1.5.2 compatibility. While this is much less relevant these days, there probably needs to be a separate commit for removing all archaic constructs at the same time.
........
r58288 | brett.cannon | 2007-09-30 12:45:10 -0700 (Sun, 30 Sep 2007) | 9 lines
tuple.__repr__ did not consider a reference loop as it is not possible from
Python code; but it is possible from C. object.__str__ had the issue of not
expecting a type to doing something within it's tp_str implementation that
could trigger an infinite recursion, but it could in C code.. Both found
thanks to BaseException and how it handles its repr.
Closes issue #1686386. Thanks to Thomas Herve for taking an initial stab at
coming up with a solution.
........
r58289 | brett.cannon | 2007-09-30 13:37:19 -0700 (Sun, 30 Sep 2007) | 3 lines
Fix error introduced by r58288; if a tuple is length 0 return its repr and
don't worry about any self-referring tuples.
........
r58294 | facundo.batista | 2007-10-02 10:01:24 -0700 (Tue, 02 Oct 2007) | 11 lines
Made the various is_* operations return booleans. This was discussed
with Cawlishaw by mail, and he basically confirmed that to these is_*
operations, there's no need to return Decimal(0) and Decimal(1) if
the language supports the False and True booleans.
Also added a few tests for the these functions in extra.decTest, since
they are mostly untested (apart from the doctests).
Thanks Mark Dickinson
........
r58295 | facundo.batista | 2007-10-02 11:21:18 -0700 (Tue, 02 Oct 2007) | 4 lines
Added a class to store the digits of log(10), so that they can be made
available when necessary without recomputing. Thanks Mark Dickinson
........
r58299 | mark.summerfield | 2007-10-03 01:53:21 -0700 (Wed, 03 Oct 2007) | 4 lines
Added note in footnote about string comparisons about
unicodedata.normalize().
........
r58304 | raymond.hettinger | 2007-10-03 14:18:11 -0700 (Wed, 03 Oct 2007) | 1 line
enumerate() is no longer bounded to using sequences shorter than LONG_MAX. The possibility of overflow was sending some newsgroup posters into a tizzy.
........
r58305 | raymond.hettinger | 2007-10-03 17:20:27 -0700 (Wed, 03 Oct 2007) | 1 line
itertools.count() no longer limited to sys.maxint.
........
r58306 | kurt.kaiser | 2007-10-03 18:49:54 -0700 (Wed, 03 Oct 2007) | 3 lines
Assume that the user knows when he wants to end the line; don't insert
something he didn't select or complete.
........
r58307 | kurt.kaiser | 2007-10-03 19:07:50 -0700 (Wed, 03 Oct 2007) | 2 lines
Remove unused theme that was causing a fault in p3k.
........
r58308 | kurt.kaiser | 2007-10-03 19:09:17 -0700 (Wed, 03 Oct 2007) | 2 lines
Clean up EditorWindow close.
........
r58309 | kurt.kaiser | 2007-10-03 19:53:07 -0700 (Wed, 03 Oct 2007) | 7 lines
textView cleanup. Patch 1718043 Tal Einat.
M idlelib/EditorWindow.py
M idlelib/aboutDialog.py
M idlelib/textView.py
M idlelib/NEWS.txt
........
r58310 | kurt.kaiser | 2007-10-03 20:11:12 -0700 (Wed, 03 Oct 2007) | 3 lines
configDialog cleanup. Patch 1730217 Tal Einat.
........
r58311 | neal.norwitz | 2007-10-03 23:00:48 -0700 (Wed, 03 Oct 2007) | 4 lines
Coverity #151: Remove deadcode.
All this code already exists above starting at line 653.
........
r58325 | fred.drake | 2007-10-04 19:46:12 -0700 (Thu, 04 Oct 2007) | 1 line
wrap lines to <80 characters before fixing errors
........
r58326 | raymond.hettinger | 2007-10-04 19:47:07 -0700 (Thu, 04 Oct 2007) | 6 lines
Add __asdict__() to NamedTuple and refine the docs.
Add maxlen support to deque() and fixup docs.
Partially fix __reduce__(). The None as a third arg was no longer supported.
Still needs work on __reduce__() to handle recursive inputs.
........
r58327 | fred.drake | 2007-10-04 19:48:32 -0700 (Thu, 04 Oct 2007) | 3 lines
move descriptions of ac_(in|out)_buffer_size to the right place
http://bugs.python.org/issue1053
........
r58329 | neal.norwitz | 2007-10-04 20:39:17 -0700 (Thu, 04 Oct 2007) | 3 lines
dict could be NULL, so we need to XDECREF.
Fix a compiler warning about passing a PyTypeObject* instead of PyObject*.
........
r58330 | neal.norwitz | 2007-10-04 20:41:19 -0700 (Thu, 04 Oct 2007) | 2 lines
Fix Coverity #158: Check the correct variable.
........
r58332 | neal.norwitz | 2007-10-04 22:01:38 -0700 (Thu, 04 Oct 2007) | 7 lines
Fix Coverity #159.
This code was broken if save() returned a negative number since i contained
a boolean value and then we compared i < 0 which should never be true.
Will backport (assuming it's necessary)
........
r58334 | neal.norwitz | 2007-10-04 22:29:17 -0700 (Thu, 04 Oct 2007) | 1 line
Add a note about fixing some more warnings found by Coverity.
........
r58338 | raymond.hettinger | 2007-10-05 12:07:31 -0700 (Fri, 05 Oct 2007) | 1 line
Restore BEGIN/END THREADS macros which were squashed in the previous checkin
........
r58343 | gregory.p.smith | 2007-10-06 00:48:10 -0700 (Sat, 06 Oct 2007) | 3 lines
Stab in the dark attempt to fix the test_bsddb3 failure on sparc and S-390
ubuntu buildbots.
........
r58344 | gregory.p.smith | 2007-10-06 00:51:59 -0700 (Sat, 06 Oct 2007) | 2 lines
Allows BerkeleyDB 4.6.x >= 4.6.21 for the bsddb module.
........
r58348 | gregory.p.smith | 2007-10-06 08:47:37 -0700 (Sat, 06 Oct 2007) | 3 lines
Use the host the author likely meant in the first place. pop.gmail.com is
reliable. gmail.org is someones personal domain.
........
r58351 | neal.norwitz | 2007-10-06 12:16:28 -0700 (Sat, 06 Oct 2007) | 3 lines
Ensure that this test will pass even if another test left an unwritable TESTFN.
Also use the safe unlink in test_support instead of rolling our own here.
........
r58368 | georg.brandl | 2007-10-08 00:50:24 -0700 (Mon, 08 Oct 2007) | 3 lines
#1123: fix the docs for the str.split(None, sep) case.
Also expand a few other methods' docs, which had more info in the deprecated string module docs.
........
r58369 | georg.brandl | 2007-10-08 01:06:05 -0700 (Mon, 08 Oct 2007) | 2 lines
Update docstring of sched, also remove an unused assignment.
........
r58370 | raymond.hettinger | 2007-10-08 02:14:28 -0700 (Mon, 08 Oct 2007) | 5 lines
Add comments to NamedTuple code.
Let the field spec be either a string or a non-string sequence (suggested by Martin Blais with use cases).
Improve the error message in the case of a SyntaxError (caused by a duplicate field name).
........
r58371 | raymond.hettinger | 2007-10-08 02:56:29 -0700 (Mon, 08 Oct 2007) | 1 line
Missed a line in the docs
........
r58372 | raymond.hettinger | 2007-10-08 03:11:51 -0700 (Mon, 08 Oct 2007) | 1 line
Better variable names
........
r58376 | georg.brandl | 2007-10-08 07:12:47 -0700 (Mon, 08 Oct 2007) | 3 lines
#1199: docs for tp_as_{number,sequence,mapping}, by Amaury Forgeot d'Arc.
No need to merge this to py3k!
........
r58380 | raymond.hettinger | 2007-10-08 14:26:58 -0700 (Mon, 08 Oct 2007) | 1 line
Eliminate camelcase function name
........
r58381 | andrew.kuchling | 2007-10-08 16:23:03 -0700 (Mon, 08 Oct 2007) | 1 line
Eliminate camelcase function name
........
r58382 | raymond.hettinger | 2007-10-08 18:36:23 -0700 (Mon, 08 Oct 2007) | 1 line
Make the error messages more specific
........
r58384 | gregory.p.smith | 2007-10-08 23:02:21 -0700 (Mon, 08 Oct 2007) | 10 lines
Splits Modules/_bsddb.c up into bsddb.h and _bsddb.c and adds a C API
object available as bsddb.db.api. This is based on the patch submitted
by Duncan Grisby here:
http://sourceforge.net/tracker/index.php?func=detail&aid=1551895&group_id=13900&atid=313900
See this thread for additional info:
http://sourceforge.net/mailarchive/forum.php?thread_name=E1GAVDK-0002rk-Iw%40apasphere.com&forum_name=pybsddb-users
It also cleans up the code a little by removing some ifdef/endifs for
python prior to 2.1 and for unsupported Berkeley DB <= 3.2.
........
r58385 | gregory.p.smith | 2007-10-08 23:50:43 -0700 (Mon, 08 Oct 2007) | 5 lines
Fix a double free when positioning a database cursor to a non-existant
string key (and probably a few other situations with string keys).
This was reported with a patch as pybsddb sourceforge bug 1708868 by
jjjhhhlll at gmail.
........
r58386 | gregory.p.smith | 2007-10-09 00:19:11 -0700 (Tue, 09 Oct 2007) | 3 lines
Use the highest cPickle protocol in bsddb.dbshelve. This comes from
sourceforge pybsddb patch 1551443 by w_barnes.
........
r58394 | gregory.p.smith | 2007-10-09 11:26:02 -0700 (Tue, 09 Oct 2007) | 2 lines
remove another sleepycat reference
........
r58396 | kurt.kaiser | 2007-10-09 12:31:30 -0700 (Tue, 09 Oct 2007) | 3 lines
Allow interrupt only when executing user code in subprocess
Patch 1225 Tal Einat modified from IDLE-Spoon.
........
r58399 | brett.cannon | 2007-10-09 17:07:50 -0700 (Tue, 09 Oct 2007) | 5 lines
Remove file-level typedefs that were inconsistently used throughout the file.
Just move over to the public API names.
Closes issue1238.
........
r58401 | raymond.hettinger | 2007-10-09 17:26:46 -0700 (Tue, 09 Oct 2007) | 1 line
Accept Jim Jewett's api suggestion to use None instead of -1 to indicate unbounded deques.
........
r58403 | kurt.kaiser | 2007-10-09 17:55:40 -0700 (Tue, 09 Oct 2007) | 2 lines
Allow cursor color change w/o restart. Patch 1725576 Tal Einat.
........
r58404 | kurt.kaiser | 2007-10-09 18:06:47 -0700 (Tue, 09 Oct 2007) | 2 lines
show paste if > 80 columns. Patch 1659326 Tal Einat.
........
r58415 | thomas.heller | 2007-10-11 12:51:32 -0700 (Thu, 11 Oct 2007) | 5 lines
On OS X, use os.uname() instead of gestalt.sysv(...) to get the
operating system version. This allows to use ctypes when Python
was configured with --disable-toolbox-glue.
........
r58419 | neal.norwitz | 2007-10-11 20:01:01 -0700 (Thu, 11 Oct 2007) | 1 line
Get rid of warning about not being able to create an existing directory.
........
r58420 | neal.norwitz | 2007-10-11 20:01:30 -0700 (Thu, 11 Oct 2007) | 1 line
Get rid of warnings on a bunch of platforms by using a proper prototype.
........
r58421 | neal.norwitz | 2007-10-11 20:01:54 -0700 (Thu, 11 Oct 2007) | 4 lines
Get rid of compiler warning about retval being used (returned) without
being initialized. (gcc warning and Coverity 202)
........
r58422 | neal.norwitz | 2007-10-11 20:03:23 -0700 (Thu, 11 Oct 2007) | 1 line
Fix Coverity 168: Close the file before returning (exiting).
........
r58423 | neal.norwitz | 2007-10-11 20:04:18 -0700 (Thu, 11 Oct 2007) | 4 lines
Fix Coverity 180: Don't overallocate. We don't need structs, but pointers.
Also fix a memory leak.
........
r58424 | neal.norwitz | 2007-10-11 20:05:19 -0700 (Thu, 11 Oct 2007) | 5 lines
Fix Coverity 185-186: If the passed in FILE is NULL, uninitialized memory
would be accessed.
Will backport.
........
r58425 | neal.norwitz | 2007-10-11 20:52:34 -0700 (Thu, 11 Oct 2007) | 1 line
Get this module to compile with bsddb versions prior to 4.3
........
r58430 | martin.v.loewis | 2007-10-12 01:56:52 -0700 (Fri, 12 Oct 2007) | 3 lines
Bug #1216: Restore support for Visual Studio 2002.
Will backport to 2.5.
........
r58433 | raymond.hettinger | 2007-10-12 10:53:11 -0700 (Fri, 12 Oct 2007) | 1 line
Fix test of count.__repr__() to ignore the 'L' if the count is a long
........
r58434 | gregory.p.smith | 2007-10-12 11:44:06 -0700 (Fri, 12 Oct 2007) | 4 lines
Fixes http://bugs.python.org/issue1233 - bsddb.dbshelve.DBShelf.append
was useless due to inverted logic. Also adds a test case for RECNO dbs
to test_dbshelve.
........
r58445 | georg.brandl | 2007-10-13 06:20:03 -0700 (Sat, 13 Oct 2007) | 2 lines
Fix email example.
........
r58450 | gregory.p.smith | 2007-10-13 16:02:05 -0700 (Sat, 13 Oct 2007) | 2 lines
Fix an uncollectable reference leak in bsddb.db.DBShelf.append
........
r58453 | neal.norwitz | 2007-10-13 17:18:40 -0700 (Sat, 13 Oct 2007) | 8 lines
Let the O/S supply a port if none of the default ports can be used.
This should make the tests more robust at the expense of allowing
tests to be sloppier by not requiring them to cleanup after themselves.
(It will legitamitely help when running two test suites simultaneously
or if another process is already using one of the predefined ports.)
Also simplifies (slightLy) the exception handling elsewhere.
........
r58459 | neal.norwitz | 2007-10-14 11:30:21 -0700 (Sun, 14 Oct 2007) | 2 lines
Don't raise a string exception, they don't work anymore.
........
r58460 | neal.norwitz | 2007-10-14 11:40:37 -0700 (Sun, 14 Oct 2007) | 1 line
Use unittest for assertions
........
r58468 | armin.rigo | 2007-10-15 00:48:35 -0700 (Mon, 15 Oct 2007) | 2 lines
test_bigbits was not testing what it seemed to.
........
r58471 | guido.van.rossum | 2007-10-15 08:54:11 -0700 (Mon, 15 Oct 2007) | 3 lines
Change a PyErr_Print() into a PyErr_Clear(),
per discussion in issue 1031213.
........
r58500 | raymond.hettinger | 2007-10-16 12:18:30 -0700 (Tue, 16 Oct 2007) | 1 line
Improve error messages
........
r58506 | raymond.hettinger | 2007-10-16 14:28:32 -0700 (Tue, 16 Oct 2007) | 1 line
More docs, error messages, and tests
........
r58507 | andrew.kuchling | 2007-10-16 15:58:03 -0700 (Tue, 16 Oct 2007) | 1 line
Add items
........
r58508 | brett.cannon | 2007-10-16 16:24:06 -0700 (Tue, 16 Oct 2007) | 3 lines
Remove ``:const:`` notation on None in parameter list. Since the markup is not
rendered for parameters it just showed up as ``:const:`None` `` in the output.
........
r58509 | brett.cannon | 2007-10-16 16:26:45 -0700 (Tue, 16 Oct 2007) | 3 lines
Re-order some functions whose parameters differ between PyObject and const char
* so that they are next to each other.
........
r58522 | armin.rigo | 2007-10-17 11:46:37 -0700 (Wed, 17 Oct 2007) | 5 lines
Fix the overflow checking of list_repeat.
Introduce overflow checking into list_inplace_repeat.
Backport candidate, possibly.
........
r58530 | facundo.batista | 2007-10-17 20:16:03 -0700 (Wed, 17 Oct 2007) | 7 lines
Issue #1580738. When HTTPConnection reads the whole stream with read(),
it closes itself. When the stream is read in several calls to read(n),
it should behave in the same way if HTTPConnection knows where the end
of the stream is (through self.length). Added a test case for this
behaviour.
........
r58531 | facundo.batista | 2007-10-17 20:44:48 -0700 (Wed, 17 Oct 2007) | 3 lines
Issue 1289, just a typo.
........
r58532 | gregory.p.smith | 2007-10-18 00:56:54 -0700 (Thu, 18 Oct 2007) | 4 lines
cleanup test_dbtables to use mkdtemp. cleanup dbtables to pass txn as a
keyword argument whenever possible to avoid bugs and confusion. (dbtables.py
line 447 self.db.get using txn as a non-keyword was an actual bug due to this)
........
r58533 | gregory.p.smith | 2007-10-18 01:34:20 -0700 (Thu, 18 Oct 2007) | 4 lines
Fix a weird bug in dbtables: if it chose a random rowid string that contained
NULL bytes it would cause the database all sorts of problems in the future
leading to very strange random failures and corrupt dbtables.bsdTableDb dbs.
........
r58534 | gregory.p.smith | 2007-10-18 09:32:02 -0700 (Thu, 18 Oct 2007) | 3 lines
A cleaner fix than the one committed last night. Generate random rowids that
do not contain null bytes.
........
r58537 | gregory.p.smith | 2007-10-18 10:17:57 -0700 (Thu, 18 Oct 2007) | 2 lines
mention bsddb fixes.
........
r58538 | raymond.hettinger | 2007-10-18 14:13:06 -0700 (Thu, 18 Oct 2007) | 1 line
Remove useless warning
........
r58539 | gregory.p.smith | 2007-10-19 00:31:20 -0700 (Fri, 19 Oct 2007) | 2 lines
squelch the warning that this test is supposed to trigger.
........
r58542 | georg.brandl | 2007-10-19 05:32:39 -0700 (Fri, 19 Oct 2007) | 2 lines
Clarify wording for apply().
........
r58544 | mark.summerfield | 2007-10-19 05:48:17 -0700 (Fri, 19 Oct 2007) | 3 lines
Added a cross-ref to each other.
........
r58545 | georg.brandl | 2007-10-19 10:38:49 -0700 (Fri, 19 Oct 2007) | 2 lines
#1284: "S" means "seen", not unread.
........
r58548 | thomas.heller | 2007-10-19 11:11:41 -0700 (Fri, 19 Oct 2007) | 4 lines
Fix ctypes on 32-bit systems when Python is configured --with-system-ffi.
See also https://bugs.launchpad.net/bugs/72505.
Ported from release25-maint branch.
........
r58550 | facundo.batista | 2007-10-19 12:25:57 -0700 (Fri, 19 Oct 2007) | 8 lines
The constructor from tuple was way too permissive: it allowed bad
coefficient numbers, floats in the sign, and other details that
generated directly the wrong number in the best case, or triggered
misfunctionality in the alorithms.
Test cases added for these issues. Thanks Mark Dickinson.
........
r58559 | georg.brandl | 2007-10-20 06:22:53 -0700 (Sat, 20 Oct 2007) | 2 lines
Fix code being interpreted as a target.
........
r58561 | georg.brandl | 2007-10-20 06:36:24 -0700 (Sat, 20 Oct 2007) | 2 lines
Document new "cmdoption" directive.
........
r58562 | georg.brandl | 2007-10-20 08:21:22 -0700 (Sat, 20 Oct 2007) | 2 lines
Make a path more Unix-standardy.
........
r58564 | georg.brandl | 2007-10-20 10:51:39 -0700 (Sat, 20 Oct 2007) | 2 lines
Document new directive "envvar".
........
r58567 | georg.brandl | 2007-10-20 11:08:14 -0700 (Sat, 20 Oct 2007) | 6 lines
* Add new toplevel chapter, "Using Python." (how to install,
configure and setup python on different platforms -- at least
in theory.)
* Move the Python on Mac docs in that chapter.
* Add a new chapter about the command line invocation, by stargaming.
........
r58568 | georg.brandl | 2007-10-20 11:33:20 -0700 (Sat, 20 Oct 2007) | 2 lines
Change title, for now.
........
r58569 | georg.brandl | 2007-10-20 11:39:25 -0700 (Sat, 20 Oct 2007) | 2 lines
Add entry to ACKS.
........
r58570 | georg.brandl | 2007-10-20 12:05:45 -0700 (Sat, 20 Oct 2007) | 2 lines
Clarify -E docs.
........
r58571 | georg.brandl | 2007-10-20 12:08:36 -0700 (Sat, 20 Oct 2007) | 2 lines
Even more clarification.
........
r58572 | andrew.kuchling | 2007-10-20 12:25:37 -0700 (Sat, 20 Oct 2007) | 1 line
Fix protocol name
........
r58573 | andrew.kuchling | 2007-10-20 12:35:18 -0700 (Sat, 20 Oct 2007) | 1 line
Various items
........
r58574 | andrew.kuchling | 2007-10-20 12:39:35 -0700 (Sat, 20 Oct 2007) | 1 line
Use correct header line
........
r58576 | armin.rigo | 2007-10-21 02:14:15 -0700 (Sun, 21 Oct 2007) | 3 lines
Add a crasher for the long-standing issue with closing a file
while another thread uses it.
........
r58577 | georg.brandl | 2007-10-21 03:01:56 -0700 (Sun, 21 Oct 2007) | 2 lines
Remove duplicate crasher.
........
r58578 | georg.brandl | 2007-10-21 03:24:20 -0700 (Sun, 21 Oct 2007) | 2 lines
Unify "byte code" to "bytecode". Also sprinkle :term: markup for it.
........
r58579 | georg.brandl | 2007-10-21 03:32:54 -0700 (Sun, 21 Oct 2007) | 2 lines
Add markup to new function descriptions.
........
r58580 | georg.brandl | 2007-10-21 03:45:46 -0700 (Sun, 21 Oct 2007) | 2 lines
Add :term:s for descriptors.
........
r58581 | georg.brandl | 2007-10-21 03:46:24 -0700 (Sun, 21 Oct 2007) | 2 lines
Unify "file-descriptor" to "file descriptor".
........
r58582 | georg.brandl | 2007-10-21 03:52:38 -0700 (Sun, 21 Oct 2007) | 2 lines
Add :term: for generators.
........
r58583 | georg.brandl | 2007-10-21 05:10:28 -0700 (Sun, 21 Oct 2007) | 2 lines
Add :term:s for iterator.
........
r58584 | georg.brandl | 2007-10-21 05:15:05 -0700 (Sun, 21 Oct 2007) | 2 lines
Add :term:s for "new-style class".
........
r58588 | neal.norwitz | 2007-10-21 21:47:54 -0700 (Sun, 21 Oct 2007) | 1 line
Add Chris Monson so he can edit PEPs.
........
r58594 | guido.van.rossum | 2007-10-22 09:27:19 -0700 (Mon, 22 Oct 2007) | 4 lines
Issue #1307, patch by Derek Shockey.
When "MAIL" is received without args, an exception happens instead of
sending a 501 syntax error response.
........
r58598 | travis.oliphant | 2007-10-22 19:40:56 -0700 (Mon, 22 Oct 2007) | 1 line
Add phuang patch from Issue 708374 which adds offset parameter to mmap module.
........
r58601 | neal.norwitz | 2007-10-22 22:44:27 -0700 (Mon, 22 Oct 2007) | 2 lines
Bug #1313, fix typo (wrong variable name) in example.
........
r58609 | georg.brandl | 2007-10-23 11:21:35 -0700 (Tue, 23 Oct 2007) | 2 lines
Update Pygments version from externals.
........
r58618 | guido.van.rossum | 2007-10-23 12:25:41 -0700 (Tue, 23 Oct 2007) | 3 lines
Issue 1307 by Derek Shockey, fox the same bug for RCPT.
Neal: please backport!
........
r58620 | raymond.hettinger | 2007-10-23 13:37:41 -0700 (Tue, 23 Oct 2007) | 1 line
Shorter name for namedtuple()
........
r58621 | andrew.kuchling | 2007-10-23 13:55:47 -0700 (Tue, 23 Oct 2007) | 1 line
Update name
........
r58622 | raymond.hettinger | 2007-10-23 14:23:07 -0700 (Tue, 23 Oct 2007) | 1 line
Fixup news entry
........
r58623 | raymond.hettinger | 2007-10-23 18:28:33 -0700 (Tue, 23 Oct 2007) | 1 line
Optimize sum() for integer and float inputs.
........
r58624 | raymond.hettinger | 2007-10-23 19:05:51 -0700 (Tue, 23 Oct 2007) | 1 line
Fixup error return and add support for intermixed ints and floats/
........
r58628 | vinay.sajip | 2007-10-24 03:47:06 -0700 (Wed, 24 Oct 2007) | 1 line
Bug #1321: Fixed logic error in TimedRotatingFileHandler.__init__()
........
r58641 | facundo.batista | 2007-10-24 12:11:08 -0700 (Wed, 24 Oct 2007) | 4 lines
Issue 1290. CharacterData.__repr__ was constructing a string
in response that keeped having a non-ascii character.
........
r58643 | thomas.heller | 2007-10-24 12:50:45 -0700 (Wed, 24 Oct 2007) | 1 line
Added unittest for calling a function with paramflags (backport from py3k branch).
........
r58645 | matthias.klose | 2007-10-24 13:00:44 -0700 (Wed, 24 Oct 2007) | 2 lines
- Build using system ffi library on arm*-linux*.
........
r58651 | georg.brandl | 2007-10-24 14:40:38 -0700 (Wed, 24 Oct 2007) | 2 lines
Bug #1287: make os.environ.pop() work as expected.
........
r58652 | raymond.hettinger | 2007-10-24 19:26:58 -0700 (Wed, 24 Oct 2007) | 1 line
Missing DECREFs
........
r58653 | matthias.klose | 2007-10-24 23:37:24 -0700 (Wed, 24 Oct 2007) | 2 lines
- Build using system ffi library on arm*-linux*, pass --with-system-ffi to CONFIG_ARGS
........
r58655 | thomas.heller | 2007-10-25 12:47:32 -0700 (Thu, 25 Oct 2007) | 2 lines
ffi_type_longdouble may be already #defined.
See issue 1324.
........
r58656 | kurt.kaiser | 2007-10-25 15:43:45 -0700 (Thu, 25 Oct 2007) | 3 lines
Correct an ancient bug in an unused path by removing that path: register() is
now idempotent.
........
r58660 | kurt.kaiser | 2007-10-25 17:10:09 -0700 (Thu, 25 Oct 2007) | 4 lines
1. Add comments to provide top-level documentation.
2. Refactor to use more descriptive names.
3. Enhance tests in main().
........
r58675 | georg.brandl | 2007-10-26 11:30:41 -0700 (Fri, 26 Oct 2007) | 2 lines
Fix new pop() method on os.environ on ignorecase-platforms.
........
r58696 | neal.norwitz | 2007-10-27 15:32:21 -0700 (Sat, 27 Oct 2007) | 1 line
Update URL for Pygments. 0.8.1 is no longer available
........
r58697 | hyeshik.chang | 2007-10-28 04:19:02 -0700 (Sun, 28 Oct 2007) | 3 lines
- Add support for FreeBSD 8 which is recently forked from FreeBSD 7.
- Regenerate IN module for most recent maintenance tree of FreeBSD 6 and 7.
........
r58698 | hyeshik.chang | 2007-10-28 05:38:09 -0700 (Sun, 28 Oct 2007) | 2 lines
Enable platform-specific tweaks for FreeBSD 8 (exactly same to FreeBSD 7's yet)
........
r58700 | kurt.kaiser | 2007-10-28 12:03:59 -0700 (Sun, 28 Oct 2007) | 2 lines
Add confirmation dialog before printing. Patch 1717170 Tal Einat.
........
r58706 | guido.van.rossum | 2007-10-29 13:52:45 -0700 (Mon, 29 Oct 2007) | 3 lines
Patch 1353 by Jacob Winther.
Add mp4 mapping to mimetypes.py.
........
r58709 | guido.van.rossum | 2007-10-29 15:15:05 -0700 (Mon, 29 Oct 2007) | 6 lines
Backport fixes for the code that decodes octal escapes (and for PyString
also hex escapes) -- this was reaching beyond the end of the input string
buffer, even though it is not supposed to be \0-terminated.
This has no visible effect but is clearly the correct thing to do.
(In 3.0 it had a visible effect after removing ob_sstate from PyString.)
........
r58710 | kurt.kaiser | 2007-10-29 19:38:54 -0700 (Mon, 29 Oct 2007) | 7 lines
check in Tal Einat's update to tabpage.py
Patch 1612746
M configDialog.py
M NEWS.txt
AM tabbedpages.py
........
r58715 | georg.brandl | 2007-10-30 10:51:18 -0700 (Tue, 30 Oct 2007) | 2 lines
Use correct markup.
........
r58716 | georg.brandl | 2007-10-30 10:57:12 -0700 (Tue, 30 Oct 2007) | 2 lines
Make example about hiding None return values at the prompt clearer.
........
r58728 | neal.norwitz | 2007-10-30 23:33:20 -0700 (Tue, 30 Oct 2007) | 1 line
Fix some compiler warnings for signed comparisons on Unix and Windows.
........
r58731 | martin.v.loewis | 2007-10-31 10:19:33 -0700 (Wed, 31 Oct 2007) | 2 lines
Adding Christian Heimes.
........
r58737 | raymond.hettinger | 2007-10-31 14:57:58 -0700 (Wed, 31 Oct 2007) | 1 line
Clarify the reasons why pickle is almost always better than marshal
........
r58739 | raymond.hettinger | 2007-10-31 15:15:49 -0700 (Wed, 31 Oct 2007) | 1 line
Sets are marshalable.
........
2007-11-01 16:42:39 -03:00
|
|
|
static PyObject *dictiter_new(PyDictObject *, PyTypeObject *);
|
2001-05-01 09:10:21 -03:00
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
static Py_ssize_t
|
|
|
|
sizeof_lock_held(PyDictObject *mp)
|
2008-06-04 11:18:43 -03:00
|
|
|
{
|
2022-11-29 07:12:17 -04:00
|
|
|
size_t res = _PyObject_SIZE(Py_TYPE(mp));
|
2024-02-20 20:40:37 -04:00
|
|
|
if (_PyDict_HasSplitTable(mp)) {
|
2021-10-13 10:19:34 -03:00
|
|
|
res += shared_keys_usable_size(mp->ma_keys) * sizeof(PyObject*);
|
|
|
|
}
|
2012-04-24 14:13:57 -03:00
|
|
|
/* If the dictionary is split, the keys portion is accounted-for
|
|
|
|
in the type object. */
|
2021-10-13 10:19:34 -03:00
|
|
|
if (mp->ma_keys->dk_refcnt == 1) {
|
2022-03-01 19:09:28 -04:00
|
|
|
res += _PyDict_KeysSize(mp->ma_keys);
|
2021-10-13 10:19:34 -03:00
|
|
|
}
|
2022-11-29 07:12:17 -04:00
|
|
|
assert(res <= (size_t)PY_SSIZE_T_MAX);
|
|
|
|
return (Py_ssize_t)res;
|
2012-04-24 14:13:57 -03:00
|
|
|
}
|
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
Py_ssize_t
|
|
|
|
_PyDict_SizeOf(PyDictObject *mp)
|
|
|
|
{
|
|
|
|
Py_ssize_t res;
|
|
|
|
Py_BEGIN_CRITICAL_SECTION(mp);
|
|
|
|
res = sizeof_lock_held(mp);
|
|
|
|
Py_END_CRITICAL_SECTION();
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2022-11-29 07:12:17 -04:00
|
|
|
size_t
|
2012-04-24 14:13:57 -03:00
|
|
|
_PyDict_KeysSize(PyDictKeysObject *keys)
|
|
|
|
{
|
2022-11-29 07:12:17 -04:00
|
|
|
size_t es = (keys->dk_kind == DICT_KEYS_GENERAL
|
|
|
|
? sizeof(PyDictKeyEntry) : sizeof(PyDictUnicodeEntry));
|
|
|
|
size_t size = sizeof(PyDictKeysObject);
|
|
|
|
size += (size_t)1 << keys->dk_log2_index_bytes;
|
|
|
|
size += USABLE_FRACTION((size_t)DK_SIZE(keys)) * es;
|
|
|
|
return size;
|
2008-06-04 11:18:43 -03:00
|
|
|
}
|
|
|
|
|
2024-01-23 18:10:04 -04:00
|
|
|
/*[clinic input]
|
|
|
|
dict.__sizeof__
|
|
|
|
|
|
|
|
Return the size of the dict in memory, in bytes.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
2016-01-14 09:04:59 -04:00
|
|
|
static PyObject *
|
2024-01-23 18:10:04 -04:00
|
|
|
dict___sizeof___impl(PyDictObject *self)
|
|
|
|
/*[clinic end generated code: output=44279379b3824bda input=4fec4ddfc44a4d1a]*/
|
2015-12-22 02:16:18 -04:00
|
|
|
{
|
2024-01-23 18:10:04 -04:00
|
|
|
return PyLong_FromSsize_t(_PyDict_SizeOf(self));
|
2015-12-22 02:16:18 -04:00
|
|
|
}
|
|
|
|
|
2020-02-24 23:47:34 -04:00
|
|
|
static PyObject *
|
|
|
|
dict_or(PyObject *self, PyObject *other)
|
|
|
|
{
|
|
|
|
if (!PyDict_Check(self) || !PyDict_Check(other)) {
|
|
|
|
Py_RETURN_NOTIMPLEMENTED;
|
|
|
|
}
|
|
|
|
PyObject *new = PyDict_Copy(self);
|
|
|
|
if (new == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if (dict_update_arg(new, other)) {
|
|
|
|
Py_DECREF(new);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return new;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
dict_ior(PyObject *self, PyObject *other)
|
|
|
|
{
|
|
|
|
if (dict_update_arg(self, other)) {
|
|
|
|
return NULL;
|
|
|
|
}
|
2022-11-10 11:27:53 -04:00
|
|
|
return Py_NewRef(self);
|
2020-02-24 23:47:34 -04:00
|
|
|
}
|
|
|
|
|
2022-09-09 05:37:02 -03:00
|
|
|
PyDoc_STRVAR(getitem__doc__,
|
|
|
|
"__getitem__($self, key, /)\n--\n\nReturn self[key].");
|
2003-12-13 07:26:12 -04:00
|
|
|
|
2002-06-13 17:33:02 -03:00
|
|
|
PyDoc_STRVAR(update__doc__,
|
2024-10-29 20:00:04 -03:00
|
|
|
"D.update([E, ]**F) -> None. Update D from mapping/iterable E and F.\n\
|
|
|
|
If E is present and has a .keys() method, then does: for k in E.keys(): D[k] = E[k]\n\
|
2013-05-11 15:46:48 -03:00
|
|
|
If E is present and lacks a .keys() method, then does: for k, v in E: D[k] = v\n\
|
|
|
|
In either case, this is followed by: for k in F: D[k] = F[k]");
|
2000-12-13 19:18:45 -04:00
|
|
|
|
2007-02-09 21:11:45 -04:00
|
|
|
/* Forward */
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
static PyMethodDef mapp_methods[] = {
|
2013-10-19 04:09:25 -03:00
|
|
|
DICT___CONTAINS___METHODDEF
|
2024-01-02 10:32:37 -04:00
|
|
|
{"__getitem__", dict_subscript, METH_O | METH_COEXIST,
|
2010-05-09 12:52:27 -03:00
|
|
|
getitem__doc__},
|
2024-01-23 18:10:04 -04:00
|
|
|
DICT___SIZEOF___METHODDEF
|
2017-01-19 07:37:13 -04:00
|
|
|
DICT_GET_METHODDEF
|
|
|
|
DICT_SETDEFAULT_METHODDEF
|
2019-04-12 04:11:28 -03:00
|
|
|
DICT_POP_METHODDEF
|
|
|
|
DICT_POPITEM_METHODDEF
|
2024-01-23 18:10:04 -04:00
|
|
|
DICT_KEYS_METHODDEF
|
|
|
|
DICT_ITEMS_METHODDEF
|
|
|
|
DICT_VALUES_METHODDEF
|
2022-05-03 16:42:14 -03:00
|
|
|
{"update", _PyCFunction_CAST(dict_update), METH_VARARGS | METH_KEYWORDS,
|
2010-05-09 12:52:27 -03:00
|
|
|
update__doc__},
|
2014-01-24 10:17:25 -04:00
|
|
|
DICT_FROMKEYS_METHODDEF
|
2024-01-23 18:10:04 -04:00
|
|
|
DICT_CLEAR_METHODDEF
|
|
|
|
DICT_COPY_METHODDEF
|
2018-11-05 20:38:54 -04:00
|
|
|
DICT___REVERSED___METHODDEF
|
2021-09-19 12:05:30 -03:00
|
|
|
{"__class_getitem__", Py_GenericAlias, METH_O|METH_CLASS, PyDoc_STR("See PEP 585")},
|
2010-05-09 12:52:27 -03:00
|
|
|
{NULL, NULL} /* sentinel */
|
1993-03-27 14:11:32 -04:00
|
|
|
};
|
|
|
|
|
2024-02-20 21:08:14 -04:00
|
|
|
/* Return 1 if `key` is in dict `op`, 0 if not, and -1 on error. */
|
|
|
|
int
|
|
|
|
PyDict_Contains(PyObject *op, PyObject *key)
|
2001-04-20 13:50:40 -03:00
|
|
|
{
|
2024-07-01 16:11:39 -03:00
|
|
|
Py_hash_t hash = _PyObject_HashFast(key);
|
2024-02-06 18:03:43 -04:00
|
|
|
|
2024-07-01 16:11:39 -03:00
|
|
|
if (hash == -1) {
|
|
|
|
return -1;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2001-04-20 13:50:40 -03:00
|
|
|
|
2024-02-20 21:08:14 -04:00
|
|
|
return _PyDict_Contains_KnownHash(op, key, hash);
|
2024-02-06 18:03:43 -04:00
|
|
|
}
|
|
|
|
|
2023-08-24 10:59:12 -03:00
|
|
|
int
|
|
|
|
PyDict_ContainsString(PyObject *op, const char *key)
|
|
|
|
{
|
|
|
|
PyObject *key_obj = PyUnicode_FromString(key);
|
|
|
|
if (key_obj == NULL) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
int res = PyDict_Contains(op, key_obj);
|
|
|
|
Py_DECREF(key_obj);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
Merged revisions 53623-53858 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r53624 | peter.astrand | 2007-02-02 20:06:36 +0100 (Fri, 02 Feb 2007) | 1 line
We had several if statements checking the value of a fd. This is unsafe, since valid fds might be zero. We should check for not None instead.
........
r53635 | kurt.kaiser | 2007-02-05 07:03:18 +0100 (Mon, 05 Feb 2007) | 2 lines
Add 'raw' support to configHandler. Patch 1650174 Tal Einat.
........
r53641 | kurt.kaiser | 2007-02-06 00:02:16 +0100 (Tue, 06 Feb 2007) | 5 lines
1. Calltips now 'handle' tuples in the argument list (display '<tuple>' :)
Suggested solution by Christos Georgiou, Bug 791968.
2. Clean up tests, were not failing when they should have been.
4. Remove some camelcase and an unneeded try/except block.
........
r53644 | kurt.kaiser | 2007-02-06 04:21:40 +0100 (Tue, 06 Feb 2007) | 2 lines
Clean up ModifiedInterpreter.runcode() structure
........
r53646 | peter.astrand | 2007-02-06 16:37:50 +0100 (Tue, 06 Feb 2007) | 1 line
Applied patch 1124861.3.patch to solve bug #1124861: Automatically create pipes on Windows, if GetStdHandle fails. Will backport.
........
r53648 | lars.gustaebel | 2007-02-06 19:38:13 +0100 (Tue, 06 Feb 2007) | 4 lines
Patch #1652681: create nonexistent files in append mode and
allow appending to empty files.
........
r53649 | kurt.kaiser | 2007-02-06 20:09:43 +0100 (Tue, 06 Feb 2007) | 4 lines
Updated patch (CodeContext.061217.patch) to
[ 1362975 ] CodeContext - Improved text indentation
Tal Einat 16Dec06
........
r53650 | kurt.kaiser | 2007-02-06 20:21:19 +0100 (Tue, 06 Feb 2007) | 2 lines
narrow exception per [ 1540849 ] except too broad
........
r53653 | kurt.kaiser | 2007-02-07 04:39:41 +0100 (Wed, 07 Feb 2007) | 4 lines
[ 1621265 ] Auto-completion list placement
Move AC window below input line unless not enough space, then put it above.
Patch: Tal Einat
........
r53654 | kurt.kaiser | 2007-02-07 09:07:13 +0100 (Wed, 07 Feb 2007) | 2 lines
Handle AttributeError during calltip lookup
........
r53656 | raymond.hettinger | 2007-02-07 21:08:22 +0100 (Wed, 07 Feb 2007) | 3 lines
SF #1615701: make d.update(m) honor __getitem__() and keys() in dict subclasses
........
r53658 | raymond.hettinger | 2007-02-07 22:04:20 +0100 (Wed, 07 Feb 2007) | 1 line
SF: 1397711 Set docs conflated immutable and hashable
........
r53660 | raymond.hettinger | 2007-02-07 22:42:17 +0100 (Wed, 07 Feb 2007) | 1 line
Check for a common user error with defaultdict().
........
r53662 | raymond.hettinger | 2007-02-07 23:24:07 +0100 (Wed, 07 Feb 2007) | 1 line
Bug #1575169: operator.isSequenceType() now returns False for subclasses of dict.
........
r53664 | raymond.hettinger | 2007-02-08 00:49:03 +0100 (Thu, 08 Feb 2007) | 1 line
Silence compiler warning
........
r53666 | raymond.hettinger | 2007-02-08 01:07:32 +0100 (Thu, 08 Feb 2007) | 1 line
Do not let overflows in enumerate() and count() pass silently.
........
r53668 | raymond.hettinger | 2007-02-08 01:50:39 +0100 (Thu, 08 Feb 2007) | 1 line
Bypass set specific optimizations for set and frozenset subclasses.
........
r53670 | raymond.hettinger | 2007-02-08 02:42:35 +0100 (Thu, 08 Feb 2007) | 1 line
Fix docstring bug
........
r53671 | martin.v.loewis | 2007-02-08 10:13:36 +0100 (Thu, 08 Feb 2007) | 3 lines
Bug #1653736: Complain about keyword arguments to time.isoformat.
Will backport to 2.5.
........
r53679 | kurt.kaiser | 2007-02-08 23:58:18 +0100 (Thu, 08 Feb 2007) | 6 lines
Corrected some bugs in AutoComplete. Also, Page Up/Down in ACW implemented;
mouse and cursor selection in ACWindow implemented; double Tab inserts current
selection and closes ACW (similar to double-click and Return); scroll wheel now
works in ACW. Added AutoComplete instructions to IDLE Help.
........
r53689 | martin.v.loewis | 2007-02-09 13:19:32 +0100 (Fri, 09 Feb 2007) | 3 lines
Bug #1653736: Properly discard third argument to slot_nb_inplace_power.
Will backport.
........
r53691 | martin.v.loewis | 2007-02-09 13:36:48 +0100 (Fri, 09 Feb 2007) | 4 lines
Bug #1600860: Search for shared python library in LIBDIR, not
lib/python/config, on "linux" and "gnu" systems.
Will backport.
........
r53693 | martin.v.loewis | 2007-02-09 13:58:49 +0100 (Fri, 09 Feb 2007) | 2 lines
Update broken link. Will backport to 2.5.
........
r53697 | georg.brandl | 2007-02-09 19:48:41 +0100 (Fri, 09 Feb 2007) | 2 lines
Bug #1656078: typo in in profile docs.
........
r53731 | brett.cannon | 2007-02-11 06:36:00 +0100 (Sun, 11 Feb 2007) | 3 lines
Change a very minor inconsistency (that is purely cosmetic) in the AST
definition.
........
r53735 | skip.montanaro | 2007-02-11 19:24:37 +0100 (Sun, 11 Feb 2007) | 1 line
fix trace.py --ignore-dir
........
r53741 | brett.cannon | 2007-02-11 20:44:41 +0100 (Sun, 11 Feb 2007) | 3 lines
Check in changed Python-ast.c from a cosmetic change to Python.asdl (in
r53731).
........
r53751 | brett.cannon | 2007-02-12 04:51:02 +0100 (Mon, 12 Feb 2007) | 5 lines
Modify Parser/asdl_c.py so that the __version__ number for Python/Python-ast.c
is specified at the top of the file. Also add a note that Python/Python-ast.c
needs to be committed separately after a change to the AST grammar to capture
the revision number of the change (which is what __version__ is set to).
........
r53752 | lars.gustaebel | 2007-02-12 10:25:53 +0100 (Mon, 12 Feb 2007) | 3 lines
Bug #1656581: Point out that external file objects are supposed to be
at position 0.
........
r53754 | martin.v.loewis | 2007-02-12 13:21:10 +0100 (Mon, 12 Feb 2007) | 3 lines
Patch 1463026: Support default namespace in XMLGenerator.
Fixes #847665. Will backport.
........
r53757 | armin.rigo | 2007-02-12 17:23:24 +0100 (Mon, 12 Feb 2007) | 4 lines
Fix the line to what is my guess at the original author's meaning.
(The line has no effect anyway, but is present because it's
customary call the base class __init__).
........
r53763 | martin.v.loewis | 2007-02-13 09:34:45 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #685268: Consider a package's __path__ in imputil.
Will backport.
........
r53765 | martin.v.loewis | 2007-02-13 10:49:38 +0100 (Tue, 13 Feb 2007) | 2 lines
Patch #698833: Support file decryption in zipfile.
........
r53766 | martin.v.loewis | 2007-02-13 11:10:39 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #1517891: Make 'a' create the file if it doesn't exist.
Fixes #1514451.
........
r53767 | martin.v.loewis | 2007-02-13 13:08:24 +0100 (Tue, 13 Feb 2007) | 3 lines
Bug #1658794: Remove extraneous 'this'.
Will backport to 2.5.
........
r53769 | martin.v.loewis | 2007-02-13 13:14:19 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #1657276: Make NETLINK_DNRTMSG conditional.
Will backport.
........
r53771 | lars.gustaebel | 2007-02-13 17:09:24 +0100 (Tue, 13 Feb 2007) | 4 lines
Patch #1647484: Renamed GzipFile's filename attribute to name. The
filename attribute is still accessible as a property that emits a
DeprecationWarning.
........
r53772 | lars.gustaebel | 2007-02-13 17:24:00 +0100 (Tue, 13 Feb 2007) | 3 lines
Strip the '.gz' extension from the filename that is written to the
gzip header.
........
r53774 | martin.v.loewis | 2007-02-14 11:07:37 +0100 (Wed, 14 Feb 2007) | 2 lines
Patch #1432399: Add HCI sockets.
........
r53775 | martin.v.loewis | 2007-02-14 12:30:07 +0100 (Wed, 14 Feb 2007) | 2 lines
Update 1432399 to removal of _BT_SOCKADDR_MEMB.
........
r53776 | martin.v.loewis | 2007-02-14 12:30:56 +0100 (Wed, 14 Feb 2007) | 3 lines
Ignore directory time stamps when considering
whether to rerun libffi configure.
........
r53778 | lars.gustaebel | 2007-02-14 15:45:12 +0100 (Wed, 14 Feb 2007) | 4 lines
A missing binary mode in AppendTest caused failures in Windows
Buildbot.
........
r53782 | martin.v.loewis | 2007-02-15 10:51:35 +0100 (Thu, 15 Feb 2007) | 2 lines
Patch #1397848: add the reasoning behind no-resize-on-shrinkage.
........
r53783 | georg.brandl | 2007-02-15 11:37:59 +0100 (Thu, 15 Feb 2007) | 2 lines
Make functools.wraps() docs a bit clearer.
........
r53785 | georg.brandl | 2007-02-15 12:29:04 +0100 (Thu, 15 Feb 2007) | 2 lines
Patch #1494140: Add documentation for the new struct.Struct object.
........
r53787 | georg.brandl | 2007-02-15 12:29:55 +0100 (Thu, 15 Feb 2007) | 2 lines
Add missing \versionadded.
........
r53800 | brett.cannon | 2007-02-15 23:54:39 +0100 (Thu, 15 Feb 2007) | 11 lines
Update the encoding package's search function to use absolute imports when
calling __import__. This helps make the expected search locations for encoding
modules be more explicit.
One could use an explicit value for __path__ when making the call to __import__
to force the exact location searched for encodings. This would give the most
strict search path possible if one is worried about malicious code being
imported. The unfortunate side-effect of that is that if __path__ was modified
on 'encodings' on purpose in a safe way it would not be picked up in future
__import__ calls.
........
r53801 | brett.cannon | 2007-02-16 20:33:01 +0100 (Fri, 16 Feb 2007) | 2 lines
Make the __import__ call in encodings.__init__ absolute with a level 0 call.
........
r53809 | vinay.sajip | 2007-02-16 23:36:24 +0100 (Fri, 16 Feb 2007) | 1 line
Minor fix for currentframe (SF #1652788).
........
r53818 | raymond.hettinger | 2007-02-19 03:03:19 +0100 (Mon, 19 Feb 2007) | 3 lines
Extend work on revision 52962: Eliminate redundant calls to PyObject_Hash().
........
r53820 | raymond.hettinger | 2007-02-19 05:08:43 +0100 (Mon, 19 Feb 2007) | 1 line
Add merge() function to heapq.
........
r53821 | raymond.hettinger | 2007-02-19 06:28:28 +0100 (Mon, 19 Feb 2007) | 1 line
Add tie-breaker count to preserve sort stability.
........
r53822 | raymond.hettinger | 2007-02-19 07:59:32 +0100 (Mon, 19 Feb 2007) | 1 line
Use C heapreplace() instead of slower _siftup() in pure python.
........
r53823 | raymond.hettinger | 2007-02-19 08:30:21 +0100 (Mon, 19 Feb 2007) | 1 line
Add test for merge stability
........
r53824 | raymond.hettinger | 2007-02-19 10:14:10 +0100 (Mon, 19 Feb 2007) | 1 line
Provide an example of defaultdict with non-zero constant factory function.
........
r53825 | lars.gustaebel | 2007-02-19 10:54:47 +0100 (Mon, 19 Feb 2007) | 2 lines
Moved misplaced news item.
........
r53826 | martin.v.loewis | 2007-02-19 11:55:19 +0100 (Mon, 19 Feb 2007) | 3 lines
Patch #1490190: posixmodule now includes os.chflags() and os.lchflags()
functions on platforms where the underlying system calls are available.
........
r53827 | raymond.hettinger | 2007-02-19 19:15:04 +0100 (Mon, 19 Feb 2007) | 1 line
Fixup docstrings for merge().
........
r53829 | raymond.hettinger | 2007-02-19 21:44:04 +0100 (Mon, 19 Feb 2007) | 1 line
Fixup set/dict interoperability.
........
r53837 | raymond.hettinger | 2007-02-21 06:20:38 +0100 (Wed, 21 Feb 2007) | 1 line
Add itertools.izip_longest().
........
r53838 | raymond.hettinger | 2007-02-21 18:22:05 +0100 (Wed, 21 Feb 2007) | 1 line
Remove filler struct item and fix leak.
........
2007-02-23 11:07:44 -04:00
|
|
|
/* Internal version of PyDict_Contains used when the hash value is already known */
|
|
|
|
int
|
2020-10-26 03:43:39 -03:00
|
|
|
_PyDict_Contains_KnownHash(PyObject *op, PyObject *key, Py_hash_t hash)
|
Merged revisions 53623-53858 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r53624 | peter.astrand | 2007-02-02 20:06:36 +0100 (Fri, 02 Feb 2007) | 1 line
We had several if statements checking the value of a fd. This is unsafe, since valid fds might be zero. We should check for not None instead.
........
r53635 | kurt.kaiser | 2007-02-05 07:03:18 +0100 (Mon, 05 Feb 2007) | 2 lines
Add 'raw' support to configHandler. Patch 1650174 Tal Einat.
........
r53641 | kurt.kaiser | 2007-02-06 00:02:16 +0100 (Tue, 06 Feb 2007) | 5 lines
1. Calltips now 'handle' tuples in the argument list (display '<tuple>' :)
Suggested solution by Christos Georgiou, Bug 791968.
2. Clean up tests, were not failing when they should have been.
4. Remove some camelcase and an unneeded try/except block.
........
r53644 | kurt.kaiser | 2007-02-06 04:21:40 +0100 (Tue, 06 Feb 2007) | 2 lines
Clean up ModifiedInterpreter.runcode() structure
........
r53646 | peter.astrand | 2007-02-06 16:37:50 +0100 (Tue, 06 Feb 2007) | 1 line
Applied patch 1124861.3.patch to solve bug #1124861: Automatically create pipes on Windows, if GetStdHandle fails. Will backport.
........
r53648 | lars.gustaebel | 2007-02-06 19:38:13 +0100 (Tue, 06 Feb 2007) | 4 lines
Patch #1652681: create nonexistent files in append mode and
allow appending to empty files.
........
r53649 | kurt.kaiser | 2007-02-06 20:09:43 +0100 (Tue, 06 Feb 2007) | 4 lines
Updated patch (CodeContext.061217.patch) to
[ 1362975 ] CodeContext - Improved text indentation
Tal Einat 16Dec06
........
r53650 | kurt.kaiser | 2007-02-06 20:21:19 +0100 (Tue, 06 Feb 2007) | 2 lines
narrow exception per [ 1540849 ] except too broad
........
r53653 | kurt.kaiser | 2007-02-07 04:39:41 +0100 (Wed, 07 Feb 2007) | 4 lines
[ 1621265 ] Auto-completion list placement
Move AC window below input line unless not enough space, then put it above.
Patch: Tal Einat
........
r53654 | kurt.kaiser | 2007-02-07 09:07:13 +0100 (Wed, 07 Feb 2007) | 2 lines
Handle AttributeError during calltip lookup
........
r53656 | raymond.hettinger | 2007-02-07 21:08:22 +0100 (Wed, 07 Feb 2007) | 3 lines
SF #1615701: make d.update(m) honor __getitem__() and keys() in dict subclasses
........
r53658 | raymond.hettinger | 2007-02-07 22:04:20 +0100 (Wed, 07 Feb 2007) | 1 line
SF: 1397711 Set docs conflated immutable and hashable
........
r53660 | raymond.hettinger | 2007-02-07 22:42:17 +0100 (Wed, 07 Feb 2007) | 1 line
Check for a common user error with defaultdict().
........
r53662 | raymond.hettinger | 2007-02-07 23:24:07 +0100 (Wed, 07 Feb 2007) | 1 line
Bug #1575169: operator.isSequenceType() now returns False for subclasses of dict.
........
r53664 | raymond.hettinger | 2007-02-08 00:49:03 +0100 (Thu, 08 Feb 2007) | 1 line
Silence compiler warning
........
r53666 | raymond.hettinger | 2007-02-08 01:07:32 +0100 (Thu, 08 Feb 2007) | 1 line
Do not let overflows in enumerate() and count() pass silently.
........
r53668 | raymond.hettinger | 2007-02-08 01:50:39 +0100 (Thu, 08 Feb 2007) | 1 line
Bypass set specific optimizations for set and frozenset subclasses.
........
r53670 | raymond.hettinger | 2007-02-08 02:42:35 +0100 (Thu, 08 Feb 2007) | 1 line
Fix docstring bug
........
r53671 | martin.v.loewis | 2007-02-08 10:13:36 +0100 (Thu, 08 Feb 2007) | 3 lines
Bug #1653736: Complain about keyword arguments to time.isoformat.
Will backport to 2.5.
........
r53679 | kurt.kaiser | 2007-02-08 23:58:18 +0100 (Thu, 08 Feb 2007) | 6 lines
Corrected some bugs in AutoComplete. Also, Page Up/Down in ACW implemented;
mouse and cursor selection in ACWindow implemented; double Tab inserts current
selection and closes ACW (similar to double-click and Return); scroll wheel now
works in ACW. Added AutoComplete instructions to IDLE Help.
........
r53689 | martin.v.loewis | 2007-02-09 13:19:32 +0100 (Fri, 09 Feb 2007) | 3 lines
Bug #1653736: Properly discard third argument to slot_nb_inplace_power.
Will backport.
........
r53691 | martin.v.loewis | 2007-02-09 13:36:48 +0100 (Fri, 09 Feb 2007) | 4 lines
Bug #1600860: Search for shared python library in LIBDIR, not
lib/python/config, on "linux" and "gnu" systems.
Will backport.
........
r53693 | martin.v.loewis | 2007-02-09 13:58:49 +0100 (Fri, 09 Feb 2007) | 2 lines
Update broken link. Will backport to 2.5.
........
r53697 | georg.brandl | 2007-02-09 19:48:41 +0100 (Fri, 09 Feb 2007) | 2 lines
Bug #1656078: typo in in profile docs.
........
r53731 | brett.cannon | 2007-02-11 06:36:00 +0100 (Sun, 11 Feb 2007) | 3 lines
Change a very minor inconsistency (that is purely cosmetic) in the AST
definition.
........
r53735 | skip.montanaro | 2007-02-11 19:24:37 +0100 (Sun, 11 Feb 2007) | 1 line
fix trace.py --ignore-dir
........
r53741 | brett.cannon | 2007-02-11 20:44:41 +0100 (Sun, 11 Feb 2007) | 3 lines
Check in changed Python-ast.c from a cosmetic change to Python.asdl (in
r53731).
........
r53751 | brett.cannon | 2007-02-12 04:51:02 +0100 (Mon, 12 Feb 2007) | 5 lines
Modify Parser/asdl_c.py so that the __version__ number for Python/Python-ast.c
is specified at the top of the file. Also add a note that Python/Python-ast.c
needs to be committed separately after a change to the AST grammar to capture
the revision number of the change (which is what __version__ is set to).
........
r53752 | lars.gustaebel | 2007-02-12 10:25:53 +0100 (Mon, 12 Feb 2007) | 3 lines
Bug #1656581: Point out that external file objects are supposed to be
at position 0.
........
r53754 | martin.v.loewis | 2007-02-12 13:21:10 +0100 (Mon, 12 Feb 2007) | 3 lines
Patch 1463026: Support default namespace in XMLGenerator.
Fixes #847665. Will backport.
........
r53757 | armin.rigo | 2007-02-12 17:23:24 +0100 (Mon, 12 Feb 2007) | 4 lines
Fix the line to what is my guess at the original author's meaning.
(The line has no effect anyway, but is present because it's
customary call the base class __init__).
........
r53763 | martin.v.loewis | 2007-02-13 09:34:45 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #685268: Consider a package's __path__ in imputil.
Will backport.
........
r53765 | martin.v.loewis | 2007-02-13 10:49:38 +0100 (Tue, 13 Feb 2007) | 2 lines
Patch #698833: Support file decryption in zipfile.
........
r53766 | martin.v.loewis | 2007-02-13 11:10:39 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #1517891: Make 'a' create the file if it doesn't exist.
Fixes #1514451.
........
r53767 | martin.v.loewis | 2007-02-13 13:08:24 +0100 (Tue, 13 Feb 2007) | 3 lines
Bug #1658794: Remove extraneous 'this'.
Will backport to 2.5.
........
r53769 | martin.v.loewis | 2007-02-13 13:14:19 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #1657276: Make NETLINK_DNRTMSG conditional.
Will backport.
........
r53771 | lars.gustaebel | 2007-02-13 17:09:24 +0100 (Tue, 13 Feb 2007) | 4 lines
Patch #1647484: Renamed GzipFile's filename attribute to name. The
filename attribute is still accessible as a property that emits a
DeprecationWarning.
........
r53772 | lars.gustaebel | 2007-02-13 17:24:00 +0100 (Tue, 13 Feb 2007) | 3 lines
Strip the '.gz' extension from the filename that is written to the
gzip header.
........
r53774 | martin.v.loewis | 2007-02-14 11:07:37 +0100 (Wed, 14 Feb 2007) | 2 lines
Patch #1432399: Add HCI sockets.
........
r53775 | martin.v.loewis | 2007-02-14 12:30:07 +0100 (Wed, 14 Feb 2007) | 2 lines
Update 1432399 to removal of _BT_SOCKADDR_MEMB.
........
r53776 | martin.v.loewis | 2007-02-14 12:30:56 +0100 (Wed, 14 Feb 2007) | 3 lines
Ignore directory time stamps when considering
whether to rerun libffi configure.
........
r53778 | lars.gustaebel | 2007-02-14 15:45:12 +0100 (Wed, 14 Feb 2007) | 4 lines
A missing binary mode in AppendTest caused failures in Windows
Buildbot.
........
r53782 | martin.v.loewis | 2007-02-15 10:51:35 +0100 (Thu, 15 Feb 2007) | 2 lines
Patch #1397848: add the reasoning behind no-resize-on-shrinkage.
........
r53783 | georg.brandl | 2007-02-15 11:37:59 +0100 (Thu, 15 Feb 2007) | 2 lines
Make functools.wraps() docs a bit clearer.
........
r53785 | georg.brandl | 2007-02-15 12:29:04 +0100 (Thu, 15 Feb 2007) | 2 lines
Patch #1494140: Add documentation for the new struct.Struct object.
........
r53787 | georg.brandl | 2007-02-15 12:29:55 +0100 (Thu, 15 Feb 2007) | 2 lines
Add missing \versionadded.
........
r53800 | brett.cannon | 2007-02-15 23:54:39 +0100 (Thu, 15 Feb 2007) | 11 lines
Update the encoding package's search function to use absolute imports when
calling __import__. This helps make the expected search locations for encoding
modules be more explicit.
One could use an explicit value for __path__ when making the call to __import__
to force the exact location searched for encodings. This would give the most
strict search path possible if one is worried about malicious code being
imported. The unfortunate side-effect of that is that if __path__ was modified
on 'encodings' on purpose in a safe way it would not be picked up in future
__import__ calls.
........
r53801 | brett.cannon | 2007-02-16 20:33:01 +0100 (Fri, 16 Feb 2007) | 2 lines
Make the __import__ call in encodings.__init__ absolute with a level 0 call.
........
r53809 | vinay.sajip | 2007-02-16 23:36:24 +0100 (Fri, 16 Feb 2007) | 1 line
Minor fix for currentframe (SF #1652788).
........
r53818 | raymond.hettinger | 2007-02-19 03:03:19 +0100 (Mon, 19 Feb 2007) | 3 lines
Extend work on revision 52962: Eliminate redundant calls to PyObject_Hash().
........
r53820 | raymond.hettinger | 2007-02-19 05:08:43 +0100 (Mon, 19 Feb 2007) | 1 line
Add merge() function to heapq.
........
r53821 | raymond.hettinger | 2007-02-19 06:28:28 +0100 (Mon, 19 Feb 2007) | 1 line
Add tie-breaker count to preserve sort stability.
........
r53822 | raymond.hettinger | 2007-02-19 07:59:32 +0100 (Mon, 19 Feb 2007) | 1 line
Use C heapreplace() instead of slower _siftup() in pure python.
........
r53823 | raymond.hettinger | 2007-02-19 08:30:21 +0100 (Mon, 19 Feb 2007) | 1 line
Add test for merge stability
........
r53824 | raymond.hettinger | 2007-02-19 10:14:10 +0100 (Mon, 19 Feb 2007) | 1 line
Provide an example of defaultdict with non-zero constant factory function.
........
r53825 | lars.gustaebel | 2007-02-19 10:54:47 +0100 (Mon, 19 Feb 2007) | 2 lines
Moved misplaced news item.
........
r53826 | martin.v.loewis | 2007-02-19 11:55:19 +0100 (Mon, 19 Feb 2007) | 3 lines
Patch #1490190: posixmodule now includes os.chflags() and os.lchflags()
functions on platforms where the underlying system calls are available.
........
r53827 | raymond.hettinger | 2007-02-19 19:15:04 +0100 (Mon, 19 Feb 2007) | 1 line
Fixup docstrings for merge().
........
r53829 | raymond.hettinger | 2007-02-19 21:44:04 +0100 (Mon, 19 Feb 2007) | 1 line
Fixup set/dict interoperability.
........
r53837 | raymond.hettinger | 2007-02-21 06:20:38 +0100 (Wed, 21 Feb 2007) | 1 line
Add itertools.izip_longest().
........
r53838 | raymond.hettinger | 2007-02-21 18:22:05 +0100 (Wed, 21 Feb 2007) | 1 line
Remove filler struct item and fix leak.
........
2007-02-23 11:07:44 -04:00
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
PyDictObject *mp = (PyDictObject *)op;
|
2016-12-07 07:41:42 -04:00
|
|
|
PyObject *value;
|
2016-09-07 21:40:12 -03:00
|
|
|
Py_ssize_t ix;
|
Merged revisions 53623-53858 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r53624 | peter.astrand | 2007-02-02 20:06:36 +0100 (Fri, 02 Feb 2007) | 1 line
We had several if statements checking the value of a fd. This is unsafe, since valid fds might be zero. We should check for not None instead.
........
r53635 | kurt.kaiser | 2007-02-05 07:03:18 +0100 (Mon, 05 Feb 2007) | 2 lines
Add 'raw' support to configHandler. Patch 1650174 Tal Einat.
........
r53641 | kurt.kaiser | 2007-02-06 00:02:16 +0100 (Tue, 06 Feb 2007) | 5 lines
1. Calltips now 'handle' tuples in the argument list (display '<tuple>' :)
Suggested solution by Christos Georgiou, Bug 791968.
2. Clean up tests, were not failing when they should have been.
4. Remove some camelcase and an unneeded try/except block.
........
r53644 | kurt.kaiser | 2007-02-06 04:21:40 +0100 (Tue, 06 Feb 2007) | 2 lines
Clean up ModifiedInterpreter.runcode() structure
........
r53646 | peter.astrand | 2007-02-06 16:37:50 +0100 (Tue, 06 Feb 2007) | 1 line
Applied patch 1124861.3.patch to solve bug #1124861: Automatically create pipes on Windows, if GetStdHandle fails. Will backport.
........
r53648 | lars.gustaebel | 2007-02-06 19:38:13 +0100 (Tue, 06 Feb 2007) | 4 lines
Patch #1652681: create nonexistent files in append mode and
allow appending to empty files.
........
r53649 | kurt.kaiser | 2007-02-06 20:09:43 +0100 (Tue, 06 Feb 2007) | 4 lines
Updated patch (CodeContext.061217.patch) to
[ 1362975 ] CodeContext - Improved text indentation
Tal Einat 16Dec06
........
r53650 | kurt.kaiser | 2007-02-06 20:21:19 +0100 (Tue, 06 Feb 2007) | 2 lines
narrow exception per [ 1540849 ] except too broad
........
r53653 | kurt.kaiser | 2007-02-07 04:39:41 +0100 (Wed, 07 Feb 2007) | 4 lines
[ 1621265 ] Auto-completion list placement
Move AC window below input line unless not enough space, then put it above.
Patch: Tal Einat
........
r53654 | kurt.kaiser | 2007-02-07 09:07:13 +0100 (Wed, 07 Feb 2007) | 2 lines
Handle AttributeError during calltip lookup
........
r53656 | raymond.hettinger | 2007-02-07 21:08:22 +0100 (Wed, 07 Feb 2007) | 3 lines
SF #1615701: make d.update(m) honor __getitem__() and keys() in dict subclasses
........
r53658 | raymond.hettinger | 2007-02-07 22:04:20 +0100 (Wed, 07 Feb 2007) | 1 line
SF: 1397711 Set docs conflated immutable and hashable
........
r53660 | raymond.hettinger | 2007-02-07 22:42:17 +0100 (Wed, 07 Feb 2007) | 1 line
Check for a common user error with defaultdict().
........
r53662 | raymond.hettinger | 2007-02-07 23:24:07 +0100 (Wed, 07 Feb 2007) | 1 line
Bug #1575169: operator.isSequenceType() now returns False for subclasses of dict.
........
r53664 | raymond.hettinger | 2007-02-08 00:49:03 +0100 (Thu, 08 Feb 2007) | 1 line
Silence compiler warning
........
r53666 | raymond.hettinger | 2007-02-08 01:07:32 +0100 (Thu, 08 Feb 2007) | 1 line
Do not let overflows in enumerate() and count() pass silently.
........
r53668 | raymond.hettinger | 2007-02-08 01:50:39 +0100 (Thu, 08 Feb 2007) | 1 line
Bypass set specific optimizations for set and frozenset subclasses.
........
r53670 | raymond.hettinger | 2007-02-08 02:42:35 +0100 (Thu, 08 Feb 2007) | 1 line
Fix docstring bug
........
r53671 | martin.v.loewis | 2007-02-08 10:13:36 +0100 (Thu, 08 Feb 2007) | 3 lines
Bug #1653736: Complain about keyword arguments to time.isoformat.
Will backport to 2.5.
........
r53679 | kurt.kaiser | 2007-02-08 23:58:18 +0100 (Thu, 08 Feb 2007) | 6 lines
Corrected some bugs in AutoComplete. Also, Page Up/Down in ACW implemented;
mouse and cursor selection in ACWindow implemented; double Tab inserts current
selection and closes ACW (similar to double-click and Return); scroll wheel now
works in ACW. Added AutoComplete instructions to IDLE Help.
........
r53689 | martin.v.loewis | 2007-02-09 13:19:32 +0100 (Fri, 09 Feb 2007) | 3 lines
Bug #1653736: Properly discard third argument to slot_nb_inplace_power.
Will backport.
........
r53691 | martin.v.loewis | 2007-02-09 13:36:48 +0100 (Fri, 09 Feb 2007) | 4 lines
Bug #1600860: Search for shared python library in LIBDIR, not
lib/python/config, on "linux" and "gnu" systems.
Will backport.
........
r53693 | martin.v.loewis | 2007-02-09 13:58:49 +0100 (Fri, 09 Feb 2007) | 2 lines
Update broken link. Will backport to 2.5.
........
r53697 | georg.brandl | 2007-02-09 19:48:41 +0100 (Fri, 09 Feb 2007) | 2 lines
Bug #1656078: typo in in profile docs.
........
r53731 | brett.cannon | 2007-02-11 06:36:00 +0100 (Sun, 11 Feb 2007) | 3 lines
Change a very minor inconsistency (that is purely cosmetic) in the AST
definition.
........
r53735 | skip.montanaro | 2007-02-11 19:24:37 +0100 (Sun, 11 Feb 2007) | 1 line
fix trace.py --ignore-dir
........
r53741 | brett.cannon | 2007-02-11 20:44:41 +0100 (Sun, 11 Feb 2007) | 3 lines
Check in changed Python-ast.c from a cosmetic change to Python.asdl (in
r53731).
........
r53751 | brett.cannon | 2007-02-12 04:51:02 +0100 (Mon, 12 Feb 2007) | 5 lines
Modify Parser/asdl_c.py so that the __version__ number for Python/Python-ast.c
is specified at the top of the file. Also add a note that Python/Python-ast.c
needs to be committed separately after a change to the AST grammar to capture
the revision number of the change (which is what __version__ is set to).
........
r53752 | lars.gustaebel | 2007-02-12 10:25:53 +0100 (Mon, 12 Feb 2007) | 3 lines
Bug #1656581: Point out that external file objects are supposed to be
at position 0.
........
r53754 | martin.v.loewis | 2007-02-12 13:21:10 +0100 (Mon, 12 Feb 2007) | 3 lines
Patch 1463026: Support default namespace in XMLGenerator.
Fixes #847665. Will backport.
........
r53757 | armin.rigo | 2007-02-12 17:23:24 +0100 (Mon, 12 Feb 2007) | 4 lines
Fix the line to what is my guess at the original author's meaning.
(The line has no effect anyway, but is present because it's
customary call the base class __init__).
........
r53763 | martin.v.loewis | 2007-02-13 09:34:45 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #685268: Consider a package's __path__ in imputil.
Will backport.
........
r53765 | martin.v.loewis | 2007-02-13 10:49:38 +0100 (Tue, 13 Feb 2007) | 2 lines
Patch #698833: Support file decryption in zipfile.
........
r53766 | martin.v.loewis | 2007-02-13 11:10:39 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #1517891: Make 'a' create the file if it doesn't exist.
Fixes #1514451.
........
r53767 | martin.v.loewis | 2007-02-13 13:08:24 +0100 (Tue, 13 Feb 2007) | 3 lines
Bug #1658794: Remove extraneous 'this'.
Will backport to 2.5.
........
r53769 | martin.v.loewis | 2007-02-13 13:14:19 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #1657276: Make NETLINK_DNRTMSG conditional.
Will backport.
........
r53771 | lars.gustaebel | 2007-02-13 17:09:24 +0100 (Tue, 13 Feb 2007) | 4 lines
Patch #1647484: Renamed GzipFile's filename attribute to name. The
filename attribute is still accessible as a property that emits a
DeprecationWarning.
........
r53772 | lars.gustaebel | 2007-02-13 17:24:00 +0100 (Tue, 13 Feb 2007) | 3 lines
Strip the '.gz' extension from the filename that is written to the
gzip header.
........
r53774 | martin.v.loewis | 2007-02-14 11:07:37 +0100 (Wed, 14 Feb 2007) | 2 lines
Patch #1432399: Add HCI sockets.
........
r53775 | martin.v.loewis | 2007-02-14 12:30:07 +0100 (Wed, 14 Feb 2007) | 2 lines
Update 1432399 to removal of _BT_SOCKADDR_MEMB.
........
r53776 | martin.v.loewis | 2007-02-14 12:30:56 +0100 (Wed, 14 Feb 2007) | 3 lines
Ignore directory time stamps when considering
whether to rerun libffi configure.
........
r53778 | lars.gustaebel | 2007-02-14 15:45:12 +0100 (Wed, 14 Feb 2007) | 4 lines
A missing binary mode in AppendTest caused failures in Windows
Buildbot.
........
r53782 | martin.v.loewis | 2007-02-15 10:51:35 +0100 (Thu, 15 Feb 2007) | 2 lines
Patch #1397848: add the reasoning behind no-resize-on-shrinkage.
........
r53783 | georg.brandl | 2007-02-15 11:37:59 +0100 (Thu, 15 Feb 2007) | 2 lines
Make functools.wraps() docs a bit clearer.
........
r53785 | georg.brandl | 2007-02-15 12:29:04 +0100 (Thu, 15 Feb 2007) | 2 lines
Patch #1494140: Add documentation for the new struct.Struct object.
........
r53787 | georg.brandl | 2007-02-15 12:29:55 +0100 (Thu, 15 Feb 2007) | 2 lines
Add missing \versionadded.
........
r53800 | brett.cannon | 2007-02-15 23:54:39 +0100 (Thu, 15 Feb 2007) | 11 lines
Update the encoding package's search function to use absolute imports when
calling __import__. This helps make the expected search locations for encoding
modules be more explicit.
One could use an explicit value for __path__ when making the call to __import__
to force the exact location searched for encodings. This would give the most
strict search path possible if one is worried about malicious code being
imported. The unfortunate side-effect of that is that if __path__ was modified
on 'encodings' on purpose in a safe way it would not be picked up in future
__import__ calls.
........
r53801 | brett.cannon | 2007-02-16 20:33:01 +0100 (Fri, 16 Feb 2007) | 2 lines
Make the __import__ call in encodings.__init__ absolute with a level 0 call.
........
r53809 | vinay.sajip | 2007-02-16 23:36:24 +0100 (Fri, 16 Feb 2007) | 1 line
Minor fix for currentframe (SF #1652788).
........
r53818 | raymond.hettinger | 2007-02-19 03:03:19 +0100 (Mon, 19 Feb 2007) | 3 lines
Extend work on revision 52962: Eliminate redundant calls to PyObject_Hash().
........
r53820 | raymond.hettinger | 2007-02-19 05:08:43 +0100 (Mon, 19 Feb 2007) | 1 line
Add merge() function to heapq.
........
r53821 | raymond.hettinger | 2007-02-19 06:28:28 +0100 (Mon, 19 Feb 2007) | 1 line
Add tie-breaker count to preserve sort stability.
........
r53822 | raymond.hettinger | 2007-02-19 07:59:32 +0100 (Mon, 19 Feb 2007) | 1 line
Use C heapreplace() instead of slower _siftup() in pure python.
........
r53823 | raymond.hettinger | 2007-02-19 08:30:21 +0100 (Mon, 19 Feb 2007) | 1 line
Add test for merge stability
........
r53824 | raymond.hettinger | 2007-02-19 10:14:10 +0100 (Mon, 19 Feb 2007) | 1 line
Provide an example of defaultdict with non-zero constant factory function.
........
r53825 | lars.gustaebel | 2007-02-19 10:54:47 +0100 (Mon, 19 Feb 2007) | 2 lines
Moved misplaced news item.
........
r53826 | martin.v.loewis | 2007-02-19 11:55:19 +0100 (Mon, 19 Feb 2007) | 3 lines
Patch #1490190: posixmodule now includes os.chflags() and os.lchflags()
functions on platforms where the underlying system calls are available.
........
r53827 | raymond.hettinger | 2007-02-19 19:15:04 +0100 (Mon, 19 Feb 2007) | 1 line
Fixup docstrings for merge().
........
r53829 | raymond.hettinger | 2007-02-19 21:44:04 +0100 (Mon, 19 Feb 2007) | 1 line
Fixup set/dict interoperability.
........
r53837 | raymond.hettinger | 2007-02-21 06:20:38 +0100 (Wed, 21 Feb 2007) | 1 line
Add itertools.izip_longest().
........
r53838 | raymond.hettinger | 2007-02-21 18:22:05 +0100 (Wed, 21 Feb 2007) | 1 line
Remove filler struct item and fix leak.
........
2007-02-23 11:07:44 -04:00
|
|
|
|
2024-02-20 21:08:14 -04:00
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
ix = _Py_dict_lookup_threadsafe(mp, key, hash, &value);
|
|
|
|
#else
|
2021-05-28 05:54:10 -03:00
|
|
|
ix = _Py_dict_lookup(mp, key, hash, &value);
|
2024-02-20 21:08:14 -04:00
|
|
|
#endif
|
2016-09-07 21:40:12 -03:00
|
|
|
if (ix == DKIX_ERROR)
|
|
|
|
return -1;
|
2024-02-20 21:08:14 -04:00
|
|
|
if (ix != DKIX_EMPTY && value != NULL) {
|
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
Py_DECREF(value);
|
|
|
|
#endif
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
Merged revisions 53623-53858 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r53624 | peter.astrand | 2007-02-02 20:06:36 +0100 (Fri, 02 Feb 2007) | 1 line
We had several if statements checking the value of a fd. This is unsafe, since valid fds might be zero. We should check for not None instead.
........
r53635 | kurt.kaiser | 2007-02-05 07:03:18 +0100 (Mon, 05 Feb 2007) | 2 lines
Add 'raw' support to configHandler. Patch 1650174 Tal Einat.
........
r53641 | kurt.kaiser | 2007-02-06 00:02:16 +0100 (Tue, 06 Feb 2007) | 5 lines
1. Calltips now 'handle' tuples in the argument list (display '<tuple>' :)
Suggested solution by Christos Georgiou, Bug 791968.
2. Clean up tests, were not failing when they should have been.
4. Remove some camelcase and an unneeded try/except block.
........
r53644 | kurt.kaiser | 2007-02-06 04:21:40 +0100 (Tue, 06 Feb 2007) | 2 lines
Clean up ModifiedInterpreter.runcode() structure
........
r53646 | peter.astrand | 2007-02-06 16:37:50 +0100 (Tue, 06 Feb 2007) | 1 line
Applied patch 1124861.3.patch to solve bug #1124861: Automatically create pipes on Windows, if GetStdHandle fails. Will backport.
........
r53648 | lars.gustaebel | 2007-02-06 19:38:13 +0100 (Tue, 06 Feb 2007) | 4 lines
Patch #1652681: create nonexistent files in append mode and
allow appending to empty files.
........
r53649 | kurt.kaiser | 2007-02-06 20:09:43 +0100 (Tue, 06 Feb 2007) | 4 lines
Updated patch (CodeContext.061217.patch) to
[ 1362975 ] CodeContext - Improved text indentation
Tal Einat 16Dec06
........
r53650 | kurt.kaiser | 2007-02-06 20:21:19 +0100 (Tue, 06 Feb 2007) | 2 lines
narrow exception per [ 1540849 ] except too broad
........
r53653 | kurt.kaiser | 2007-02-07 04:39:41 +0100 (Wed, 07 Feb 2007) | 4 lines
[ 1621265 ] Auto-completion list placement
Move AC window below input line unless not enough space, then put it above.
Patch: Tal Einat
........
r53654 | kurt.kaiser | 2007-02-07 09:07:13 +0100 (Wed, 07 Feb 2007) | 2 lines
Handle AttributeError during calltip lookup
........
r53656 | raymond.hettinger | 2007-02-07 21:08:22 +0100 (Wed, 07 Feb 2007) | 3 lines
SF #1615701: make d.update(m) honor __getitem__() and keys() in dict subclasses
........
r53658 | raymond.hettinger | 2007-02-07 22:04:20 +0100 (Wed, 07 Feb 2007) | 1 line
SF: 1397711 Set docs conflated immutable and hashable
........
r53660 | raymond.hettinger | 2007-02-07 22:42:17 +0100 (Wed, 07 Feb 2007) | 1 line
Check for a common user error with defaultdict().
........
r53662 | raymond.hettinger | 2007-02-07 23:24:07 +0100 (Wed, 07 Feb 2007) | 1 line
Bug #1575169: operator.isSequenceType() now returns False for subclasses of dict.
........
r53664 | raymond.hettinger | 2007-02-08 00:49:03 +0100 (Thu, 08 Feb 2007) | 1 line
Silence compiler warning
........
r53666 | raymond.hettinger | 2007-02-08 01:07:32 +0100 (Thu, 08 Feb 2007) | 1 line
Do not let overflows in enumerate() and count() pass silently.
........
r53668 | raymond.hettinger | 2007-02-08 01:50:39 +0100 (Thu, 08 Feb 2007) | 1 line
Bypass set specific optimizations for set and frozenset subclasses.
........
r53670 | raymond.hettinger | 2007-02-08 02:42:35 +0100 (Thu, 08 Feb 2007) | 1 line
Fix docstring bug
........
r53671 | martin.v.loewis | 2007-02-08 10:13:36 +0100 (Thu, 08 Feb 2007) | 3 lines
Bug #1653736: Complain about keyword arguments to time.isoformat.
Will backport to 2.5.
........
r53679 | kurt.kaiser | 2007-02-08 23:58:18 +0100 (Thu, 08 Feb 2007) | 6 lines
Corrected some bugs in AutoComplete. Also, Page Up/Down in ACW implemented;
mouse and cursor selection in ACWindow implemented; double Tab inserts current
selection and closes ACW (similar to double-click and Return); scroll wheel now
works in ACW. Added AutoComplete instructions to IDLE Help.
........
r53689 | martin.v.loewis | 2007-02-09 13:19:32 +0100 (Fri, 09 Feb 2007) | 3 lines
Bug #1653736: Properly discard third argument to slot_nb_inplace_power.
Will backport.
........
r53691 | martin.v.loewis | 2007-02-09 13:36:48 +0100 (Fri, 09 Feb 2007) | 4 lines
Bug #1600860: Search for shared python library in LIBDIR, not
lib/python/config, on "linux" and "gnu" systems.
Will backport.
........
r53693 | martin.v.loewis | 2007-02-09 13:58:49 +0100 (Fri, 09 Feb 2007) | 2 lines
Update broken link. Will backport to 2.5.
........
r53697 | georg.brandl | 2007-02-09 19:48:41 +0100 (Fri, 09 Feb 2007) | 2 lines
Bug #1656078: typo in in profile docs.
........
r53731 | brett.cannon | 2007-02-11 06:36:00 +0100 (Sun, 11 Feb 2007) | 3 lines
Change a very minor inconsistency (that is purely cosmetic) in the AST
definition.
........
r53735 | skip.montanaro | 2007-02-11 19:24:37 +0100 (Sun, 11 Feb 2007) | 1 line
fix trace.py --ignore-dir
........
r53741 | brett.cannon | 2007-02-11 20:44:41 +0100 (Sun, 11 Feb 2007) | 3 lines
Check in changed Python-ast.c from a cosmetic change to Python.asdl (in
r53731).
........
r53751 | brett.cannon | 2007-02-12 04:51:02 +0100 (Mon, 12 Feb 2007) | 5 lines
Modify Parser/asdl_c.py so that the __version__ number for Python/Python-ast.c
is specified at the top of the file. Also add a note that Python/Python-ast.c
needs to be committed separately after a change to the AST grammar to capture
the revision number of the change (which is what __version__ is set to).
........
r53752 | lars.gustaebel | 2007-02-12 10:25:53 +0100 (Mon, 12 Feb 2007) | 3 lines
Bug #1656581: Point out that external file objects are supposed to be
at position 0.
........
r53754 | martin.v.loewis | 2007-02-12 13:21:10 +0100 (Mon, 12 Feb 2007) | 3 lines
Patch 1463026: Support default namespace in XMLGenerator.
Fixes #847665. Will backport.
........
r53757 | armin.rigo | 2007-02-12 17:23:24 +0100 (Mon, 12 Feb 2007) | 4 lines
Fix the line to what is my guess at the original author's meaning.
(The line has no effect anyway, but is present because it's
customary call the base class __init__).
........
r53763 | martin.v.loewis | 2007-02-13 09:34:45 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #685268: Consider a package's __path__ in imputil.
Will backport.
........
r53765 | martin.v.loewis | 2007-02-13 10:49:38 +0100 (Tue, 13 Feb 2007) | 2 lines
Patch #698833: Support file decryption in zipfile.
........
r53766 | martin.v.loewis | 2007-02-13 11:10:39 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #1517891: Make 'a' create the file if it doesn't exist.
Fixes #1514451.
........
r53767 | martin.v.loewis | 2007-02-13 13:08:24 +0100 (Tue, 13 Feb 2007) | 3 lines
Bug #1658794: Remove extraneous 'this'.
Will backport to 2.5.
........
r53769 | martin.v.loewis | 2007-02-13 13:14:19 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #1657276: Make NETLINK_DNRTMSG conditional.
Will backport.
........
r53771 | lars.gustaebel | 2007-02-13 17:09:24 +0100 (Tue, 13 Feb 2007) | 4 lines
Patch #1647484: Renamed GzipFile's filename attribute to name. The
filename attribute is still accessible as a property that emits a
DeprecationWarning.
........
r53772 | lars.gustaebel | 2007-02-13 17:24:00 +0100 (Tue, 13 Feb 2007) | 3 lines
Strip the '.gz' extension from the filename that is written to the
gzip header.
........
r53774 | martin.v.loewis | 2007-02-14 11:07:37 +0100 (Wed, 14 Feb 2007) | 2 lines
Patch #1432399: Add HCI sockets.
........
r53775 | martin.v.loewis | 2007-02-14 12:30:07 +0100 (Wed, 14 Feb 2007) | 2 lines
Update 1432399 to removal of _BT_SOCKADDR_MEMB.
........
r53776 | martin.v.loewis | 2007-02-14 12:30:56 +0100 (Wed, 14 Feb 2007) | 3 lines
Ignore directory time stamps when considering
whether to rerun libffi configure.
........
r53778 | lars.gustaebel | 2007-02-14 15:45:12 +0100 (Wed, 14 Feb 2007) | 4 lines
A missing binary mode in AppendTest caused failures in Windows
Buildbot.
........
r53782 | martin.v.loewis | 2007-02-15 10:51:35 +0100 (Thu, 15 Feb 2007) | 2 lines
Patch #1397848: add the reasoning behind no-resize-on-shrinkage.
........
r53783 | georg.brandl | 2007-02-15 11:37:59 +0100 (Thu, 15 Feb 2007) | 2 lines
Make functools.wraps() docs a bit clearer.
........
r53785 | georg.brandl | 2007-02-15 12:29:04 +0100 (Thu, 15 Feb 2007) | 2 lines
Patch #1494140: Add documentation for the new struct.Struct object.
........
r53787 | georg.brandl | 2007-02-15 12:29:55 +0100 (Thu, 15 Feb 2007) | 2 lines
Add missing \versionadded.
........
r53800 | brett.cannon | 2007-02-15 23:54:39 +0100 (Thu, 15 Feb 2007) | 11 lines
Update the encoding package's search function to use absolute imports when
calling __import__. This helps make the expected search locations for encoding
modules be more explicit.
One could use an explicit value for __path__ when making the call to __import__
to force the exact location searched for encodings. This would give the most
strict search path possible if one is worried about malicious code being
imported. The unfortunate side-effect of that is that if __path__ was modified
on 'encodings' on purpose in a safe way it would not be picked up in future
__import__ calls.
........
r53801 | brett.cannon | 2007-02-16 20:33:01 +0100 (Fri, 16 Feb 2007) | 2 lines
Make the __import__ call in encodings.__init__ absolute with a level 0 call.
........
r53809 | vinay.sajip | 2007-02-16 23:36:24 +0100 (Fri, 16 Feb 2007) | 1 line
Minor fix for currentframe (SF #1652788).
........
r53818 | raymond.hettinger | 2007-02-19 03:03:19 +0100 (Mon, 19 Feb 2007) | 3 lines
Extend work on revision 52962: Eliminate redundant calls to PyObject_Hash().
........
r53820 | raymond.hettinger | 2007-02-19 05:08:43 +0100 (Mon, 19 Feb 2007) | 1 line
Add merge() function to heapq.
........
r53821 | raymond.hettinger | 2007-02-19 06:28:28 +0100 (Mon, 19 Feb 2007) | 1 line
Add tie-breaker count to preserve sort stability.
........
r53822 | raymond.hettinger | 2007-02-19 07:59:32 +0100 (Mon, 19 Feb 2007) | 1 line
Use C heapreplace() instead of slower _siftup() in pure python.
........
r53823 | raymond.hettinger | 2007-02-19 08:30:21 +0100 (Mon, 19 Feb 2007) | 1 line
Add test for merge stability
........
r53824 | raymond.hettinger | 2007-02-19 10:14:10 +0100 (Mon, 19 Feb 2007) | 1 line
Provide an example of defaultdict with non-zero constant factory function.
........
r53825 | lars.gustaebel | 2007-02-19 10:54:47 +0100 (Mon, 19 Feb 2007) | 2 lines
Moved misplaced news item.
........
r53826 | martin.v.loewis | 2007-02-19 11:55:19 +0100 (Mon, 19 Feb 2007) | 3 lines
Patch #1490190: posixmodule now includes os.chflags() and os.lchflags()
functions on platforms where the underlying system calls are available.
........
r53827 | raymond.hettinger | 2007-02-19 19:15:04 +0100 (Mon, 19 Feb 2007) | 1 line
Fixup docstrings for merge().
........
r53829 | raymond.hettinger | 2007-02-19 21:44:04 +0100 (Mon, 19 Feb 2007) | 1 line
Fixup set/dict interoperability.
........
r53837 | raymond.hettinger | 2007-02-21 06:20:38 +0100 (Wed, 21 Feb 2007) | 1 line
Add itertools.izip_longest().
........
r53838 | raymond.hettinger | 2007-02-21 18:22:05 +0100 (Wed, 21 Feb 2007) | 1 line
Remove filler struct item and fix leak.
........
2007-02-23 11:07:44 -04:00
|
|
|
}
|
|
|
|
|
2020-10-26 03:43:39 -03:00
|
|
|
int
|
2022-02-24 12:51:59 -04:00
|
|
|
_PyDict_ContainsId(PyObject *op, _Py_Identifier *key)
|
2020-10-26 03:43:39 -03:00
|
|
|
{
|
|
|
|
PyObject *kv = _PyUnicode_FromId(key); /* borrowed */
|
|
|
|
if (kv == NULL) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return PyDict_Contains(op, kv);
|
|
|
|
}
|
|
|
|
|
2001-04-20 13:50:40 -03:00
|
|
|
/* Hack to implement "key in dict" */
|
|
|
|
static PySequenceMethods dict_as_sequence = {
|
2010-05-09 12:52:27 -03:00
|
|
|
0, /* sq_length */
|
|
|
|
0, /* sq_concat */
|
|
|
|
0, /* sq_repeat */
|
|
|
|
0, /* sq_item */
|
|
|
|
0, /* sq_slice */
|
|
|
|
0, /* sq_ass_item */
|
|
|
|
0, /* sq_ass_slice */
|
|
|
|
PyDict_Contains, /* sq_contains */
|
|
|
|
0, /* sq_inplace_concat */
|
|
|
|
0, /* sq_inplace_repeat */
|
2001-04-20 13:50:40 -03:00
|
|
|
};
|
|
|
|
|
2020-02-24 23:47:34 -04:00
|
|
|
static PyNumberMethods dict_as_number = {
|
|
|
|
.nb_or = dict_or,
|
|
|
|
.nb_inplace_or = dict_ior,
|
|
|
|
};
|
|
|
|
|
2001-08-02 01:15:00 -03:00
|
|
|
static PyObject *
|
|
|
|
dict_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
|
|
|
|
{
|
2021-06-30 21:30:46 -03:00
|
|
|
assert(type != NULL);
|
|
|
|
assert(type->tp_alloc != NULL);
|
|
|
|
// dict subclasses must implement the GC protocol
|
|
|
|
assert(_PyType_IS_GC(type));
|
2010-05-09 12:52:27 -03:00
|
|
|
|
2021-06-30 21:30:46 -03:00
|
|
|
PyObject *self = type->tp_alloc(type, 0);
|
|
|
|
if (self == NULL) {
|
2013-07-16 17:17:26 -03:00
|
|
|
return NULL;
|
2020-08-03 23:08:06 -03:00
|
|
|
}
|
2021-06-30 21:30:46 -03:00
|
|
|
PyDictObject *d = (PyDictObject *)self;
|
2013-07-16 17:19:00 -03:00
|
|
|
|
|
|
|
d->ma_used = 0;
|
2024-10-01 13:39:56 -03:00
|
|
|
d->_ma_watcher_tag = 0;
|
2020-08-03 23:08:06 -03:00
|
|
|
dictkeys_incref(Py_EMPTY_KEYS);
|
|
|
|
d->ma_keys = Py_EMPTY_KEYS;
|
2022-03-02 06:05:12 -04:00
|
|
|
d->ma_values = NULL;
|
2019-04-12 16:51:34 -03:00
|
|
|
ASSERT_CONSISTENT(d);
|
2024-11-20 12:41:20 -04:00
|
|
|
if (!_PyObject_GC_IS_TRACKED(d)) {
|
|
|
|
_PyObject_GC_TRACK(d);
|
2021-06-30 21:30:46 -03:00
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
return self;
|
2001-08-02 01:15:00 -03:00
|
|
|
}
|
|
|
|
|
2001-09-02 05:22:48 -03:00
|
|
|
static int
|
|
|
|
dict_init(PyObject *self, PyObject *args, PyObject *kwds)
|
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
return dict_update_common(self, args, kwds, "dict");
|
2001-09-02 05:22:48 -03:00
|
|
|
}
|
|
|
|
|
2020-04-01 21:55:43 -03:00
|
|
|
static PyObject *
|
|
|
|
dict_vectorcall(PyObject *type, PyObject * const*args,
|
|
|
|
size_t nargsf, PyObject *kwnames)
|
|
|
|
{
|
|
|
|
Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
|
|
|
|
if (!_PyArg_CheckPositional("dict", nargs, 0, 1)) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2022-01-21 18:33:43 -04:00
|
|
|
PyObject *self = dict_new(_PyType_CAST(type), NULL, NULL);
|
2020-04-01 21:55:43 -03:00
|
|
|
if (self == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if (nargs == 1) {
|
|
|
|
if (dict_update_arg(self, args[0]) < 0) {
|
|
|
|
Py_DECREF(self);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
args++;
|
|
|
|
}
|
|
|
|
if (kwnames != NULL) {
|
|
|
|
for (Py_ssize_t i = 0; i < PyTuple_GET_SIZE(kwnames); i++) {
|
|
|
|
if (PyDict_SetItem(self, PyTuple_GET_ITEM(kwnames, i), args[i]) < 0) {
|
|
|
|
Py_DECREF(self);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return self;
|
|
|
|
}
|
|
|
|
|
2001-05-01 09:10:21 -03:00
|
|
|
static PyObject *
|
2024-01-02 10:32:37 -04:00
|
|
|
dict_iter(PyObject *self)
|
2001-05-01 09:10:21 -03:00
|
|
|
{
|
2024-01-02 10:32:37 -04:00
|
|
|
PyDictObject *dict = (PyDictObject *)self;
|
2010-05-09 12:52:27 -03:00
|
|
|
return dictiter_new(dict, &PyDictIterKey_Type);
|
2001-05-01 09:10:21 -03:00
|
|
|
}
|
2001-04-20 16:13:02 -03:00
|
|
|
|
2002-06-13 17:33:02 -03:00
|
|
|
PyDoc_STRVAR(dictionary_doc,
|
2010-03-01 00:08:34 -04:00
|
|
|
"dict() -> new empty dictionary\n"
|
2001-10-29 18:25:45 -04:00
|
|
|
"dict(mapping) -> new dictionary initialized from a mapping object's\n"
|
2010-03-01 00:08:34 -04:00
|
|
|
" (key, value) pairs\n"
|
|
|
|
"dict(iterable) -> new dictionary initialized as if via:\n"
|
2001-10-27 15:27:48 -03:00
|
|
|
" d = {}\n"
|
2010-03-01 00:08:34 -04:00
|
|
|
" for k, v in iterable:\n"
|
2002-11-23 05:45:04 -04:00
|
|
|
" d[k] = v\n"
|
|
|
|
"dict(**kwargs) -> new dictionary initialized with the name=value pairs\n"
|
|
|
|
" in the keyword argument list. For example: dict(one=1, two=2)");
|
2001-09-02 05:22:48 -03:00
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
PyTypeObject PyDict_Type = {
|
2010-05-09 12:52:27 -03:00
|
|
|
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
|
|
|
"dict",
|
|
|
|
sizeof(PyDictObject),
|
|
|
|
0,
|
2024-01-02 10:32:37 -04:00
|
|
|
dict_dealloc, /* tp_dealloc */
|
2019-05-30 23:13:39 -03:00
|
|
|
0, /* tp_vectorcall_offset */
|
2010-05-09 12:52:27 -03:00
|
|
|
0, /* tp_getattr */
|
|
|
|
0, /* tp_setattr */
|
2019-05-30 23:13:39 -03:00
|
|
|
0, /* tp_as_async */
|
2024-01-02 10:32:37 -04:00
|
|
|
dict_repr, /* tp_repr */
|
2020-02-24 23:47:34 -04:00
|
|
|
&dict_as_number, /* tp_as_number */
|
2010-05-09 12:52:27 -03:00
|
|
|
&dict_as_sequence, /* tp_as_sequence */
|
|
|
|
&dict_as_mapping, /* tp_as_mapping */
|
2010-10-18 04:32:48 -03:00
|
|
|
PyObject_HashNotImplemented, /* tp_hash */
|
2010-05-09 12:52:27 -03:00
|
|
|
0, /* tp_call */
|
|
|
|
0, /* tp_str */
|
|
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
|
|
0, /* tp_setattro */
|
|
|
|
0, /* tp_as_buffer */
|
|
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC |
|
2021-02-26 18:51:55 -04:00
|
|
|
Py_TPFLAGS_BASETYPE | Py_TPFLAGS_DICT_SUBCLASS |
|
2021-04-30 05:50:28 -03:00
|
|
|
_Py_TPFLAGS_MATCH_SELF | Py_TPFLAGS_MAPPING, /* tp_flags */
|
2010-05-09 12:52:27 -03:00
|
|
|
dictionary_doc, /* tp_doc */
|
|
|
|
dict_traverse, /* tp_traverse */
|
|
|
|
dict_tp_clear, /* tp_clear */
|
|
|
|
dict_richcompare, /* tp_richcompare */
|
|
|
|
0, /* tp_weaklistoffset */
|
2024-01-02 10:32:37 -04:00
|
|
|
dict_iter, /* tp_iter */
|
2010-05-09 12:52:27 -03:00
|
|
|
0, /* tp_iternext */
|
|
|
|
mapp_methods, /* tp_methods */
|
|
|
|
0, /* tp_members */
|
|
|
|
0, /* tp_getset */
|
|
|
|
0, /* tp_base */
|
|
|
|
0, /* tp_dict */
|
|
|
|
0, /* tp_descr_get */
|
|
|
|
0, /* tp_descr_set */
|
|
|
|
0, /* tp_dictoffset */
|
|
|
|
dict_init, /* tp_init */
|
2021-06-30 21:30:46 -03:00
|
|
|
_PyType_AllocNoTrack, /* tp_alloc */
|
2010-05-09 12:52:27 -03:00
|
|
|
dict_new, /* tp_new */
|
|
|
|
PyObject_GC_Del, /* tp_free */
|
2020-04-01 21:55:43 -03:00
|
|
|
.tp_vectorcall = dict_vectorcall,
|
2024-11-08 12:44:44 -04:00
|
|
|
.tp_version_tag = _Py_TYPE_VERSION_DICT,
|
1993-03-27 14:11:32 -04:00
|
|
|
};
|
|
|
|
|
1997-05-16 11:23:33 -03:00
|
|
|
/* For backward compatibility with old dictionary interface */
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
PyObject *
|
2002-12-11 09:21:12 -04:00
|
|
|
PyDict_GetItemString(PyObject *v, const char *key)
|
1993-03-27 14:11:32 -04:00
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject *kv, *rv;
|
|
|
|
kv = PyUnicode_FromString(key);
|
2013-07-16 17:16:05 -03:00
|
|
|
if (kv == NULL) {
|
2023-11-07 09:58:04 -04:00
|
|
|
PyErr_FormatUnraisable(
|
|
|
|
"Exception ignored in PyDict_GetItemString(); consider using "
|
|
|
|
"PyDict_GetItemRefString()");
|
2010-05-09 12:52:27 -03:00
|
|
|
return NULL;
|
2013-07-16 17:16:05 -03:00
|
|
|
}
|
2023-11-07 09:58:04 -04:00
|
|
|
rv = dict_getitem(v, kv,
|
|
|
|
"Exception ignored in PyDict_GetItemString(); consider using "
|
|
|
|
"PyDict_GetItemRefString()");
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_DECREF(kv);
|
2023-07-21 18:10:51 -03:00
|
|
|
return rv; // borrowed reference
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
PyDict_GetItemStringRef(PyObject *v, const char *key, PyObject **result)
|
|
|
|
{
|
|
|
|
PyObject *key_obj = PyUnicode_FromString(key);
|
|
|
|
if (key_obj == NULL) {
|
|
|
|
*result = NULL;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
int res = PyDict_GetItemRef(v, key_obj, result);
|
|
|
|
Py_DECREF(key_obj);
|
|
|
|
return res;
|
1993-03-27 14:11:32 -04:00
|
|
|
}
|
|
|
|
|
2012-03-26 17:10:51 -03:00
|
|
|
int
|
2022-02-24 12:51:59 -04:00
|
|
|
_PyDict_SetItemId(PyObject *v, _Py_Identifier *key, PyObject *item)
|
2012-03-26 17:10:51 -03:00
|
|
|
{
|
|
|
|
PyObject *kv;
|
|
|
|
kv = _PyUnicode_FromId(key); /* borrowed */
|
|
|
|
if (kv == NULL)
|
|
|
|
return -1;
|
|
|
|
return PyDict_SetItem(v, kv, item);
|
|
|
|
}
|
|
|
|
|
1993-03-27 14:11:32 -04:00
|
|
|
int
|
2002-12-11 09:21:12 -04:00
|
|
|
PyDict_SetItemString(PyObject *v, const char *key, PyObject *item)
|
1993-03-27 14:11:32 -04:00
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject *kv;
|
|
|
|
int err;
|
|
|
|
kv = PyUnicode_FromString(key);
|
|
|
|
if (kv == NULL)
|
|
|
|
return -1;
|
2024-06-21 12:19:31 -03:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
|
|
|
_PyUnicode_InternImmortal(interp, &kv); /* XXX Should we really? */
|
2010-05-09 12:52:27 -03:00
|
|
|
err = PyDict_SetItem(v, kv, item);
|
|
|
|
Py_DECREF(kv);
|
|
|
|
return err;
|
1993-03-27 14:11:32 -04:00
|
|
|
}
|
|
|
|
|
2013-11-06 13:58:22 -04:00
|
|
|
int
|
|
|
|
_PyDict_DelItemId(PyObject *v, _Py_Identifier *key)
|
|
|
|
{
|
|
|
|
PyObject *kv = _PyUnicode_FromId(key); /* borrowed */
|
|
|
|
if (kv == NULL)
|
|
|
|
return -1;
|
|
|
|
return PyDict_DelItem(v, kv);
|
|
|
|
}
|
|
|
|
|
1993-03-27 14:11:32 -04:00
|
|
|
int
|
2002-12-11 09:21:12 -04:00
|
|
|
PyDict_DelItemString(PyObject *v, const char *key)
|
1993-03-27 14:11:32 -04:00
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject *kv;
|
|
|
|
int err;
|
|
|
|
kv = PyUnicode_FromString(key);
|
|
|
|
if (kv == NULL)
|
|
|
|
return -1;
|
|
|
|
err = PyDict_DelItem(v, kv);
|
|
|
|
Py_DECREF(kv);
|
|
|
|
return err;
|
1993-03-27 14:11:32 -04:00
|
|
|
}
|
2001-04-20 16:13:02 -03:00
|
|
|
|
2004-03-17 22:41:19 -04:00
|
|
|
/* Dictionary iterator types */
|
2001-04-20 16:13:02 -03:00
|
|
|
|
|
|
|
typedef struct {
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject_HEAD
|
|
|
|
PyDictObject *di_dict; /* Set to NULL when iterator is exhausted */
|
|
|
|
Py_ssize_t di_used;
|
|
|
|
Py_ssize_t di_pos;
|
|
|
|
PyObject* di_result; /* reusable result tuple for iteritems */
|
|
|
|
Py_ssize_t len;
|
2001-04-20 16:13:02 -03:00
|
|
|
} dictiterobject;
|
|
|
|
|
|
|
|
static PyObject *
|
Merged revisions 58221-58741 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r58221 | georg.brandl | 2007-09-20 10:57:59 -0700 (Thu, 20 Sep 2007) | 2 lines
Patch #1181: add os.environ.clear() method.
........
r58225 | sean.reifschneider | 2007-09-20 23:33:28 -0700 (Thu, 20 Sep 2007) | 3 lines
Issue1704287: "make install" fails unless you do "make" first. Make
oldsharedmods and sharedmods in "libinstall".
........
r58232 | guido.van.rossum | 2007-09-22 13:18:03 -0700 (Sat, 22 Sep 2007) | 4 lines
Patch # 188 by Philip Jenvey.
Make tell() mark CRLF as a newline.
With unit test.
........
r58242 | georg.brandl | 2007-09-24 10:55:47 -0700 (Mon, 24 Sep 2007) | 2 lines
Fix typo and double word.
........
r58245 | georg.brandl | 2007-09-24 10:59:28 -0700 (Mon, 24 Sep 2007) | 2 lines
#1196: document default radix for int().
........
r58247 | georg.brandl | 2007-09-24 11:08:24 -0700 (Mon, 24 Sep 2007) | 2 lines
#1177: accept 2xx responses for https too, not only http.
........
r58249 | andrew.kuchling | 2007-09-24 16:45:51 -0700 (Mon, 24 Sep 2007) | 1 line
Remove stray odd character; grammar fix
........
r58250 | andrew.kuchling | 2007-09-24 16:46:28 -0700 (Mon, 24 Sep 2007) | 1 line
Typo fix
........
r58251 | andrew.kuchling | 2007-09-24 17:09:42 -0700 (Mon, 24 Sep 2007) | 1 line
Add various items
........
r58268 | vinay.sajip | 2007-09-26 22:34:45 -0700 (Wed, 26 Sep 2007) | 1 line
Change to flush and close logic to fix #1760556.
........
r58269 | vinay.sajip | 2007-09-26 22:38:51 -0700 (Wed, 26 Sep 2007) | 1 line
Change to basicConfig() to fix #1021.
........
r58270 | georg.brandl | 2007-09-26 23:26:58 -0700 (Wed, 26 Sep 2007) | 2 lines
#1208: document match object's boolean value.
........
r58271 | vinay.sajip | 2007-09-26 23:56:13 -0700 (Wed, 26 Sep 2007) | 1 line
Minor date change.
........
r58272 | vinay.sajip | 2007-09-27 00:35:10 -0700 (Thu, 27 Sep 2007) | 1 line
Change to LogRecord.__init__() to fix #1206. Note that archaic use of type(x) == types.DictType is because of keeping 1.5.2 compatibility. While this is much less relevant these days, there probably needs to be a separate commit for removing all archaic constructs at the same time.
........
r58288 | brett.cannon | 2007-09-30 12:45:10 -0700 (Sun, 30 Sep 2007) | 9 lines
tuple.__repr__ did not consider a reference loop as it is not possible from
Python code; but it is possible from C. object.__str__ had the issue of not
expecting a type to doing something within it's tp_str implementation that
could trigger an infinite recursion, but it could in C code.. Both found
thanks to BaseException and how it handles its repr.
Closes issue #1686386. Thanks to Thomas Herve for taking an initial stab at
coming up with a solution.
........
r58289 | brett.cannon | 2007-09-30 13:37:19 -0700 (Sun, 30 Sep 2007) | 3 lines
Fix error introduced by r58288; if a tuple is length 0 return its repr and
don't worry about any self-referring tuples.
........
r58294 | facundo.batista | 2007-10-02 10:01:24 -0700 (Tue, 02 Oct 2007) | 11 lines
Made the various is_* operations return booleans. This was discussed
with Cawlishaw by mail, and he basically confirmed that to these is_*
operations, there's no need to return Decimal(0) and Decimal(1) if
the language supports the False and True booleans.
Also added a few tests for the these functions in extra.decTest, since
they are mostly untested (apart from the doctests).
Thanks Mark Dickinson
........
r58295 | facundo.batista | 2007-10-02 11:21:18 -0700 (Tue, 02 Oct 2007) | 4 lines
Added a class to store the digits of log(10), so that they can be made
available when necessary without recomputing. Thanks Mark Dickinson
........
r58299 | mark.summerfield | 2007-10-03 01:53:21 -0700 (Wed, 03 Oct 2007) | 4 lines
Added note in footnote about string comparisons about
unicodedata.normalize().
........
r58304 | raymond.hettinger | 2007-10-03 14:18:11 -0700 (Wed, 03 Oct 2007) | 1 line
enumerate() is no longer bounded to using sequences shorter than LONG_MAX. The possibility of overflow was sending some newsgroup posters into a tizzy.
........
r58305 | raymond.hettinger | 2007-10-03 17:20:27 -0700 (Wed, 03 Oct 2007) | 1 line
itertools.count() no longer limited to sys.maxint.
........
r58306 | kurt.kaiser | 2007-10-03 18:49:54 -0700 (Wed, 03 Oct 2007) | 3 lines
Assume that the user knows when he wants to end the line; don't insert
something he didn't select or complete.
........
r58307 | kurt.kaiser | 2007-10-03 19:07:50 -0700 (Wed, 03 Oct 2007) | 2 lines
Remove unused theme that was causing a fault in p3k.
........
r58308 | kurt.kaiser | 2007-10-03 19:09:17 -0700 (Wed, 03 Oct 2007) | 2 lines
Clean up EditorWindow close.
........
r58309 | kurt.kaiser | 2007-10-03 19:53:07 -0700 (Wed, 03 Oct 2007) | 7 lines
textView cleanup. Patch 1718043 Tal Einat.
M idlelib/EditorWindow.py
M idlelib/aboutDialog.py
M idlelib/textView.py
M idlelib/NEWS.txt
........
r58310 | kurt.kaiser | 2007-10-03 20:11:12 -0700 (Wed, 03 Oct 2007) | 3 lines
configDialog cleanup. Patch 1730217 Tal Einat.
........
r58311 | neal.norwitz | 2007-10-03 23:00:48 -0700 (Wed, 03 Oct 2007) | 4 lines
Coverity #151: Remove deadcode.
All this code already exists above starting at line 653.
........
r58325 | fred.drake | 2007-10-04 19:46:12 -0700 (Thu, 04 Oct 2007) | 1 line
wrap lines to <80 characters before fixing errors
........
r58326 | raymond.hettinger | 2007-10-04 19:47:07 -0700 (Thu, 04 Oct 2007) | 6 lines
Add __asdict__() to NamedTuple and refine the docs.
Add maxlen support to deque() and fixup docs.
Partially fix __reduce__(). The None as a third arg was no longer supported.
Still needs work on __reduce__() to handle recursive inputs.
........
r58327 | fred.drake | 2007-10-04 19:48:32 -0700 (Thu, 04 Oct 2007) | 3 lines
move descriptions of ac_(in|out)_buffer_size to the right place
http://bugs.python.org/issue1053
........
r58329 | neal.norwitz | 2007-10-04 20:39:17 -0700 (Thu, 04 Oct 2007) | 3 lines
dict could be NULL, so we need to XDECREF.
Fix a compiler warning about passing a PyTypeObject* instead of PyObject*.
........
r58330 | neal.norwitz | 2007-10-04 20:41:19 -0700 (Thu, 04 Oct 2007) | 2 lines
Fix Coverity #158: Check the correct variable.
........
r58332 | neal.norwitz | 2007-10-04 22:01:38 -0700 (Thu, 04 Oct 2007) | 7 lines
Fix Coverity #159.
This code was broken if save() returned a negative number since i contained
a boolean value and then we compared i < 0 which should never be true.
Will backport (assuming it's necessary)
........
r58334 | neal.norwitz | 2007-10-04 22:29:17 -0700 (Thu, 04 Oct 2007) | 1 line
Add a note about fixing some more warnings found by Coverity.
........
r58338 | raymond.hettinger | 2007-10-05 12:07:31 -0700 (Fri, 05 Oct 2007) | 1 line
Restore BEGIN/END THREADS macros which were squashed in the previous checkin
........
r58343 | gregory.p.smith | 2007-10-06 00:48:10 -0700 (Sat, 06 Oct 2007) | 3 lines
Stab in the dark attempt to fix the test_bsddb3 failure on sparc and S-390
ubuntu buildbots.
........
r58344 | gregory.p.smith | 2007-10-06 00:51:59 -0700 (Sat, 06 Oct 2007) | 2 lines
Allows BerkeleyDB 4.6.x >= 4.6.21 for the bsddb module.
........
r58348 | gregory.p.smith | 2007-10-06 08:47:37 -0700 (Sat, 06 Oct 2007) | 3 lines
Use the host the author likely meant in the first place. pop.gmail.com is
reliable. gmail.org is someones personal domain.
........
r58351 | neal.norwitz | 2007-10-06 12:16:28 -0700 (Sat, 06 Oct 2007) | 3 lines
Ensure that this test will pass even if another test left an unwritable TESTFN.
Also use the safe unlink in test_support instead of rolling our own here.
........
r58368 | georg.brandl | 2007-10-08 00:50:24 -0700 (Mon, 08 Oct 2007) | 3 lines
#1123: fix the docs for the str.split(None, sep) case.
Also expand a few other methods' docs, which had more info in the deprecated string module docs.
........
r58369 | georg.brandl | 2007-10-08 01:06:05 -0700 (Mon, 08 Oct 2007) | 2 lines
Update docstring of sched, also remove an unused assignment.
........
r58370 | raymond.hettinger | 2007-10-08 02:14:28 -0700 (Mon, 08 Oct 2007) | 5 lines
Add comments to NamedTuple code.
Let the field spec be either a string or a non-string sequence (suggested by Martin Blais with use cases).
Improve the error message in the case of a SyntaxError (caused by a duplicate field name).
........
r58371 | raymond.hettinger | 2007-10-08 02:56:29 -0700 (Mon, 08 Oct 2007) | 1 line
Missed a line in the docs
........
r58372 | raymond.hettinger | 2007-10-08 03:11:51 -0700 (Mon, 08 Oct 2007) | 1 line
Better variable names
........
r58376 | georg.brandl | 2007-10-08 07:12:47 -0700 (Mon, 08 Oct 2007) | 3 lines
#1199: docs for tp_as_{number,sequence,mapping}, by Amaury Forgeot d'Arc.
No need to merge this to py3k!
........
r58380 | raymond.hettinger | 2007-10-08 14:26:58 -0700 (Mon, 08 Oct 2007) | 1 line
Eliminate camelcase function name
........
r58381 | andrew.kuchling | 2007-10-08 16:23:03 -0700 (Mon, 08 Oct 2007) | 1 line
Eliminate camelcase function name
........
r58382 | raymond.hettinger | 2007-10-08 18:36:23 -0700 (Mon, 08 Oct 2007) | 1 line
Make the error messages more specific
........
r58384 | gregory.p.smith | 2007-10-08 23:02:21 -0700 (Mon, 08 Oct 2007) | 10 lines
Splits Modules/_bsddb.c up into bsddb.h and _bsddb.c and adds a C API
object available as bsddb.db.api. This is based on the patch submitted
by Duncan Grisby here:
http://sourceforge.net/tracker/index.php?func=detail&aid=1551895&group_id=13900&atid=313900
See this thread for additional info:
http://sourceforge.net/mailarchive/forum.php?thread_name=E1GAVDK-0002rk-Iw%40apasphere.com&forum_name=pybsddb-users
It also cleans up the code a little by removing some ifdef/endifs for
python prior to 2.1 and for unsupported Berkeley DB <= 3.2.
........
r58385 | gregory.p.smith | 2007-10-08 23:50:43 -0700 (Mon, 08 Oct 2007) | 5 lines
Fix a double free when positioning a database cursor to a non-existant
string key (and probably a few other situations with string keys).
This was reported with a patch as pybsddb sourceforge bug 1708868 by
jjjhhhlll at gmail.
........
r58386 | gregory.p.smith | 2007-10-09 00:19:11 -0700 (Tue, 09 Oct 2007) | 3 lines
Use the highest cPickle protocol in bsddb.dbshelve. This comes from
sourceforge pybsddb patch 1551443 by w_barnes.
........
r58394 | gregory.p.smith | 2007-10-09 11:26:02 -0700 (Tue, 09 Oct 2007) | 2 lines
remove another sleepycat reference
........
r58396 | kurt.kaiser | 2007-10-09 12:31:30 -0700 (Tue, 09 Oct 2007) | 3 lines
Allow interrupt only when executing user code in subprocess
Patch 1225 Tal Einat modified from IDLE-Spoon.
........
r58399 | brett.cannon | 2007-10-09 17:07:50 -0700 (Tue, 09 Oct 2007) | 5 lines
Remove file-level typedefs that were inconsistently used throughout the file.
Just move over to the public API names.
Closes issue1238.
........
r58401 | raymond.hettinger | 2007-10-09 17:26:46 -0700 (Tue, 09 Oct 2007) | 1 line
Accept Jim Jewett's api suggestion to use None instead of -1 to indicate unbounded deques.
........
r58403 | kurt.kaiser | 2007-10-09 17:55:40 -0700 (Tue, 09 Oct 2007) | 2 lines
Allow cursor color change w/o restart. Patch 1725576 Tal Einat.
........
r58404 | kurt.kaiser | 2007-10-09 18:06:47 -0700 (Tue, 09 Oct 2007) | 2 lines
show paste if > 80 columns. Patch 1659326 Tal Einat.
........
r58415 | thomas.heller | 2007-10-11 12:51:32 -0700 (Thu, 11 Oct 2007) | 5 lines
On OS X, use os.uname() instead of gestalt.sysv(...) to get the
operating system version. This allows to use ctypes when Python
was configured with --disable-toolbox-glue.
........
r58419 | neal.norwitz | 2007-10-11 20:01:01 -0700 (Thu, 11 Oct 2007) | 1 line
Get rid of warning about not being able to create an existing directory.
........
r58420 | neal.norwitz | 2007-10-11 20:01:30 -0700 (Thu, 11 Oct 2007) | 1 line
Get rid of warnings on a bunch of platforms by using a proper prototype.
........
r58421 | neal.norwitz | 2007-10-11 20:01:54 -0700 (Thu, 11 Oct 2007) | 4 lines
Get rid of compiler warning about retval being used (returned) without
being initialized. (gcc warning and Coverity 202)
........
r58422 | neal.norwitz | 2007-10-11 20:03:23 -0700 (Thu, 11 Oct 2007) | 1 line
Fix Coverity 168: Close the file before returning (exiting).
........
r58423 | neal.norwitz | 2007-10-11 20:04:18 -0700 (Thu, 11 Oct 2007) | 4 lines
Fix Coverity 180: Don't overallocate. We don't need structs, but pointers.
Also fix a memory leak.
........
r58424 | neal.norwitz | 2007-10-11 20:05:19 -0700 (Thu, 11 Oct 2007) | 5 lines
Fix Coverity 185-186: If the passed in FILE is NULL, uninitialized memory
would be accessed.
Will backport.
........
r58425 | neal.norwitz | 2007-10-11 20:52:34 -0700 (Thu, 11 Oct 2007) | 1 line
Get this module to compile with bsddb versions prior to 4.3
........
r58430 | martin.v.loewis | 2007-10-12 01:56:52 -0700 (Fri, 12 Oct 2007) | 3 lines
Bug #1216: Restore support for Visual Studio 2002.
Will backport to 2.5.
........
r58433 | raymond.hettinger | 2007-10-12 10:53:11 -0700 (Fri, 12 Oct 2007) | 1 line
Fix test of count.__repr__() to ignore the 'L' if the count is a long
........
r58434 | gregory.p.smith | 2007-10-12 11:44:06 -0700 (Fri, 12 Oct 2007) | 4 lines
Fixes http://bugs.python.org/issue1233 - bsddb.dbshelve.DBShelf.append
was useless due to inverted logic. Also adds a test case for RECNO dbs
to test_dbshelve.
........
r58445 | georg.brandl | 2007-10-13 06:20:03 -0700 (Sat, 13 Oct 2007) | 2 lines
Fix email example.
........
r58450 | gregory.p.smith | 2007-10-13 16:02:05 -0700 (Sat, 13 Oct 2007) | 2 lines
Fix an uncollectable reference leak in bsddb.db.DBShelf.append
........
r58453 | neal.norwitz | 2007-10-13 17:18:40 -0700 (Sat, 13 Oct 2007) | 8 lines
Let the O/S supply a port if none of the default ports can be used.
This should make the tests more robust at the expense of allowing
tests to be sloppier by not requiring them to cleanup after themselves.
(It will legitamitely help when running two test suites simultaneously
or if another process is already using one of the predefined ports.)
Also simplifies (slightLy) the exception handling elsewhere.
........
r58459 | neal.norwitz | 2007-10-14 11:30:21 -0700 (Sun, 14 Oct 2007) | 2 lines
Don't raise a string exception, they don't work anymore.
........
r58460 | neal.norwitz | 2007-10-14 11:40:37 -0700 (Sun, 14 Oct 2007) | 1 line
Use unittest for assertions
........
r58468 | armin.rigo | 2007-10-15 00:48:35 -0700 (Mon, 15 Oct 2007) | 2 lines
test_bigbits was not testing what it seemed to.
........
r58471 | guido.van.rossum | 2007-10-15 08:54:11 -0700 (Mon, 15 Oct 2007) | 3 lines
Change a PyErr_Print() into a PyErr_Clear(),
per discussion in issue 1031213.
........
r58500 | raymond.hettinger | 2007-10-16 12:18:30 -0700 (Tue, 16 Oct 2007) | 1 line
Improve error messages
........
r58506 | raymond.hettinger | 2007-10-16 14:28:32 -0700 (Tue, 16 Oct 2007) | 1 line
More docs, error messages, and tests
........
r58507 | andrew.kuchling | 2007-10-16 15:58:03 -0700 (Tue, 16 Oct 2007) | 1 line
Add items
........
r58508 | brett.cannon | 2007-10-16 16:24:06 -0700 (Tue, 16 Oct 2007) | 3 lines
Remove ``:const:`` notation on None in parameter list. Since the markup is not
rendered for parameters it just showed up as ``:const:`None` `` in the output.
........
r58509 | brett.cannon | 2007-10-16 16:26:45 -0700 (Tue, 16 Oct 2007) | 3 lines
Re-order some functions whose parameters differ between PyObject and const char
* so that they are next to each other.
........
r58522 | armin.rigo | 2007-10-17 11:46:37 -0700 (Wed, 17 Oct 2007) | 5 lines
Fix the overflow checking of list_repeat.
Introduce overflow checking into list_inplace_repeat.
Backport candidate, possibly.
........
r58530 | facundo.batista | 2007-10-17 20:16:03 -0700 (Wed, 17 Oct 2007) | 7 lines
Issue #1580738. When HTTPConnection reads the whole stream with read(),
it closes itself. When the stream is read in several calls to read(n),
it should behave in the same way if HTTPConnection knows where the end
of the stream is (through self.length). Added a test case for this
behaviour.
........
r58531 | facundo.batista | 2007-10-17 20:44:48 -0700 (Wed, 17 Oct 2007) | 3 lines
Issue 1289, just a typo.
........
r58532 | gregory.p.smith | 2007-10-18 00:56:54 -0700 (Thu, 18 Oct 2007) | 4 lines
cleanup test_dbtables to use mkdtemp. cleanup dbtables to pass txn as a
keyword argument whenever possible to avoid bugs and confusion. (dbtables.py
line 447 self.db.get using txn as a non-keyword was an actual bug due to this)
........
r58533 | gregory.p.smith | 2007-10-18 01:34:20 -0700 (Thu, 18 Oct 2007) | 4 lines
Fix a weird bug in dbtables: if it chose a random rowid string that contained
NULL bytes it would cause the database all sorts of problems in the future
leading to very strange random failures and corrupt dbtables.bsdTableDb dbs.
........
r58534 | gregory.p.smith | 2007-10-18 09:32:02 -0700 (Thu, 18 Oct 2007) | 3 lines
A cleaner fix than the one committed last night. Generate random rowids that
do not contain null bytes.
........
r58537 | gregory.p.smith | 2007-10-18 10:17:57 -0700 (Thu, 18 Oct 2007) | 2 lines
mention bsddb fixes.
........
r58538 | raymond.hettinger | 2007-10-18 14:13:06 -0700 (Thu, 18 Oct 2007) | 1 line
Remove useless warning
........
r58539 | gregory.p.smith | 2007-10-19 00:31:20 -0700 (Fri, 19 Oct 2007) | 2 lines
squelch the warning that this test is supposed to trigger.
........
r58542 | georg.brandl | 2007-10-19 05:32:39 -0700 (Fri, 19 Oct 2007) | 2 lines
Clarify wording for apply().
........
r58544 | mark.summerfield | 2007-10-19 05:48:17 -0700 (Fri, 19 Oct 2007) | 3 lines
Added a cross-ref to each other.
........
r58545 | georg.brandl | 2007-10-19 10:38:49 -0700 (Fri, 19 Oct 2007) | 2 lines
#1284: "S" means "seen", not unread.
........
r58548 | thomas.heller | 2007-10-19 11:11:41 -0700 (Fri, 19 Oct 2007) | 4 lines
Fix ctypes on 32-bit systems when Python is configured --with-system-ffi.
See also https://bugs.launchpad.net/bugs/72505.
Ported from release25-maint branch.
........
r58550 | facundo.batista | 2007-10-19 12:25:57 -0700 (Fri, 19 Oct 2007) | 8 lines
The constructor from tuple was way too permissive: it allowed bad
coefficient numbers, floats in the sign, and other details that
generated directly the wrong number in the best case, or triggered
misfunctionality in the alorithms.
Test cases added for these issues. Thanks Mark Dickinson.
........
r58559 | georg.brandl | 2007-10-20 06:22:53 -0700 (Sat, 20 Oct 2007) | 2 lines
Fix code being interpreted as a target.
........
r58561 | georg.brandl | 2007-10-20 06:36:24 -0700 (Sat, 20 Oct 2007) | 2 lines
Document new "cmdoption" directive.
........
r58562 | georg.brandl | 2007-10-20 08:21:22 -0700 (Sat, 20 Oct 2007) | 2 lines
Make a path more Unix-standardy.
........
r58564 | georg.brandl | 2007-10-20 10:51:39 -0700 (Sat, 20 Oct 2007) | 2 lines
Document new directive "envvar".
........
r58567 | georg.brandl | 2007-10-20 11:08:14 -0700 (Sat, 20 Oct 2007) | 6 lines
* Add new toplevel chapter, "Using Python." (how to install,
configure and setup python on different platforms -- at least
in theory.)
* Move the Python on Mac docs in that chapter.
* Add a new chapter about the command line invocation, by stargaming.
........
r58568 | georg.brandl | 2007-10-20 11:33:20 -0700 (Sat, 20 Oct 2007) | 2 lines
Change title, for now.
........
r58569 | georg.brandl | 2007-10-20 11:39:25 -0700 (Sat, 20 Oct 2007) | 2 lines
Add entry to ACKS.
........
r58570 | georg.brandl | 2007-10-20 12:05:45 -0700 (Sat, 20 Oct 2007) | 2 lines
Clarify -E docs.
........
r58571 | georg.brandl | 2007-10-20 12:08:36 -0700 (Sat, 20 Oct 2007) | 2 lines
Even more clarification.
........
r58572 | andrew.kuchling | 2007-10-20 12:25:37 -0700 (Sat, 20 Oct 2007) | 1 line
Fix protocol name
........
r58573 | andrew.kuchling | 2007-10-20 12:35:18 -0700 (Sat, 20 Oct 2007) | 1 line
Various items
........
r58574 | andrew.kuchling | 2007-10-20 12:39:35 -0700 (Sat, 20 Oct 2007) | 1 line
Use correct header line
........
r58576 | armin.rigo | 2007-10-21 02:14:15 -0700 (Sun, 21 Oct 2007) | 3 lines
Add a crasher for the long-standing issue with closing a file
while another thread uses it.
........
r58577 | georg.brandl | 2007-10-21 03:01:56 -0700 (Sun, 21 Oct 2007) | 2 lines
Remove duplicate crasher.
........
r58578 | georg.brandl | 2007-10-21 03:24:20 -0700 (Sun, 21 Oct 2007) | 2 lines
Unify "byte code" to "bytecode". Also sprinkle :term: markup for it.
........
r58579 | georg.brandl | 2007-10-21 03:32:54 -0700 (Sun, 21 Oct 2007) | 2 lines
Add markup to new function descriptions.
........
r58580 | georg.brandl | 2007-10-21 03:45:46 -0700 (Sun, 21 Oct 2007) | 2 lines
Add :term:s for descriptors.
........
r58581 | georg.brandl | 2007-10-21 03:46:24 -0700 (Sun, 21 Oct 2007) | 2 lines
Unify "file-descriptor" to "file descriptor".
........
r58582 | georg.brandl | 2007-10-21 03:52:38 -0700 (Sun, 21 Oct 2007) | 2 lines
Add :term: for generators.
........
r58583 | georg.brandl | 2007-10-21 05:10:28 -0700 (Sun, 21 Oct 2007) | 2 lines
Add :term:s for iterator.
........
r58584 | georg.brandl | 2007-10-21 05:15:05 -0700 (Sun, 21 Oct 2007) | 2 lines
Add :term:s for "new-style class".
........
r58588 | neal.norwitz | 2007-10-21 21:47:54 -0700 (Sun, 21 Oct 2007) | 1 line
Add Chris Monson so he can edit PEPs.
........
r58594 | guido.van.rossum | 2007-10-22 09:27:19 -0700 (Mon, 22 Oct 2007) | 4 lines
Issue #1307, patch by Derek Shockey.
When "MAIL" is received without args, an exception happens instead of
sending a 501 syntax error response.
........
r58598 | travis.oliphant | 2007-10-22 19:40:56 -0700 (Mon, 22 Oct 2007) | 1 line
Add phuang patch from Issue 708374 which adds offset parameter to mmap module.
........
r58601 | neal.norwitz | 2007-10-22 22:44:27 -0700 (Mon, 22 Oct 2007) | 2 lines
Bug #1313, fix typo (wrong variable name) in example.
........
r58609 | georg.brandl | 2007-10-23 11:21:35 -0700 (Tue, 23 Oct 2007) | 2 lines
Update Pygments version from externals.
........
r58618 | guido.van.rossum | 2007-10-23 12:25:41 -0700 (Tue, 23 Oct 2007) | 3 lines
Issue 1307 by Derek Shockey, fox the same bug for RCPT.
Neal: please backport!
........
r58620 | raymond.hettinger | 2007-10-23 13:37:41 -0700 (Tue, 23 Oct 2007) | 1 line
Shorter name for namedtuple()
........
r58621 | andrew.kuchling | 2007-10-23 13:55:47 -0700 (Tue, 23 Oct 2007) | 1 line
Update name
........
r58622 | raymond.hettinger | 2007-10-23 14:23:07 -0700 (Tue, 23 Oct 2007) | 1 line
Fixup news entry
........
r58623 | raymond.hettinger | 2007-10-23 18:28:33 -0700 (Tue, 23 Oct 2007) | 1 line
Optimize sum() for integer and float inputs.
........
r58624 | raymond.hettinger | 2007-10-23 19:05:51 -0700 (Tue, 23 Oct 2007) | 1 line
Fixup error return and add support for intermixed ints and floats/
........
r58628 | vinay.sajip | 2007-10-24 03:47:06 -0700 (Wed, 24 Oct 2007) | 1 line
Bug #1321: Fixed logic error in TimedRotatingFileHandler.__init__()
........
r58641 | facundo.batista | 2007-10-24 12:11:08 -0700 (Wed, 24 Oct 2007) | 4 lines
Issue 1290. CharacterData.__repr__ was constructing a string
in response that keeped having a non-ascii character.
........
r58643 | thomas.heller | 2007-10-24 12:50:45 -0700 (Wed, 24 Oct 2007) | 1 line
Added unittest for calling a function with paramflags (backport from py3k branch).
........
r58645 | matthias.klose | 2007-10-24 13:00:44 -0700 (Wed, 24 Oct 2007) | 2 lines
- Build using system ffi library on arm*-linux*.
........
r58651 | georg.brandl | 2007-10-24 14:40:38 -0700 (Wed, 24 Oct 2007) | 2 lines
Bug #1287: make os.environ.pop() work as expected.
........
r58652 | raymond.hettinger | 2007-10-24 19:26:58 -0700 (Wed, 24 Oct 2007) | 1 line
Missing DECREFs
........
r58653 | matthias.klose | 2007-10-24 23:37:24 -0700 (Wed, 24 Oct 2007) | 2 lines
- Build using system ffi library on arm*-linux*, pass --with-system-ffi to CONFIG_ARGS
........
r58655 | thomas.heller | 2007-10-25 12:47:32 -0700 (Thu, 25 Oct 2007) | 2 lines
ffi_type_longdouble may be already #defined.
See issue 1324.
........
r58656 | kurt.kaiser | 2007-10-25 15:43:45 -0700 (Thu, 25 Oct 2007) | 3 lines
Correct an ancient bug in an unused path by removing that path: register() is
now idempotent.
........
r58660 | kurt.kaiser | 2007-10-25 17:10:09 -0700 (Thu, 25 Oct 2007) | 4 lines
1. Add comments to provide top-level documentation.
2. Refactor to use more descriptive names.
3. Enhance tests in main().
........
r58675 | georg.brandl | 2007-10-26 11:30:41 -0700 (Fri, 26 Oct 2007) | 2 lines
Fix new pop() method on os.environ on ignorecase-platforms.
........
r58696 | neal.norwitz | 2007-10-27 15:32:21 -0700 (Sat, 27 Oct 2007) | 1 line
Update URL for Pygments. 0.8.1 is no longer available
........
r58697 | hyeshik.chang | 2007-10-28 04:19:02 -0700 (Sun, 28 Oct 2007) | 3 lines
- Add support for FreeBSD 8 which is recently forked from FreeBSD 7.
- Regenerate IN module for most recent maintenance tree of FreeBSD 6 and 7.
........
r58698 | hyeshik.chang | 2007-10-28 05:38:09 -0700 (Sun, 28 Oct 2007) | 2 lines
Enable platform-specific tweaks for FreeBSD 8 (exactly same to FreeBSD 7's yet)
........
r58700 | kurt.kaiser | 2007-10-28 12:03:59 -0700 (Sun, 28 Oct 2007) | 2 lines
Add confirmation dialog before printing. Patch 1717170 Tal Einat.
........
r58706 | guido.van.rossum | 2007-10-29 13:52:45 -0700 (Mon, 29 Oct 2007) | 3 lines
Patch 1353 by Jacob Winther.
Add mp4 mapping to mimetypes.py.
........
r58709 | guido.van.rossum | 2007-10-29 15:15:05 -0700 (Mon, 29 Oct 2007) | 6 lines
Backport fixes for the code that decodes octal escapes (and for PyString
also hex escapes) -- this was reaching beyond the end of the input string
buffer, even though it is not supposed to be \0-terminated.
This has no visible effect but is clearly the correct thing to do.
(In 3.0 it had a visible effect after removing ob_sstate from PyString.)
........
r58710 | kurt.kaiser | 2007-10-29 19:38:54 -0700 (Mon, 29 Oct 2007) | 7 lines
check in Tal Einat's update to tabpage.py
Patch 1612746
M configDialog.py
M NEWS.txt
AM tabbedpages.py
........
r58715 | georg.brandl | 2007-10-30 10:51:18 -0700 (Tue, 30 Oct 2007) | 2 lines
Use correct markup.
........
r58716 | georg.brandl | 2007-10-30 10:57:12 -0700 (Tue, 30 Oct 2007) | 2 lines
Make example about hiding None return values at the prompt clearer.
........
r58728 | neal.norwitz | 2007-10-30 23:33:20 -0700 (Tue, 30 Oct 2007) | 1 line
Fix some compiler warnings for signed comparisons on Unix and Windows.
........
r58731 | martin.v.loewis | 2007-10-31 10:19:33 -0700 (Wed, 31 Oct 2007) | 2 lines
Adding Christian Heimes.
........
r58737 | raymond.hettinger | 2007-10-31 14:57:58 -0700 (Wed, 31 Oct 2007) | 1 line
Clarify the reasons why pickle is almost always better than marshal
........
r58739 | raymond.hettinger | 2007-10-31 15:15:49 -0700 (Wed, 31 Oct 2007) | 1 line
Sets are marshalable.
........
2007-11-01 16:42:39 -03:00
|
|
|
dictiter_new(PyDictObject *dict, PyTypeObject *itertype)
|
2001-04-20 16:13:02 -03:00
|
|
|
{
|
2024-05-24 14:39:06 -03:00
|
|
|
Py_ssize_t used;
|
2010-05-09 12:52:27 -03:00
|
|
|
dictiterobject *di;
|
|
|
|
di = PyObject_GC_New(dictiterobject, itertype);
|
2018-11-05 20:38:54 -04:00
|
|
|
if (di == NULL) {
|
2010-05-09 12:52:27 -03:00
|
|
|
return NULL;
|
2018-11-05 20:38:54 -04:00
|
|
|
}
|
2022-11-10 11:27:53 -04:00
|
|
|
di->di_dict = (PyDictObject*)Py_NewRef(dict);
|
2024-05-24 14:39:06 -03:00
|
|
|
used = FT_ATOMIC_LOAD_SSIZE_RELAXED(dict->ma_used);
|
|
|
|
di->di_used = used;
|
|
|
|
di->len = used;
|
2019-10-19 17:01:08 -03:00
|
|
|
if (itertype == &PyDictRevIterKey_Type ||
|
2018-11-05 20:38:54 -04:00
|
|
|
itertype == &PyDictRevIterItem_Type ||
|
2019-10-19 17:01:08 -03:00
|
|
|
itertype == &PyDictRevIterValue_Type) {
|
2024-02-20 20:40:37 -04:00
|
|
|
if (_PyDict_HasSplitTable(dict)) {
|
2024-05-24 14:39:06 -03:00
|
|
|
di->di_pos = used - 1;
|
2019-10-19 17:01:08 -03:00
|
|
|
}
|
|
|
|
else {
|
2024-02-22 16:02:39 -04:00
|
|
|
di->di_pos = load_keys_nentries(dict) - 1;
|
2019-10-19 17:01:08 -03:00
|
|
|
}
|
2018-11-05 20:38:54 -04:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
di->di_pos = 0;
|
|
|
|
}
|
|
|
|
if (itertype == &PyDictIterItem_Type ||
|
|
|
|
itertype == &PyDictRevIterItem_Type) {
|
2010-05-09 12:52:27 -03:00
|
|
|
di->di_result = PyTuple_Pack(2, Py_None, Py_None);
|
|
|
|
if (di->di_result == NULL) {
|
|
|
|
Py_DECREF(di);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
2018-11-05 20:38:54 -04:00
|
|
|
else {
|
2010-05-09 12:52:27 -03:00
|
|
|
di->di_result = NULL;
|
2018-11-05 20:38:54 -04:00
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
_PyObject_GC_TRACK(di);
|
|
|
|
return (PyObject *)di;
|
2001-04-20 16:13:02 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2024-01-02 10:32:37 -04:00
|
|
|
dictiter_dealloc(PyObject *self)
|
2001-04-20 16:13:02 -03:00
|
|
|
{
|
2024-01-02 10:32:37 -04:00
|
|
|
dictiterobject *di = (dictiterobject *)self;
|
2017-08-24 02:55:17 -03:00
|
|
|
/* bpo-31095: UnTrack is needed before calling any callbacks */
|
|
|
|
_PyObject_GC_UNTRACK(di);
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_XDECREF(di->di_dict);
|
|
|
|
Py_XDECREF(di->di_result);
|
|
|
|
PyObject_GC_Del(di);
|
2009-01-01 11:35:33 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2024-01-02 10:32:37 -04:00
|
|
|
dictiter_traverse(PyObject *self, visitproc visit, void *arg)
|
2009-01-01 11:35:33 -04:00
|
|
|
{
|
2024-01-02 10:32:37 -04:00
|
|
|
dictiterobject *di = (dictiterobject *)self;
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_VISIT(di->di_dict);
|
|
|
|
Py_VISIT(di->di_result);
|
|
|
|
return 0;
|
2001-04-20 16:13:02 -03:00
|
|
|
}
|
|
|
|
|
2005-09-24 18:23:05 -03:00
|
|
|
static PyObject *
|
2024-01-02 10:32:37 -04:00
|
|
|
dictiter_len(PyObject *self, PyObject *Py_UNUSED(ignored))
|
2004-03-18 04:38:00 -04:00
|
|
|
{
|
2024-01-02 10:32:37 -04:00
|
|
|
dictiterobject *di = (dictiterobject *)self;
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_ssize_t len = 0;
|
2024-05-24 14:39:06 -03:00
|
|
|
if (di->di_dict != NULL && di->di_used == FT_ATOMIC_LOAD_SSIZE_RELAXED(di->di_dict->ma_used))
|
|
|
|
len = FT_ATOMIC_LOAD_SSIZE_RELAXED(di->len);
|
2010-05-09 12:52:27 -03:00
|
|
|
return PyLong_FromSize_t(len);
|
2004-03-18 04:38:00 -04:00
|
|
|
}
|
|
|
|
|
2007-02-09 21:11:45 -04:00
|
|
|
PyDoc_STRVAR(length_hint_doc,
|
|
|
|
"Private method returning an estimate of len(list(it)).");
|
2005-09-24 18:23:05 -03:00
|
|
|
|
2012-04-03 07:49:41 -03:00
|
|
|
static PyObject *
|
2024-01-02 10:32:37 -04:00
|
|
|
dictiter_reduce(PyObject *di, PyObject *Py_UNUSED(ignored));
|
2012-04-03 07:49:41 -03:00
|
|
|
|
|
|
|
PyDoc_STRVAR(reduce_doc, "Return state information for pickling.");
|
|
|
|
|
2005-09-24 18:23:05 -03:00
|
|
|
static PyMethodDef dictiter_methods[] = {
|
2024-01-02 10:32:37 -04:00
|
|
|
{"__length_hint__", dictiter_len, METH_NOARGS,
|
2010-05-09 12:52:27 -03:00
|
|
|
length_hint_doc},
|
2024-01-02 10:32:37 -04:00
|
|
|
{"__reduce__", dictiter_reduce, METH_NOARGS,
|
2012-04-03 07:49:41 -03:00
|
|
|
reduce_doc},
|
2010-05-09 12:52:27 -03:00
|
|
|
{NULL, NULL} /* sentinel */
|
2004-03-18 04:38:00 -04:00
|
|
|
};
|
|
|
|
|
2024-02-22 16:02:39 -04:00
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
|
|
|
|
static int
|
|
|
|
dictiter_iternext_threadsafe(PyDictObject *d, PyObject *self,
|
|
|
|
PyObject **out_key, PyObject **out_value);
|
|
|
|
|
|
|
|
#else /* Py_GIL_DISABLED */
|
|
|
|
|
2016-10-09 17:08:05 -03:00
|
|
|
static PyObject*
|
2024-02-06 18:03:43 -04:00
|
|
|
dictiter_iternextkey_lock_held(PyDictObject *d, PyObject *self)
|
2001-04-20 16:13:02 -03:00
|
|
|
{
|
2024-01-02 10:32:37 -04:00
|
|
|
dictiterobject *di = (dictiterobject *)self;
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject *key;
|
2016-11-04 04:59:10 -03:00
|
|
|
Py_ssize_t i;
|
2013-08-13 15:18:52 -03:00
|
|
|
PyDictKeysObject *k;
|
2010-05-09 12:52:27 -03:00
|
|
|
|
|
|
|
assert (PyDict_Check(d));
|
2024-02-06 18:03:43 -04:00
|
|
|
ASSERT_DICT_LOCKED(d);
|
2010-05-09 12:52:27 -03:00
|
|
|
|
|
|
|
if (di->di_used != d->ma_used) {
|
|
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
|
|
"dictionary changed size during iteration");
|
|
|
|
di->di_used = -1; /* Make this state sticky */
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
i = di->di_pos;
|
2012-04-23 12:24:50 -03:00
|
|
|
k = d->ma_keys;
|
2016-11-04 04:59:10 -03:00
|
|
|
assert(i >= 0);
|
2024-02-20 20:40:37 -04:00
|
|
|
if (_PyDict_HasSplitTable(d)) {
|
2016-11-04 04:59:10 -03:00
|
|
|
if (i >= d->ma_used)
|
2016-10-09 17:08:05 -03:00
|
|
|
goto fail;
|
2021-10-06 09:19:53 -03:00
|
|
|
int index = get_index_from_order(d, i);
|
2024-02-20 20:40:37 -04:00
|
|
|
key = LOAD_SHARED_KEY(DK_UNICODE_ENTRIES(k)[index].me_key);
|
2021-10-06 09:19:53 -03:00
|
|
|
assert(d->ma_values->values[index] != NULL);
|
2012-04-23 12:24:50 -03:00
|
|
|
}
|
|
|
|
else {
|
2016-11-04 04:59:10 -03:00
|
|
|
Py_ssize_t n = k->dk_nentries;
|
2022-03-01 19:09:28 -04:00
|
|
|
if (DK_IS_UNICODE(k)) {
|
|
|
|
PyDictUnicodeEntry *entry_ptr = &DK_UNICODE_ENTRIES(k)[i];
|
|
|
|
while (i < n && entry_ptr->me_value == NULL) {
|
|
|
|
entry_ptr++;
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
if (i >= n)
|
|
|
|
goto fail;
|
|
|
|
key = entry_ptr->me_key;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
PyDictKeyEntry *entry_ptr = &DK_ENTRIES(k)[i];
|
|
|
|
while (i < n && entry_ptr->me_value == NULL) {
|
|
|
|
entry_ptr++;
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
if (i >= n)
|
|
|
|
goto fail;
|
|
|
|
key = entry_ptr->me_key;
|
2016-10-09 17:08:05 -03:00
|
|
|
}
|
2012-04-23 12:24:50 -03:00
|
|
|
}
|
2019-03-28 03:03:25 -03:00
|
|
|
// We found an element (key), but did not expect it
|
|
|
|
if (di->len == 0) {
|
|
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
|
|
"dictionary keys changed during iteration");
|
|
|
|
goto fail;
|
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
di->di_pos = i+1;
|
|
|
|
di->len--;
|
2022-11-10 11:27:53 -04:00
|
|
|
return Py_NewRef(key);
|
2004-03-17 22:41:19 -04:00
|
|
|
|
|
|
|
fail:
|
2010-05-09 12:52:27 -03:00
|
|
|
di->di_dict = NULL;
|
Issue #26494: Fixed crash on iterating exhausting iterators.
Affected classes are generic sequence iterators, iterators of str, bytes,
bytearray, list, tuple, set, frozenset, dict, OrderedDict, corresponding
views and os.scandir() iterator.
2016-03-30 14:40:02 -03:00
|
|
|
Py_DECREF(d);
|
2010-05-09 12:52:27 -03:00
|
|
|
return NULL;
|
2001-04-20 16:13:02 -03:00
|
|
|
}
|
|
|
|
|
2024-02-22 16:02:39 -04:00
|
|
|
#endif /* Py_GIL_DISABLED */
|
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
static PyObject*
|
|
|
|
dictiter_iternextkey(PyObject *self)
|
|
|
|
{
|
|
|
|
dictiterobject *di = (dictiterobject *)self;
|
|
|
|
PyDictObject *d = di->di_dict;
|
|
|
|
|
|
|
|
if (d == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
PyObject *value;
|
2024-02-22 16:02:39 -04:00
|
|
|
#ifdef Py_GIL_DISABLED
|
2024-02-28 13:51:59 -04:00
|
|
|
if (dictiter_iternext_threadsafe(d, self, &value, NULL) < 0) {
|
2024-02-22 16:02:39 -04:00
|
|
|
value = NULL;
|
|
|
|
}
|
|
|
|
#else
|
2024-02-06 18:03:43 -04:00
|
|
|
value = dictiter_iternextkey_lock_held(d, self);
|
2024-02-22 16:02:39 -04:00
|
|
|
#endif
|
2024-02-06 18:03:43 -04:00
|
|
|
|
|
|
|
return value;
|
|
|
|
}
|
|
|
|
|
2004-03-17 22:41:19 -04:00
|
|
|
PyTypeObject PyDictIterKey_Type = {
|
2010-05-09 12:52:27 -03:00
|
|
|
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
|
|
|
"dict_keyiterator", /* tp_name */
|
|
|
|
sizeof(dictiterobject), /* tp_basicsize */
|
|
|
|
0, /* tp_itemsize */
|
|
|
|
/* methods */
|
2024-01-02 10:32:37 -04:00
|
|
|
dictiter_dealloc, /* tp_dealloc */
|
2019-05-30 23:13:39 -03:00
|
|
|
0, /* tp_vectorcall_offset */
|
2010-05-09 12:52:27 -03:00
|
|
|
0, /* tp_getattr */
|
|
|
|
0, /* tp_setattr */
|
2019-05-30 23:13:39 -03:00
|
|
|
0, /* tp_as_async */
|
2010-05-09 12:52:27 -03:00
|
|
|
0, /* tp_repr */
|
|
|
|
0, /* tp_as_number */
|
|
|
|
0, /* tp_as_sequence */
|
|
|
|
0, /* tp_as_mapping */
|
|
|
|
0, /* tp_hash */
|
|
|
|
0, /* tp_call */
|
|
|
|
0, /* tp_str */
|
|
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
|
|
0, /* tp_setattro */
|
|
|
|
0, /* tp_as_buffer */
|
|
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */
|
|
|
|
0, /* tp_doc */
|
2024-01-02 10:32:37 -04:00
|
|
|
dictiter_traverse, /* tp_traverse */
|
2010-05-09 12:52:27 -03:00
|
|
|
0, /* tp_clear */
|
|
|
|
0, /* tp_richcompare */
|
|
|
|
0, /* tp_weaklistoffset */
|
|
|
|
PyObject_SelfIter, /* tp_iter */
|
2024-01-02 10:32:37 -04:00
|
|
|
dictiter_iternextkey, /* tp_iternext */
|
2010-05-09 12:52:27 -03:00
|
|
|
dictiter_methods, /* tp_methods */
|
|
|
|
0,
|
2004-03-17 22:41:19 -04:00
|
|
|
};
|
|
|
|
|
2024-02-22 16:02:39 -04:00
|
|
|
#ifndef Py_GIL_DISABLED
|
|
|
|
|
2016-10-09 17:08:05 -03:00
|
|
|
static PyObject *
|
2024-02-06 18:03:43 -04:00
|
|
|
dictiter_iternextvalue_lock_held(PyDictObject *d, PyObject *self)
|
2004-03-17 22:41:19 -04:00
|
|
|
{
|
2024-01-02 10:32:37 -04:00
|
|
|
dictiterobject *di = (dictiterobject *)self;
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject *value;
|
2016-11-04 04:59:10 -03:00
|
|
|
Py_ssize_t i;
|
2010-05-09 12:52:27 -03:00
|
|
|
|
|
|
|
assert (PyDict_Check(d));
|
2024-02-06 18:03:43 -04:00
|
|
|
ASSERT_DICT_LOCKED(d);
|
2010-05-09 12:52:27 -03:00
|
|
|
|
|
|
|
if (di->di_used != d->ma_used) {
|
|
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
|
|
"dictionary changed size during iteration");
|
|
|
|
di->di_used = -1; /* Make this state sticky */
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
i = di->di_pos;
|
2016-11-04 04:59:10 -03:00
|
|
|
assert(i >= 0);
|
2024-02-20 20:40:37 -04:00
|
|
|
if (_PyDict_HasSplitTable(d)) {
|
2016-11-04 04:59:10 -03:00
|
|
|
if (i >= d->ma_used)
|
2016-10-09 17:08:05 -03:00
|
|
|
goto fail;
|
2021-10-06 09:19:53 -03:00
|
|
|
int index = get_index_from_order(d, i);
|
|
|
|
value = d->ma_values->values[index];
|
2016-11-04 04:59:10 -03:00
|
|
|
assert(value != NULL);
|
2012-04-23 12:24:50 -03:00
|
|
|
}
|
|
|
|
else {
|
2016-11-04 04:59:10 -03:00
|
|
|
Py_ssize_t n = d->ma_keys->dk_nentries;
|
2022-03-01 19:09:28 -04:00
|
|
|
if (DK_IS_UNICODE(d->ma_keys)) {
|
|
|
|
PyDictUnicodeEntry *entry_ptr = &DK_UNICODE_ENTRIES(d->ma_keys)[i];
|
|
|
|
while (i < n && entry_ptr->me_value == NULL) {
|
|
|
|
entry_ptr++;
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
if (i >= n)
|
|
|
|
goto fail;
|
|
|
|
value = entry_ptr->me_value;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
PyDictKeyEntry *entry_ptr = &DK_ENTRIES(d->ma_keys)[i];
|
|
|
|
while (i < n && entry_ptr->me_value == NULL) {
|
|
|
|
entry_ptr++;
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
if (i >= n)
|
|
|
|
goto fail;
|
|
|
|
value = entry_ptr->me_value;
|
2016-10-09 17:08:05 -03:00
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2019-04-02 06:30:10 -03:00
|
|
|
// We found an element, but did not expect it
|
|
|
|
if (di->len == 0) {
|
|
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
|
|
"dictionary keys changed during iteration");
|
|
|
|
goto fail;
|
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
di->di_pos = i+1;
|
|
|
|
di->len--;
|
2022-11-10 11:27:53 -04:00
|
|
|
return Py_NewRef(value);
|
2004-03-17 22:41:19 -04:00
|
|
|
|
|
|
|
fail:
|
2010-05-09 12:52:27 -03:00
|
|
|
di->di_dict = NULL;
|
Issue #26494: Fixed crash on iterating exhausting iterators.
Affected classes are generic sequence iterators, iterators of str, bytes,
bytearray, list, tuple, set, frozenset, dict, OrderedDict, corresponding
views and os.scandir() iterator.
2016-03-30 14:40:02 -03:00
|
|
|
Py_DECREF(d);
|
2010-05-09 12:52:27 -03:00
|
|
|
return NULL;
|
2004-03-17 22:41:19 -04:00
|
|
|
}
|
|
|
|
|
2024-02-22 16:02:39 -04:00
|
|
|
#endif /* Py_GIL_DISABLED */
|
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
static PyObject *
|
|
|
|
dictiter_iternextvalue(PyObject *self)
|
|
|
|
{
|
|
|
|
dictiterobject *di = (dictiterobject *)self;
|
|
|
|
PyDictObject *d = di->di_dict;
|
|
|
|
|
|
|
|
if (d == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
PyObject *value;
|
2024-02-22 16:02:39 -04:00
|
|
|
#ifdef Py_GIL_DISABLED
|
2024-02-28 13:51:59 -04:00
|
|
|
if (dictiter_iternext_threadsafe(d, self, NULL, &value) < 0) {
|
2024-02-22 16:02:39 -04:00
|
|
|
value = NULL;
|
|
|
|
}
|
|
|
|
#else
|
2024-02-06 18:03:43 -04:00
|
|
|
value = dictiter_iternextvalue_lock_held(d, self);
|
2024-02-22 16:02:39 -04:00
|
|
|
#endif
|
2024-02-06 18:03:43 -04:00
|
|
|
|
|
|
|
return value;
|
|
|
|
}
|
|
|
|
|
2004-03-17 22:41:19 -04:00
|
|
|
PyTypeObject PyDictIterValue_Type = {
|
2010-05-09 12:52:27 -03:00
|
|
|
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
|
|
|
"dict_valueiterator", /* tp_name */
|
|
|
|
sizeof(dictiterobject), /* tp_basicsize */
|
|
|
|
0, /* tp_itemsize */
|
|
|
|
/* methods */
|
2024-01-02 10:32:37 -04:00
|
|
|
dictiter_dealloc, /* tp_dealloc */
|
2019-05-30 23:13:39 -03:00
|
|
|
0, /* tp_vectorcall_offset */
|
2010-05-09 12:52:27 -03:00
|
|
|
0, /* tp_getattr */
|
|
|
|
0, /* tp_setattr */
|
2019-05-30 23:13:39 -03:00
|
|
|
0, /* tp_as_async */
|
2010-05-09 12:52:27 -03:00
|
|
|
0, /* tp_repr */
|
|
|
|
0, /* tp_as_number */
|
|
|
|
0, /* tp_as_sequence */
|
|
|
|
0, /* tp_as_mapping */
|
|
|
|
0, /* tp_hash */
|
|
|
|
0, /* tp_call */
|
|
|
|
0, /* tp_str */
|
|
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
|
|
0, /* tp_setattro */
|
|
|
|
0, /* tp_as_buffer */
|
2016-10-09 17:08:05 -03:00
|
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */
|
2010-05-09 12:52:27 -03:00
|
|
|
0, /* tp_doc */
|
2024-01-02 10:32:37 -04:00
|
|
|
dictiter_traverse, /* tp_traverse */
|
2010-05-09 12:52:27 -03:00
|
|
|
0, /* tp_clear */
|
|
|
|
0, /* tp_richcompare */
|
|
|
|
0, /* tp_weaklistoffset */
|
|
|
|
PyObject_SelfIter, /* tp_iter */
|
2024-01-02 10:32:37 -04:00
|
|
|
dictiter_iternextvalue, /* tp_iternext */
|
2010-05-09 12:52:27 -03:00
|
|
|
dictiter_methods, /* tp_methods */
|
|
|
|
0,
|
2004-03-17 22:41:19 -04:00
|
|
|
};
|
|
|
|
|
2024-02-22 16:02:39 -04:00
|
|
|
static int
|
|
|
|
dictiter_iternextitem_lock_held(PyDictObject *d, PyObject *self,
|
|
|
|
PyObject **out_key, PyObject **out_value)
|
2004-03-17 22:41:19 -04:00
|
|
|
{
|
2024-01-02 10:32:37 -04:00
|
|
|
dictiterobject *di = (dictiterobject *)self;
|
2024-02-22 16:02:39 -04:00
|
|
|
PyObject *key, *value;
|
2016-11-04 04:59:10 -03:00
|
|
|
Py_ssize_t i;
|
2010-05-09 12:52:27 -03:00
|
|
|
|
|
|
|
assert (PyDict_Check(d));
|
2024-05-24 14:39:06 -03:00
|
|
|
ASSERT_DICT_LOCKED(d);
|
2010-05-09 12:52:27 -03:00
|
|
|
|
|
|
|
if (di->di_used != d->ma_used) {
|
|
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
|
|
"dictionary changed size during iteration");
|
|
|
|
di->di_used = -1; /* Make this state sticky */
|
2024-02-22 16:02:39 -04:00
|
|
|
return -1;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
|
|
|
|
2024-02-22 16:02:39 -04:00
|
|
|
i = FT_ATOMIC_LOAD_SSIZE_RELAXED(di->di_pos);
|
|
|
|
|
2016-11-04 04:59:10 -03:00
|
|
|
assert(i >= 0);
|
2024-02-20 20:40:37 -04:00
|
|
|
if (_PyDict_HasSplitTable(d)) {
|
2016-11-04 04:59:10 -03:00
|
|
|
if (i >= d->ma_used)
|
2016-10-09 17:08:05 -03:00
|
|
|
goto fail;
|
2021-10-06 09:19:53 -03:00
|
|
|
int index = get_index_from_order(d, i);
|
2024-02-20 20:40:37 -04:00
|
|
|
key = LOAD_SHARED_KEY(DK_UNICODE_ENTRIES(d->ma_keys)[index].me_key);
|
2021-10-06 09:19:53 -03:00
|
|
|
value = d->ma_values->values[index];
|
2016-11-04 04:59:10 -03:00
|
|
|
assert(value != NULL);
|
2012-04-23 12:24:50 -03:00
|
|
|
}
|
|
|
|
else {
|
2016-11-04 04:59:10 -03:00
|
|
|
Py_ssize_t n = d->ma_keys->dk_nentries;
|
2022-03-01 19:09:28 -04:00
|
|
|
if (DK_IS_UNICODE(d->ma_keys)) {
|
|
|
|
PyDictUnicodeEntry *entry_ptr = &DK_UNICODE_ENTRIES(d->ma_keys)[i];
|
|
|
|
while (i < n && entry_ptr->me_value == NULL) {
|
|
|
|
entry_ptr++;
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
if (i >= n)
|
|
|
|
goto fail;
|
|
|
|
key = entry_ptr->me_key;
|
|
|
|
value = entry_ptr->me_value;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
PyDictKeyEntry *entry_ptr = &DK_ENTRIES(d->ma_keys)[i];
|
|
|
|
while (i < n && entry_ptr->me_value == NULL) {
|
|
|
|
entry_ptr++;
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
if (i >= n)
|
|
|
|
goto fail;
|
|
|
|
key = entry_ptr->me_key;
|
|
|
|
value = entry_ptr->me_value;
|
2016-10-09 17:08:05 -03:00
|
|
|
}
|
2012-04-23 12:24:50 -03:00
|
|
|
}
|
2019-04-02 06:30:10 -03:00
|
|
|
// We found an element, but did not expect it
|
|
|
|
if (di->len == 0) {
|
|
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
|
|
"dictionary keys changed during iteration");
|
|
|
|
goto fail;
|
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
di->di_pos = i+1;
|
2016-10-09 17:08:05 -03:00
|
|
|
di->len--;
|
2024-02-22 16:02:39 -04:00
|
|
|
if (out_key != NULL) {
|
|
|
|
*out_key = Py_NewRef(key);
|
|
|
|
}
|
|
|
|
if (out_value != NULL) {
|
|
|
|
*out_value = Py_NewRef(value);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
fail:
|
|
|
|
di->di_dict = NULL;
|
|
|
|
Py_DECREF(d);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
|
|
|
|
// Grabs the key and/or value from the provided locations and if successful
|
2024-06-24 14:47:00 -03:00
|
|
|
// returns them with an increased reference count. If either one is unsuccessful
|
2024-02-22 16:02:39 -04:00
|
|
|
// nothing is incref'd and returns -1.
|
|
|
|
static int
|
|
|
|
acquire_key_value(PyObject **key_loc, PyObject *value, PyObject **value_loc,
|
|
|
|
PyObject **out_key, PyObject **out_value)
|
|
|
|
{
|
|
|
|
if (out_key) {
|
|
|
|
*out_key = _Py_TryXGetRef(key_loc);
|
|
|
|
if (*out_key == NULL) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (out_value) {
|
2024-04-08 11:58:38 -03:00
|
|
|
if (!_Py_TryIncrefCompare(value_loc, value)) {
|
2024-02-22 16:02:39 -04:00
|
|
|
if (out_key) {
|
|
|
|
Py_DECREF(*out_key);
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
*out_value = value;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
dictiter_iternext_threadsafe(PyDictObject *d, PyObject *self,
|
|
|
|
PyObject **out_key, PyObject **out_value)
|
|
|
|
{
|
2024-05-09 14:15:14 -03:00
|
|
|
int res;
|
2024-02-22 16:02:39 -04:00
|
|
|
dictiterobject *di = (dictiterobject *)self;
|
|
|
|
Py_ssize_t i;
|
|
|
|
PyDictKeysObject *k;
|
|
|
|
|
|
|
|
assert (PyDict_Check(d));
|
|
|
|
|
|
|
|
if (di->di_used != _Py_atomic_load_ssize_relaxed(&d->ma_used)) {
|
|
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
|
|
"dictionary changed size during iteration");
|
|
|
|
di->di_used = -1; /* Make this state sticky */
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
ensure_shared_on_read(d);
|
|
|
|
|
|
|
|
i = _Py_atomic_load_ssize_relaxed(&di->di_pos);
|
|
|
|
k = _Py_atomic_load_ptr_relaxed(&d->ma_keys);
|
|
|
|
assert(i >= 0);
|
|
|
|
if (_PyDict_HasSplitTable(d)) {
|
|
|
|
PyDictValues *values = _Py_atomic_load_ptr_relaxed(&d->ma_values);
|
|
|
|
if (values == NULL) {
|
|
|
|
goto concurrent_modification;
|
|
|
|
}
|
|
|
|
|
2024-04-02 07:59:21 -03:00
|
|
|
Py_ssize_t used = (Py_ssize_t)_Py_atomic_load_uint8(&values->size);
|
2024-02-22 16:02:39 -04:00
|
|
|
if (i >= used) {
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
// We're racing against writes to the order from delete_index_from_values, but
|
|
|
|
// single threaded can suffer from concurrent modification to those as well and
|
|
|
|
// can have either duplicated or skipped attributes, so we strive to do no better
|
|
|
|
// here.
|
|
|
|
int index = get_index_from_order(d, i);
|
|
|
|
PyObject *value = _Py_atomic_load_ptr(&values->values[index]);
|
|
|
|
if (acquire_key_value(&DK_UNICODE_ENTRIES(k)[index].me_key, value,
|
|
|
|
&values->values[index], out_key, out_value) < 0) {
|
|
|
|
goto try_locked;
|
2020-12-04 23:45:57 -04:00
|
|
|
}
|
2016-10-09 17:08:05 -03:00
|
|
|
}
|
|
|
|
else {
|
2024-02-22 16:02:39 -04:00
|
|
|
Py_ssize_t n = _Py_atomic_load_ssize_relaxed(&k->dk_nentries);
|
|
|
|
if (DK_IS_UNICODE(k)) {
|
|
|
|
PyDictUnicodeEntry *entry_ptr = &DK_UNICODE_ENTRIES(k)[i];
|
|
|
|
PyObject *value;
|
|
|
|
while (i < n &&
|
|
|
|
(value = _Py_atomic_load_ptr(&entry_ptr->me_value)) == NULL) {
|
|
|
|
entry_ptr++;
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
if (i >= n)
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
if (acquire_key_value(&entry_ptr->me_key, value,
|
|
|
|
&entry_ptr->me_value, out_key, out_value) < 0) {
|
|
|
|
goto try_locked;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
PyDictKeyEntry *entry_ptr = &DK_ENTRIES(k)[i];
|
|
|
|
PyObject *value;
|
|
|
|
while (i < n &&
|
|
|
|
(value = _Py_atomic_load_ptr(&entry_ptr->me_value)) == NULL) {
|
|
|
|
entry_ptr++;
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (i >= n)
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
if (acquire_key_value(&entry_ptr->me_key, value,
|
|
|
|
&entry_ptr->me_value, out_key, out_value) < 0) {
|
|
|
|
goto try_locked;
|
|
|
|
}
|
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2024-02-22 16:02:39 -04:00
|
|
|
// We found an element (key), but did not expect it
|
|
|
|
Py_ssize_t len;
|
|
|
|
if ((len = _Py_atomic_load_ssize_relaxed(&di->len)) == 0) {
|
|
|
|
goto concurrent_modification;
|
|
|
|
}
|
|
|
|
|
|
|
|
_Py_atomic_store_ssize_relaxed(&di->di_pos, i + 1);
|
|
|
|
_Py_atomic_store_ssize_relaxed(&di->len, len - 1);
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
concurrent_modification:
|
|
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
|
|
"dictionary keys changed during iteration");
|
2004-03-17 22:41:19 -04:00
|
|
|
|
|
|
|
fail:
|
2010-05-09 12:52:27 -03:00
|
|
|
di->di_dict = NULL;
|
Issue #26494: Fixed crash on iterating exhausting iterators.
Affected classes are generic sequence iterators, iterators of str, bytes,
bytearray, list, tuple, set, frozenset, dict, OrderedDict, corresponding
views and os.scandir() iterator.
2016-03-30 14:40:02 -03:00
|
|
|
Py_DECREF(d);
|
2024-02-22 16:02:39 -04:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
try_locked:
|
|
|
|
Py_BEGIN_CRITICAL_SECTION(d);
|
|
|
|
res = dictiter_iternextitem_lock_held(d, self, out_key, out_value);
|
|
|
|
Py_END_CRITICAL_SECTION();
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static bool
|
|
|
|
has_unique_reference(PyObject *op)
|
|
|
|
{
|
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
return (_Py_IsOwnedByCurrentThread(op) &&
|
|
|
|
op->ob_ref_local == 1 &&
|
|
|
|
_Py_atomic_load_ssize_relaxed(&op->ob_ref_shared) == 0);
|
|
|
|
#else
|
|
|
|
return Py_REFCNT(op) == 1;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool
|
|
|
|
acquire_iter_result(PyObject *result)
|
|
|
|
{
|
|
|
|
if (has_unique_reference(result)) {
|
|
|
|
Py_INCREF(result);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
2004-03-17 22:41:19 -04:00
|
|
|
}
|
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
static PyObject *
|
|
|
|
dictiter_iternextitem(PyObject *self)
|
|
|
|
{
|
|
|
|
dictiterobject *di = (dictiterobject *)self;
|
|
|
|
PyDictObject *d = di->di_dict;
|
|
|
|
|
|
|
|
if (d == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
2024-02-22 16:02:39 -04:00
|
|
|
PyObject *key, *value;
|
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
if (dictiter_iternext_threadsafe(d, self, &key, &value) == 0) {
|
|
|
|
#else
|
|
|
|
if (dictiter_iternextitem_lock_held(d, self, &key, &value) == 0) {
|
|
|
|
|
|
|
|
#endif
|
|
|
|
PyObject *result = di->di_result;
|
|
|
|
if (acquire_iter_result(result)) {
|
|
|
|
PyObject *oldkey = PyTuple_GET_ITEM(result, 0);
|
|
|
|
PyObject *oldvalue = PyTuple_GET_ITEM(result, 1);
|
|
|
|
PyTuple_SET_ITEM(result, 0, key);
|
|
|
|
PyTuple_SET_ITEM(result, 1, value);
|
|
|
|
Py_DECREF(oldkey);
|
|
|
|
Py_DECREF(oldvalue);
|
|
|
|
// bpo-42536: The GC may have untracked this result tuple. Since we're
|
|
|
|
// recycling it, make sure it's tracked again:
|
|
|
|
if (!_PyObject_GC_IS_TRACKED(result)) {
|
|
|
|
_PyObject_GC_TRACK(result);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
result = PyTuple_New(2);
|
|
|
|
if (result == NULL)
|
|
|
|
return NULL;
|
|
|
|
PyTuple_SET_ITEM(result, 0, key);
|
|
|
|
PyTuple_SET_ITEM(result, 1, value);
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
return NULL;
|
2024-02-06 18:03:43 -04:00
|
|
|
}
|
|
|
|
|
2004-03-17 22:41:19 -04:00
|
|
|
PyTypeObject PyDictIterItem_Type = {
|
2010-05-09 12:52:27 -03:00
|
|
|
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
|
|
|
"dict_itemiterator", /* tp_name */
|
|
|
|
sizeof(dictiterobject), /* tp_basicsize */
|
|
|
|
0, /* tp_itemsize */
|
|
|
|
/* methods */
|
2024-01-02 10:32:37 -04:00
|
|
|
dictiter_dealloc, /* tp_dealloc */
|
2019-05-30 23:13:39 -03:00
|
|
|
0, /* tp_vectorcall_offset */
|
2010-05-09 12:52:27 -03:00
|
|
|
0, /* tp_getattr */
|
|
|
|
0, /* tp_setattr */
|
2019-05-30 23:13:39 -03:00
|
|
|
0, /* tp_as_async */
|
2010-05-09 12:52:27 -03:00
|
|
|
0, /* tp_repr */
|
|
|
|
0, /* tp_as_number */
|
|
|
|
0, /* tp_as_sequence */
|
|
|
|
0, /* tp_as_mapping */
|
|
|
|
0, /* tp_hash */
|
|
|
|
0, /* tp_call */
|
|
|
|
0, /* tp_str */
|
|
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
|
|
0, /* tp_setattro */
|
|
|
|
0, /* tp_as_buffer */
|
|
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */
|
|
|
|
0, /* tp_doc */
|
2024-01-02 10:32:37 -04:00
|
|
|
dictiter_traverse, /* tp_traverse */
|
2010-05-09 12:52:27 -03:00
|
|
|
0, /* tp_clear */
|
|
|
|
0, /* tp_richcompare */
|
|
|
|
0, /* tp_weaklistoffset */
|
|
|
|
PyObject_SelfIter, /* tp_iter */
|
2024-01-02 10:32:37 -04:00
|
|
|
dictiter_iternextitem, /* tp_iternext */
|
2010-05-09 12:52:27 -03:00
|
|
|
dictiter_methods, /* tp_methods */
|
|
|
|
0,
|
2001-04-20 16:13:02 -03:00
|
|
|
};
|
2007-02-09 21:11:45 -04:00
|
|
|
|
|
|
|
|
2018-11-05 20:38:54 -04:00
|
|
|
/* dictreviter */
|
|
|
|
|
|
|
|
static PyObject *
|
2024-02-20 21:08:14 -04:00
|
|
|
dictreviter_iter_lock_held(PyDictObject *d, PyObject *self)
|
2018-11-05 20:38:54 -04:00
|
|
|
{
|
2024-01-02 10:32:37 -04:00
|
|
|
dictiterobject *di = (dictiterobject *)self;
|
2018-11-05 20:38:54 -04:00
|
|
|
|
|
|
|
assert (PyDict_Check(d));
|
2024-02-06 18:03:43 -04:00
|
|
|
ASSERT_DICT_LOCKED(d);
|
2018-11-05 20:38:54 -04:00
|
|
|
|
|
|
|
if (di->di_used != d->ma_used) {
|
|
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
|
|
"dictionary changed size during iteration");
|
|
|
|
di->di_used = -1; /* Make this state sticky */
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
Py_ssize_t i = di->di_pos;
|
|
|
|
PyDictKeysObject *k = d->ma_keys;
|
|
|
|
PyObject *key, *value, *result;
|
|
|
|
|
2019-10-23 08:48:08 -03:00
|
|
|
if (i < 0) {
|
|
|
|
goto fail;
|
|
|
|
}
|
2024-02-20 20:40:37 -04:00
|
|
|
if (_PyDict_HasSplitTable(d)) {
|
2021-10-06 09:19:53 -03:00
|
|
|
int index = get_index_from_order(d, i);
|
2024-02-20 20:40:37 -04:00
|
|
|
key = LOAD_SHARED_KEY(DK_UNICODE_ENTRIES(k)[index].me_key);
|
2021-10-06 09:19:53 -03:00
|
|
|
value = d->ma_values->values[index];
|
2018-11-05 20:38:54 -04:00
|
|
|
assert (value != NULL);
|
|
|
|
}
|
|
|
|
else {
|
2022-03-01 19:09:28 -04:00
|
|
|
if (DK_IS_UNICODE(k)) {
|
|
|
|
PyDictUnicodeEntry *entry_ptr = &DK_UNICODE_ENTRIES(k)[i];
|
|
|
|
while (entry_ptr->me_value == NULL) {
|
|
|
|
if (--i < 0) {
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
entry_ptr--;
|
|
|
|
}
|
|
|
|
key = entry_ptr->me_key;
|
|
|
|
value = entry_ptr->me_value;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
PyDictKeyEntry *entry_ptr = &DK_ENTRIES(k)[i];
|
|
|
|
while (entry_ptr->me_value == NULL) {
|
|
|
|
if (--i < 0) {
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
entry_ptr--;
|
2019-10-23 08:48:08 -03:00
|
|
|
}
|
2022-03-01 19:09:28 -04:00
|
|
|
key = entry_ptr->me_key;
|
|
|
|
value = entry_ptr->me_value;
|
2018-11-05 20:38:54 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
di->di_pos = i-1;
|
|
|
|
di->len--;
|
|
|
|
|
2020-02-17 06:09:15 -04:00
|
|
|
if (Py_IS_TYPE(di, &PyDictRevIterKey_Type)) {
|
2022-11-10 11:27:53 -04:00
|
|
|
return Py_NewRef(key);
|
2018-11-05 20:38:54 -04:00
|
|
|
}
|
2020-02-17 06:09:15 -04:00
|
|
|
else if (Py_IS_TYPE(di, &PyDictRevIterValue_Type)) {
|
2022-11-10 11:27:53 -04:00
|
|
|
return Py_NewRef(value);
|
2018-11-05 20:38:54 -04:00
|
|
|
}
|
2020-02-17 06:09:15 -04:00
|
|
|
else if (Py_IS_TYPE(di, &PyDictRevIterItem_Type)) {
|
2018-11-05 20:38:54 -04:00
|
|
|
result = di->di_result;
|
|
|
|
if (Py_REFCNT(result) == 1) {
|
|
|
|
PyObject *oldkey = PyTuple_GET_ITEM(result, 0);
|
|
|
|
PyObject *oldvalue = PyTuple_GET_ITEM(result, 1);
|
2022-11-10 11:27:53 -04:00
|
|
|
PyTuple_SET_ITEM(result, 0, Py_NewRef(key));
|
|
|
|
PyTuple_SET_ITEM(result, 1, Py_NewRef(value));
|
2018-11-05 20:38:54 -04:00
|
|
|
Py_INCREF(result);
|
|
|
|
Py_DECREF(oldkey);
|
|
|
|
Py_DECREF(oldvalue);
|
2020-12-04 23:45:57 -04:00
|
|
|
// bpo-42536: The GC may have untracked this result tuple. Since
|
|
|
|
// we're recycling it, make sure it's tracked again:
|
|
|
|
if (!_PyObject_GC_IS_TRACKED(result)) {
|
|
|
|
_PyObject_GC_TRACK(result);
|
|
|
|
}
|
2018-11-05 20:38:54 -04:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
result = PyTuple_New(2);
|
|
|
|
if (result == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
2022-11-10 11:27:53 -04:00
|
|
|
PyTuple_SET_ITEM(result, 0, Py_NewRef(key));
|
|
|
|
PyTuple_SET_ITEM(result, 1, Py_NewRef(value));
|
2018-11-05 20:38:54 -04:00
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
Py_UNREACHABLE();
|
|
|
|
}
|
|
|
|
|
|
|
|
fail:
|
|
|
|
di->di_dict = NULL;
|
|
|
|
Py_DECREF(d);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
static PyObject *
|
|
|
|
dictreviter_iternext(PyObject *self)
|
|
|
|
{
|
|
|
|
dictiterobject *di = (dictiterobject *)self;
|
|
|
|
PyDictObject *d = di->di_dict;
|
|
|
|
|
|
|
|
if (d == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
PyObject *value;
|
|
|
|
Py_BEGIN_CRITICAL_SECTION(d);
|
2024-02-20 21:08:14 -04:00
|
|
|
value = dictreviter_iter_lock_held(d, self);
|
2024-02-06 18:03:43 -04:00
|
|
|
Py_END_CRITICAL_SECTION();
|
|
|
|
|
|
|
|
return value;
|
|
|
|
}
|
|
|
|
|
2018-11-05 20:38:54 -04:00
|
|
|
PyTypeObject PyDictRevIterKey_Type = {
|
|
|
|
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
|
|
|
"dict_reversekeyiterator",
|
|
|
|
sizeof(dictiterobject),
|
2024-01-02 10:32:37 -04:00
|
|
|
.tp_dealloc = dictiter_dealloc,
|
2018-11-05 20:38:54 -04:00
|
|
|
.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,
|
2024-01-02 10:32:37 -04:00
|
|
|
.tp_traverse = dictiter_traverse,
|
2018-11-05 20:38:54 -04:00
|
|
|
.tp_iter = PyObject_SelfIter,
|
2024-01-02 10:32:37 -04:00
|
|
|
.tp_iternext = dictreviter_iternext,
|
2018-11-05 20:38:54 -04:00
|
|
|
.tp_methods = dictiter_methods
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*[clinic input]
|
|
|
|
dict.__reversed__
|
|
|
|
|
|
|
|
Return a reverse iterator over the dict keys.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
dict___reversed___impl(PyDictObject *self)
|
|
|
|
/*[clinic end generated code: output=e674483336d1ed51 input=23210ef3477d8c4d]*/
|
|
|
|
{
|
|
|
|
assert (PyDict_Check(self));
|
|
|
|
return dictiter_new(self, &PyDictRevIterKey_Type);
|
|
|
|
}
|
|
|
|
|
2012-04-03 07:49:41 -03:00
|
|
|
static PyObject *
|
2024-01-02 10:32:37 -04:00
|
|
|
dictiter_reduce(PyObject *self, PyObject *Py_UNUSED(ignored))
|
2012-04-03 07:49:41 -03:00
|
|
|
{
|
2024-01-02 10:32:37 -04:00
|
|
|
dictiterobject *di = (dictiterobject *)self;
|
2018-10-19 21:43:33 -03:00
|
|
|
/* copy the iterator state */
|
|
|
|
dictiterobject tmp = *di;
|
2012-04-03 07:49:41 -03:00
|
|
|
Py_XINCREF(tmp.di_dict);
|
2018-10-19 21:43:33 -03:00
|
|
|
PyObject *list = PySequence_List((PyObject*)&tmp);
|
2012-04-03 07:49:41 -03:00
|
|
|
Py_XDECREF(tmp.di_dict);
|
2018-10-19 21:43:33 -03:00
|
|
|
if (list == NULL) {
|
2012-04-03 07:49:41 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
2022-02-08 16:39:07 -04:00
|
|
|
return Py_BuildValue("N(N)", _PyEval_GetBuiltin(&_Py_ID(iter)), list);
|
2012-04-03 07:49:41 -03:00
|
|
|
}
|
|
|
|
|
2018-11-05 20:38:54 -04:00
|
|
|
PyTypeObject PyDictRevIterItem_Type = {
|
|
|
|
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
|
|
|
"dict_reverseitemiterator",
|
|
|
|
sizeof(dictiterobject),
|
2024-01-02 10:32:37 -04:00
|
|
|
.tp_dealloc = dictiter_dealloc,
|
2018-11-05 20:38:54 -04:00
|
|
|
.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,
|
2024-01-02 10:32:37 -04:00
|
|
|
.tp_traverse = dictiter_traverse,
|
2018-11-05 20:38:54 -04:00
|
|
|
.tp_iter = PyObject_SelfIter,
|
2024-01-02 10:32:37 -04:00
|
|
|
.tp_iternext = dictreviter_iternext,
|
2018-11-05 20:38:54 -04:00
|
|
|
.tp_methods = dictiter_methods
|
|
|
|
};
|
|
|
|
|
|
|
|
PyTypeObject PyDictRevIterValue_Type = {
|
|
|
|
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
|
|
|
"dict_reversevalueiterator",
|
|
|
|
sizeof(dictiterobject),
|
2024-01-02 10:32:37 -04:00
|
|
|
.tp_dealloc = dictiter_dealloc,
|
2018-11-05 20:38:54 -04:00
|
|
|
.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,
|
2024-01-02 10:32:37 -04:00
|
|
|
.tp_traverse = dictiter_traverse,
|
2018-11-05 20:38:54 -04:00
|
|
|
.tp_iter = PyObject_SelfIter,
|
2024-01-02 10:32:37 -04:00
|
|
|
.tp_iternext = dictreviter_iternext,
|
2018-11-05 20:38:54 -04:00
|
|
|
.tp_methods = dictiter_methods
|
|
|
|
};
|
|
|
|
|
2007-02-10 14:55:06 -04:00
|
|
|
/***********************************************/
|
2007-02-09 21:11:45 -04:00
|
|
|
/* View objects for keys(), items(), values(). */
|
2007-02-10 14:55:06 -04:00
|
|
|
/***********************************************/
|
|
|
|
|
2007-02-09 21:11:45 -04:00
|
|
|
/* The instance lay-out is the same for all three; but the type differs. */
|
|
|
|
|
|
|
|
static void
|
2024-01-02 10:32:37 -04:00
|
|
|
dictview_dealloc(PyObject *self)
|
2007-02-09 21:11:45 -04:00
|
|
|
{
|
2024-01-02 10:32:37 -04:00
|
|
|
_PyDictViewObject *dv = (_PyDictViewObject *)self;
|
2017-08-24 02:55:17 -03:00
|
|
|
/* bpo-31095: UnTrack is needed before calling any callbacks */
|
|
|
|
_PyObject_GC_UNTRACK(dv);
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_XDECREF(dv->dv_dict);
|
|
|
|
PyObject_GC_Del(dv);
|
2009-01-01 11:35:33 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2024-01-02 10:32:37 -04:00
|
|
|
dictview_traverse(PyObject *self, visitproc visit, void *arg)
|
2009-01-01 11:35:33 -04:00
|
|
|
{
|
2024-01-02 10:32:37 -04:00
|
|
|
_PyDictViewObject *dv = (_PyDictViewObject *)self;
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_VISIT(dv->dv_dict);
|
|
|
|
return 0;
|
2007-02-09 21:11:45 -04:00
|
|
|
}
|
|
|
|
|
2007-02-10 00:54:19 -04:00
|
|
|
static Py_ssize_t
|
2024-01-02 10:32:37 -04:00
|
|
|
dictview_len(PyObject *self)
|
2007-02-09 21:11:45 -04:00
|
|
|
{
|
2024-01-02 10:32:37 -04:00
|
|
|
_PyDictViewObject *dv = (_PyDictViewObject *)self;
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_ssize_t len = 0;
|
|
|
|
if (dv->dv_dict != NULL)
|
2024-05-24 14:39:06 -03:00
|
|
|
len = FT_ATOMIC_LOAD_SSIZE_RELAXED(dv->dv_dict->ma_used);
|
2010-05-09 12:52:27 -03:00
|
|
|
return len;
|
2007-02-09 21:11:45 -04:00
|
|
|
}
|
|
|
|
|
2015-05-30 01:21:39 -03:00
|
|
|
PyObject *
|
|
|
|
_PyDictView_New(PyObject *dict, PyTypeObject *type)
|
2007-02-09 21:11:45 -04:00
|
|
|
{
|
2015-05-30 01:21:39 -03:00
|
|
|
_PyDictViewObject *dv;
|
2010-05-09 12:52:27 -03:00
|
|
|
if (dict == NULL) {
|
|
|
|
PyErr_BadInternalCall();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if (!PyDict_Check(dict)) {
|
|
|
|
/* XXX Get rid of this restriction later */
|
|
|
|
PyErr_Format(PyExc_TypeError,
|
|
|
|
"%s() requires a dict argument, not '%s'",
|
2020-02-06 22:04:21 -04:00
|
|
|
type->tp_name, Py_TYPE(dict)->tp_name);
|
2010-05-09 12:52:27 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
2015-05-30 01:21:39 -03:00
|
|
|
dv = PyObject_GC_New(_PyDictViewObject, type);
|
2010-05-09 12:52:27 -03:00
|
|
|
if (dv == NULL)
|
|
|
|
return NULL;
|
2022-11-10 11:27:53 -04:00
|
|
|
dv->dv_dict = (PyDictObject *)Py_NewRef(dict);
|
2010-05-09 12:52:27 -03:00
|
|
|
_PyObject_GC_TRACK(dv);
|
|
|
|
return (PyObject *)dv;
|
2007-02-09 21:11:45 -04:00
|
|
|
}
|
|
|
|
|
2020-06-12 14:19:25 -03:00
|
|
|
static PyObject *
|
2020-06-14 22:05:20 -03:00
|
|
|
dictview_mapping(PyObject *view, void *Py_UNUSED(ignored)) {
|
2020-06-12 14:19:25 -03:00
|
|
|
assert(view != NULL);
|
|
|
|
assert(PyDictKeys_Check(view)
|
|
|
|
|| PyDictValues_Check(view)
|
|
|
|
|| PyDictItems_Check(view));
|
|
|
|
PyObject *mapping = (PyObject *)((_PyDictViewObject *)view)->dv_dict;
|
|
|
|
return PyDictProxy_New(mapping);
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyGetSetDef dictview_getset[] = {
|
2020-06-14 22:05:20 -03:00
|
|
|
{"mapping", dictview_mapping, (setter)NULL,
|
2023-09-15 10:10:48 -03:00
|
|
|
PyDoc_STR("dictionary that this view refers to"), NULL},
|
2020-06-12 14:19:25 -03:00
|
|
|
{0}
|
|
|
|
};
|
|
|
|
|
2007-02-26 19:12:28 -04:00
|
|
|
/* TODO(guido): The views objects are not complete:
|
|
|
|
|
|
|
|
* support more set operations
|
|
|
|
* support arbitrary mappings?
|
|
|
|
- either these should be static or exported in dictobject.h
|
|
|
|
- if public then they should probably be in builtins
|
|
|
|
*/
|
|
|
|
|
2007-08-24 19:33:45 -03:00
|
|
|
/* Return 1 if self is a subset of other, iterating over self;
|
|
|
|
0 if not; -1 if an error occurred. */
|
2007-02-11 22:23:40 -04:00
|
|
|
static int
|
|
|
|
all_contained_in(PyObject *self, PyObject *other)
|
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject *iter = PyObject_GetIter(self);
|
|
|
|
int ok = 1;
|
|
|
|
|
|
|
|
if (iter == NULL)
|
|
|
|
return -1;
|
|
|
|
for (;;) {
|
|
|
|
PyObject *next = PyIter_Next(iter);
|
|
|
|
if (next == NULL) {
|
|
|
|
if (PyErr_Occurred())
|
|
|
|
ok = -1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
ok = PySequence_Contains(other, next);
|
|
|
|
Py_DECREF(next);
|
|
|
|
if (ok <= 0)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
Py_DECREF(iter);
|
|
|
|
return ok;
|
2007-02-11 22:23:40 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
dictview_richcompare(PyObject *self, PyObject *other, int op)
|
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_ssize_t len_self, len_other;
|
|
|
|
int ok;
|
|
|
|
PyObject *result;
|
|
|
|
|
|
|
|
assert(self != NULL);
|
|
|
|
assert(PyDictViewSet_Check(self));
|
|
|
|
assert(other != NULL);
|
|
|
|
|
2011-08-10 22:28:54 -03:00
|
|
|
if (!PyAnySet_Check(other) && !PyDictViewSet_Check(other))
|
|
|
|
Py_RETURN_NOTIMPLEMENTED;
|
2010-05-09 12:52:27 -03:00
|
|
|
|
|
|
|
len_self = PyObject_Size(self);
|
|
|
|
if (len_self < 0)
|
|
|
|
return NULL;
|
|
|
|
len_other = PyObject_Size(other);
|
|
|
|
if (len_other < 0)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
ok = 0;
|
|
|
|
switch(op) {
|
|
|
|
|
|
|
|
case Py_NE:
|
|
|
|
case Py_EQ:
|
|
|
|
if (len_self == len_other)
|
|
|
|
ok = all_contained_in(self, other);
|
|
|
|
if (op == Py_NE && ok >= 0)
|
|
|
|
ok = !ok;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case Py_LT:
|
|
|
|
if (len_self < len_other)
|
|
|
|
ok = all_contained_in(self, other);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case Py_LE:
|
|
|
|
if (len_self <= len_other)
|
|
|
|
ok = all_contained_in(self, other);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case Py_GT:
|
|
|
|
if (len_self > len_other)
|
|
|
|
ok = all_contained_in(other, self);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case Py_GE:
|
|
|
|
if (len_self >= len_other)
|
|
|
|
ok = all_contained_in(other, self);
|
|
|
|
break;
|
|
|
|
|
|
|
|
}
|
|
|
|
if (ok < 0)
|
|
|
|
return NULL;
|
|
|
|
result = ok ? Py_True : Py_False;
|
2022-11-10 11:27:53 -04:00
|
|
|
return Py_NewRef(result);
|
2007-02-11 22:23:40 -04:00
|
|
|
}
|
|
|
|
|
2009-03-03 06:52:49 -04:00
|
|
|
static PyObject *
|
2024-01-02 10:32:37 -04:00
|
|
|
dictview_repr(PyObject *self)
|
2009-03-03 06:52:49 -04:00
|
|
|
{
|
2024-01-02 10:32:37 -04:00
|
|
|
_PyDictViewObject *dv = (_PyDictViewObject *)self;
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject *seq;
|
2018-01-26 11:46:01 -04:00
|
|
|
PyObject *result = NULL;
|
|
|
|
Py_ssize_t rc;
|
2010-05-09 12:52:27 -03:00
|
|
|
|
2018-01-26 11:46:01 -04:00
|
|
|
rc = Py_ReprEnter((PyObject *)dv);
|
|
|
|
if (rc != 0) {
|
|
|
|
return rc > 0 ? PyUnicode_FromString("...") : NULL;
|
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
seq = PySequence_List((PyObject *)dv);
|
2018-01-26 11:46:01 -04:00
|
|
|
if (seq == NULL) {
|
|
|
|
goto Done;
|
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
result = PyUnicode_FromFormat("%s(%R)", Py_TYPE(dv)->tp_name, seq);
|
|
|
|
Py_DECREF(seq);
|
2018-01-26 11:46:01 -04:00
|
|
|
|
|
|
|
Done:
|
|
|
|
Py_ReprLeave((PyObject *)dv);
|
2010-05-09 12:52:27 -03:00
|
|
|
return result;
|
2009-03-03 06:52:49 -04:00
|
|
|
}
|
|
|
|
|
2007-02-10 14:55:06 -04:00
|
|
|
/*** dict_keys ***/
|
2007-02-09 21:11:45 -04:00
|
|
|
|
|
|
|
static PyObject *
|
2024-01-02 10:32:37 -04:00
|
|
|
dictkeys_iter(PyObject *self)
|
2007-02-09 21:11:45 -04:00
|
|
|
{
|
2024-01-02 10:32:37 -04:00
|
|
|
_PyDictViewObject *dv = (_PyDictViewObject *)self;
|
2010-05-09 12:52:27 -03:00
|
|
|
if (dv->dv_dict == NULL) {
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
return dictiter_new(dv->dv_dict, &PyDictIterKey_Type);
|
2007-02-10 14:55:06 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2024-01-02 10:32:37 -04:00
|
|
|
dictkeys_contains(PyObject *self, PyObject *obj)
|
2007-02-10 14:55:06 -04:00
|
|
|
{
|
2024-01-02 10:32:37 -04:00
|
|
|
_PyDictViewObject *dv = (_PyDictViewObject *)self;
|
2010-05-09 12:52:27 -03:00
|
|
|
if (dv->dv_dict == NULL)
|
|
|
|
return 0;
|
|
|
|
return PyDict_Contains((PyObject *)dv->dv_dict, obj);
|
2007-02-09 21:11:45 -04:00
|
|
|
}
|
|
|
|
|
2007-02-10 00:54:19 -04:00
|
|
|
static PySequenceMethods dictkeys_as_sequence = {
|
2024-01-02 10:32:37 -04:00
|
|
|
dictview_len, /* sq_length */
|
2010-05-09 12:52:27 -03:00
|
|
|
0, /* sq_concat */
|
|
|
|
0, /* sq_repeat */
|
|
|
|
0, /* sq_item */
|
|
|
|
0, /* sq_slice */
|
|
|
|
0, /* sq_ass_item */
|
|
|
|
0, /* sq_ass_slice */
|
2024-01-02 10:32:37 -04:00
|
|
|
dictkeys_contains, /* sq_contains */
|
2007-02-10 00:54:19 -04:00
|
|
|
};
|
|
|
|
|
2022-09-20 09:17:40 -03:00
|
|
|
// Create a set object from dictviews object.
|
2019-11-07 11:59:04 -04:00
|
|
|
// Returns a new reference.
|
|
|
|
// This utility function is used by set operations.
|
2007-08-24 20:41:22 -03:00
|
|
|
static PyObject*
|
2019-11-07 11:59:04 -04:00
|
|
|
dictviews_to_set(PyObject *self)
|
2007-08-24 20:41:22 -03:00
|
|
|
{
|
2019-11-07 11:59:04 -04:00
|
|
|
PyObject *left = self;
|
|
|
|
if (PyDictKeys_Check(self)) {
|
|
|
|
// PySet_New() has fast path for the dict object.
|
|
|
|
PyObject *dict = (PyObject *)((_PyDictViewObject *)self)->dv_dict;
|
|
|
|
if (PyDict_CheckExact(dict)) {
|
|
|
|
left = dict;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return PySet_New(left);
|
|
|
|
}
|
2011-10-09 05:38:36 -03:00
|
|
|
|
2019-11-07 11:59:04 -04:00
|
|
|
static PyObject*
|
|
|
|
dictviews_sub(PyObject *self, PyObject *other)
|
|
|
|
{
|
|
|
|
PyObject *result = dictviews_to_set(self);
|
|
|
|
if (result == NULL) {
|
2010-05-09 12:52:27 -03:00
|
|
|
return NULL;
|
2019-11-07 11:59:04 -04:00
|
|
|
}
|
2007-08-24 20:41:22 -03:00
|
|
|
|
2022-02-08 16:39:07 -04:00
|
|
|
PyObject *tmp = PyObject_CallMethodOneArg(
|
|
|
|
result, &_Py_ID(difference_update), other);
|
2010-05-09 12:52:27 -03:00
|
|
|
if (tmp == NULL) {
|
|
|
|
Py_DECREF(result);
|
|
|
|
return NULL;
|
|
|
|
}
|
2007-08-24 20:41:22 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_DECREF(tmp);
|
|
|
|
return result;
|
2007-08-24 20:41:22 -03:00
|
|
|
}
|
|
|
|
|
2019-08-26 04:17:43 -03:00
|
|
|
static int
|
2024-01-02 10:32:37 -04:00
|
|
|
dictitems_contains(PyObject *dv, PyObject *obj);
|
2019-08-26 04:17:43 -03:00
|
|
|
|
|
|
|
PyObject *
|
2015-05-05 21:16:41 -03:00
|
|
|
_PyDictView_Intersect(PyObject* self, PyObject *other)
|
2007-08-24 20:41:22 -03:00
|
|
|
{
|
2019-08-26 04:17:43 -03:00
|
|
|
PyObject *result;
|
|
|
|
PyObject *it;
|
|
|
|
PyObject *key;
|
|
|
|
Py_ssize_t len_self;
|
|
|
|
int rv;
|
2024-01-02 10:32:37 -04:00
|
|
|
objobjproc dict_contains;
|
2011-10-09 05:38:36 -03:00
|
|
|
|
2019-08-26 04:17:43 -03:00
|
|
|
/* Python interpreter swaps parameters when dict view
|
|
|
|
is on right side of & */
|
|
|
|
if (!PyDictViewSet_Check(self)) {
|
|
|
|
PyObject *tmp = other;
|
|
|
|
other = self;
|
|
|
|
self = tmp;
|
|
|
|
}
|
|
|
|
|
2024-01-02 10:32:37 -04:00
|
|
|
len_self = dictview_len(self);
|
2019-08-26 04:17:43 -03:00
|
|
|
|
|
|
|
/* if other is a set and self is smaller than other,
|
|
|
|
reuse set intersection logic */
|
2021-02-20 14:03:08 -04:00
|
|
|
if (PySet_CheckExact(other) && len_self <= PyObject_Size(other)) {
|
2022-02-08 16:39:07 -04:00
|
|
|
return PyObject_CallMethodObjArgs(
|
|
|
|
other, &_Py_ID(intersection), self, NULL);
|
2019-08-26 04:17:43 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* if other is another dict view, and it is bigger than self,
|
|
|
|
swap them */
|
|
|
|
if (PyDictViewSet_Check(other)) {
|
2024-01-02 10:32:37 -04:00
|
|
|
Py_ssize_t len_other = dictview_len(other);
|
2019-08-26 04:17:43 -03:00
|
|
|
if (len_other > len_self) {
|
|
|
|
PyObject *tmp = other;
|
|
|
|
other = self;
|
|
|
|
self = tmp;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* at this point, two things should be true
|
|
|
|
1. self is a dictview
|
|
|
|
2. if other is a dictview then it is smaller than self */
|
|
|
|
result = PySet_New(NULL);
|
2010-05-09 12:52:27 -03:00
|
|
|
if (result == NULL)
|
|
|
|
return NULL;
|
2007-08-24 20:41:22 -03:00
|
|
|
|
2019-08-26 04:17:43 -03:00
|
|
|
it = PyObject_GetIter(other);
|
2019-10-13 08:49:05 -03:00
|
|
|
if (it == NULL) {
|
|
|
|
Py_DECREF(result);
|
|
|
|
return NULL;
|
|
|
|
}
|
2019-08-26 04:17:43 -03:00
|
|
|
|
|
|
|
if (PyDictKeys_Check(self)) {
|
|
|
|
dict_contains = dictkeys_contains;
|
|
|
|
}
|
|
|
|
/* else PyDictItems_Check(self) */
|
|
|
|
else {
|
|
|
|
dict_contains = dictitems_contains;
|
|
|
|
}
|
|
|
|
|
|
|
|
while ((key = PyIter_Next(it)) != NULL) {
|
2024-01-02 10:32:37 -04:00
|
|
|
rv = dict_contains(self, key);
|
2019-08-26 04:17:43 -03:00
|
|
|
if (rv < 0) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
if (rv) {
|
|
|
|
if (PySet_Add(result, key)) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Py_DECREF(key);
|
|
|
|
}
|
|
|
|
Py_DECREF(it);
|
|
|
|
if (PyErr_Occurred()) {
|
|
|
|
Py_DECREF(result);
|
|
|
|
return NULL;
|
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
return result;
|
2019-08-26 04:17:43 -03:00
|
|
|
|
|
|
|
error:
|
|
|
|
Py_DECREF(it);
|
|
|
|
Py_DECREF(result);
|
|
|
|
Py_DECREF(key);
|
|
|
|
return NULL;
|
2007-08-24 20:41:22 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject*
|
|
|
|
dictviews_or(PyObject* self, PyObject *other)
|
|
|
|
{
|
2019-11-07 11:59:04 -04:00
|
|
|
PyObject *result = dictviews_to_set(self);
|
|
|
|
if (result == NULL) {
|
2010-05-09 12:52:27 -03:00
|
|
|
return NULL;
|
2019-11-07 11:59:04 -04:00
|
|
|
}
|
2007-08-24 20:41:22 -03:00
|
|
|
|
2019-11-07 11:59:04 -04:00
|
|
|
if (_PySet_Update(result, other) < 0) {
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_DECREF(result);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return result;
|
2007-08-24 20:41:22 -03:00
|
|
|
}
|
|
|
|
|
2020-06-10 02:56:56 -03:00
|
|
|
static PyObject *
|
2024-02-06 18:03:43 -04:00
|
|
|
dictitems_xor_lock_held(PyObject *d1, PyObject *d2)
|
2020-06-10 02:56:56 -03:00
|
|
|
{
|
2024-02-06 18:03:43 -04:00
|
|
|
ASSERT_DICT_LOCKED(d1);
|
|
|
|
ASSERT_DICT_LOCKED(d2);
|
2020-06-10 02:56:56 -03:00
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
PyObject *temp_dict = copy_lock_held(d1);
|
2020-06-10 02:56:56 -03:00
|
|
|
if (temp_dict == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
PyObject *result_set = PySet_New(NULL);
|
|
|
|
if (result_set == NULL) {
|
|
|
|
Py_CLEAR(temp_dict);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *key = NULL, *val1 = NULL, *val2 = NULL;
|
|
|
|
Py_ssize_t pos = 0;
|
|
|
|
Py_hash_t hash;
|
|
|
|
|
|
|
|
while (_PyDict_Next(d2, &pos, &key, &val2, &hash)) {
|
|
|
|
Py_INCREF(key);
|
|
|
|
Py_INCREF(val2);
|
|
|
|
val1 = _PyDict_GetItem_KnownHash(temp_dict, key, hash);
|
|
|
|
|
|
|
|
int to_delete;
|
|
|
|
if (val1 == NULL) {
|
|
|
|
if (PyErr_Occurred()) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
to_delete = 0;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
Py_INCREF(val1);
|
|
|
|
to_delete = PyObject_RichCompareBool(val1, val2, Py_EQ);
|
|
|
|
if (to_delete < 0) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (to_delete) {
|
|
|
|
if (_PyDict_DelItem_KnownHash(temp_dict, key, hash) < 0) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
PyObject *pair = PyTuple_Pack(2, key, val2);
|
|
|
|
if (pair == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
if (PySet_Add(result_set, pair) < 0) {
|
|
|
|
Py_DECREF(pair);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
Py_DECREF(pair);
|
|
|
|
}
|
|
|
|
Py_DECREF(key);
|
|
|
|
Py_XDECREF(val1);
|
|
|
|
Py_DECREF(val2);
|
|
|
|
}
|
|
|
|
key = val1 = val2 = NULL;
|
|
|
|
|
2022-02-08 16:39:07 -04:00
|
|
|
PyObject *remaining_pairs = PyObject_CallMethodNoArgs(
|
|
|
|
temp_dict, &_Py_ID(items));
|
2020-06-10 02:56:56 -03:00
|
|
|
if (remaining_pairs == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
if (_PySet_Update(result_set, remaining_pairs) < 0) {
|
|
|
|
Py_DECREF(remaining_pairs);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
Py_DECREF(temp_dict);
|
|
|
|
Py_DECREF(remaining_pairs);
|
|
|
|
return result_set;
|
|
|
|
|
|
|
|
error:
|
|
|
|
Py_XDECREF(temp_dict);
|
|
|
|
Py_XDECREF(result_set);
|
|
|
|
Py_XDECREF(key);
|
|
|
|
Py_XDECREF(val1);
|
|
|
|
Py_XDECREF(val2);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2024-02-06 18:03:43 -04:00
|
|
|
static PyObject *
|
|
|
|
dictitems_xor(PyObject *self, PyObject *other)
|
|
|
|
{
|
|
|
|
assert(PyDictItems_Check(self));
|
|
|
|
assert(PyDictItems_Check(other));
|
|
|
|
PyObject *d1 = (PyObject *)((_PyDictViewObject *)self)->dv_dict;
|
|
|
|
PyObject *d2 = (PyObject *)((_PyDictViewObject *)other)->dv_dict;
|
|
|
|
|
|
|
|
PyObject *res;
|
|
|
|
Py_BEGIN_CRITICAL_SECTION2(d1, d2);
|
|
|
|
res = dictitems_xor_lock_held(d1, d2);
|
|
|
|
Py_END_CRITICAL_SECTION2();
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2007-08-24 20:41:22 -03:00
|
|
|
static PyObject*
|
|
|
|
dictviews_xor(PyObject* self, PyObject *other)
|
|
|
|
{
|
2020-06-10 02:56:56 -03:00
|
|
|
if (PyDictItems_Check(self) && PyDictItems_Check(other)) {
|
|
|
|
return dictitems_xor(self, other);
|
|
|
|
}
|
2019-11-07 11:59:04 -04:00
|
|
|
PyObject *result = dictviews_to_set(self);
|
|
|
|
if (result == NULL) {
|
2010-05-09 12:52:27 -03:00
|
|
|
return NULL;
|
2019-11-07 11:59:04 -04:00
|
|
|
}
|
2007-08-24 20:41:22 -03:00
|
|
|
|
2022-02-08 16:39:07 -04:00
|
|
|
PyObject *tmp = PyObject_CallMethodOneArg(
|
|
|
|
result, &_Py_ID(symmetric_difference_update), other);
|
2010-05-09 12:52:27 -03:00
|
|
|
if (tmp == NULL) {
|
|
|
|
Py_DECREF(result);
|
|
|
|
return NULL;
|
|
|
|
}
|
2007-08-24 20:41:22 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_DECREF(tmp);
|
|
|
|
return result;
|
2007-08-24 20:41:22 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyNumberMethods dictviews_as_number = {
|
2010-05-09 12:52:27 -03:00
|
|
|
0, /*nb_add*/
|
|
|
|
(binaryfunc)dictviews_sub, /*nb_subtract*/
|
|
|
|
0, /*nb_multiply*/
|
|
|
|
0, /*nb_remainder*/
|
|
|
|
0, /*nb_divmod*/
|
|
|
|
0, /*nb_power*/
|
|
|
|
0, /*nb_negative*/
|
|
|
|
0, /*nb_positive*/
|
|
|
|
0, /*nb_absolute*/
|
|
|
|
0, /*nb_bool*/
|
|
|
|
0, /*nb_invert*/
|
|
|
|
0, /*nb_lshift*/
|
|
|
|
0, /*nb_rshift*/
|
2015-05-05 21:16:41 -03:00
|
|
|
(binaryfunc)_PyDictView_Intersect, /*nb_and*/
|
2010-05-09 12:52:27 -03:00
|
|
|
(binaryfunc)dictviews_xor, /*nb_xor*/
|
|
|
|
(binaryfunc)dictviews_or, /*nb_or*/
|
2007-08-24 20:41:22 -03:00
|
|
|
};
|
|
|
|
|
2010-09-02 12:06:06 -03:00
|
|
|
static PyObject*
|
|
|
|
dictviews_isdisjoint(PyObject *self, PyObject *other)
|
|
|
|
{
|
|
|
|
PyObject *it;
|
|
|
|
PyObject *item = NULL;
|
|
|
|
|
|
|
|
if (self == other) {
|
2024-01-02 10:32:37 -04:00
|
|
|
if (dictview_len(self) == 0)
|
2010-09-02 12:06:06 -03:00
|
|
|
Py_RETURN_TRUE;
|
|
|
|
else
|
|
|
|
Py_RETURN_FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Iterate over the shorter object (only if other is a set,
|
|
|
|
* because PySequence_Contains may be expensive otherwise): */
|
|
|
|
if (PyAnySet_Check(other) || PyDictViewSet_Check(other)) {
|
2024-01-02 10:32:37 -04:00
|
|
|
Py_ssize_t len_self = dictview_len(self);
|
2010-09-02 12:06:06 -03:00
|
|
|
Py_ssize_t len_other = PyObject_Size(other);
|
|
|
|
if (len_other == -1)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if ((len_other > len_self)) {
|
|
|
|
PyObject *tmp = other;
|
|
|
|
other = self;
|
|
|
|
self = tmp;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
it = PyObject_GetIter(other);
|
|
|
|
if (it == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
while ((item = PyIter_Next(it)) != NULL) {
|
|
|
|
int contains = PySequence_Contains(self, item);
|
|
|
|
Py_DECREF(item);
|
|
|
|
if (contains == -1) {
|
|
|
|
Py_DECREF(it);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (contains) {
|
|
|
|
Py_DECREF(it);
|
|
|
|
Py_RETURN_FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Py_DECREF(it);
|
|
|
|
if (PyErr_Occurred())
|
|
|
|
return NULL; /* PyIter_Next raised an exception. */
|
|
|
|
Py_RETURN_TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyDoc_STRVAR(isdisjoint_doc,
|
|
|
|
"Return True if the view and the given iterable have a null intersection.");
|
|
|
|
|
2024-01-02 10:32:37 -04:00
|
|
|
static PyObject* dictkeys_reversed(PyObject *dv, PyObject *Py_UNUSED(ignored));
|
2018-11-05 20:38:54 -04:00
|
|
|
|
|
|
|
PyDoc_STRVAR(reversed_keys_doc,
|
|
|
|
"Return a reverse iterator over the dict keys.");
|
|
|
|
|
2007-02-09 21:11:45 -04:00
|
|
|
static PyMethodDef dictkeys_methods[] = {
|
2024-01-02 10:32:37 -04:00
|
|
|
{"isdisjoint", dictviews_isdisjoint, METH_O,
|
2010-09-02 12:06:06 -03:00
|
|
|
isdisjoint_doc},
|
2024-01-02 10:32:37 -04:00
|
|
|
{"__reversed__", dictkeys_reversed, METH_NOARGS,
|
2018-11-05 20:38:54 -04:00
|
|
|
reversed_keys_doc},
|
2010-05-09 12:52:27 -03:00
|
|
|
{NULL, NULL} /* sentinel */
|
2007-02-09 21:11:45 -04:00
|
|
|
};
|
|
|
|
|
|
|
|
PyTypeObject PyDictKeys_Type = {
|
2010-05-09 12:52:27 -03:00
|
|
|
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
|
|
|
"dict_keys", /* tp_name */
|
2015-05-30 01:21:39 -03:00
|
|
|
sizeof(_PyDictViewObject), /* tp_basicsize */
|
2010-05-09 12:52:27 -03:00
|
|
|
0, /* tp_itemsize */
|
|
|
|
/* methods */
|
2024-01-02 10:32:37 -04:00
|
|
|
dictview_dealloc, /* tp_dealloc */
|
2019-05-30 23:13:39 -03:00
|
|
|
0, /* tp_vectorcall_offset */
|
2010-05-09 12:52:27 -03:00
|
|
|
0, /* tp_getattr */
|
|
|
|
0, /* tp_setattr */
|
2019-05-30 23:13:39 -03:00
|
|
|
0, /* tp_as_async */
|
2024-01-02 10:32:37 -04:00
|
|
|
dictview_repr, /* tp_repr */
|
2010-05-09 12:52:27 -03:00
|
|
|
&dictviews_as_number, /* tp_as_number */
|
|
|
|
&dictkeys_as_sequence, /* tp_as_sequence */
|
|
|
|
0, /* tp_as_mapping */
|
|
|
|
0, /* tp_hash */
|
|
|
|
0, /* tp_call */
|
|
|
|
0, /* tp_str */
|
|
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
|
|
0, /* tp_setattro */
|
|
|
|
0, /* tp_as_buffer */
|
|
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */
|
|
|
|
0, /* tp_doc */
|
2024-01-02 10:32:37 -04:00
|
|
|
dictview_traverse, /* tp_traverse */
|
2010-05-09 12:52:27 -03:00
|
|
|
0, /* tp_clear */
|
|
|
|
dictview_richcompare, /* tp_richcompare */
|
|
|
|
0, /* tp_weaklistoffset */
|
2024-01-02 10:32:37 -04:00
|
|
|
dictkeys_iter, /* tp_iter */
|
2010-05-09 12:52:27 -03:00
|
|
|
0, /* tp_iternext */
|
|
|
|
dictkeys_methods, /* tp_methods */
|
2020-06-12 14:19:25 -03:00
|
|
|
.tp_getset = dictview_getset,
|
2007-02-09 21:11:45 -04:00
|
|
|
};
|
|
|
|
|
2024-01-23 18:10:04 -04:00
|
|
|
/*[clinic input]
|
|
|
|
dict.keys
|
|
|
|
|
|
|
|
Return a set-like object providing a view on the dict's keys.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
2007-02-09 21:11:45 -04:00
|
|
|
static PyObject *
|
2024-01-23 18:10:04 -04:00
|
|
|
dict_keys_impl(PyDictObject *self)
|
|
|
|
/*[clinic end generated code: output=aac2830c62990358 input=42f48a7a771212a7]*/
|
2007-02-09 21:11:45 -04:00
|
|
|
{
|
2024-01-23 18:10:04 -04:00
|
|
|
return _PyDictView_New((PyObject *)self, &PyDictKeys_Type);
|
2007-02-09 21:11:45 -04:00
|
|
|
}
|
|
|
|
|
2018-11-05 20:38:54 -04:00
|
|
|
static PyObject *
|
2024-01-02 10:32:37 -04:00
|
|
|
dictkeys_reversed(PyObject *self, PyObject *Py_UNUSED(ignored))
|
2018-11-05 20:38:54 -04:00
|
|
|
{
|
2024-01-02 10:32:37 -04:00
|
|
|
_PyDictViewObject *dv = (_PyDictViewObject *)self;
|
2018-11-05 20:38:54 -04:00
|
|
|
if (dv->dv_dict == NULL) {
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
return dictiter_new(dv->dv_dict, &PyDictRevIterKey_Type);
|
|
|
|
}
|
|
|
|
|
2007-02-10 14:55:06 -04:00
|
|
|
/*** dict_items ***/
|
2007-02-09 21:11:45 -04:00
|
|
|
|
|
|
|
static PyObject *
|
2024-01-02 10:32:37 -04:00
|
|
|
dictitems_iter(PyObject *self)
|
2007-02-09 21:11:45 -04:00
|
|
|
{
|
2024-01-02 10:32:37 -04:00
|
|
|
_PyDictViewObject *dv = (_PyDictViewObject *)self;
|
2010-05-09 12:52:27 -03:00
|
|
|
if (dv->dv_dict == NULL) {
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
return dictiter_new(dv->dv_dict, &PyDictIterItem_Type);
|
2007-02-10 14:55:06 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2024-01-02 10:32:37 -04:00
|
|
|
dictitems_contains(PyObject *self, PyObject *obj)
|
2007-02-10 14:55:06 -04:00
|
|
|
{
|
2024-01-02 10:32:37 -04:00
|
|
|
_PyDictViewObject *dv = (_PyDictViewObject *)self;
|
2017-05-20 06:30:02 -03:00
|
|
|
int result;
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject *key, *value, *found;
|
|
|
|
if (dv->dv_dict == NULL)
|
|
|
|
return 0;
|
|
|
|
if (!PyTuple_Check(obj) || PyTuple_GET_SIZE(obj) != 2)
|
|
|
|
return 0;
|
|
|
|
key = PyTuple_GET_ITEM(obj, 0);
|
|
|
|
value = PyTuple_GET_ITEM(obj, 1);
|
2023-07-21 18:10:51 -03:00
|
|
|
result = PyDict_GetItemRef((PyObject *)dv->dv_dict, key, &found);
|
|
|
|
if (result == 1) {
|
|
|
|
result = PyObject_RichCompareBool(found, value, Py_EQ);
|
|
|
|
Py_DECREF(found);
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2017-05-20 06:30:02 -03:00
|
|
|
return result;
|
2007-02-09 21:11:45 -04:00
|
|
|
}
|
|
|
|
|
2007-02-10 00:54:19 -04:00
|
|
|
static PySequenceMethods dictitems_as_sequence = {
|
2024-01-02 10:32:37 -04:00
|
|
|
dictview_len, /* sq_length */
|
2010-05-09 12:52:27 -03:00
|
|
|
0, /* sq_concat */
|
|
|
|
0, /* sq_repeat */
|
|
|
|
0, /* sq_item */
|
|
|
|
0, /* sq_slice */
|
|
|
|
0, /* sq_ass_item */
|
|
|
|
0, /* sq_ass_slice */
|
2024-01-02 10:32:37 -04:00
|
|
|
dictitems_contains, /* sq_contains */
|
2007-02-10 00:54:19 -04:00
|
|
|
};
|
|
|
|
|
2024-01-02 10:32:37 -04:00
|
|
|
static PyObject* dictitems_reversed(PyObject *dv, PyObject *Py_UNUSED(ignored));
|
2018-11-05 20:38:54 -04:00
|
|
|
|
|
|
|
PyDoc_STRVAR(reversed_items_doc,
|
|
|
|
"Return a reverse iterator over the dict items.");
|
|
|
|
|
2007-02-09 21:11:45 -04:00
|
|
|
static PyMethodDef dictitems_methods[] = {
|
2024-01-02 10:32:37 -04:00
|
|
|
{"isdisjoint", dictviews_isdisjoint, METH_O,
|
2010-09-02 12:06:06 -03:00
|
|
|
isdisjoint_doc},
|
2024-01-02 10:32:37 -04:00
|
|
|
{"__reversed__", dictitems_reversed, METH_NOARGS,
|
2018-11-05 20:38:54 -04:00
|
|
|
reversed_items_doc},
|
2010-05-09 12:52:27 -03:00
|
|
|
{NULL, NULL} /* sentinel */
|
2007-02-09 21:11:45 -04:00
|
|
|
};
|
|
|
|
|
|
|
|
PyTypeObject PyDictItems_Type = {
|
2010-05-09 12:52:27 -03:00
|
|
|
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
|
|
|
"dict_items", /* tp_name */
|
2015-05-30 01:21:39 -03:00
|
|
|
sizeof(_PyDictViewObject), /* tp_basicsize */
|
2010-05-09 12:52:27 -03:00
|
|
|
0, /* tp_itemsize */
|
|
|
|
/* methods */
|
2024-01-02 10:32:37 -04:00
|
|
|
dictview_dealloc, /* tp_dealloc */
|
2019-05-30 23:13:39 -03:00
|
|
|
0, /* tp_vectorcall_offset */
|
2010-05-09 12:52:27 -03:00
|
|
|
0, /* tp_getattr */
|
|
|
|
0, /* tp_setattr */
|
2019-05-30 23:13:39 -03:00
|
|
|
0, /* tp_as_async */
|
2024-01-02 10:32:37 -04:00
|
|
|
dictview_repr, /* tp_repr */
|
2010-05-09 12:52:27 -03:00
|
|
|
&dictviews_as_number, /* tp_as_number */
|
|
|
|
&dictitems_as_sequence, /* tp_as_sequence */
|
|
|
|
0, /* tp_as_mapping */
|
|
|
|
0, /* tp_hash */
|
|
|
|
0, /* tp_call */
|
|
|
|
0, /* tp_str */
|
|
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
|
|
0, /* tp_setattro */
|
|
|
|
0, /* tp_as_buffer */
|
|
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */
|
|
|
|
0, /* tp_doc */
|
2024-01-02 10:32:37 -04:00
|
|
|
dictview_traverse, /* tp_traverse */
|
2010-05-09 12:52:27 -03:00
|
|
|
0, /* tp_clear */
|
|
|
|
dictview_richcompare, /* tp_richcompare */
|
|
|
|
0, /* tp_weaklistoffset */
|
2024-01-02 10:32:37 -04:00
|
|
|
dictitems_iter, /* tp_iter */
|
2010-05-09 12:52:27 -03:00
|
|
|
0, /* tp_iternext */
|
|
|
|
dictitems_methods, /* tp_methods */
|
2020-06-12 14:19:25 -03:00
|
|
|
.tp_getset = dictview_getset,
|
2007-02-09 21:11:45 -04:00
|
|
|
};
|
|
|
|
|
2024-01-23 18:10:04 -04:00
|
|
|
/*[clinic input]
|
|
|
|
dict.items
|
|
|
|
|
|
|
|
Return a set-like object providing a view on the dict's items.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
2007-02-09 21:11:45 -04:00
|
|
|
static PyObject *
|
2024-01-23 18:10:04 -04:00
|
|
|
dict_items_impl(PyDictObject *self)
|
|
|
|
/*[clinic end generated code: output=88c7db7150c7909a input=87c822872eb71f5a]*/
|
2007-02-09 21:11:45 -04:00
|
|
|
{
|
2024-01-23 18:10:04 -04:00
|
|
|
return _PyDictView_New((PyObject *)self, &PyDictItems_Type);
|
2007-02-09 21:11:45 -04:00
|
|
|
}
|
|
|
|
|
2018-11-05 20:38:54 -04:00
|
|
|
static PyObject *
|
2024-01-02 10:32:37 -04:00
|
|
|
dictitems_reversed(PyObject *self, PyObject *Py_UNUSED(ignored))
|
2018-11-05 20:38:54 -04:00
|
|
|
{
|
2024-01-02 10:32:37 -04:00
|
|
|
_PyDictViewObject *dv = (_PyDictViewObject *)self;
|
2018-11-05 20:38:54 -04:00
|
|
|
if (dv->dv_dict == NULL) {
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
return dictiter_new(dv->dv_dict, &PyDictRevIterItem_Type);
|
|
|
|
}
|
|
|
|
|
2007-02-10 14:55:06 -04:00
|
|
|
/*** dict_values ***/
|
2007-02-09 21:11:45 -04:00
|
|
|
|
|
|
|
static PyObject *
|
2024-01-02 10:32:37 -04:00
|
|
|
dictvalues_iter(PyObject *self)
|
2007-02-09 21:11:45 -04:00
|
|
|
{
|
2024-01-02 10:32:37 -04:00
|
|
|
_PyDictViewObject *dv = (_PyDictViewObject *)self;
|
2010-05-09 12:52:27 -03:00
|
|
|
if (dv->dv_dict == NULL) {
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
return dictiter_new(dv->dv_dict, &PyDictIterValue_Type);
|
2007-02-09 21:11:45 -04:00
|
|
|
}
|
|
|
|
|
2007-02-10 00:54:19 -04:00
|
|
|
static PySequenceMethods dictvalues_as_sequence = {
|
2024-01-02 10:32:37 -04:00
|
|
|
dictview_len, /* sq_length */
|
2010-05-09 12:52:27 -03:00
|
|
|
0, /* sq_concat */
|
|
|
|
0, /* sq_repeat */
|
|
|
|
0, /* sq_item */
|
|
|
|
0, /* sq_slice */
|
|
|
|
0, /* sq_ass_item */
|
|
|
|
0, /* sq_ass_slice */
|
|
|
|
(objobjproc)0, /* sq_contains */
|
2007-02-10 00:54:19 -04:00
|
|
|
};
|
|
|
|
|
2024-01-02 10:32:37 -04:00
|
|
|
static PyObject* dictvalues_reversed(PyObject *dv, PyObject *Py_UNUSED(ignored));
|
2018-11-05 20:38:54 -04:00
|
|
|
|
|
|
|
PyDoc_STRVAR(reversed_values_doc,
|
|
|
|
"Return a reverse iterator over the dict values.");
|
|
|
|
|
2007-02-09 21:11:45 -04:00
|
|
|
static PyMethodDef dictvalues_methods[] = {
|
2024-01-02 10:32:37 -04:00
|
|
|
{"__reversed__", dictvalues_reversed, METH_NOARGS,
|
2018-11-05 20:38:54 -04:00
|
|
|
reversed_values_doc},
|
2010-05-09 12:52:27 -03:00
|
|
|
{NULL, NULL} /* sentinel */
|
2007-02-09 21:11:45 -04:00
|
|
|
};
|
|
|
|
|
|
|
|
PyTypeObject PyDictValues_Type = {
|
2010-05-09 12:52:27 -03:00
|
|
|
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
|
|
|
"dict_values", /* tp_name */
|
2015-05-30 01:21:39 -03:00
|
|
|
sizeof(_PyDictViewObject), /* tp_basicsize */
|
2010-05-09 12:52:27 -03:00
|
|
|
0, /* tp_itemsize */
|
|
|
|
/* methods */
|
2024-01-02 10:32:37 -04:00
|
|
|
dictview_dealloc, /* tp_dealloc */
|
2019-05-30 23:13:39 -03:00
|
|
|
0, /* tp_vectorcall_offset */
|
2010-05-09 12:52:27 -03:00
|
|
|
0, /* tp_getattr */
|
|
|
|
0, /* tp_setattr */
|
2019-05-30 23:13:39 -03:00
|
|
|
0, /* tp_as_async */
|
2024-01-02 10:32:37 -04:00
|
|
|
dictview_repr, /* tp_repr */
|
2010-05-09 12:52:27 -03:00
|
|
|
0, /* tp_as_number */
|
|
|
|
&dictvalues_as_sequence, /* tp_as_sequence */
|
|
|
|
0, /* tp_as_mapping */
|
|
|
|
0, /* tp_hash */
|
|
|
|
0, /* tp_call */
|
|
|
|
0, /* tp_str */
|
|
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
|
|
0, /* tp_setattro */
|
|
|
|
0, /* tp_as_buffer */
|
|
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */
|
|
|
|
0, /* tp_doc */
|
2024-01-02 10:32:37 -04:00
|
|
|
dictview_traverse, /* tp_traverse */
|
2010-05-09 12:52:27 -03:00
|
|
|
0, /* tp_clear */
|
|
|
|
0, /* tp_richcompare */
|
|
|
|
0, /* tp_weaklistoffset */
|
2024-01-02 10:32:37 -04:00
|
|
|
dictvalues_iter, /* tp_iter */
|
2010-05-09 12:52:27 -03:00
|
|
|
0, /* tp_iternext */
|
|
|
|
dictvalues_methods, /* tp_methods */
|
2020-06-12 14:19:25 -03:00
|
|
|
.tp_getset = dictview_getset,
|
2007-02-09 21:11:45 -04:00
|
|
|
};
|
|
|
|
|
2024-01-23 18:10:04 -04:00
|
|
|
/*[clinic input]
|
|
|
|
dict.values
|
|
|
|
|
|
|
|
Return an object providing a view on the dict's values.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
2007-02-09 21:11:45 -04:00
|
|
|
static PyObject *
|
2024-01-23 18:10:04 -04:00
|
|
|
dict_values_impl(PyDictObject *self)
|
|
|
|
/*[clinic end generated code: output=ce9f2e9e8a959dd4 input=b46944f85493b230]*/
|
2007-02-09 21:11:45 -04:00
|
|
|
{
|
2024-01-23 18:10:04 -04:00
|
|
|
return _PyDictView_New((PyObject *)self, &PyDictValues_Type);
|
2007-02-09 21:11:45 -04:00
|
|
|
}
|
2012-04-23 12:24:50 -03:00
|
|
|
|
2018-11-05 20:38:54 -04:00
|
|
|
static PyObject *
|
2024-01-02 10:32:37 -04:00
|
|
|
dictvalues_reversed(PyObject *self, PyObject *Py_UNUSED(ignored))
|
2018-11-05 20:38:54 -04:00
|
|
|
{
|
2024-01-02 10:32:37 -04:00
|
|
|
_PyDictViewObject *dv = (_PyDictViewObject *)self;
|
2018-11-05 20:38:54 -04:00
|
|
|
if (dv->dv_dict == NULL) {
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
return dictiter_new(dv->dv_dict, &PyDictRevIterValue_Type);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-04-23 12:24:50 -03:00
|
|
|
/* Returns NULL if cannot allocate a new PyDictKeysObject,
|
|
|
|
but does not set an error */
|
|
|
|
PyDictKeysObject *
|
2024-08-27 06:34:46 -03:00
|
|
|
_PyDict_NewKeysForClass(PyHeapTypeObject *cls)
|
2012-04-23 12:24:50 -03:00
|
|
|
{
|
2023-03-09 11:16:30 -04:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
2024-08-27 06:34:46 -03:00
|
|
|
|
2023-03-09 11:16:30 -04:00
|
|
|
PyDictKeysObject *keys = new_keys_object(
|
|
|
|
interp, NEXT_LOG2_SHARED_KEYS_MAX_SIZE, 1);
|
2021-04-10 18:15:32 -03:00
|
|
|
if (keys == NULL) {
|
2012-04-23 12:24:50 -03:00
|
|
|
PyErr_Clear();
|
2021-04-10 18:15:32 -03:00
|
|
|
}
|
|
|
|
else {
|
2021-10-13 10:19:34 -03:00
|
|
|
assert(keys->dk_nentries == 0);
|
|
|
|
/* Set to max size+1 as it will shrink by one before each new object */
|
|
|
|
keys->dk_usable = SHARED_KEYS_MAX_SIZE;
|
2021-05-28 05:54:10 -03:00
|
|
|
keys->dk_kind = DICT_KEYS_SPLIT;
|
2021-04-10 18:15:32 -03:00
|
|
|
}
|
2024-08-27 06:34:46 -03:00
|
|
|
if (cls->ht_type.tp_dict) {
|
|
|
|
PyObject *attrs = PyDict_GetItem(cls->ht_type.tp_dict, &_Py_ID(__static_attributes__));
|
|
|
|
if (attrs != NULL && PyTuple_Check(attrs)) {
|
|
|
|
for (Py_ssize_t i = 0; i < PyTuple_GET_SIZE(attrs); i++) {
|
|
|
|
PyObject *key = PyTuple_GET_ITEM(attrs, i);
|
|
|
|
Py_hash_t hash;
|
|
|
|
if (PyUnicode_CheckExact(key) && (hash = unicode_get_hash(key)) != -1) {
|
|
|
|
if (insert_split_key(keys, key, hash) == DKIX_EMPTY) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2012-04-23 12:24:50 -03:00
|
|
|
return keys;
|
|
|
|
}
|
|
|
|
|
2024-04-02 07:59:21 -03:00
|
|
|
void
|
2023-06-22 05:48:19 -03:00
|
|
|
_PyObject_InitInlineValues(PyObject *obj, PyTypeObject *tp)
|
2021-10-13 10:19:34 -03:00
|
|
|
{
|
|
|
|
assert(tp->tp_flags & Py_TPFLAGS_HEAPTYPE);
|
2024-04-02 07:59:21 -03:00
|
|
|
assert(tp->tp_flags & Py_TPFLAGS_INLINE_VALUES);
|
2021-12-07 12:02:53 -04:00
|
|
|
assert(tp->tp_flags & Py_TPFLAGS_MANAGED_DICT);
|
2021-10-13 10:19:34 -03:00
|
|
|
PyDictKeysObject *keys = CACHED_KEYS(tp);
|
|
|
|
assert(keys != NULL);
|
2024-04-02 07:59:21 -03:00
|
|
|
OBJECT_STAT_INC(inline_values);
|
2024-02-20 20:40:37 -04:00
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
Py_ssize_t usable = _Py_atomic_load_ssize_relaxed(&keys->dk_usable);
|
|
|
|
if (usable > 1) {
|
|
|
|
LOCK_KEYS(keys);
|
|
|
|
if (keys->dk_usable > 1) {
|
|
|
|
_Py_atomic_store_ssize(&keys->dk_usable, keys->dk_usable - 1);
|
|
|
|
}
|
|
|
|
UNLOCK_KEYS(keys);
|
|
|
|
}
|
|
|
|
#else
|
2021-10-13 10:19:34 -03:00
|
|
|
if (keys->dk_usable > 1) {
|
|
|
|
keys->dk_usable--;
|
|
|
|
}
|
2024-02-20 20:40:37 -04:00
|
|
|
#endif
|
2022-11-29 07:12:17 -04:00
|
|
|
size_t size = shared_keys_usable_size(keys);
|
2024-04-02 07:59:21 -03:00
|
|
|
PyDictValues *values = _PyObject_InlineValues(obj);
|
|
|
|
assert(size < 256);
|
|
|
|
values->capacity = (uint8_t)size;
|
|
|
|
values->size = 0;
|
|
|
|
values->embedded = 1;
|
|
|
|
values->valid = 1;
|
2022-11-29 07:12:17 -04:00
|
|
|
for (size_t i = 0; i < size; i++) {
|
2021-10-13 10:19:34 -03:00
|
|
|
values->values[i] = NULL;
|
|
|
|
}
|
2024-04-02 07:59:21 -03:00
|
|
|
_PyObject_ManagedDictPointer(obj)->dict = NULL;
|
2021-08-04 12:41:14 -03:00
|
|
|
}
|
|
|
|
|
2024-04-02 07:59:21 -03:00
|
|
|
static PyDictObject *
|
2023-03-09 11:16:30 -04:00
|
|
|
make_dict_from_instance_attributes(PyInterpreterState *interp,
|
|
|
|
PyDictKeysObject *keys, PyDictValues *values)
|
2021-10-13 10:19:34 -03:00
|
|
|
{
|
|
|
|
dictkeys_incref(keys);
|
|
|
|
Py_ssize_t used = 0;
|
2022-11-29 07:12:17 -04:00
|
|
|
size_t size = shared_keys_usable_size(keys);
|
|
|
|
for (size_t i = 0; i < size; i++) {
|
2021-10-13 10:19:34 -03:00
|
|
|
PyObject *val = values->values[i];
|
|
|
|
if (val != NULL) {
|
|
|
|
used += 1;
|
|
|
|
}
|
|
|
|
}
|
2024-04-02 07:59:21 -03:00
|
|
|
PyDictObject *res = (PyDictObject *)new_dict(interp, keys, values, used, 0);
|
2021-10-13 10:19:34 -03:00
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2024-07-10 15:02:08 -03:00
|
|
|
PyDictObject *
|
|
|
|
_PyObject_MaterializeManagedDict_LockHeld(PyObject *obj)
|
2021-10-13 10:19:34 -03:00
|
|
|
{
|
2024-07-10 15:02:08 -03:00
|
|
|
ASSERT_WORLD_STOPPED_OR_OBJ_LOCKED(obj);
|
2024-04-22 02:57:05 -03:00
|
|
|
|
2022-02-01 11:05:18 -04:00
|
|
|
OBJECT_STAT_INC(dict_materialized_on_request);
|
2024-07-16 15:58:36 -03:00
|
|
|
|
|
|
|
PyDictValues *values = _PyObject_InlineValues(obj);
|
|
|
|
PyDictObject *dict;
|
|
|
|
if (values->valid) {
|
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
|
|
|
PyDictKeysObject *keys = CACHED_KEYS(Py_TYPE(obj));
|
|
|
|
dict = make_dict_from_instance_attributes(interp, keys, values);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
dict = (PyDictObject *)PyDict_New();
|
|
|
|
}
|
2024-04-22 02:57:05 -03:00
|
|
|
FT_ATOMIC_STORE_PTR_RELEASE(_PyObject_ManagedDictPointer(obj)->dict,
|
2024-07-16 15:58:36 -03:00
|
|
|
dict);
|
2024-04-22 02:57:05 -03:00
|
|
|
return dict;
|
2021-10-13 10:19:34 -03:00
|
|
|
}
|
|
|
|
|
2024-04-22 02:57:05 -03:00
|
|
|
PyDictObject *
|
|
|
|
_PyObject_MaterializeManagedDict(PyObject *obj)
|
|
|
|
{
|
|
|
|
PyDictObject *dict = _PyObject_GetManagedDict(obj);
|
|
|
|
if (dict != NULL) {
|
|
|
|
return dict;
|
|
|
|
}
|
2024-02-20 21:08:14 -04:00
|
|
|
|
2024-04-22 02:57:05 -03:00
|
|
|
Py_BEGIN_CRITICAL_SECTION(obj);
|
2023-08-09 16:14:50 -03:00
|
|
|
|
2024-04-22 02:57:05 -03:00
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
dict = _PyObject_GetManagedDict(obj);
|
|
|
|
if (dict != NULL) {
|
|
|
|
// We raced with another thread creating the dict
|
|
|
|
goto exit;
|
|
|
|
}
|
|
|
|
#endif
|
2024-07-10 15:02:08 -03:00
|
|
|
dict = _PyObject_MaterializeManagedDict_LockHeld(obj);
|
2024-04-22 02:57:05 -03:00
|
|
|
|
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
exit:
|
|
|
|
#endif
|
|
|
|
Py_END_CRITICAL_SECTION();
|
|
|
|
return dict;
|
|
|
|
}
|
|
|
|
|
2024-05-06 14:50:35 -03:00
|
|
|
int
|
|
|
|
_PyDict_SetItem_LockHeld(PyDictObject *dict, PyObject *name, PyObject *value)
|
2024-04-22 02:57:05 -03:00
|
|
|
{
|
|
|
|
if (value == NULL) {
|
2024-07-01 16:11:39 -03:00
|
|
|
Py_hash_t hash = _PyObject_HashFast(name);
|
|
|
|
if (hash == -1) {
|
|
|
|
return -1;
|
2024-04-22 02:57:05 -03:00
|
|
|
}
|
|
|
|
return delitem_knownhash_lock_held((PyObject *)dict, name, hash);
|
|
|
|
} else {
|
|
|
|
return setitem_lock_held(dict, name, value);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Called with either the object's lock or the dict's lock held
|
|
|
|
// depending on whether or not a dict has been materialized for
|
|
|
|
// the object.
|
|
|
|
static int
|
|
|
|
store_instance_attr_lock_held(PyObject *obj, PyDictValues *values,
|
2021-10-13 10:19:34 -03:00
|
|
|
PyObject *name, PyObject *value)
|
|
|
|
{
|
|
|
|
PyDictKeysObject *keys = CACHED_KEYS(Py_TYPE(obj));
|
|
|
|
assert(keys != NULL);
|
|
|
|
assert(values != NULL);
|
2024-04-02 07:59:21 -03:00
|
|
|
assert(Py_TYPE(obj)->tp_flags & Py_TPFLAGS_INLINE_VALUES);
|
2022-03-04 07:31:29 -04:00
|
|
|
Py_ssize_t ix = DKIX_EMPTY;
|
2024-04-22 02:57:05 -03:00
|
|
|
PyDictObject *dict = _PyObject_GetManagedDict(obj);
|
|
|
|
assert(dict == NULL || ((PyDictObject *)dict)->ma_values == values);
|
2022-03-04 07:31:29 -04:00
|
|
|
if (PyUnicode_CheckExact(name)) {
|
2024-02-29 17:38:50 -04:00
|
|
|
Py_hash_t hash = unicode_get_hash(name);
|
|
|
|
if (hash == -1) {
|
|
|
|
hash = PyUnicode_Type.tp_hash(name);
|
|
|
|
assert(hash != -1);
|
|
|
|
}
|
|
|
|
|
2024-04-25 19:34:05 -03:00
|
|
|
ix = insert_split_key(keys, name, hash);
|
2024-02-29 17:38:50 -04:00
|
|
|
|
2022-02-01 11:05:18 -04:00
|
|
|
#ifdef Py_STATS
|
2024-02-20 20:40:37 -04:00
|
|
|
if (ix == DKIX_EMPTY) {
|
|
|
|
if (PyUnicode_CheckExact(name)) {
|
|
|
|
if (shared_keys_usable_size(keys) == SHARED_KEYS_MAX_SIZE) {
|
|
|
|
OBJECT_STAT_INC(dict_materialized_too_big);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
OBJECT_STAT_INC(dict_materialized_new_key);
|
|
|
|
}
|
2022-03-04 07:31:29 -04:00
|
|
|
}
|
|
|
|
else {
|
2024-02-20 20:40:37 -04:00
|
|
|
OBJECT_STAT_INC(dict_materialized_str_subclass);
|
2022-03-04 07:31:29 -04:00
|
|
|
}
|
2022-02-01 11:05:18 -04:00
|
|
|
}
|
|
|
|
#endif
|
2024-02-20 20:40:37 -04:00
|
|
|
}
|
2024-04-22 02:57:05 -03:00
|
|
|
|
2024-02-20 20:40:37 -04:00
|
|
|
if (ix == DKIX_EMPTY) {
|
2024-04-22 02:57:05 -03:00
|
|
|
int res;
|
2021-10-13 10:19:34 -03:00
|
|
|
if (dict == NULL) {
|
2024-04-22 02:57:05 -03:00
|
|
|
// Make the dict but don't publish it in the object
|
|
|
|
// so that no one else will see it.
|
|
|
|
dict = make_dict_from_instance_attributes(PyInterpreterState_Get(), keys, values);
|
|
|
|
if (dict == NULL ||
|
2024-05-06 14:50:35 -03:00
|
|
|
_PyDict_SetItem_LockHeld(dict, name, value) < 0) {
|
2024-04-22 02:57:05 -03:00
|
|
|
Py_XDECREF(dict);
|
2024-04-02 07:59:21 -03:00
|
|
|
return -1;
|
|
|
|
}
|
2024-04-22 02:57:05 -03:00
|
|
|
|
|
|
|
FT_ATOMIC_STORE_PTR_RELEASE(_PyObject_ManagedDictPointer(obj)->dict,
|
|
|
|
(PyDictObject *)dict);
|
|
|
|
return 0;
|
2022-03-04 07:31:29 -04:00
|
|
|
}
|
2024-04-22 02:57:05 -03:00
|
|
|
|
|
|
|
_Py_CRITICAL_SECTION_ASSERT_OBJECT_LOCKED(dict);
|
|
|
|
|
2024-05-06 14:50:35 -03:00
|
|
|
res = _PyDict_SetItem_LockHeld(dict, name, value);
|
2024-04-22 02:57:05 -03:00
|
|
|
return res;
|
2021-10-13 10:19:34 -03:00
|
|
|
}
|
2024-04-22 02:57:05 -03:00
|
|
|
|
2021-10-13 10:19:34 -03:00
|
|
|
PyObject *old_value = values->values[ix];
|
2024-10-21 09:23:38 -03:00
|
|
|
if (old_value == NULL && value == NULL) {
|
|
|
|
PyErr_Format(PyExc_AttributeError,
|
|
|
|
"'%.100s' object has no attribute '%U'",
|
|
|
|
Py_TYPE(obj)->tp_name, name);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (dict) {
|
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
|
|
|
PyDict_WatchEvent event = (old_value == NULL ? PyDict_EVENT_ADDED :
|
|
|
|
value == NULL ? PyDict_EVENT_DELETED :
|
|
|
|
PyDict_EVENT_MODIFIED);
|
|
|
|
_PyDict_NotifyEvent(interp, event, dict, name, value);
|
|
|
|
}
|
|
|
|
|
2024-04-22 02:57:05 -03:00
|
|
|
FT_ATOMIC_STORE_PTR_RELEASE(values->values[ix], Py_XNewRef(value));
|
|
|
|
|
2021-10-13 10:19:34 -03:00
|
|
|
if (old_value == NULL) {
|
2022-02-08 07:50:38 -04:00
|
|
|
_PyDictValues_AddToInsertionOrder(values, ix);
|
2024-04-02 07:59:21 -03:00
|
|
|
if (dict) {
|
|
|
|
assert(dict->ma_values == values);
|
2024-05-24 14:39:06 -03:00
|
|
|
STORE_USED(dict, dict->ma_used + 1);
|
2024-04-02 07:59:21 -03:00
|
|
|
}
|
2021-10-13 10:19:34 -03:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (value == NULL) {
|
2022-02-08 07:50:38 -04:00
|
|
|
delete_index_from_values(values, ix);
|
2024-04-02 07:59:21 -03:00
|
|
|
if (dict) {
|
|
|
|
assert(dict->ma_values == values);
|
2024-05-24 14:39:06 -03:00
|
|
|
STORE_USED(dict, dict->ma_used - 1);
|
2024-04-02 07:59:21 -03:00
|
|
|
}
|
2021-10-13 10:19:34 -03:00
|
|
|
}
|
|
|
|
Py_DECREF(old_value);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2024-04-22 02:57:05 -03:00
|
|
|
static inline int
|
|
|
|
store_instance_attr_dict(PyObject *obj, PyDictObject *dict, PyObject *name, PyObject *value)
|
|
|
|
{
|
|
|
|
PyDictValues *values = _PyObject_InlineValues(obj);
|
|
|
|
int res;
|
|
|
|
Py_BEGIN_CRITICAL_SECTION(dict);
|
|
|
|
if (dict->ma_values == values) {
|
|
|
|
res = store_instance_attr_lock_held(obj, values, name, value);
|
|
|
|
}
|
|
|
|
else {
|
2024-05-06 14:50:35 -03:00
|
|
|
res = _PyDict_SetItem_LockHeld(dict, name, value);
|
2024-04-22 02:57:05 -03:00
|
|
|
}
|
|
|
|
Py_END_CRITICAL_SECTION();
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
_PyObject_StoreInstanceAttribute(PyObject *obj, PyObject *name, PyObject *value)
|
|
|
|
{
|
|
|
|
PyDictValues *values = _PyObject_InlineValues(obj);
|
|
|
|
if (!FT_ATOMIC_LOAD_UINT8(values->valid)) {
|
|
|
|
PyDictObject *dict = _PyObject_GetManagedDict(obj);
|
|
|
|
if (dict == NULL) {
|
|
|
|
dict = (PyDictObject *)PyObject_GenericGetDict(obj, NULL);
|
|
|
|
if (dict == NULL) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
int res = store_instance_attr_dict(obj, dict, name, value);
|
|
|
|
Py_DECREF(dict);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
return store_instance_attr_dict(obj, dict, name, value);
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
// We have a valid inline values, at least for now... There are two potential
|
|
|
|
// races with having the values become invalid. One is the dictionary
|
|
|
|
// being detached from the object. The other is if someone is inserting
|
|
|
|
// into the dictionary directly and therefore causing it to resize.
|
|
|
|
//
|
|
|
|
// If we haven't materialized the dictionary yet we lock on the object, which
|
|
|
|
// will also be used to prevent the dictionary from being materialized while
|
|
|
|
// we're doing the insertion. If we race and the dictionary gets created
|
|
|
|
// then we'll need to release the object lock and lock the dictionary to
|
|
|
|
// prevent resizing.
|
|
|
|
PyDictObject *dict = _PyObject_GetManagedDict(obj);
|
|
|
|
if (dict == NULL) {
|
|
|
|
int res;
|
|
|
|
Py_BEGIN_CRITICAL_SECTION(obj);
|
|
|
|
dict = _PyObject_GetManagedDict(obj);
|
|
|
|
|
|
|
|
if (dict == NULL) {
|
|
|
|
res = store_instance_attr_lock_held(obj, values, name, value);
|
|
|
|
}
|
|
|
|
Py_END_CRITICAL_SECTION();
|
|
|
|
|
|
|
|
if (dict == NULL) {
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return store_instance_attr_dict(obj, dict, name, value);
|
|
|
|
#else
|
|
|
|
return store_instance_attr_lock_held(obj, values, name, value);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2022-08-01 10:34:54 -03:00
|
|
|
/* Sanity check for managed dicts */
|
|
|
|
#if 0
|
|
|
|
#define CHECK(val) assert(val); if (!(val)) { return 0; }
|
|
|
|
|
|
|
|
int
|
|
|
|
_PyObject_ManagedDictValidityCheck(PyObject *obj)
|
|
|
|
{
|
|
|
|
PyTypeObject *tp = Py_TYPE(obj);
|
|
|
|
CHECK(tp->tp_flags & Py_TPFLAGS_MANAGED_DICT);
|
2024-04-02 07:59:21 -03:00
|
|
|
PyManagedDictPointer *managed_dict = _PyObject_ManagedDictPointer(obj);
|
|
|
|
if (_PyManagedDictPointer_IsValues(*managed_dict)) {
|
|
|
|
PyDictValues *values = _PyManagedDictPointer_GetValues(*managed_dict);
|
2022-08-01 10:34:54 -03:00
|
|
|
int size = ((uint8_t *)values)[-2];
|
|
|
|
int count = 0;
|
|
|
|
PyDictKeysObject *keys = CACHED_KEYS(tp);
|
|
|
|
for (Py_ssize_t i = 0; i < keys->dk_nentries; i++) {
|
|
|
|
if (values->values[i] != NULL) {
|
|
|
|
count++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
CHECK(size == count);
|
|
|
|
}
|
|
|
|
else {
|
2024-04-02 07:59:21 -03:00
|
|
|
if (managed_dict->dict != NULL) {
|
|
|
|
CHECK(PyDict_Check(managed_dict->dict));
|
2022-08-01 10:34:54 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2024-04-22 02:57:05 -03:00
|
|
|
// Attempts to get an instance attribute from the inline values. Returns true
|
|
|
|
// if successful, or false if the caller needs to lookup in the dictionary.
|
|
|
|
bool
|
|
|
|
_PyObject_TryGetInstanceAttribute(PyObject *obj, PyObject *name, PyObject **attr)
|
2021-10-13 10:19:34 -03:00
|
|
|
{
|
|
|
|
assert(PyUnicode_CheckExact(name));
|
2024-04-22 02:57:05 -03:00
|
|
|
PyDictValues *values = _PyObject_InlineValues(obj);
|
|
|
|
if (!FT_ATOMIC_LOAD_UINT8(values->valid)) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2021-10-13 10:19:34 -03:00
|
|
|
PyDictKeysObject *keys = CACHED_KEYS(Py_TYPE(obj));
|
|
|
|
assert(keys != NULL);
|
|
|
|
Py_ssize_t ix = _PyDictKeys_StringLookup(keys, name);
|
|
|
|
if (ix == DKIX_EMPTY) {
|
2024-04-22 02:57:05 -03:00
|
|
|
*attr = NULL;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef Py_GIL_DISABLED
|
2024-04-25 12:53:29 -03:00
|
|
|
PyObject *value = _Py_atomic_load_ptr_acquire(&values->values[ix]);
|
2024-04-22 02:57:05 -03:00
|
|
|
if (value == NULL || _Py_TryIncrefCompare(&values->values[ix], value)) {
|
|
|
|
*attr = value;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyDictObject *dict = _PyObject_GetManagedDict(obj);
|
|
|
|
if (dict == NULL) {
|
|
|
|
// No dict, lock the object to prevent one from being
|
|
|
|
// materialized...
|
|
|
|
bool success = false;
|
|
|
|
Py_BEGIN_CRITICAL_SECTION(obj);
|
|
|
|
|
|
|
|
dict = _PyObject_GetManagedDict(obj);
|
|
|
|
if (dict == NULL) {
|
|
|
|
// Still no dict, we can read from the values
|
|
|
|
assert(values->valid);
|
|
|
|
value = values->values[ix];
|
2024-09-30 14:04:32 -03:00
|
|
|
*attr = _Py_XNewRefWithLock(value);
|
2024-04-22 02:57:05 -03:00
|
|
|
success = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
Py_END_CRITICAL_SECTION();
|
|
|
|
|
|
|
|
if (success) {
|
|
|
|
return true;
|
|
|
|
}
|
2021-10-13 10:19:34 -03:00
|
|
|
}
|
2024-04-22 02:57:05 -03:00
|
|
|
|
|
|
|
// We have a dictionary, we'll need to lock it to prevent
|
|
|
|
// the values from being resized.
|
|
|
|
assert(dict != NULL);
|
|
|
|
|
|
|
|
bool success;
|
|
|
|
Py_BEGIN_CRITICAL_SECTION(dict);
|
|
|
|
|
|
|
|
if (dict->ma_values == values && FT_ATOMIC_LOAD_UINT8(values->valid)) {
|
|
|
|
value = _Py_atomic_load_ptr_relaxed(&values->values[ix]);
|
2024-09-30 14:04:32 -03:00
|
|
|
*attr = _Py_XNewRefWithLock(value);
|
2024-04-22 02:57:05 -03:00
|
|
|
success = true;
|
|
|
|
} else {
|
|
|
|
// Caller needs to lookup from the dictionary
|
|
|
|
success = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
Py_END_CRITICAL_SECTION();
|
|
|
|
|
|
|
|
return success;
|
|
|
|
#else
|
2021-10-13 10:19:34 -03:00
|
|
|
PyObject *value = values->values[ix];
|
2024-04-22 02:57:05 -03:00
|
|
|
*attr = Py_XNewRef(value);
|
|
|
|
return true;
|
|
|
|
#endif
|
2021-10-13 10:19:34 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
_PyObject_IsInstanceDictEmpty(PyObject *obj)
|
|
|
|
{
|
|
|
|
PyTypeObject *tp = Py_TYPE(obj);
|
|
|
|
if (tp->tp_dictoffset == 0) {
|
|
|
|
return 1;
|
|
|
|
}
|
2024-04-02 07:59:21 -03:00
|
|
|
PyDictObject *dict;
|
|
|
|
if (tp->tp_flags & Py_TPFLAGS_INLINE_VALUES) {
|
|
|
|
PyDictValues *values = _PyObject_InlineValues(obj);
|
2024-04-22 02:57:05 -03:00
|
|
|
if (FT_ATOMIC_LOAD_UINT8(values->valid)) {
|
2021-12-07 12:02:53 -04:00
|
|
|
PyDictKeysObject *keys = CACHED_KEYS(tp);
|
|
|
|
for (Py_ssize_t i = 0; i < keys->dk_nentries; i++) {
|
2024-04-22 02:57:05 -03:00
|
|
|
if (FT_ATOMIC_LOAD_PTR_RELAXED(values->values[i]) != NULL) {
|
2021-12-07 12:02:53 -04:00
|
|
|
return 0;
|
|
|
|
}
|
2021-10-13 10:19:34 -03:00
|
|
|
}
|
2021-12-07 12:02:53 -04:00
|
|
|
return 1;
|
2021-10-13 10:19:34 -03:00
|
|
|
}
|
2024-04-22 02:57:05 -03:00
|
|
|
dict = _PyObject_GetManagedDict(obj);
|
2024-04-02 07:59:21 -03:00
|
|
|
}
|
|
|
|
else if (tp->tp_flags & Py_TPFLAGS_MANAGED_DICT) {
|
2024-04-22 02:57:05 -03:00
|
|
|
dict = _PyObject_GetManagedDict(obj);
|
2021-12-07 12:02:53 -04:00
|
|
|
}
|
|
|
|
else {
|
2022-08-01 10:34:54 -03:00
|
|
|
PyObject **dictptr = _PyObject_ComputedDictPointer(obj);
|
2024-04-02 07:59:21 -03:00
|
|
|
dict = (PyDictObject *)*dictptr;
|
2021-10-13 10:19:34 -03:00
|
|
|
}
|
|
|
|
if (dict == NULL) {
|
|
|
|
return 1;
|
|
|
|
}
|
2024-05-24 14:39:06 -03:00
|
|
|
return FT_ATOMIC_LOAD_SSIZE_RELAXED(((PyDictObject *)dict)->ma_used) == 0;
|
2021-10-13 10:19:34 -03:00
|
|
|
}
|
|
|
|
|
2022-07-25 18:30:53 -03:00
|
|
|
int
|
2023-10-02 14:24:08 -03:00
|
|
|
PyObject_VisitManagedDict(PyObject *obj, visitproc visit, void *arg)
|
2022-07-25 18:30:53 -03:00
|
|
|
{
|
2022-08-01 10:34:54 -03:00
|
|
|
PyTypeObject *tp = Py_TYPE(obj);
|
2022-07-25 18:30:53 -03:00
|
|
|
if((tp->tp_flags & Py_TPFLAGS_MANAGED_DICT) == 0) {
|
|
|
|
return 0;
|
|
|
|
}
|
2024-04-02 07:59:21 -03:00
|
|
|
if (tp->tp_flags & Py_TPFLAGS_INLINE_VALUES) {
|
|
|
|
PyDictValues *values = _PyObject_InlineValues(obj);
|
|
|
|
if (values->valid) {
|
|
|
|
for (Py_ssize_t i = 0; i < values->capacity; i++) {
|
|
|
|
Py_VISIT(values->values[i]);
|
|
|
|
}
|
|
|
|
return 0;
|
2022-08-01 10:34:54 -03:00
|
|
|
}
|
|
|
|
}
|
2024-04-02 07:59:21 -03:00
|
|
|
Py_VISIT(_PyObject_ManagedDictPointer(obj)->dict);
|
2022-07-25 18:30:53 -03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2024-04-22 02:57:05 -03:00
|
|
|
static void
|
|
|
|
set_dict_inline_values(PyObject *obj, PyDictObject *new_dict)
|
|
|
|
{
|
|
|
|
_Py_CRITICAL_SECTION_ASSERT_OBJECT_LOCKED(obj);
|
|
|
|
|
|
|
|
PyDictValues *values = _PyObject_InlineValues(obj);
|
|
|
|
|
|
|
|
Py_XINCREF(new_dict);
|
|
|
|
FT_ATOMIC_STORE_PTR(_PyObject_ManagedDictPointer(obj)->dict, new_dict);
|
|
|
|
|
|
|
|
if (values->valid) {
|
|
|
|
FT_ATOMIC_STORE_UINT8(values->valid, 0);
|
|
|
|
for (Py_ssize_t i = 0; i < values->capacity; i++) {
|
|
|
|
Py_CLEAR(values->values[i]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2024-04-29 16:49:01 -03:00
|
|
|
int
|
2024-04-22 02:57:05 -03:00
|
|
|
_PyObject_SetManagedDict(PyObject *obj, PyObject *new_dict)
|
2022-07-25 18:30:53 -03:00
|
|
|
{
|
2024-04-02 07:59:21 -03:00
|
|
|
assert(Py_TYPE(obj)->tp_flags & Py_TPFLAGS_MANAGED_DICT);
|
|
|
|
assert(_PyObject_InlineValuesConsistencyCheck(obj));
|
2024-04-29 16:49:01 -03:00
|
|
|
int err = 0;
|
2022-08-01 10:34:54 -03:00
|
|
|
PyTypeObject *tp = Py_TYPE(obj);
|
2024-04-02 07:59:21 -03:00
|
|
|
if (tp->tp_flags & Py_TPFLAGS_INLINE_VALUES) {
|
2024-04-22 02:57:05 -03:00
|
|
|
PyDictObject *dict = _PyObject_GetManagedDict(obj);
|
|
|
|
if (dict == NULL) {
|
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
Py_BEGIN_CRITICAL_SECTION(obj);
|
|
|
|
|
|
|
|
dict = _PyObject_ManagedDictPointer(obj)->dict;
|
|
|
|
if (dict == NULL) {
|
|
|
|
set_dict_inline_values(obj, (PyDictObject *)new_dict);
|
|
|
|
}
|
|
|
|
|
|
|
|
Py_END_CRITICAL_SECTION();
|
|
|
|
|
|
|
|
if (dict == NULL) {
|
2024-04-29 16:49:01 -03:00
|
|
|
return 0;
|
2024-04-02 07:59:21 -03:00
|
|
|
}
|
2024-04-22 02:57:05 -03:00
|
|
|
#else
|
|
|
|
set_dict_inline_values(obj, (PyDictObject *)new_dict);
|
2024-04-29 16:49:01 -03:00
|
|
|
return 0;
|
2024-04-22 02:57:05 -03:00
|
|
|
#endif
|
2024-04-02 07:59:21 -03:00
|
|
|
}
|
2024-04-22 02:57:05 -03:00
|
|
|
|
|
|
|
Py_BEGIN_CRITICAL_SECTION2(dict, obj);
|
|
|
|
|
|
|
|
// We've locked dict, but the actual dict could have changed
|
|
|
|
// since we locked it.
|
|
|
|
dict = _PyObject_ManagedDictPointer(obj)->dict;
|
2024-04-29 16:49:01 -03:00
|
|
|
err = _PyDict_DetachFromObject(dict, obj);
|
2024-11-20 12:41:20 -04:00
|
|
|
assert(err == 0 || new_dict == NULL);
|
2024-04-29 16:49:01 -03:00
|
|
|
if (err == 0) {
|
|
|
|
FT_ATOMIC_STORE_PTR(_PyObject_ManagedDictPointer(obj)->dict,
|
|
|
|
(PyDictObject *)Py_XNewRef(new_dict));
|
|
|
|
}
|
2024-04-22 02:57:05 -03:00
|
|
|
Py_END_CRITICAL_SECTION2();
|
|
|
|
|
2024-04-29 16:49:01 -03:00
|
|
|
if (err == 0) {
|
|
|
|
Py_XDECREF(dict);
|
|
|
|
}
|
2024-04-02 07:59:21 -03:00
|
|
|
}
|
|
|
|
else {
|
2024-04-22 02:57:05 -03:00
|
|
|
PyDictObject *dict;
|
|
|
|
|
|
|
|
Py_BEGIN_CRITICAL_SECTION(obj);
|
|
|
|
|
|
|
|
dict = _PyObject_ManagedDictPointer(obj)->dict;
|
|
|
|
|
|
|
|
FT_ATOMIC_STORE_PTR(_PyObject_ManagedDictPointer(obj)->dict,
|
|
|
|
(PyDictObject *)Py_XNewRef(new_dict));
|
|
|
|
|
|
|
|
Py_END_CRITICAL_SECTION();
|
|
|
|
|
|
|
|
Py_XDECREF(dict);
|
2024-04-02 07:59:21 -03:00
|
|
|
}
|
|
|
|
assert(_PyObject_InlineValuesConsistencyCheck(obj));
|
2024-04-29 16:49:01 -03:00
|
|
|
return err;
|
2024-04-02 07:59:21 -03:00
|
|
|
}
|
|
|
|
|
2024-04-22 02:57:05 -03:00
|
|
|
void
|
|
|
|
PyObject_ClearManagedDict(PyObject *obj)
|
|
|
|
{
|
2024-04-29 16:49:01 -03:00
|
|
|
if (_PyObject_SetManagedDict(obj, NULL) < 0) {
|
2024-11-20 12:41:20 -04:00
|
|
|
/* Must be out of memory */
|
|
|
|
assert(PyErr_Occurred() == PyExc_MemoryError);
|
2024-04-29 16:49:01 -03:00
|
|
|
PyErr_WriteUnraisable(NULL);
|
2024-11-20 12:41:20 -04:00
|
|
|
/* Clear the dict */
|
|
|
|
PyDictObject *dict = _PyObject_GetManagedDict(obj);
|
|
|
|
Py_BEGIN_CRITICAL_SECTION2(dict, obj);
|
|
|
|
dict = _PyObject_ManagedDictPointer(obj)->dict;
|
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
|
|
|
PyDictKeysObject *oldkeys = dict->ma_keys;
|
|
|
|
set_keys(dict, Py_EMPTY_KEYS);
|
|
|
|
dict->ma_values = NULL;
|
|
|
|
dictkeys_decref(interp, oldkeys, IS_DICT_SHARED(dict));
|
|
|
|
STORE_USED(dict, 0);
|
|
|
|
set_dict_inline_values(obj, NULL);
|
|
|
|
Py_END_CRITICAL_SECTION2();
|
2024-04-29 16:49:01 -03:00
|
|
|
}
|
2024-04-22 02:57:05 -03:00
|
|
|
}
|
|
|
|
|
2024-04-02 07:59:21 -03:00
|
|
|
int
|
|
|
|
_PyDict_DetachFromObject(PyDictObject *mp, PyObject *obj)
|
|
|
|
{
|
2024-07-10 15:02:08 -03:00
|
|
|
ASSERT_WORLD_STOPPED_OR_OBJ_LOCKED(obj);
|
2024-04-29 16:49:01 -03:00
|
|
|
assert(_PyObject_ManagedDictPointer(obj)->dict == mp);
|
|
|
|
assert(_PyObject_InlineValuesConsistencyCheck(obj));
|
2024-04-22 02:57:05 -03:00
|
|
|
|
|
|
|
if (FT_ATOMIC_LOAD_PTR_RELAXED(mp->ma_values) != _PyObject_InlineValues(obj)) {
|
2024-04-02 07:59:21 -03:00
|
|
|
return 0;
|
|
|
|
}
|
2024-04-22 02:57:05 -03:00
|
|
|
|
|
|
|
// We could be called with an unlocked dict when the caller knows the
|
|
|
|
// values are already detached, so we assert after inline values check.
|
|
|
|
_Py_CRITICAL_SECTION_ASSERT_OBJECT_LOCKED(mp);
|
2024-04-02 07:59:21 -03:00
|
|
|
assert(mp->ma_values->embedded == 1);
|
|
|
|
assert(mp->ma_values->valid == 1);
|
|
|
|
assert(Py_TYPE(obj)->tp_flags & Py_TPFLAGS_INLINE_VALUES);
|
2024-04-22 02:57:05 -03:00
|
|
|
|
|
|
|
PyDictValues *values = copy_values(mp->ma_values);
|
|
|
|
|
|
|
|
if (values == NULL) {
|
2024-09-27 18:51:01 -03:00
|
|
|
PyErr_NoMemory();
|
2024-04-02 07:59:21 -03:00
|
|
|
return -1;
|
2022-08-01 10:34:54 -03:00
|
|
|
}
|
2024-04-22 02:57:05 -03:00
|
|
|
mp->ma_values = values;
|
|
|
|
|
|
|
|
FT_ATOMIC_STORE_UINT8(_PyObject_InlineValues(obj)->valid, 0);
|
|
|
|
|
2024-04-02 07:59:21 -03:00
|
|
|
assert(_PyObject_InlineValuesConsistencyCheck(obj));
|
|
|
|
ASSERT_CONSISTENT(mp);
|
|
|
|
return 0;
|
2022-07-25 18:30:53 -03:00
|
|
|
}
|
|
|
|
|
2024-05-06 20:31:09 -03:00
|
|
|
static inline PyObject *
|
|
|
|
ensure_managed_dict(PyObject *obj)
|
2012-04-23 12:24:50 -03:00
|
|
|
{
|
2024-05-06 20:31:09 -03:00
|
|
|
PyDictObject *dict = _PyObject_GetManagedDict(obj);
|
|
|
|
if (dict == NULL) {
|
|
|
|
PyTypeObject *tp = Py_TYPE(obj);
|
|
|
|
if ((tp->tp_flags & Py_TPFLAGS_INLINE_VALUES) &&
|
2024-04-22 02:57:05 -03:00
|
|
|
FT_ATOMIC_LOAD_UINT8(_PyObject_InlineValues(obj)->valid)) {
|
|
|
|
dict = _PyObject_MaterializeManagedDict(obj);
|
2021-10-13 10:19:34 -03:00
|
|
|
}
|
2024-05-06 20:31:09 -03:00
|
|
|
else {
|
|
|
|
#ifdef Py_GIL_DISABLED
|
2024-04-22 02:57:05 -03:00
|
|
|
// Check again that we're not racing with someone else creating the dict
|
2024-05-06 20:31:09 -03:00
|
|
|
Py_BEGIN_CRITICAL_SECTION(obj);
|
2024-04-22 02:57:05 -03:00
|
|
|
dict = _PyObject_GetManagedDict(obj);
|
2024-05-06 20:31:09 -03:00
|
|
|
if (dict != NULL) {
|
|
|
|
goto done;
|
2022-08-01 10:34:54 -03:00
|
|
|
}
|
2024-05-06 20:31:09 -03:00
|
|
|
#endif
|
|
|
|
dict = (PyDictObject *)new_dict_with_shared_keys(_PyInterpreterState_GET(),
|
|
|
|
CACHED_KEYS(tp));
|
|
|
|
FT_ATOMIC_STORE_PTR_RELEASE(_PyObject_ManagedDictPointer(obj)->dict,
|
|
|
|
(PyDictObject *)dict);
|
2024-04-22 02:57:05 -03:00
|
|
|
|
2024-05-06 20:31:09 -03:00
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
done:
|
2024-04-22 02:57:05 -03:00
|
|
|
Py_END_CRITICAL_SECTION();
|
2024-05-06 20:31:09 -03:00
|
|
|
#endif
|
2021-12-07 12:02:53 -04:00
|
|
|
}
|
2024-05-06 20:31:09 -03:00
|
|
|
}
|
|
|
|
return (PyObject *)dict;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline PyObject *
|
|
|
|
ensure_nonmanaged_dict(PyObject *obj, PyObject **dictptr)
|
|
|
|
{
|
|
|
|
PyDictKeysObject *cached;
|
|
|
|
|
|
|
|
PyObject *dict = FT_ATOMIC_LOAD_PTR_ACQUIRE(*dictptr);
|
|
|
|
if (dict == NULL) {
|
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
Py_BEGIN_CRITICAL_SECTION(obj);
|
|
|
|
dict = *dictptr;
|
|
|
|
if (dict != NULL) {
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
PyTypeObject *tp = Py_TYPE(obj);
|
|
|
|
if (_PyType_HasFeature(tp, Py_TPFLAGS_HEAPTYPE) && (cached = CACHED_KEYS(tp))) {
|
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
|
|
|
assert(!_PyType_HasFeature(tp, Py_TPFLAGS_INLINE_VALUES));
|
|
|
|
dict = new_dict_with_shared_keys(interp, cached);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
dict = PyDict_New();
|
|
|
|
}
|
|
|
|
FT_ATOMIC_STORE_PTR_RELEASE(*dictptr, dict);
|
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
done:
|
|
|
|
Py_END_CRITICAL_SECTION();
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
return dict;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *
|
|
|
|
PyObject_GenericGetDict(PyObject *obj, void *context)
|
|
|
|
{
|
|
|
|
PyTypeObject *tp = Py_TYPE(obj);
|
|
|
|
if (_PyType_HasFeature(tp, Py_TPFLAGS_MANAGED_DICT)) {
|
|
|
|
return Py_XNewRef(ensure_managed_dict(obj));
|
2021-12-07 12:02:53 -04:00
|
|
|
}
|
|
|
|
else {
|
2022-08-01 10:34:54 -03:00
|
|
|
PyObject **dictptr = _PyObject_ComputedDictPointer(obj);
|
2021-12-07 12:02:53 -04:00
|
|
|
if (dictptr == NULL) {
|
|
|
|
PyErr_SetString(PyExc_AttributeError,
|
|
|
|
"This object has no __dict__");
|
|
|
|
return NULL;
|
|
|
|
}
|
2024-05-06 20:31:09 -03:00
|
|
|
|
|
|
|
return Py_XNewRef(ensure_nonmanaged_dict(obj, dictptr));
|
2012-04-23 12:24:50 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2024-05-06 20:31:09 -03:00
|
|
|
_PyObjectDict_SetItem(PyTypeObject *tp, PyObject *obj, PyObject **dictptr,
|
2016-09-07 21:40:12 -03:00
|
|
|
PyObject *key, PyObject *value)
|
2012-04-23 12:24:50 -03:00
|
|
|
{
|
|
|
|
PyObject *dict;
|
|
|
|
int res;
|
|
|
|
|
|
|
|
assert(dictptr != NULL);
|
2024-05-06 20:31:09 -03:00
|
|
|
dict = ensure_nonmanaged_dict(obj, dictptr);
|
|
|
|
if (dict == NULL) {
|
|
|
|
return -1;
|
2012-04-23 12:24:50 -03:00
|
|
|
}
|
2024-05-06 14:50:35 -03:00
|
|
|
|
2024-05-06 20:31:09 -03:00
|
|
|
Py_BEGIN_CRITICAL_SECTION(dict);
|
|
|
|
res = _PyDict_SetItem_LockHeld((PyDictObject *)dict, key, value);
|
2021-10-06 09:19:53 -03:00
|
|
|
ASSERT_CONSISTENT(dict);
|
2024-05-06 20:31:09 -03:00
|
|
|
Py_END_CRITICAL_SECTION();
|
2012-04-23 12:24:50 -03:00
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
_PyDictKeys_DecRef(PyDictKeysObject *keys)
|
|
|
|
{
|
2023-03-09 11:16:30 -04:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
2024-02-20 21:08:14 -04:00
|
|
|
dictkeys_decref(interp, keys, false);
|
2012-04-23 12:24:50 -03:00
|
|
|
}
|
2021-05-28 05:54:10 -03:00
|
|
|
|
2023-03-08 21:04:16 -04:00
|
|
|
uint32_t _PyDictKeys_GetVersionForCurrentState(PyInterpreterState *interp,
|
|
|
|
PyDictKeysObject *dictkeys)
|
2021-05-28 05:54:10 -03:00
|
|
|
{
|
2021-09-17 08:20:51 -03:00
|
|
|
if (dictkeys->dk_version != 0) {
|
|
|
|
return dictkeys->dk_version;
|
2021-05-28 05:54:10 -03:00
|
|
|
}
|
2023-03-08 21:04:16 -04:00
|
|
|
if (interp->dict_state.next_keys_version == 0) {
|
2021-05-28 05:54:10 -03:00
|
|
|
return 0;
|
|
|
|
}
|
2023-03-08 21:04:16 -04:00
|
|
|
uint32_t v = interp->dict_state.next_keys_version++;
|
2021-09-17 08:20:51 -03:00
|
|
|
dictkeys->dk_version = v;
|
2021-05-28 05:54:10 -03:00
|
|
|
return v;
|
|
|
|
}
|
2022-10-06 21:08:00 -03:00
|
|
|
|
2022-10-07 21:37:46 -03:00
|
|
|
static inline int
|
|
|
|
validate_watcher_id(PyInterpreterState *interp, int watcher_id)
|
|
|
|
{
|
|
|
|
if (watcher_id < 0 || watcher_id >= DICT_MAX_WATCHERS) {
|
|
|
|
PyErr_Format(PyExc_ValueError, "Invalid dict watcher ID %d", watcher_id);
|
|
|
|
return -1;
|
|
|
|
}
|
2022-11-16 13:37:29 -04:00
|
|
|
if (!interp->dict_state.watchers[watcher_id]) {
|
2022-10-07 21:37:46 -03:00
|
|
|
PyErr_Format(PyExc_ValueError, "No dict watcher set for ID %d", watcher_id);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2022-10-06 21:08:00 -03:00
|
|
|
int
|
|
|
|
PyDict_Watch(int watcher_id, PyObject* dict)
|
|
|
|
{
|
|
|
|
if (!PyDict_Check(dict)) {
|
|
|
|
PyErr_SetString(PyExc_ValueError, "Cannot watch non-dictionary");
|
|
|
|
return -1;
|
|
|
|
}
|
2022-10-07 21:37:46 -03:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
|
|
|
if (validate_watcher_id(interp, watcher_id)) {
|
|
|
|
return -1;
|
|
|
|
}
|
2024-10-01 13:39:56 -03:00
|
|
|
((PyDictObject*)dict)->_ma_watcher_tag |= (1LL << watcher_id);
|
2022-10-07 21:37:46 -03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
PyDict_Unwatch(int watcher_id, PyObject* dict)
|
|
|
|
{
|
|
|
|
if (!PyDict_Check(dict)) {
|
|
|
|
PyErr_SetString(PyExc_ValueError, "Cannot watch non-dictionary");
|
2022-10-06 21:08:00 -03:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
2022-10-07 21:37:46 -03:00
|
|
|
if (validate_watcher_id(interp, watcher_id)) {
|
2022-10-06 21:08:00 -03:00
|
|
|
return -1;
|
|
|
|
}
|
2024-10-01 13:39:56 -03:00
|
|
|
((PyDictObject*)dict)->_ma_watcher_tag &= ~(1LL << watcher_id);
|
2022-10-06 21:08:00 -03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
PyDict_AddWatcher(PyDict_WatchCallback callback)
|
|
|
|
{
|
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
|
|
|
|
2024-02-02 08:14:34 -04:00
|
|
|
/* Start at 2, as 0 and 1 are reserved for CPython */
|
|
|
|
for (int i = 2; i < DICT_MAX_WATCHERS; i++) {
|
2022-11-16 13:37:29 -04:00
|
|
|
if (!interp->dict_state.watchers[i]) {
|
|
|
|
interp->dict_state.watchers[i] = callback;
|
2022-10-06 21:08:00 -03:00
|
|
|
return i;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
PyErr_SetString(PyExc_RuntimeError, "no more dict watcher IDs available");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
PyDict_ClearWatcher(int watcher_id)
|
|
|
|
{
|
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
2022-10-07 21:37:46 -03:00
|
|
|
if (validate_watcher_id(interp, watcher_id)) {
|
2022-10-06 21:08:00 -03:00
|
|
|
return -1;
|
|
|
|
}
|
2022-11-16 13:37:29 -04:00
|
|
|
interp->dict_state.watchers[watcher_id] = NULL;
|
2022-10-06 21:08:00 -03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2023-03-07 20:10:58 -04:00
|
|
|
static const char *
|
|
|
|
dict_event_name(PyDict_WatchEvent event) {
|
|
|
|
switch (event) {
|
|
|
|
#define CASE(op) \
|
|
|
|
case PyDict_EVENT_##op: \
|
|
|
|
return "PyDict_EVENT_" #op;
|
|
|
|
PY_FOREACH_DICT_EVENT(CASE)
|
|
|
|
#undef CASE
|
|
|
|
}
|
|
|
|
Py_UNREACHABLE();
|
|
|
|
}
|
|
|
|
|
2022-10-06 21:08:00 -03:00
|
|
|
void
|
|
|
|
_PyDict_SendEvent(int watcher_bits,
|
|
|
|
PyDict_WatchEvent event,
|
|
|
|
PyDictObject *mp,
|
|
|
|
PyObject *key,
|
|
|
|
PyObject *value)
|
|
|
|
{
|
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
|
|
|
for (int i = 0; i < DICT_MAX_WATCHERS; i++) {
|
|
|
|
if (watcher_bits & 1) {
|
2022-11-16 13:37:29 -04:00
|
|
|
PyDict_WatchCallback cb = interp->dict_state.watchers[i];
|
2022-10-06 21:08:00 -03:00
|
|
|
if (cb && (cb(event, (PyObject*)mp, key, value) < 0)) {
|
2023-03-07 20:10:58 -04:00
|
|
|
// We don't want to resurrect the dict by potentially having an
|
|
|
|
// unraisablehook keep a reference to it, so we don't pass the
|
|
|
|
// dict as context, just an informative string message. Dict
|
|
|
|
// repr can call arbitrary code, so we invent a simpler version.
|
2023-11-02 06:16:34 -03:00
|
|
|
PyErr_FormatUnraisable(
|
|
|
|
"Exception ignored in %s watcher callback for <dict at %p>",
|
2023-03-07 20:10:58 -04:00
|
|
|
dict_event_name(event), mp);
|
2022-10-06 21:08:00 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
watcher_bits >>= 1;
|
|
|
|
}
|
|
|
|
}
|
2024-04-02 07:59:21 -03:00
|
|
|
|
|
|
|
#ifndef NDEBUG
|
|
|
|
static int
|
|
|
|
_PyObject_InlineValuesConsistencyCheck(PyObject *obj)
|
|
|
|
{
|
|
|
|
if ((Py_TYPE(obj)->tp_flags & Py_TPFLAGS_INLINE_VALUES) == 0) {
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
assert(Py_TYPE(obj)->tp_flags & Py_TPFLAGS_MANAGED_DICT);
|
2024-04-22 02:57:05 -03:00
|
|
|
PyDictObject *dict = _PyObject_GetManagedDict(obj);
|
2024-04-02 07:59:21 -03:00
|
|
|
if (dict == NULL) {
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
if (dict->ma_values == _PyObject_InlineValues(obj) ||
|
|
|
|
_PyObject_InlineValues(obj)->valid == 0) {
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
assert(0);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif
|