Mercurial > cpython-lru_cache-weakref

comparison Python/structmember.c @ 42466:3fc3cedc49ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged revisions 56753-56781 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/p3yk ................ r56760 | neal.norwitz | 2007-08-05 18:55:39 -0700 (Sun, 05 Aug 2007) | 178 lines Merged revisions 56477-56759 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r56485 | facundo.batista | 2007-07-21 17:13:00 -0700 (Sat, 21 Jul 2007) | 5 lines Selectively enable tests for asyncore.readwrite based on the presence of poll support in the select module (since this is the only case in which readwrite can be called). [GSoC - Alan McIntyre] ........ r56488 | nick.coghlan | 2007-07-22 03:18:07 -0700 (Sun, 22 Jul 2007) | 1 line Add explicit relative import tests for runpy.run_module ........ r56509 | nick.coghlan | 2007-07-23 06:41:45 -0700 (Mon, 23 Jul 2007) | 5 lines Correctly cleanup sys.modules after executing runpy relative import tests Restore Python 2.4 ImportError when attempting to execute a package (as imports cannot be guaranteed to work properly if you try it) ........ r56519 | nick.coghlan | 2007-07-24 06:07:38 -0700 (Tue, 24 Jul 2007) | 1 line Tweak runpy test to do a better job of confirming that sys has been manipulated correctly ........ r56520 | nick.coghlan | 2007-07-24 06:58:28 -0700 (Tue, 24 Jul 2007) | 1 line Fix an incompatibility between the -i and -m command line switches as reported on python-dev by PJE - runpy.run_module now leaves any changes it makes to the sys module intact after the function terminates ........ r56523 | nick.coghlan | 2007-07-24 07:39:23 -0700 (Tue, 24 Jul 2007) | 1 line Try to get rid of spurious failure in test_resource on the Debian buildbots by changing the file size limit before attempting to close the file ........ r56533 | facundo.batista | 2007-07-24 14:20:42 -0700 (Tue, 24 Jul 2007) | 7 lines New tests for basic behavior of smtplib.SMTP and smtpd.DebuggingServer. Change to use global host & port number variables. Modified the 'server' to take a string to send back in order to vary test server responses. Added a test for the reaction of smtplib.SMTP to a non-200 HELO response. [GSoC - Alan McIntyre] ........ r56538 | nick.coghlan | 2007-07-25 05:57:48 -0700 (Wed, 25 Jul 2007) | 1 line More buildbot cleanup - let the OS assign the port for test_urllib2_localnet ........ r56539 | nick.coghlan | 2007-07-25 06:18:58 -0700 (Wed, 25 Jul 2007) | 1 line Add a temporary diagnostic message before a strange failure on the alpha Debian buildbot ........ r56543 | martin.v.loewis | 2007-07-25 09:24:23 -0700 (Wed, 25 Jul 2007) | 2 lines Change location of the package index to pypi.python.org/pypi ........ r56551 | georg.brandl | 2007-07-26 02:36:25 -0700 (Thu, 26 Jul 2007) | 2 lines tabs, newlines and crs are valid XML characters. ........ r56553 | nick.coghlan | 2007-07-26 07:03:00 -0700 (Thu, 26 Jul 2007) | 1 line Add explicit test for a misbehaving math.floor ........ r56561 | mark.hammond | 2007-07-26 21:52:32 -0700 (Thu, 26 Jul 2007) | 3 lines In consultation with Kristjan Jonsson, only define WINVER and _WINNT_WIN32 if (a) we are building Python itself and (b) no one previously defined them ........ r56562 | mark.hammond | 2007-07-26 22:08:54 -0700 (Thu, 26 Jul 2007) | 2 lines Correctly detect AMD64 architecture on VC2003 ........ r56566 | nick.coghlan | 2007-07-27 03:36:30 -0700 (Fri, 27 Jul 2007) | 1 line Make test_math error messages more meaningful for small discrepancies in results ........ r56588 | martin.v.loewis | 2007-07-27 11:28:22 -0700 (Fri, 27 Jul 2007) | 2 lines Bug #978833: Close https sockets by releasing the _ssl object. ........ r56601 | martin.v.loewis | 2007-07-28 00:03:05 -0700 (Sat, 28 Jul 2007) | 3 lines Bug #1704793: Return UTF-16 pair if unicodedata.lookup cannot represent the result in a single character. ........ r56604 | facundo.batista | 2007-07-28 07:21:22 -0700 (Sat, 28 Jul 2007) | 9 lines Moved all of the capture_server socket setup code into the try block so that the event gets set if a failure occurs during server setup (otherwise the test will block forever). Changed to let the OS assign the server port number, and client side of test waits for port number assignment before proceeding. The test data in DispatcherWithSendTests is also sent in multiple send() calls instead of one to make sure this works properly. [GSoC - Alan McIntyre] ........ r56611 | georg.brandl | 2007-07-29 01:26:10 -0700 (Sun, 29 Jul 2007) | 2 lines Clarify PEP 343 description. ........ r56614 | georg.brandl | 2007-07-29 02:11:15 -0700 (Sun, 29 Jul 2007) | 2 lines try-except-finally is new in 2.5. ........ r56617 | facundo.batista | 2007-07-29 07:23:08 -0700 (Sun, 29 Jul 2007) | 9 lines Added tests for asynchat classes simple_producer & fifo, and the find_prefix_at_end function. Check behavior of a string given as a producer. Added tests for behavior of asynchat.async_chat when given int, long, and None terminator arguments. Added usepoll attribute to TestAsynchat to allow running the asynchat tests with poll support chosen whether it's available or not (improves coverage of asyncore code). [GSoC - Alan McIntyre] ........ r56620 | georg.brandl | 2007-07-29 10:38:35 -0700 (Sun, 29 Jul 2007) | 2 lines Bug #1763149: use proper slice syntax in docstring. (backport) ........ r56624 | mark.hammond | 2007-07-29 17:45:29 -0700 (Sun, 29 Jul 2007) | 4 lines Correct use of Py_BUILD_CORE - now make sure it is defined before it is referenced, and also fix definition of _WIN32_WINNT. Resolves patch 1761803. ........ r56632 | facundo.batista | 2007-07-30 20:03:34 -0700 (Mon, 30 Jul 2007) | 8 lines When running asynchat tests on OS X (darwin), the test client now overrides asyncore.dispatcher.handle_expt to do nothing, since select.poll gives a POLLHUP error at the completion of these tests. Added timeout & count arguments to several asyncore.loop calls to avoid the possibility of a test hanging up a build. [GSoC - Alan McIntyre] ........ r56633 | nick.coghlan | 2007-07-31 06:38:01 -0700 (Tue, 31 Jul 2007) | 1 line Eliminate RLock race condition reported in SF bug #1764059 ........ r56636 | martin.v.loewis | 2007-07-31 12:57:56 -0700 (Tue, 31 Jul 2007) | 2 lines Define _BSD_SOURCE, to get access to POSIX extensions on OpenBSD 4.1+. ........ r56653 | facundo.batista | 2007-08-01 16:18:36 -0700 (Wed, 01 Aug 2007) | 9 lines Allow the OS to select a free port for each test server. For DebuggingServerTests, construct SMTP objects with a localhost argument to avoid abysmally long FQDN lookups (not relevant to items under test) on some machines that would cause the test to fail. Moved server setup code in the server function inside the try block to avoid the possibility of setup failure hanging the test. Minor edits to conform to PEP 8. [GSoC - Alan McIntyre] ........ r56681 | matthias.klose | 2007-08-02 14:33:13 -0700 (Thu, 02 Aug 2007) | 2 lines - Allow Emacs 22 for building the documentation in info format. ........ r56689 | neal.norwitz | 2007-08-02 23:46:29 -0700 (Thu, 02 Aug 2007) | 1 line Py_ssize_t is defined regardless of HAVE_LONG_LONG. Will backport ........ r56727 | hyeshik.chang | 2007-08-03 21:10:18 -0700 (Fri, 03 Aug 2007) | 3 lines Fix gb18030 codec's bug that doesn't map two-byte characters on GB18030 extension in encoding. (bug reported by Bjorn Stabell) ........ r56751 | neal.norwitz | 2007-08-04 20:23:31 -0700 (Sat, 04 Aug 2007) | 7 lines Handle errors when generating a warning. The value is always written to the returned pointer if getting it was successful, even if a warning causes an error. (This probably doesn't matter as the caller will probably discard the value.) Will backport. ........ ................
author Guido van Rossum <guido@python.org>
date Mon, 06 Aug 2007 23:33:07 +0000
parents e4f649c4f457
children 74a3c6826683
comparison
equal deleted inserted replaced
42465:440176f06147 42466:3fc3cedc49ca
154 154
155 PyErr_SetString(PyExc_AttributeError, name); 155 PyErr_SetString(PyExc_AttributeError, name);
156 return -1; 156 return -1;
157 } 157 }
158 158
159 #define WARN(msg) \
160 do { \
161 if (PyErr_Warn(PyExc_RuntimeWarning, msg) < 0) \
162 return -1; \
163 } while (0)
164
159 int 165 int
160 PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v) 166 PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v)
161 { 167 {
162 PyObject *oldv; 168 PyObject *oldv;
163 169
172 return -1; 178 return -1;
173 } 179 }
174 addr += l->offset; 180 addr += l->offset;
175 switch (l->type) { 181 switch (l->type) {
176 case T_BYTE:{ 182 case T_BYTE:{
177 long long_val; 183 long long_val = PyInt_AsLong(v);
178 long_val = PyInt_AsLong(v); 184 if ((long_val == -1) && PyErr_Occurred())
179 if ((long_val == -1) && PyErr_Occurred()) 185 return -1;
180 return -1; 186 *(char*)addr = (char)long_val;
181 /* XXX: For compatibility, only warn about truncations 187 /* XXX: For compatibility, only warn about truncations
182 for now. */ 188 for now. */
183 if ((long_val > CHAR_MAX) || (long_val < CHAR_MIN)) 189 if ((long_val > CHAR_MAX) || (long_val < CHAR_MIN))
184 PyErr_Warn(PyExc_RuntimeWarning, "Truncation of value to char"); 190 WARN("Truncation of value to char");
185 *(char*)addr = (char)long_val;
186 break; 191 break;
187 } 192 }
188 case T_UBYTE:{ 193 case T_UBYTE:{
189 long long_val; 194 long long_val = PyInt_AsLong(v);
190 long_val = PyInt_AsLong(v); 195 if ((long_val == -1) && PyErr_Occurred())
191 if ((long_val == -1) && PyErr_Occurred()) 196 return -1;
192 return -1; 197 *(unsigned char*)addr = (unsigned char)long_val;
193 if ((long_val > UCHAR_MAX) || (long_val < 0)) 198 if ((long_val > UCHAR_MAX) || (long_val < 0))
194 PyErr_Warn(PyExc_RuntimeWarning, "Truncation of value to unsigned char"); 199 WARN("Truncation of value to unsigned char");
195 *(unsigned char*)addr = (unsigned char)long_val;
196 break; 200 break;
197 } 201 }
198 case T_SHORT:{ 202 case T_SHORT:{
199 long long_val; 203 long long_val = PyInt_AsLong(v);
200 long_val = PyInt_AsLong(v); 204 if ((long_val == -1) && PyErr_Occurred())
201 if ((long_val == -1) && PyErr_Occurred()) 205 return -1;
202 return -1; 206 *(short*)addr = (short)long_val;
203 if ((long_val > SHRT_MAX) || (long_val < SHRT_MIN)) 207 if ((long_val > SHRT_MAX) || (long_val < SHRT_MIN))
204 PyErr_Warn(PyExc_RuntimeWarning, "Truncation of value to short"); 208 WARN("Truncation of value to short");
205 *(short*)addr = (short)long_val;
206 break; 209 break;
207 } 210 }
208 case T_USHORT:{ 211 case T_USHORT:{
209 long long_val; 212 long long_val = PyInt_AsLong(v);
210 long_val = PyInt_AsLong(v); 213 if ((long_val == -1) && PyErr_Occurred())
211 if ((long_val == -1) && PyErr_Occurred()) 214 return -1;
212 return -1; 215 *(unsigned short*)addr = (unsigned short)long_val;
213 if ((long_val > USHRT_MAX) || (long_val < 0)) 216 if ((long_val > USHRT_MAX) || (long_val < 0))
214 PyErr_Warn(PyExc_RuntimeWarning, "Truncation of value to unsigned short"); 217 WARN("Truncation of value to unsigned short");
215 *(unsigned short*)addr = (unsigned short)long_val;
216 break; 218 break;
217 } 219 }
218 case T_INT:{ 220 case T_INT:{
219 long long_val; 221 long long_val = PyInt_AsLong(v);
220 long_val = PyInt_AsLong(v); 222 if ((long_val == -1) && PyErr_Occurred())
221 if ((long_val == -1) && PyErr_Occurred()) 223 return -1;
222 return -1; 224 *(int *)addr = (int)long_val;
223 if ((long_val > INT_MAX) || (long_val < INT_MIN)) 225 if ((long_val > INT_MAX) || (long_val < INT_MIN))
224 PyErr_Warn(PyExc_RuntimeWarning, "Truncation of value to int"); 226 WARN("Truncation of value to int");
225 *(int *)addr = (int)long_val;
226 break; 227 break;
227 } 228 }
228 case T_UINT:{ 229 case T_UINT:{
229 unsigned long ulong_val; 230 unsigned long ulong_val = PyLong_AsUnsignedLong(v);
230 ulong_val = PyLong_AsUnsignedLong(v);
231 if ((ulong_val == (unsigned int)-1) && PyErr_Occurred()) { 231 if ((ulong_val == (unsigned int)-1) && PyErr_Occurred()) {
232 /* XXX: For compatibility, accept negative int values 232 /* XXX: For compatibility, accept negative int values
233 as well. */ 233 as well. */
234 PyErr_Clear(); 234 PyErr_Clear();
235 ulong_val = PyLong_AsLong(v); 235 ulong_val = PyLong_AsLong(v);
236 if ((ulong_val == (unsigned int)-1) && PyErr_Occurred()) 236 if ((ulong_val == (unsigned int)-1) && PyErr_Occurred())
237 return -1; 237 return -1;
238 PyErr_Warn(PyExc_RuntimeWarning, "Writing negative value into unsigned field"); 238 *(unsigned int *)addr = (unsigned int)ulong_val;
239 } 239 WARN("Writing negative value into unsigned field");
240 } else
241 *(unsigned int *)addr = (unsigned int)ulong_val;
240 if (ulong_val > UINT_MAX) 242 if (ulong_val > UINT_MAX)
241 PyErr_Warn(PyExc_RuntimeWarning, "Truncation of value to unsigned int"); 243 WARN("Truncation of value to unsigned int");
242 *(unsigned int *)addr = (unsigned int)ulong_val;
243 break; 244 break;
244 } 245 }
245 case T_LONG:{ 246 case T_LONG:{
246 *(long*)addr = PyLong_AsLong(v); 247 *(long*)addr = PyLong_AsLong(v);
247 if ((*(long*)addr == -1) && PyErr_Occurred()) 248 if ((*(long*)addr == -1) && PyErr_Occurred())
254 && PyErr_Occurred()) { 255 && PyErr_Occurred()) {
255 /* XXX: For compatibility, accept negative int values 256 /* XXX: For compatibility, accept negative int values
256 as well. */ 257 as well. */
257 PyErr_Clear(); 258 PyErr_Clear();
258 *(unsigned long*)addr = PyLong_AsLong(v); 259 *(unsigned long*)addr = PyLong_AsLong(v);
259 if ((*(unsigned long*)addr == (unsigned int)-1) && PyErr_Occurred()) 260 if ((*(unsigned long*)addr == (unsigned int)-1)
261 && PyErr_Occurred())
260 return -1; 262 return -1;
261 PyErr_Warn(PyExc_RuntimeWarning, "Writing negative value into unsigned field"); 263 WARN("Writing negative value into unsigned field");
262 } 264 }
263 break; 265 break;
264 } 266 }
265 case T_PYSSIZET:{ 267 case T_PYSSIZET:{
266 *(Py_ssize_t*)addr = PyInt_AsSsize_t(v); 268 *(Py_ssize_t*)addr = PyInt_AsSsize_t(v);
268 && PyErr_Occurred()) 270 && PyErr_Occurred())
269 return -1; 271 return -1;
270 break; 272 break;
271 } 273 }
272 case T_FLOAT:{ 274 case T_FLOAT:{
273 double double_val; 275 double double_val = PyFloat_AsDouble(v);
274 double_val = PyFloat_AsDouble(v);
275 if ((double_val == -1) && PyErr_Occurred()) 276 if ((double_val == -1) && PyErr_Occurred())
276 return -1; 277 return -1;
277 *(float*)addr = (float)double_val; 278 *(float*)addr = (float)double_val;
278 break; 279 break;
279 } 280 }