summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Lib/idlelib/NEWS.txt5
-rw-r--r--Lib/idlelib/configHandler.py7
-rwxr-xr-xLib/rational.py36
-rw-r--r--Lib/test/test_descr.py75
-rw-r--r--Lib/test/test_rational.py23
-rw-r--r--Lib/urllib2.py2
-rw-r--r--Modules/config.c.in2
-rw-r--r--Modules/socketmodule.c4
-rw-r--r--Python/bltinmodule.c7
-rw-r--r--Python/ceval.c6
-rw-r--r--Python/dynload_win.c9
11 files changed, 166 insertions, 10 deletions
diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 12a0c6f726..d51d94e202 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -45,6 +45,11 @@ What's New in IDLE 2.6a1?
*Release date: XX-XXX-200X* UNRELEASED, but merged into 3.0
+- There was an error on exit if no sys.exitfunc was defined. Issue 1647.
+
+- Could not open files in .idlerc directory if latter was hidden on Windows.
+ Issue 1743, Issue 1862.
+
- Configure Dialog: improved layout for keybinding. Patch 1457 Tal Einat.
- tabpage.py updated: tabbedPages.py now supports multiple dynamic rows
diff --git a/Lib/idlelib/configHandler.py b/Lib/idlelib/configHandler.py
index b5d976900d..66bad74bf0 100644
--- a/Lib/idlelib/configHandler.py
+++ b/Lib/idlelib/configHandler.py
@@ -139,7 +139,12 @@ class IdleUserConfParser(IdleConfParser):
"""
if not self.IsEmpty():
- cfgFile=open(self.file,'w')
+ fname = self.file
+ try:
+ cfgFile = open(fname, 'w')
+ except IOError:
+ fname.unlink()
+ cfgFile = open(fname, 'w')
self.write(cfgFile)
else:
self.RemoveFile()
diff --git a/Lib/rational.py b/Lib/rational.py
index 71ffff750f..4a56cf20fa 100755
--- a/Lib/rational.py
+++ b/Lib/rational.py
@@ -171,6 +171,42 @@ class Rational(RationalAbc):
else:
return cls(digits, 10 ** -exp)
+ @classmethod
+ def from_continued_fraction(cls, seq):
+ 'Build a Rational from a continued fraction expessed as a sequence'
+ n, d = 1, 0
+ for e in reversed(seq):
+ n, d = d, n
+ n += e * d
+ return cls(n, d) if seq else cls(0)
+
+ def as_continued_fraction(self):
+ 'Return continued fraction expressed as a list'
+ n = self.numerator
+ d = self.denominator
+ cf = []
+ while d:
+ e = int(n // d)
+ cf.append(e)
+ n -= e * d
+ n, d = d, n
+ return cf
+
+ @classmethod
+ def approximate_from_float(cls, f, max_denominator):
+ 'Best rational approximation to f with a denominator <= max_denominator'
+ # XXX First cut at algorithm
+ # Still needs rounding rules as specified at
+ # http://en.wikipedia.org/wiki/Continued_fraction
+ cf = cls.from_float(f).as_continued_fraction()
+ result = Rational(0)
+ for i in range(1, len(cf)):
+ new = cls.from_continued_fraction(cf[:i])
+ if new.denominator > max_denominator:
+ break
+ result = new
+ return result
+
@property
def numerator(a):
return a._numerator
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index 8ccece1e83..7ef702b1f8 100644
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -1,7 +1,7 @@
# Test enhancements related to descriptors and new-style classes
-from test.test_support import verify, vereq, verbose, TestFailed, TESTFN
-from test.test_support import get_original_stdout
+# XXX Please, please, please, someone convert this to unittest style!
+from test.test_support import verify, vereq, verbose, TestFailed, TESTFN, get_original_stdout
from copy import deepcopy
import types
@@ -4173,6 +4173,8 @@ def test_assign_slice():
# ceval.c's assign_slice used to check for
# tp->tp_as_sequence->sq_slice instead of
# tp->tp_as_sequence->sq_ass_slice
+ if verbose:
+ print("Testing assign_slice...")
class C(object):
def __setitem__(self, idx, value):
@@ -4182,8 +4184,72 @@ def test_assign_slice():
c[1:2] = 3
vereq(c.value, 3)
+def test_weakref_in_del_segfault():
+ # This used to segfault until r60057
+ if verbose:
+ print("Testing weakref in del segfault...")
+
+ import weakref
+ global ref
+
+ class Target():
+ def __del__(self):
+ global ref
+ ref = weakref.ref(self)
+
+ w = Target()
+ del w
+ del ref
+
+def test_borrowed_ref_3_segfault():
+ # This used to segfault until r60224
+ if verbose:
+ print("Testing borrowed ref 3 segfault...")
+
+ class KeyFunc(object):
+ def __call__(self, n):
+ del d['key']
+ return 1
+
+ d = {'key': KeyFunc()}
+ try:
+ min(range(10), **d)
+ except:
+ pass
+
+def test_borrowed_ref_4_segfault():
+ # This used to segfault until r60224
+ if verbose:
+ print("Testing borrowed ref 4 segfault...")
+
+ import types
+ import builtins
+
+ class X(object):
+ def __getattr__(self, name):
+ # this is called with name == '__bases__' by PyObject_IsInstance()
+ # during the unbound method call -- it frees the unbound method
+ # itself before it invokes its im_func.
+ del builtins.__import__
+ return ()
+
+ pseudoclass = X()
+
+ class Y(object):
+ def __call__(self, *args):
+ # 'self' was freed already
+ return (self, args)
+
+ # make an unbound method
+ orig_import = __import__
+ try:
+ builtins.__import__ = types.MethodType(Y(), (pseudoclass, str))
+ import spam
+ finally:
+ builtins.__import__ = orig_import
+
def test_main():
- weakref_segfault() # Must be first, somehow
+ #XXXweakref_segfault() # Must be first, somehow
wrapper_segfault() # NB This one is slow
do_this_first()
class_docstrings()
@@ -4279,6 +4345,9 @@ def test_main():
methodwrapper()
notimplemented()
test_assign_slice()
+ test_weakref_in_del_segfault()
+ test_borrowed_ref_3_segfault()
+ test_borrowed_ref_4_segfault()
if verbose: print("All OK")
diff --git a/Lib/test/test_rational.py b/Lib/test/test_rational.py
index e57adce1dc..1bd18142c6 100644
--- a/Lib/test/test_rational.py
+++ b/Lib/test/test_rational.py
@@ -135,6 +135,29 @@ class RationalTest(unittest.TestCase):
TypeError, "Cannot convert sNaN to Rational.",
R.from_decimal, Decimal("snan"))
+ def testFromContinuedFraction(self):
+ self.assertRaises(TypeError, R.from_continued_fraction, None)
+ phi = R.from_continued_fraction([1]*100)
+ self.assertEquals(round(phi - (1 + 5 ** 0.5) / 2, 10), 0.0)
+
+ minusphi = R.from_continued_fraction([-1]*100)
+ self.assertEquals(round(minusphi + (1 + 5 ** 0.5) / 2, 10), 0.0)
+
+ self.assertEquals(R.from_continued_fraction([0]), R(0))
+ self.assertEquals(R.from_continued_fraction([]), R(0))
+
+ def testAsContinuedFraction(self):
+ self.assertEqual(R.from_float(math.pi).as_continued_fraction()[:15],
+ [3, 7, 15, 1, 292, 1, 1, 1, 2, 1, 3, 1, 14, 3, 3])
+ self.assertEqual(R.from_float(-math.pi).as_continued_fraction()[:16],
+ [-4, 1, 6, 15, 1, 292, 1, 1, 1, 2, 1, 3, 1, 14, 3, 3])
+ self.assertEqual(R(0).as_continued_fraction(), [0])
+
+ def testApproximateFromFloat(self):
+ self.assertEqual(R.approximate_from_float(math.pi, 10000), R(355, 113))
+ self.assertEqual(R.approximate_from_float(-math.pi, 10000), R(-355, 113))
+ self.assertEqual(R.approximate_from_float(0.0, 10000), R(0))
+
def testConversions(self):
self.assertTypedEquals(-1, trunc(R(-11, 10)))
self.assertTypedEquals(-2, math.floor(R(-11, 10)))
diff --git a/Lib/urllib2.py b/Lib/urllib2.py
index fb2c3033bd..3ad0b15622 100644
--- a/Lib/urllib2.py
+++ b/Lib/urllib2.py
@@ -1286,7 +1286,7 @@ class FTPHandler(BaseHandler):
headers = mimetools.Message(sf)
return addinfourl(fp, headers, req.get_full_url())
except ftplib.all_errors as msg:
- raise URLError('ftp error %s' % msg).with_traceback(sys.exc_info()[2])
+ raise URLError('ftp error: %s' % msg).with_traceback(sys.exc_info()[2])
def connect_ftp(self, user, passwd, host, port, dirs, timeout):
fw = ftpwrapper(user, passwd, host, port, dirs, timeout)
diff --git a/Modules/config.c.in b/Modules/config.c.in
index 0531fab6bb..a5658f58a6 100644
--- a/Modules/config.c.in
+++ b/Modules/config.c.in
@@ -43,7 +43,7 @@ struct _inittab _PyImport_Inittab[] = {
/* This lives in Python/Python-ast.c */
{"_ast", init_ast},
- /* This lives in Python/_types.c */
+ /* This lives in Modules/_typesmodule.c */
{"_types", init_types},
/* These entries are here for sys.builtin_module_names */
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 5eb5a1e3e8..aed8bb81f6 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -966,7 +966,7 @@ makesockaddr(int sockfd, struct sockaddr *addr, int addrlen, int proto)
struct sockaddr_un *a = (struct sockaddr_un *) addr;
#ifdef linux
if (a->sun_path[0] == 0) { /* Linux abstract namespace */
- addrlen -= (sizeof(*a) - sizeof(a->sun_path));
+ addrlen -= offsetof(struct sockaddr_un, sun_path);
return PyString_FromStringAndSize(a->sun_path, addrlen);
}
else
@@ -1171,7 +1171,7 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
#if defined(PYOS_OS2)
*len_ret = sizeof(*addr);
#else
- *len_ret = len + sizeof(*addr) - sizeof(addr->sun_path);
+ *len_ret = len + offsetof(struct sockaddr_un, sun_path);
#endif
return 1;
}
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index a5b97163de..2a0376a95d 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -1008,11 +1008,14 @@ min_max(PyObject *args, PyObject *kwds, int op)
"%s() got an unexpected keyword argument", name);
return NULL;
}
+ Py_INCREF(keyfunc);
}
it = PyObject_GetIter(v);
- if (it == NULL)
+ if (it == NULL) {
+ Py_XDECREF(keyfunc);
return NULL;
+ }
maxitem = NULL; /* the result */
maxval = NULL; /* the value associated with the result */
@@ -1061,6 +1064,7 @@ min_max(PyObject *args, PyObject *kwds, int op)
else
Py_DECREF(maxval);
Py_DECREF(it);
+ Py_XDECREF(keyfunc);
return maxitem;
Fail_it_item_and_val:
@@ -1071,6 +1075,7 @@ Fail_it:
Py_XDECREF(maxval);
Py_XDECREF(maxitem);
Py_DECREF(it);
+ Py_XDECREF(keyfunc);
return NULL;
}
diff --git a/Python/ceval.c b/Python/ceval.c
index 778bbe0223..10f2db4808 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -1833,6 +1833,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
"__import__ not found");
break;
}
+ Py_INCREF(x);
v = POP();
u = TOP();
if (PyLong_AsLong(u) != -1 || PyErr_Occurred())
@@ -1854,11 +1855,14 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
Py_DECREF(u);
if (w == NULL) {
u = POP();
+ Py_DECREF(x);
x = NULL;
break;
}
READ_TIMESTAMP(intr0);
- x = PyEval_CallObject(x, w);
+ v = x;
+ x = PyEval_CallObject(v, w);
+ Py_DECREF(v);
READ_TIMESTAMP(intr1);
Py_DECREF(w);
SET_TOP(x);
diff --git a/Python/dynload_win.c b/Python/dynload_win.c
index 39c091b39a..4db12c48c7 100644
--- a/Python/dynload_win.c
+++ b/Python/dynload_win.c
@@ -171,11 +171,16 @@ dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname,
HINSTANCE hDLL = NULL;
char pathbuf[260];
LPTSTR dummy;
+ unsigned int old_mode;
/* We use LoadLibraryEx so Windows looks for dependent DLLs
in directory of pathname first. However, Windows95
can sometimes not work correctly unless the absolute
path is used. If GetFullPathName() fails, the LoadLibrary
will certainly fail too, so use its error code */
+
+ /* Don't display a message box when Python can't load a DLL */
+ old_mode = SetErrorMode(SEM_FAILCRITICALERRORS);
+
if (GetFullPathName(pathname,
sizeof(pathbuf),
pathbuf,
@@ -183,6 +188,10 @@ dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname,
/* XXX This call doesn't exist in Windows CE */
hDLL = LoadLibraryEx(pathname, NULL,
LOAD_WITH_ALTERED_SEARCH_PATH);
+
+ /* restore old error mode settings */
+ SetErrorMode(old_mode);
+
if (hDLL==NULL){
PyObject *message;
unsigned int errorCode;
View Lorry Controller Status