You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

250 lines
6.5 KiB

Merged revisions 55631-55794 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/p3yk ................ r55636 | neal.norwitz | 2007-05-29 00:06:39 -0700 (Tue, 29 May 2007) | 149 lines Merged revisions 55506-55635 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r55507 | georg.brandl | 2007-05-22 07:28:17 -0700 (Tue, 22 May 2007) | 2 lines Remove the "panel" module doc file which has been ignored since 1994. ........ r55522 | mark.hammond | 2007-05-22 19:04:28 -0700 (Tue, 22 May 2007) | 4 lines Remove definition of PY_UNICODE_TYPE from pyconfig.h, allowing the definition in unicodeobject.h to be used, giving us the desired wchar_t in place of 'unsigned short'. As discussed on python-dev. ........ r55525 | neal.norwitz | 2007-05-22 23:35:32 -0700 (Tue, 22 May 2007) | 6 lines Add -3 option to the interpreter to warn about features that are deprecated and will be changed/removed in Python 3.0. This patch is mostly from Anthony. I tweaked some format and added a little doc. ........ r55527 | neal.norwitz | 2007-05-22 23:57:35 -0700 (Tue, 22 May 2007) | 1 line Whitespace cleanup ........ r55528 | neal.norwitz | 2007-05-22 23:58:36 -0700 (Tue, 22 May 2007) | 1 line Add a bunch more deprecation warnings for builtins that are going away in 3.0 ........ r55549 | georg.brandl | 2007-05-24 09:49:29 -0700 (Thu, 24 May 2007) | 2 lines shlex.split() now has an optional "posix" parameter. ........ r55550 | georg.brandl | 2007-05-24 10:33:33 -0700 (Thu, 24 May 2007) | 2 lines Fix parameter passing. ........ r55555 | facundo.batista | 2007-05-24 10:50:54 -0700 (Thu, 24 May 2007) | 6 lines Added an optional timeout parameter to urllib.ftpwrapper, with tests (for this and a basic one, because there weren't any). Changed also NEWS, but didn't find documentation for this function, assumed it wasn't public... ........ r55563 | facundo.batista | 2007-05-24 13:01:59 -0700 (Thu, 24 May 2007) | 4 lines Removed the .recv() in the test, is not necessary, and was causing problems that didn't have anything to do with was actually being tested... ........ r55564 | facundo.batista | 2007-05-24 13:51:19 -0700 (Thu, 24 May 2007) | 5 lines Let's see if reading exactly what is written allow this live test to pass (now I know why there were so few tests in ftp, http, etc, :( ). ........ r55567 | facundo.batista | 2007-05-24 20:10:28 -0700 (Thu, 24 May 2007) | 4 lines Trying to make the tests work in Windows and Solaris, everywhere else just works ........ r55568 | facundo.batista | 2007-05-24 20:47:19 -0700 (Thu, 24 May 2007) | 4 lines Fixing stupid error, and introducing a sleep, to see if the other thread is awakened and finish sending data. ........ r55569 | facundo.batista | 2007-05-24 21:20:22 -0700 (Thu, 24 May 2007) | 4 lines Commenting out the tests until find out who can test them in one of the problematic enviroments. ........ r55570 | neal.norwitz | 2007-05-24 22:13:40 -0700 (Thu, 24 May 2007) | 2 lines Get test passing again by commenting out the reference to the test class. ........ r55575 | vinay.sajip | 2007-05-25 00:05:59 -0700 (Fri, 25 May 2007) | 1 line Updated docstring for SysLogHandler (#1720726). ........ r55576 | vinay.sajip | 2007-05-25 00:06:55 -0700 (Fri, 25 May 2007) | 1 line Updated documentation for SysLogHandler (#1720726). ........ r55592 | brett.cannon | 2007-05-25 13:17:15 -0700 (Fri, 25 May 2007) | 3 lines Remove direct call's to file's constructor and replace them with calls to open() as ths is considered best practice. ........ r55601 | kristjan.jonsson | 2007-05-26 12:19:50 -0700 (Sat, 26 May 2007) | 1 line Remove the rgbimgmodule from PCBuild8 ........ r55602 | kristjan.jonsson | 2007-05-26 12:31:39 -0700 (Sat, 26 May 2007) | 1 line Include <windows.h> after python.h, so that WINNT is properly set before windows.h is included. Fixes warnings in PC builds. ........ r55603 | walter.doerwald | 2007-05-26 14:04:13 -0700 (Sat, 26 May 2007) | 2 lines Fix typo. ........ r55604 | peter.astrand | 2007-05-26 15:18:20 -0700 (Sat, 26 May 2007) | 1 line Applied patch 1669481, slightly modified: Support close_fds on Win32 ........ r55606 | neal.norwitz | 2007-05-26 21:08:54 -0700 (Sat, 26 May 2007) | 2 lines Add the new function object attribute names from py3k. ........ r55617 | lars.gustaebel | 2007-05-27 12:49:30 -0700 (Sun, 27 May 2007) | 20 lines Added errors argument to TarFile class that allows the user to specify an error handling scheme for character conversion. Additional scheme "utf-8" in read mode. Unicode input filenames are now supported by design. The values of the pax_headers dictionary are now limited to unicode objects. Fixed: The prefix field is no longer used in PAX_FORMAT (in conformance with POSIX). Fixed: In read mode use a possible pax header size field. Fixed: Strip trailing slashes from pax header name values. Fixed: Give values in user-specified pax_headers precedence when writing. Added unicode tests. Added pax/regtype4 member to testtar.tar all possible number fields in a pax header. Added two chapters to the documentation about the different formats tarfile.py supports and how unicode issues are handled. ........ r55618 | raymond.hettinger | 2007-05-27 22:23:22 -0700 (Sun, 27 May 2007) | 1 line Explain when groupby() issues a new group. ........ r55634 | martin.v.loewis | 2007-05-28 21:01:29 -0700 (Mon, 28 May 2007) | 2 lines Test pre-commit hook for a link to a .py file. ........ r55635 | martin.v.loewis | 2007-05-28 21:02:03 -0700 (Mon, 28 May 2007) | 2 lines Revert 55634. ........ ................ r55639 | neal.norwitz | 2007-05-29 00:58:11 -0700 (Tue, 29 May 2007) | 1 line Remove sys.exc_{type,exc_value,exc_traceback} ................ r55641 | neal.norwitz | 2007-05-29 01:03:50 -0700 (Tue, 29 May 2007) | 1 line Missed one sys.exc_type. I wonder why exc_{value,traceback} were already gone ................ r55642 | neal.norwitz | 2007-05-29 01:08:33 -0700 (Tue, 29 May 2007) | 1 line Missed more doc for sys.exc_* attrs. ................ r55643 | neal.norwitz | 2007-05-29 01:18:19 -0700 (Tue, 29 May 2007) | 1 line Remove sys.exc_clear() ................ r55665 | guido.van.rossum | 2007-05-29 19:45:43 -0700 (Tue, 29 May 2007) | 4 lines Make None, True, False keywords. We can now also delete all the other places that explicitly forbid assignment to None, but I'm not going to bother right now. ................ r55666 | guido.van.rossum | 2007-05-29 20:01:51 -0700 (Tue, 29 May 2007) | 3 lines Found another place that needs check for forbidden names. Fixed test_syntax.py accordingly (it helped me find that one). ................ r55668 | guido.van.rossum | 2007-05-29 20:41:48 -0700 (Tue, 29 May 2007) | 2 lines Mark None, True, False as keywords. ................ r55673 | neal.norwitz | 2007-05-29 23:28:25 -0700 (Tue, 29 May 2007) | 3 lines Get the dis module working on modules again after changing dicts to not return lists and also new-style classes. Add a test. ................ r55674 | neal.norwitz | 2007-05-29 23:35:45 -0700 (Tue, 29 May 2007) | 1 line Umm, it helps to add the module that the test uses ................ r55675 | neal.norwitz | 2007-05-29 23:53:05 -0700 (Tue, 29 May 2007) | 4 lines Try to fix up all the other places that were assigning to True/False. There's at least one more problem in test.test_xmlrpc. I have other changes in that file and that should be fixed soon (I hope). ................ r55679 | neal.norwitz | 2007-05-30 00:31:55 -0700 (Wed, 30 May 2007) | 1 line Fix up another place that was assigning to True/False. ................ r55688 | brett.cannon | 2007-05-30 14:19:47 -0700 (Wed, 30 May 2007) | 2 lines Ditch MimeWriter. ................ r55692 | brett.cannon | 2007-05-30 14:52:00 -0700 (Wed, 30 May 2007) | 2 lines Remove the mimify module. ................ r55707 | guido.van.rossum | 2007-05-31 05:08:45 -0700 (Thu, 31 May 2007) | 2 lines Backport the addition of show_code() to dis.py -- it's too handy. ................ r55708 | guido.van.rossum | 2007-05-31 06:22:57 -0700 (Thu, 31 May 2007) | 7 lines Fix a fairly long-standing bug in the check for assignment to None (and other keywords, these days). In 2.5, you could write foo(None=1) without getting a SyntaxError (although foo()'s definition would have to use **kwds to avoid getting a runtime error complaining about an unknown keyword of course). This ought to be backported to 2.5.2 or at least 2.6. ................ r55724 | brett.cannon | 2007-05-31 19:32:41 -0700 (Thu, 31 May 2007) | 2 lines Remove the cfmfile. ................ r55727 | neal.norwitz | 2007-05-31 22:19:44 -0700 (Thu, 31 May 2007) | 1 line Remove reload() builtin. ................ r55729 | neal.norwitz | 2007-05-31 22:51:30 -0700 (Thu, 31 May 2007) | 59 lines Merged revisions 55636-55728 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r55637 | georg.brandl | 2007-05-29 00:16:47 -0700 (Tue, 29 May 2007) | 2 lines Fix rst markup. ........ r55638 | neal.norwitz | 2007-05-29 00:51:39 -0700 (Tue, 29 May 2007) | 1 line Fix typo in doc ........ r55671 | neal.norwitz | 2007-05-29 21:53:41 -0700 (Tue, 29 May 2007) | 1 line Fix indentation (whitespace only). ........ r55676 | thomas.heller | 2007-05-29 23:58:30 -0700 (Tue, 29 May 2007) | 1 line Fix compiler warnings. ........ r55677 | thomas.heller | 2007-05-30 00:01:25 -0700 (Wed, 30 May 2007) | 2 lines Correct the name of a field in the WIN32_FIND_DATAA and WIN32_FIND_DATAW structures. Closes bug #1726026. ........ r55686 | brett.cannon | 2007-05-30 13:46:26 -0700 (Wed, 30 May 2007) | 2 lines Have MimeWriter raise a DeprecationWarning as per PEP 4 and its documentation. ........ r55690 | brett.cannon | 2007-05-30 14:48:58 -0700 (Wed, 30 May 2007) | 3 lines Have mimify raise a DeprecationWarning. The docs and PEP 4 have listed the module as deprecated for a while. ........ r55696 | brett.cannon | 2007-05-30 15:24:28 -0700 (Wed, 30 May 2007) | 2 lines Have md5 raise a DeprecationWarning as per PEP 4. ........ r55705 | neal.norwitz | 2007-05-30 21:14:22 -0700 (Wed, 30 May 2007) | 1 line Add some spaces in the example code. ........ r55716 | brett.cannon | 2007-05-31 12:20:00 -0700 (Thu, 31 May 2007) | 2 lines Have the sha module raise a DeprecationWarning as specified in PEP 4. ........ r55719 | brett.cannon | 2007-05-31 12:40:42 -0700 (Thu, 31 May 2007) | 2 lines Cause buildtools to raise a DeprecationWarning. ........ r55721 | brett.cannon | 2007-05-31 13:01:11 -0700 (Thu, 31 May 2007) | 2 lines Have cfmfile raise a DeprecationWarning as per PEP 4. ........ r55726 | neal.norwitz | 2007-05-31 21:56:47 -0700 (Thu, 31 May 2007) | 1 line Mail if there is an installation failure. ........ ................ r55730 | neal.norwitz | 2007-05-31 23:22:07 -0700 (Thu, 31 May 2007) | 2 lines Remove the code that was missed in rev 55303. ................ r55738 | neal.norwitz | 2007-06-01 19:10:43 -0700 (Fri, 01 Jun 2007) | 1 line Fix doc breakage ................ r55741 | neal.norwitz | 2007-06-02 00:41:58 -0700 (Sat, 02 Jun 2007) | 1 line Remove timing module (plus some remnants of other modules). ................ r55742 | neal.norwitz | 2007-06-02 00:51:44 -0700 (Sat, 02 Jun 2007) | 1 line Remove posixfile module (plus some remnants of other modules). ................ r55744 | neal.norwitz | 2007-06-02 10:18:56 -0700 (Sat, 02 Jun 2007) | 1 line Fix doc breakage. ................ r55745 | neal.norwitz | 2007-06-02 11:32:16 -0700 (Sat, 02 Jun 2007) | 1 line Make a whatsnew 3.0 template. ................ r55754 | neal.norwitz | 2007-06-03 23:24:18 -0700 (Sun, 03 Jun 2007) | 1 line SF #1730441, os._execvpe raises UnboundLocal due to new try/except semantics ................ r55755 | neal.norwitz | 2007-06-03 23:26:00 -0700 (Sun, 03 Jun 2007) | 1 line Get rid of extra whitespace ................ r55794 | guido.van.rossum | 2007-06-06 15:29:22 -0700 (Wed, 06 Jun 2007) | 3 lines Make this compile in GCC 2.96, which does not allow interspersing declarations and code. ................
19 years ago
  1. /* Author: Toby Dickenson <htrd90@zepler.org>
  2. *
  3. * Copyright (c) 1999 Toby Dickenson
  4. *
  5. * Permission to use this software in any way is granted without
  6. * fee, provided that the copyright notice above appears in all
  7. * copies. This software is provided "as is" without any warranty.
  8. */
  9. /* Modified by Guido van Rossum */
  10. /* Beep added by Mark Hammond */
  11. /* Win9X Beep and platform identification added by Uncle Timmy */
  12. /* Example:
  13. import winsound
  14. import time
  15. # Play wav file
  16. winsound.PlaySound('c:/windows/media/Chord.wav', winsound.SND_FILENAME)
  17. # Play sound from control panel settings
  18. winsound.PlaySound('SystemQuestion', winsound.SND_ALIAS)
  19. # Play wav file from memory
  20. data=open('c:/windows/media/Chimes.wav',"rb").read()
  21. winsound.PlaySound(data, winsound.SND_MEMORY)
  22. # Start playing the first bit of wav file asynchronously
  23. winsound.PlaySound('c:/windows/media/Chord.wav',
  24. winsound.SND_FILENAME|winsound.SND_ASYNC)
  25. # But dont let it go for too long...
  26. time.sleep(0.1)
  27. # ...Before stopping it
  28. winsound.PlaySound(None, 0)
  29. */
  30. #include <Python.h>
  31. #include <windows.h>
  32. #include <mmsystem.h>
  33. PyDoc_STRVAR(sound_module_doc,
  34. "PlaySound(sound, flags) - play a sound\n"
  35. "SND_FILENAME - sound is a wav file name\n"
  36. "SND_ALIAS - sound is a registry sound association name\n"
  37. "SND_LOOP - Play the sound repeatedly; must also specify SND_ASYNC\n"
  38. "SND_MEMORY - sound is a memory image of a wav file\n"
  39. "SND_PURGE - stop all instances of the specified sound\n"
  40. "SND_ASYNC - PlaySound returns immediately\n"
  41. "SND_NODEFAULT - Do not play a default beep if the sound can not be found\n"
  42. "SND_NOSTOP - Do not interrupt any sounds currently playing\n" // Raising RuntimeError if needed
  43. "SND_NOWAIT - Return immediately if the sound driver is busy\n" // Without any errors
  44. "\n"
  45. "Beep(frequency, duration) - Make a beep through the PC speaker.\n"
  46. "MessageBeep(type) - Call Windows MessageBeep.");
  47. /*[clinic input]
  48. module winsound
  49. [clinic start generated code]*/
  50. /*[clinic end generated code: output=da39a3ee5e6b4b0d input=a18401142d97b8d5]*/
  51. #include "clinic/winsound.c.h"
  52. /*[clinic input]
  53. winsound.PlaySound
  54. sound: object
  55. The sound to play; a filename, data, or None.
  56. flags: int
  57. Flag values, ored together. See module documentation.
  58. A wrapper around the Windows PlaySound API.
  59. [clinic start generated code]*/
  60. static PyObject *
  61. winsound_PlaySound_impl(PyObject *module, PyObject *sound, int flags)
  62. /*[clinic end generated code: output=49a0fd16a372ebeb input=c63e1f2d848da2f2]*/
  63. {
  64. int ok;
  65. wchar_t *wsound;
  66. Py_buffer view = {NULL, NULL};
  67. if (sound == Py_None) {
  68. wsound = NULL;
  69. } else if (flags & SND_MEMORY) {
  70. if (flags & SND_ASYNC) {
  71. /* Sidestep reference counting headache; unfortunately this also
  72. prevent SND_LOOP from memory. */
  73. PyErr_SetString(PyExc_RuntimeError,
  74. "Cannot play asynchronously from memory");
  75. return NULL;
  76. }
  77. if (PyObject_GetBuffer(sound, &view, PyBUF_SIMPLE) < 0) {
  78. return NULL;
  79. }
  80. wsound = (wchar_t *)view.buf;
  81. } else {
  82. if (!PyUnicode_Check(sound)) {
  83. PyErr_Format(PyExc_TypeError,
  84. "'sound' must be str or None, not '%s'",
  85. Py_TYPE(sound)->tp_name);
  86. return NULL;
  87. }
  88. wsound = PyUnicode_AsWideCharString(sound, NULL);
  89. if (wsound == NULL) {
  90. return NULL;
  91. }
  92. }
  93. Py_BEGIN_ALLOW_THREADS
  94. ok = PlaySoundW(wsound, NULL, flags);
  95. Py_END_ALLOW_THREADS
  96. if (view.obj) {
  97. PyBuffer_Release(&view);
  98. } else if (sound != Py_None) {
  99. PyMem_Free(wsound);
  100. }
  101. if (!ok) {
  102. PyErr_SetString(PyExc_RuntimeError, "Failed to play sound");
  103. return NULL;
  104. }
  105. Py_RETURN_NONE;
  106. }
  107. /*[clinic input]
  108. winsound.Beep
  109. frequency: int
  110. Frequency of the sound in hertz.
  111. Must be in the range 37 through 32,767.
  112. duration: int
  113. How long the sound should play, in milliseconds.
  114. A wrapper around the Windows Beep API.
  115. [clinic start generated code]*/
  116. static PyObject *
  117. winsound_Beep_impl(PyObject *module, int frequency, int duration)
  118. /*[clinic end generated code: output=f32382e52ee9b2fb input=40e360cfa00a5cf0]*/
  119. {
  120. BOOL ok;
  121. if (frequency < 37 || frequency > 32767) {
  122. PyErr_SetString(PyExc_ValueError,
  123. "frequency must be in 37 thru 32767");
  124. return NULL;
  125. }
  126. Py_BEGIN_ALLOW_THREADS
  127. ok = Beep(frequency, duration);
  128. Py_END_ALLOW_THREADS
  129. if (!ok) {
  130. PyErr_SetString(PyExc_RuntimeError,"Failed to beep");
  131. return NULL;
  132. }
  133. Py_RETURN_NONE;
  134. }
  135. /*[clinic input]
  136. winsound.MessageBeep
  137. type: int(c_default="MB_OK") = MB_OK
  138. Call Windows MessageBeep(x).
  139. x defaults to MB_OK.
  140. [clinic start generated code]*/
  141. static PyObject *
  142. winsound_MessageBeep_impl(PyObject *module, int type)
  143. /*[clinic end generated code: output=120875455121121f input=db185f741ae21401]*/
  144. {
  145. BOOL ok;
  146. Py_BEGIN_ALLOW_THREADS
  147. ok = MessageBeep(type);
  148. Py_END_ALLOW_THREADS
  149. if (!ok) {
  150. PyErr_SetExcFromWindowsErr(PyExc_RuntimeError, 0);
  151. return NULL;
  152. }
  153. Py_RETURN_NONE;
  154. }
  155. static struct PyMethodDef sound_methods[] =
  156. {
  157. WINSOUND_PLAYSOUND_METHODDEF
  158. WINSOUND_BEEP_METHODDEF
  159. WINSOUND_MESSAGEBEEP_METHODDEF
  160. {NULL, NULL}
  161. };
  162. static void
  163. add_define(PyObject *dict, const char *key, long value)
  164. {
  165. PyObject *k = PyUnicode_FromString(key);
  166. PyObject *v = PyLong_FromLong(value);
  167. if (v && k) {
  168. PyDict_SetItem(dict, k, v);
  169. }
  170. Py_XDECREF(k);
  171. Py_XDECREF(v);
  172. }
  173. #define ADD_DEFINE(tok) add_define(dict,#tok,tok)
  174. static struct PyModuleDef winsoundmodule = {
  175. PyModuleDef_HEAD_INIT,
  176. "winsound",
  177. sound_module_doc,
  178. -1,
  179. sound_methods,
  180. NULL,
  181. NULL,
  182. NULL,
  183. NULL
  184. };
  185. PyMODINIT_FUNC
  186. PyInit_winsound(void)
  187. {
  188. PyObject *dict;
  189. PyObject *module = PyModule_Create(&winsoundmodule);
  190. if (module == NULL)
  191. return NULL;
  192. dict = PyModule_GetDict(module);
  193. ADD_DEFINE(SND_ASYNC);
  194. ADD_DEFINE(SND_NODEFAULT);
  195. ADD_DEFINE(SND_NOSTOP);
  196. ADD_DEFINE(SND_NOWAIT);
  197. ADD_DEFINE(SND_ALIAS);
  198. ADD_DEFINE(SND_FILENAME);
  199. ADD_DEFINE(SND_MEMORY);
  200. ADD_DEFINE(SND_PURGE);
  201. ADD_DEFINE(SND_LOOP);
  202. ADD_DEFINE(SND_APPLICATION);
  203. ADD_DEFINE(MB_OK);
  204. ADD_DEFINE(MB_ICONASTERISK);
  205. ADD_DEFINE(MB_ICONEXCLAMATION);
  206. ADD_DEFINE(MB_ICONHAND);
  207. ADD_DEFINE(MB_ICONQUESTION);
  208. return module;
  209. }