File ./Include/py_curses.h
45c45
< #include <curses.h>
---
> #include <ncurses/curses.h>
File ./Modules/_curses_panel.c
17c17
< #include <panel.h>
---
> #include <ncurses/panel.h>
File ./Modules/cmathmodule.c
162c162
< double l = hypot(x.real,x.imag);
---
> double l = sqrt(x.real*x.real+x.imag*x.imag);
173c173
< double l = hypot(x.real,x.imag);
---
> double l = sqrt(x.real*x.real+x.imag*x.imag);
234c234
< s = sqrt(0.5*(fabs(x.real) + hypot(x.real,x.imag)));
---
> s = sqrt(0.5*(fabs(x.real) + sqrt(x.real*x.real+x.imag*x.imag)));
File ./Modules/mathmodule.c
122,123d121
< FUNC2(hypot, hypot,
< "hypot(x,y)\n\nReturn the Euclidean distance, sqrt(x*x + y*y).")
332d329
< {"hypot", math_hypot, METH_VARARGS, math_hypot_doc},
File ./Objects/complexobject.c
139c139
< vabs = hypot(a.real,a.imag);
---
> vabs = sqrt(a.real*a.real+a.imag*a.imag);
533c533
< result = hypot(v->cval.real,v->cval.imag);
---
> result = sqrt(v->cval.real*v->cval.real+v->cval.imag*v->cval.imag);
File ./Parser/myreadline.c
21a22,23
> #include "iPodRead.c"
>
42c44
< char *p;
---
> int tam;
47,48c49,54
< p = fgets(buf, len, fp);
< if (p != NULL)
---
>
>
> if ( iPodRead(buf, len, fp) == 0 ) { /* if ok */
> tam= strlen(buf); /* bytes read */
> buf[tam] = '\n';
> buf[tam+1] = '\0';
50,80d55
< #ifdef MS_WINDOWS
< /* In the case of a Ctrl+C or some other external event
< interrupting the operation:
< Win2k/NT: ERROR_OPERATION_ABORTED is the most recent Win32
< error code (and feof() returns TRUE).
< Win9x: Ctrl+C seems to have no effect on fgets() returning
< early - the signal handler is called, but the fgets()
< only returns "normally" (ie, when Enter hit or feof())
< */
< if (GetLastError()==ERROR_OPERATION_ABORTED) {
< /* Signals come asynchronously, so we sleep a brief
< moment before checking if the handler has been
< triggered (we cant just return 1 before the
< signal handler has been called, as the later
< signal may be treated as a separate interrupt).
< */
< Sleep(1);
< if (PyOS_InterruptOccurred()) {
< return 1; /* Interrupt */
< }
< /* Either the sleep wasn't long enough (need a
< short loop retrying?) or not interrupted at all
< (in which case we should revisit the whole thing!)
< Logging some warning would be nice. assert is not
< viable as under the debugger, the various dialogs
< mean the condition is not true.
< */
< }
< #endif /* MS_WINDOWS */
< if (feof(fp)) {
< return -1; /* EOF */
82,96c57
< #ifdef EINTR
< if (errno == EINTR) {
< int s;
< PyEval_RestoreThread(_PyOS_ReadlineTState);
< s = PyErr_CheckSignals();
< PyEval_SaveThread();
< if (s < 0) {
< return 1;
< }
< }
< #endif
< if (PyOS_InterruptOccurred()) {
< return 1; /* Interrupt */
< }
< return -2; /* Error */
---
> else return -1;
98d58
< /* NOTREACHED */
101a62
>
File ./Python/pythonrun.c
686c686
< PySys_SetObject("ps1", v = PyString_FromString(">>> "));
---
> PySys_SetObject("ps1", v = PyString_FromString("> "));
691c691
< PySys_SetObject("ps2", v = PyString_FromString("... "));
---
> PySys_SetObject("ps2", v = PyString_FromString(". "));