2003-12-08 07:38:45 -04:00
|
|
|
"""
|
|
|
|
Tests common to list and UserList.UserList
|
|
|
|
"""
|
|
|
|
|
|
|
|
import sys
|
2004-09-29 05:03:17 -03:00
|
|
|
import os
|
2003-12-08 07:38:45 -04:00
|
|
|
|
2008-05-20 18:35:26 -03:00
|
|
|
from test import support, seq_tests
|
2003-12-08 07:38:45 -04:00
|
|
|
|
2008-01-30 16:15:17 -04:00
|
|
|
def CmpToKey(mycmp):
|
|
|
|
'Convert a cmp= function into a key= function'
|
|
|
|
class K(object):
|
|
|
|
def __init__(self, obj):
|
|
|
|
self.obj = obj
|
|
|
|
def __lt__(self, other):
|
|
|
|
return mycmp(self.obj, other.obj) == -1
|
|
|
|
return K
|
|
|
|
|
2003-12-08 07:38:45 -04:00
|
|
|
class CommonTest(seq_tests.CommonTest):
|
|
|
|
|
2004-09-29 05:03:17 -03:00
|
|
|
def test_init(self):
|
|
|
|
# Iterable arg is optional
|
|
|
|
self.assertEqual(self.type2test([]), self.type2test())
|
|
|
|
|
|
|
|
# Init clears previous values
|
|
|
|
a = self.type2test([1, 2, 3])
|
|
|
|
a.__init__()
|
|
|
|
self.assertEqual(a, self.type2test([]))
|
|
|
|
|
|
|
|
# Init overwrites previous values
|
|
|
|
a = self.type2test([1, 2, 3])
|
|
|
|
a.__init__([4, 5, 6])
|
|
|
|
self.assertEqual(a, self.type2test([4, 5, 6]))
|
|
|
|
|
|
|
|
# Mutables always return a new object
|
|
|
|
b = self.type2test(a)
|
|
|
|
self.assertNotEqual(id(a), id(b))
|
|
|
|
self.assertEqual(a, b)
|
|
|
|
|
2003-12-08 07:38:45 -04:00
|
|
|
def test_repr(self):
|
|
|
|
l0 = []
|
|
|
|
l2 = [0, 1, 2]
|
|
|
|
a0 = self.type2test(l0)
|
|
|
|
a2 = self.type2test(l2)
|
|
|
|
|
|
|
|
self.assertEqual(str(a0), str(l0))
|
|
|
|
self.assertEqual(repr(a0), repr(l0))
|
2006-08-24 23:59:59 -03:00
|
|
|
self.assertEqual(repr(a2), repr(l2))
|
2003-12-08 07:38:45 -04:00
|
|
|
self.assertEqual(str(a2), "[0, 1, 2]")
|
|
|
|
self.assertEqual(repr(a2), "[0, 1, 2]")
|
|
|
|
|
2004-09-29 05:03:17 -03:00
|
|
|
a2.append(a2)
|
|
|
|
a2.append(3)
|
|
|
|
self.assertEqual(str(a2), "[0, 1, 2, [...], 3]")
|
|
|
|
self.assertEqual(repr(a2), "[0, 1, 2, [...], 3]")
|
|
|
|
|
Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r58096 | brett.cannon | 2007-09-10 23:38:27 +0200 (Mon, 10 Sep 2007) | 4 lines
Fix a possible segfault from recursing too deep to get the repr of a list.
Closes issue #1096.
........
r58097 | bill.janssen | 2007-09-10 23:51:02 +0200 (Mon, 10 Sep 2007) | 33 lines
More work on SSL support.
* Much expanded test suite:
All protocols tested against all other protocols.
All protocols tested with all certificate options.
Tests for bad key and bad cert.
Test of STARTTLS functionality.
Test of RAND_* functions.
* Fixes for threading/malloc bug.
* Issue 1065 fixed:
sslsocket class renamed to SSLSocket.
sslerror class renamed to SSLError.
Function "wrap_socket" now used to wrap an existing socket.
* Issue 1583946 finally fixed:
Support for subjectAltName added.
Subject name now returned as proper DN list of RDNs.
* SSLError exported from socket as "sslerror".
* RAND_* functions properly exported from ssl.py.
* Documentation improved:
Example of how to create a self-signed certificate.
Better indexing.
........
r58098 | guido.van.rossum | 2007-09-11 00:02:25 +0200 (Tue, 11 Sep 2007) | 9 lines
Patch # 1140 (my code, approved by Effbot).
Make sure the type of the return value of re.sub(x, y, z) is the type
of y+x (i.e. unicode if either is unicode, str if they are both str)
even if there are no substitutions or if x==z (which triggered various
special cases in join_list()).
Could be backported to 2.5; no need to port to 3.0.
........
r58099 | guido.van.rossum | 2007-09-11 00:36:02 +0200 (Tue, 11 Sep 2007) | 8 lines
Patch # 1026 by Benjamin Aranguren (with Alex Martelli):
Backport abc.py and isinstance/issubclass overloading to 2.6.
I had to backport test_typechecks.py myself, and make one small change
to abc.py to avoid duplicate work when x.__class__ and type(x) are the
same.
........
r58100 | bill.janssen | 2007-09-11 01:41:24 +0200 (Tue, 11 Sep 2007) | 3 lines
A better way of finding an open port to test with.
........
r58101 | bill.janssen | 2007-09-11 03:09:19 +0200 (Tue, 11 Sep 2007) | 4 lines
Make sure test_ssl doesn't reference the ssl module in a
context where it can't be imported.
........
r58102 | bill.janssen | 2007-09-11 04:42:07 +0200 (Tue, 11 Sep 2007) | 3 lines
Fix some documentation bugs.
........
r58103 | nick.coghlan | 2007-09-11 16:01:18 +0200 (Tue, 11 Sep 2007) | 1 line
Always use the -E flag when spawning subprocesses in test_cmd_line (Issue 1056)
........
r58106 | thomas.heller | 2007-09-11 21:17:48 +0200 (Tue, 11 Sep 2007) | 3 lines
Disable some tests that fail on the 'ppc Debian unstable' buildbot to
find out if they cause the segfault on the 'alpha Debian' machine.
........
r58108 | brett.cannon | 2007-09-11 23:02:28 +0200 (Tue, 11 Sep 2007) | 6 lines
Generators had their throw() method allowing string exceptions. That's a
no-no.
Fixes issue #1147. Need to fix 2.5 to raise a proper warning if a string
exception is passed in.
........
r58112 | georg.brandl | 2007-09-12 20:03:51 +0200 (Wed, 12 Sep 2007) | 3 lines
New documentation page for the bdb module.
(This doesn't need to be merged to Py3k.)
........
r58114 | georg.brandl | 2007-09-12 20:05:57 +0200 (Wed, 12 Sep 2007) | 2 lines
Bug #1152: use non-deprecated name in example.
........
r58115 | georg.brandl | 2007-09-12 20:08:33 +0200 (Wed, 12 Sep 2007) | 2 lines
Fix #1122: wrong return type documented for various _Size() functions.
........
r58117 | georg.brandl | 2007-09-12 20:10:56 +0200 (Wed, 12 Sep 2007) | 2 lines
Fix #1139: PyFile_Encoding really is PyFile_SetEncoding.
........
r58119 | georg.brandl | 2007-09-12 20:29:18 +0200 (Wed, 12 Sep 2007) | 2 lines
bug #1154: release memory allocated by "es" PyArg_ParseTuple format specifier.
........
r58121 | bill.janssen | 2007-09-12 20:52:05 +0200 (Wed, 12 Sep 2007) | 1 line
root certificate for https://svn.python.org/, used in test_ssl
........
r58122 | georg.brandl | 2007-09-12 21:00:07 +0200 (Wed, 12 Sep 2007) | 3 lines
Bug #1153: repr.repr() now doesn't require set and dictionary items
to be orderable to properly represent them.
........
r58125 | georg.brandl | 2007-09-12 21:29:28 +0200 (Wed, 12 Sep 2007) | 4 lines
#1120: put explicit version in the shebang lines of pydoc, idle
and smtpd.py scripts that are installed by setup.py. That way, they
work when only "make altinstall" is used.
........
r58139 | mark.summerfield | 2007-09-13 16:54:30 +0200 (Thu, 13 Sep 2007) | 9 lines
Replaced variable o with obj in operator.rst because o is easy to
confuse.
Added a note about Python 3's collections.Mapping etc., above section
that describes isMappingType() etc.
Added xrefs between os, os.path, fileinput, and open().
........
r58143 | facundo.batista | 2007-09-13 20:13:15 +0200 (Thu, 13 Sep 2007) | 7 lines
Merged the decimal-branch (revisions 54886 to 58140). Decimal is now
fully updated to the latests Decimal Specification (v1.66) and the
latests test cases (v2.56).
Thanks to Mark Dickinson for all his help during this process.
........
r58145 | facundo.batista | 2007-09-13 20:42:09 +0200 (Thu, 13 Sep 2007) | 7 lines
Put the parameter watchexp back in (changed watchexp from an int
to a bool). Also second argument to watchexp is now converted
to Decimal, just as with all the other two-argument operations.
Thanks Mark Dickinson.
........
r58147 | andrew.kuchling | 2007-09-14 00:49:34 +0200 (Fri, 14 Sep 2007) | 1 line
Add various items
........
r58148 | andrew.kuchling | 2007-09-14 00:50:10 +0200 (Fri, 14 Sep 2007) | 1 line
Make target unique
........
r58154 | facundo.batista | 2007-09-14 20:58:34 +0200 (Fri, 14 Sep 2007) | 3 lines
Included the new functions, and new descriptions.
........
r58155 | thomas.heller | 2007-09-14 21:40:35 +0200 (Fri, 14 Sep 2007) | 2 lines
ctypes.util.find_library uses dump(1) instead of objdump(1) on Solaris.
Fixes issue #1777530; will backport to release25-maint.
........
r58159 | facundo.batista | 2007-09-14 23:29:52 +0200 (Fri, 14 Sep 2007) | 3 lines
Some additions (examples and a bit on the tutorial).
........
r58160 | georg.brandl | 2007-09-15 18:53:36 +0200 (Sat, 15 Sep 2007) | 2 lines
Remove bdb from the "undocumented modules" list.
........
r58164 | bill.janssen | 2007-09-17 00:06:00 +0200 (Mon, 17 Sep 2007) | 15 lines
Add support for asyncore server-side SSL support. This requires
adding the 'makefile' method to ssl.SSLSocket, and importing the
requisite fakefile class from socket.py, and making the appropriate
changes to it to make it use the SSL connection.
Added sample HTTPS server to test_ssl.py, and test that uses it.
Change SSL tests to use https://svn.python.org/, instead of
www.sf.net and pop.gmail.com.
Added utility function to ssl module, get_server_certificate,
to wrap up the several things to be done to pull a certificate
from a remote server.
........
r58173 | bill.janssen | 2007-09-17 01:16:46 +0200 (Mon, 17 Sep 2007) | 1 line
use binary mode when reading files for testAsyncore to make Windows happy
........
r58175 | raymond.hettinger | 2007-09-17 02:55:00 +0200 (Mon, 17 Sep 2007) | 7 lines
Sync-up named tuples with the latest version of the ASPN recipe.
Allows optional commas in the field-name spec (help when named tuples are used in conjuction with sql queries).
Adds the __fields__ attribute for introspection and to support conversion to dictionary form.
Adds a __replace__() method similar to str.replace() but using a named field as a target.
Clean-up spelling and presentation in doc-strings.
........
r58176 | brett.cannon | 2007-09-17 05:28:34 +0200 (Mon, 17 Sep 2007) | 5 lines
Add a bunch of GIL release/acquire points in tp_print implementations and for
PyObject_Print().
Closes issue #1164.
........
r58177 | sean.reifschneider | 2007-09-17 07:45:04 +0200 (Mon, 17 Sep 2007) | 2 lines
issue1597011: Fix for bz2 module corner-case error due to error checking bug.
........
r58180 | facundo.batista | 2007-09-17 18:26:50 +0200 (Mon, 17 Sep 2007) | 3 lines
Decimal is updated, :)
........
r58181 | facundo.batista | 2007-09-17 19:30:13 +0200 (Mon, 17 Sep 2007) | 5 lines
The methods always return Decimal classes, even if they're
executed through a subclass (thanks Mark Dickinson).
Added a bit of testing for this.
........
r58183 | sean.reifschneider | 2007-09-17 22:53:21 +0200 (Mon, 17 Sep 2007) | 2 lines
issue1082: Fixing platform and system for Vista.
........
r58185 | andrew.kuchling | 2007-09-18 03:36:16 +0200 (Tue, 18 Sep 2007) | 1 line
Add item; sort properly
........
r58186 | raymond.hettinger | 2007-09-18 05:33:19 +0200 (Tue, 18 Sep 2007) | 1 line
Handle corner cased on 0-tuples and 1-tuples. Add verbose option so people can see how it works.
........
r58192 | georg.brandl | 2007-09-18 09:24:40 +0200 (Tue, 18 Sep 2007) | 2 lines
A bit of reordering, also show more subheadings in the lang ref index.
........
r58193 | facundo.batista | 2007-09-18 18:53:18 +0200 (Tue, 18 Sep 2007) | 4 lines
Speed up of the various division operations (remainder, divide,
divideint and divmod). Thanks Mark Dickinson.
........
r58197 | raymond.hettinger | 2007-09-19 00:18:02 +0200 (Wed, 19 Sep 2007) | 1 line
Cleanup docs for NamedTuple.
........
2007-09-19 00:06:30 -03:00
|
|
|
l0 = []
|
|
|
|
for i in range(sys.getrecursionlimit() + 100):
|
|
|
|
l0 = [l0]
|
|
|
|
self.assertRaises(RuntimeError, repr, l0)
|
|
|
|
|
2004-09-29 05:03:17 -03:00
|
|
|
def test_print(self):
|
2007-05-07 19:24:25 -03:00
|
|
|
d = self.type2test(range(200))
|
2004-09-29 05:03:17 -03:00
|
|
|
d.append(d)
|
2007-05-07 19:24:25 -03:00
|
|
|
d.extend(range(200,400))
|
2004-09-29 05:03:17 -03:00
|
|
|
d.append(d)
|
|
|
|
d.append(400)
|
|
|
|
try:
|
2008-05-20 18:35:26 -03:00
|
|
|
fo = open(support.TESTFN, "w")
|
2007-02-09 18:11:20 -04:00
|
|
|
fo.write(str(d))
|
2004-09-29 05:03:17 -03:00
|
|
|
fo.close()
|
2008-05-20 18:35:26 -03:00
|
|
|
fo = open(support.TESTFN, "r")
|
2004-09-29 05:03:17 -03:00
|
|
|
self.assertEqual(fo.read(), repr(d))
|
|
|
|
finally:
|
|
|
|
fo.close()
|
2008-05-20 18:35:26 -03:00
|
|
|
os.remove(support.TESTFN)
|
2004-09-29 05:03:17 -03:00
|
|
|
|
|
|
|
def test_set_subscript(self):
|
|
|
|
a = self.type2test(range(20))
|
|
|
|
self.assertRaises(ValueError, a.__setitem__, slice(0, 10, 0), [1,2,3])
|
|
|
|
self.assertRaises(TypeError, a.__setitem__, slice(0, 10), 1)
|
|
|
|
self.assertRaises(ValueError, a.__setitem__, slice(0, 10, 2), [1,2])
|
|
|
|
self.assertRaises(TypeError, a.__getitem__, 'x', 1)
|
|
|
|
a[slice(2,10,3)] = [1,2,3]
|
|
|
|
self.assertEqual(a, self.type2test([0, 1, 1, 3, 4, 2, 6, 7, 3,
|
|
|
|
9, 10, 11, 12, 13, 14, 15,
|
|
|
|
16, 17, 18, 19]))
|
|
|
|
|
|
|
|
def test_reversed(self):
|
|
|
|
a = self.type2test(range(20))
|
|
|
|
r = reversed(a)
|
|
|
|
self.assertEqual(list(r), self.type2test(range(19, -1, -1)))
|
2007-04-21 12:47:16 -03:00
|
|
|
self.assertRaises(StopIteration, next, r)
|
2004-09-29 05:03:17 -03:00
|
|
|
self.assertEqual(list(reversed(self.type2test())),
|
|
|
|
self.type2test())
|
2008-12-02 17:33:45 -04:00
|
|
|
# Bug 3689: make sure list-reversed-iterator doesn't have __len__
|
|
|
|
self.assertRaises(TypeError, len, reversed([1,2,3]))
|
2004-09-29 05:03:17 -03:00
|
|
|
|
2003-12-08 07:38:45 -04:00
|
|
|
def test_setitem(self):
|
|
|
|
a = self.type2test([0, 1])
|
|
|
|
a[0] = 0
|
|
|
|
a[1] = 100
|
|
|
|
self.assertEqual(a, self.type2test([0, 100]))
|
|
|
|
a[-1] = 200
|
|
|
|
self.assertEqual(a, self.type2test([0, 200]))
|
|
|
|
a[-2] = 100
|
|
|
|
self.assertEqual(a, self.type2test([100, 200]))
|
|
|
|
self.assertRaises(IndexError, a.__setitem__, -3, 200)
|
|
|
|
self.assertRaises(IndexError, a.__setitem__, 2, 200)
|
|
|
|
|
|
|
|
a = self.type2test([])
|
|
|
|
self.assertRaises(IndexError, a.__setitem__, 0, 200)
|
|
|
|
self.assertRaises(IndexError, a.__setitem__, -1, 200)
|
|
|
|
self.assertRaises(TypeError, a.__setitem__)
|
|
|
|
|
|
|
|
a = self.type2test([0,1,2,3,4])
|
2007-01-15 12:59:06 -04:00
|
|
|
a[0] = 1
|
|
|
|
a[1] = 2
|
|
|
|
a[2] = 3
|
2003-12-08 07:38:45 -04:00
|
|
|
self.assertEqual(a, self.type2test([1,2,3,3,4]))
|
|
|
|
a[0] = 5
|
|
|
|
a[1] = 6
|
|
|
|
a[2] = 7
|
|
|
|
self.assertEqual(a, self.type2test([5,6,7,3,4]))
|
2007-01-15 12:59:06 -04:00
|
|
|
a[-2] = 88
|
|
|
|
a[-1] = 99
|
2003-12-08 07:38:45 -04:00
|
|
|
self.assertEqual(a, self.type2test([5,6,7,88,99]))
|
|
|
|
a[-2] = 8
|
|
|
|
a[-1] = 9
|
|
|
|
self.assertEqual(a, self.type2test([5,6,7,8,9]))
|
|
|
|
|
|
|
|
def test_delitem(self):
|
|
|
|
a = self.type2test([0, 1])
|
|
|
|
del a[1]
|
|
|
|
self.assertEqual(a, [0])
|
|
|
|
del a[0]
|
|
|
|
self.assertEqual(a, [])
|
|
|
|
|
|
|
|
a = self.type2test([0, 1])
|
|
|
|
del a[-2]
|
|
|
|
self.assertEqual(a, [1])
|
|
|
|
del a[-1]
|
|
|
|
self.assertEqual(a, [])
|
|
|
|
|
|
|
|
a = self.type2test([0, 1])
|
|
|
|
self.assertRaises(IndexError, a.__delitem__, -3)
|
|
|
|
self.assertRaises(IndexError, a.__delitem__, 2)
|
|
|
|
|
|
|
|
a = self.type2test([])
|
|
|
|
self.assertRaises(IndexError, a.__delitem__, 0)
|
|
|
|
|
|
|
|
self.assertRaises(TypeError, a.__delitem__)
|
|
|
|
|
|
|
|
def test_setslice(self):
|
|
|
|
l = [0, 1]
|
|
|
|
a = self.type2test(l)
|
|
|
|
|
|
|
|
for i in range(-3, 4):
|
|
|
|
a[:i] = l[:i]
|
|
|
|
self.assertEqual(a, l)
|
|
|
|
a2 = a[:]
|
|
|
|
a2[:i] = a[:i]
|
|
|
|
self.assertEqual(a2, a)
|
|
|
|
a[i:] = l[i:]
|
|
|
|
self.assertEqual(a, l)
|
|
|
|
a2 = a[:]
|
|
|
|
a2[i:] = a[i:]
|
|
|
|
self.assertEqual(a2, a)
|
|
|
|
for j in range(-3, 4):
|
|
|
|
a[i:j] = l[i:j]
|
|
|
|
self.assertEqual(a, l)
|
|
|
|
a2 = a[:]
|
|
|
|
a2[i:j] = a[i:j]
|
|
|
|
self.assertEqual(a2, a)
|
|
|
|
|
|
|
|
aa2 = a2[:]
|
|
|
|
aa2[:0] = [-2, -1]
|
|
|
|
self.assertEqual(aa2, [-2, -1, 0, 1])
|
|
|
|
aa2[0:] = []
|
|
|
|
self.assertEqual(aa2, [])
|
|
|
|
|
|
|
|
a = self.type2test([1, 2, 3, 4, 5])
|
|
|
|
a[:-1] = a
|
|
|
|
self.assertEqual(a, self.type2test([1, 2, 3, 4, 5, 5]))
|
|
|
|
a = self.type2test([1, 2, 3, 4, 5])
|
|
|
|
a[1:] = a
|
|
|
|
self.assertEqual(a, self.type2test([1, 1, 2, 3, 4, 5]))
|
|
|
|
a = self.type2test([1, 2, 3, 4, 5])
|
|
|
|
a[1:-1] = a
|
|
|
|
self.assertEqual(a, self.type2test([1, 1, 2, 3, 4, 5, 5]))
|
|
|
|
|
|
|
|
a = self.type2test([])
|
|
|
|
a[:] = tuple(range(10))
|
|
|
|
self.assertEqual(a, self.type2test(range(10)))
|
|
|
|
|
Merge the trunk changes in. Breaks socket.ssl for now.
Merged revisions 57392-57619 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r57395 | georg.brandl | 2007-08-24 19:23:23 +0200 (Fri, 24 Aug 2007) | 2 lines
Bug #1011: fix rfc822.Message.getheader docs.
........
r57397 | georg.brandl | 2007-08-24 19:38:49 +0200 (Fri, 24 Aug 2007) | 2 lines
Patch #1006: port test_winreg to unittest.
........
r57398 | georg.brandl | 2007-08-24 19:46:54 +0200 (Fri, 24 Aug 2007) | 2 lines
Fix #1012: wrong URL to :mod:`site` in install/index.rst.
........
r57399 | georg.brandl | 2007-08-24 20:07:52 +0200 (Fri, 24 Aug 2007) | 2 lines
Patch #1008: port test_signal to unittest.
........
r57400 | georg.brandl | 2007-08-24 20:22:54 +0200 (Fri, 24 Aug 2007) | 2 lines
Port test_frozen to unittest.
........
r57401 | georg.brandl | 2007-08-24 20:27:43 +0200 (Fri, 24 Aug 2007) | 2 lines
Document new utility functions in test_support.
........
r57402 | georg.brandl | 2007-08-24 20:30:06 +0200 (Fri, 24 Aug 2007) | 2 lines
Remove test_rgbimg output file, there is no test_rgbimg.py.
........
r57403 | georg.brandl | 2007-08-24 20:35:27 +0200 (Fri, 24 Aug 2007) | 2 lines
Remove output file for test_ossaudiodev, also properly close the dsp object.
........
r57404 | georg.brandl | 2007-08-24 20:46:27 +0200 (Fri, 24 Aug 2007) | 2 lines
Convert test_linuxaudiodev to unittest. Fix a wrong finally clause in test_ossaudiodev.
........
r57406 | collin.winter | 2007-08-24 21:13:58 +0200 (Fri, 24 Aug 2007) | 1 line
Convert test_pkg to use unittest.
........
r57408 | georg.brandl | 2007-08-24 21:22:34 +0200 (Fri, 24 Aug 2007) | 2 lines
Catch the correct errors.
........
r57409 | georg.brandl | 2007-08-24 21:33:53 +0200 (Fri, 24 Aug 2007) | 2 lines
Port test_class to unittest. Patch #1671298.
........
r57415 | collin.winter | 2007-08-24 23:09:42 +0200 (Fri, 24 Aug 2007) | 1 line
Make test_structmembers pass when run with regrtests's -R flag.
........
r57455 | nick.coghlan | 2007-08-25 06:32:07 +0200 (Sat, 25 Aug 2007) | 1 line
Revert misguided attempt at fixing incompatibility between -m and -i switches (better fix coming soon)
........
r57456 | nick.coghlan | 2007-08-25 06:35:54 +0200 (Sat, 25 Aug 2007) | 1 line
Revert compile.c changes that shouldn't have been included in previous checkin
........
r57461 | nick.coghlan | 2007-08-25 12:50:41 +0200 (Sat, 25 Aug 2007) | 1 line
Fix bug 1764407 - the -i switch now does the right thing when using the -m switch
........
r57464 | guido.van.rossum | 2007-08-25 17:08:43 +0200 (Sat, 25 Aug 2007) | 4 lines
Server-side SSL and certificate validation, by Bill Janssen.
While cleaning up Bill's C style, I may have cleaned up some code
he didn't touch as well (in _ssl.c).
........
r57465 | neal.norwitz | 2007-08-25 18:41:36 +0200 (Sat, 25 Aug 2007) | 3 lines
Try to get this to build with Visual Studio by moving all the variable
declarations to the beginning of a scope.
........
r57466 | neal.norwitz | 2007-08-25 18:54:38 +0200 (Sat, 25 Aug 2007) | 1 line
Fix test so it is skipped properly if there is no SSL support.
........
r57467 | neal.norwitz | 2007-08-25 18:58:09 +0200 (Sat, 25 Aug 2007) | 2 lines
Fix a few more variables to try to get this to compile with Visual Studio.
........
r57473 | neal.norwitz | 2007-08-25 19:25:17 +0200 (Sat, 25 Aug 2007) | 1 line
Try to get this test to pass for systems that do not have SO_REUSEPORT
........
r57482 | gregory.p.smith | 2007-08-26 02:26:00 +0200 (Sun, 26 Aug 2007) | 7 lines
keep setup.py from listing unneeded hash modules (_md5, _sha*) as
missing when they were not built because _hashlib with openssl provided
their functionality instead.
don't build bsddb185 if bsddb was built.
........
r57483 | neal.norwitz | 2007-08-26 03:08:16 +0200 (Sun, 26 Aug 2007) | 1 line
Fix typo in docstring (missing c in reacquire)
........
r57484 | neal.norwitz | 2007-08-26 03:42:03 +0200 (Sun, 26 Aug 2007) | 2 lines
Spell check (also americanify behaviour, it's almost 3 times as common)
........
r57503 | neal.norwitz | 2007-08-26 08:29:57 +0200 (Sun, 26 Aug 2007) | 4 lines
Reap children before the test starts so hopefully SocketServer
won't find any old children left around which causes an exception
in collect_children() and the test to fail.
........
r57510 | neal.norwitz | 2007-08-26 20:50:39 +0200 (Sun, 26 Aug 2007) | 1 line
Fail gracefully if the cert files cannot be created
........
r57513 | guido.van.rossum | 2007-08-26 21:35:09 +0200 (Sun, 26 Aug 2007) | 4 lines
Bill Janssen wrote:
Here's a patch which makes test_ssl a better player in the buildbots
environment. I deep-ended on "try-except-else" clauses.
........
r57518 | neal.norwitz | 2007-08-26 23:40:16 +0200 (Sun, 26 Aug 2007) | 1 line
Get the test passing by commenting out some writes (should they be removed?)
........
r57522 | neal.norwitz | 2007-08-27 00:16:23 +0200 (Mon, 27 Aug 2007) | 3 lines
Catch IOError for when the device file doesn't exist or the user doesn't have
permission to write to the device.
........
r57524 | neal.norwitz | 2007-08-27 00:20:03 +0200 (Mon, 27 Aug 2007) | 5 lines
Another patch from Bill Janssen that:
1) Fixes the bug that two class names are initial-lower-case.
2) Replaces the poll waiting for the server to become ready with
a threading.Event signal.
........
r57536 | neal.norwitz | 2007-08-27 02:58:33 +0200 (Mon, 27 Aug 2007) | 1 line
Stop using string.join (from the module) to ease upgrade to py3k
........
r57537 | neal.norwitz | 2007-08-27 03:03:18 +0200 (Mon, 27 Aug 2007) | 1 line
Make a utility function for handling (printing) an error
........
r57538 | neal.norwitz | 2007-08-27 03:15:33 +0200 (Mon, 27 Aug 2007) | 4 lines
If we can't create a certificate, print a warning, but don't fail the test.
Modified patch from what Bill Janssen sent on python-3000.
........
r57539 | facundo.batista | 2007-08-27 03:15:34 +0200 (Mon, 27 Aug 2007) | 7 lines
Ignore test failures caused by 'resource temporarily unavailable'
exceptions raised in the test server thread, since SimpleXMLRPCServer
does not gracefully handle them. Changed number of requests handled
by tests server thread to one (was 2) because no tests require more
than one request. [GSoC - Alan McIntyre]
........
r57561 | guido.van.rossum | 2007-08-27 19:19:42 +0200 (Mon, 27 Aug 2007) | 8 lines
> Regardless, building a fixed test certificate and checking it in sounds like
> the better option. Then the openssl command in the test code can be turned
> into a comment describing how the test data was pregenerated.
Here's a patch that does that.
Bill
........
r57568 | guido.van.rossum | 2007-08-27 20:42:23 +0200 (Mon, 27 Aug 2007) | 26 lines
> Some of the code sets the error string in this directly before
> returning NULL, and other pieces of the code call PySSL_SetError,
> which creates the error string. I think some of the places which set
> the string directly probably shouldn't; instead, they should call
> PySSL_SetError to cons up the error name directly from the err code.
> However, PySSL_SetError only works after the construction of an ssl
> object, which means it can't be used there... I'll take a longer look
> at it and see if there's a reasonable fix.
Here's a patch which addresses this. It also fixes the indentation in
PySSL_SetError, bringing it into line with PEP 7, fixes a compile warning
about one of the OpenSSL macros, and makes the namespace a bit more
consistent. I've tested it on FC 7 and OS X 10.4.
% ./python ./Lib/test/regrtest.py -R :1: -u all test_ssl
test_ssl
beginning 6 repetitions
123456
......
1 test OK.
[29244 refs]
%
[GvR: slightly edited to enforce 79-char line length, even if it required
violating the style guide.]
........
r57570 | guido.van.rossum | 2007-08-27 21:11:11 +0200 (Mon, 27 Aug 2007) | 2 lines
Patch 10124 by Bill Janssen, docs for the new ssl code.
........
r57574 | guido.van.rossum | 2007-08-27 22:51:00 +0200 (Mon, 27 Aug 2007) | 3 lines
Patch # 1739906 by Christian Heimes -- add reduce to functools (importing
it from __builtin__).
........
r57575 | guido.van.rossum | 2007-08-27 22:52:10 +0200 (Mon, 27 Aug 2007) | 2 lines
News about functools.reduce.
........
r57611 | georg.brandl | 2007-08-28 10:29:08 +0200 (Tue, 28 Aug 2007) | 2 lines
Document rev. 57574.
........
r57612 | sean.reifschneider | 2007-08-28 11:07:54 +0200 (Tue, 28 Aug 2007) | 2 lines
Adding basic imputil documentation.
........
r57614 | georg.brandl | 2007-08-28 12:48:18 +0200 (Tue, 28 Aug 2007) | 2 lines
Fix some glitches.
........
r57616 | lars.gustaebel | 2007-08-28 14:31:09 +0200 (Tue, 28 Aug 2007) | 5 lines
TarFile.__init__() no longer fails if no name argument is passed and
the fileobj argument has no usable name attribute (e.g. StringIO).
(will backport to 2.5)
........
r57619 | thomas.wouters | 2007-08-28 17:28:19 +0200 (Tue, 28 Aug 2007) | 22 lines
Improve extended slicing support in builtin types and classes. Specifically:
- Specialcase extended slices that amount to a shallow copy the same way as
is done for simple slices, in the tuple, string and unicode case.
- Specialcase step-1 extended slices to optimize the common case for all
involved types.
- For lists, allow extended slice assignment of differing lengths as long
as the step is 1. (Previously, 'l[:2:1] = []' failed even though
'l[:2] = []' and 'l[:2:None] = []' do not.)
- Implement extended slicing for buffer, array, structseq, mmap and
UserString.UserString.
- Implement slice-object support (but not non-step-1 slice assignment) for
UserString.MutableString.
- Add tests for all new functionality.
........
2007-08-28 18:37:11 -03:00
|
|
|
self.assertRaises(TypeError, a.__setitem__, slice(0, 1, 5))
|
2003-12-08 07:38:45 -04:00
|
|
|
|
Merge the trunk changes in. Breaks socket.ssl for now.
Merged revisions 57392-57619 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r57395 | georg.brandl | 2007-08-24 19:23:23 +0200 (Fri, 24 Aug 2007) | 2 lines
Bug #1011: fix rfc822.Message.getheader docs.
........
r57397 | georg.brandl | 2007-08-24 19:38:49 +0200 (Fri, 24 Aug 2007) | 2 lines
Patch #1006: port test_winreg to unittest.
........
r57398 | georg.brandl | 2007-08-24 19:46:54 +0200 (Fri, 24 Aug 2007) | 2 lines
Fix #1012: wrong URL to :mod:`site` in install/index.rst.
........
r57399 | georg.brandl | 2007-08-24 20:07:52 +0200 (Fri, 24 Aug 2007) | 2 lines
Patch #1008: port test_signal to unittest.
........
r57400 | georg.brandl | 2007-08-24 20:22:54 +0200 (Fri, 24 Aug 2007) | 2 lines
Port test_frozen to unittest.
........
r57401 | georg.brandl | 2007-08-24 20:27:43 +0200 (Fri, 24 Aug 2007) | 2 lines
Document new utility functions in test_support.
........
r57402 | georg.brandl | 2007-08-24 20:30:06 +0200 (Fri, 24 Aug 2007) | 2 lines
Remove test_rgbimg output file, there is no test_rgbimg.py.
........
r57403 | georg.brandl | 2007-08-24 20:35:27 +0200 (Fri, 24 Aug 2007) | 2 lines
Remove output file for test_ossaudiodev, also properly close the dsp object.
........
r57404 | georg.brandl | 2007-08-24 20:46:27 +0200 (Fri, 24 Aug 2007) | 2 lines
Convert test_linuxaudiodev to unittest. Fix a wrong finally clause in test_ossaudiodev.
........
r57406 | collin.winter | 2007-08-24 21:13:58 +0200 (Fri, 24 Aug 2007) | 1 line
Convert test_pkg to use unittest.
........
r57408 | georg.brandl | 2007-08-24 21:22:34 +0200 (Fri, 24 Aug 2007) | 2 lines
Catch the correct errors.
........
r57409 | georg.brandl | 2007-08-24 21:33:53 +0200 (Fri, 24 Aug 2007) | 2 lines
Port test_class to unittest. Patch #1671298.
........
r57415 | collin.winter | 2007-08-24 23:09:42 +0200 (Fri, 24 Aug 2007) | 1 line
Make test_structmembers pass when run with regrtests's -R flag.
........
r57455 | nick.coghlan | 2007-08-25 06:32:07 +0200 (Sat, 25 Aug 2007) | 1 line
Revert misguided attempt at fixing incompatibility between -m and -i switches (better fix coming soon)
........
r57456 | nick.coghlan | 2007-08-25 06:35:54 +0200 (Sat, 25 Aug 2007) | 1 line
Revert compile.c changes that shouldn't have been included in previous checkin
........
r57461 | nick.coghlan | 2007-08-25 12:50:41 +0200 (Sat, 25 Aug 2007) | 1 line
Fix bug 1764407 - the -i switch now does the right thing when using the -m switch
........
r57464 | guido.van.rossum | 2007-08-25 17:08:43 +0200 (Sat, 25 Aug 2007) | 4 lines
Server-side SSL and certificate validation, by Bill Janssen.
While cleaning up Bill's C style, I may have cleaned up some code
he didn't touch as well (in _ssl.c).
........
r57465 | neal.norwitz | 2007-08-25 18:41:36 +0200 (Sat, 25 Aug 2007) | 3 lines
Try to get this to build with Visual Studio by moving all the variable
declarations to the beginning of a scope.
........
r57466 | neal.norwitz | 2007-08-25 18:54:38 +0200 (Sat, 25 Aug 2007) | 1 line
Fix test so it is skipped properly if there is no SSL support.
........
r57467 | neal.norwitz | 2007-08-25 18:58:09 +0200 (Sat, 25 Aug 2007) | 2 lines
Fix a few more variables to try to get this to compile with Visual Studio.
........
r57473 | neal.norwitz | 2007-08-25 19:25:17 +0200 (Sat, 25 Aug 2007) | 1 line
Try to get this test to pass for systems that do not have SO_REUSEPORT
........
r57482 | gregory.p.smith | 2007-08-26 02:26:00 +0200 (Sun, 26 Aug 2007) | 7 lines
keep setup.py from listing unneeded hash modules (_md5, _sha*) as
missing when they were not built because _hashlib with openssl provided
their functionality instead.
don't build bsddb185 if bsddb was built.
........
r57483 | neal.norwitz | 2007-08-26 03:08:16 +0200 (Sun, 26 Aug 2007) | 1 line
Fix typo in docstring (missing c in reacquire)
........
r57484 | neal.norwitz | 2007-08-26 03:42:03 +0200 (Sun, 26 Aug 2007) | 2 lines
Spell check (also americanify behaviour, it's almost 3 times as common)
........
r57503 | neal.norwitz | 2007-08-26 08:29:57 +0200 (Sun, 26 Aug 2007) | 4 lines
Reap children before the test starts so hopefully SocketServer
won't find any old children left around which causes an exception
in collect_children() and the test to fail.
........
r57510 | neal.norwitz | 2007-08-26 20:50:39 +0200 (Sun, 26 Aug 2007) | 1 line
Fail gracefully if the cert files cannot be created
........
r57513 | guido.van.rossum | 2007-08-26 21:35:09 +0200 (Sun, 26 Aug 2007) | 4 lines
Bill Janssen wrote:
Here's a patch which makes test_ssl a better player in the buildbots
environment. I deep-ended on "try-except-else" clauses.
........
r57518 | neal.norwitz | 2007-08-26 23:40:16 +0200 (Sun, 26 Aug 2007) | 1 line
Get the test passing by commenting out some writes (should they be removed?)
........
r57522 | neal.norwitz | 2007-08-27 00:16:23 +0200 (Mon, 27 Aug 2007) | 3 lines
Catch IOError for when the device file doesn't exist or the user doesn't have
permission to write to the device.
........
r57524 | neal.norwitz | 2007-08-27 00:20:03 +0200 (Mon, 27 Aug 2007) | 5 lines
Another patch from Bill Janssen that:
1) Fixes the bug that two class names are initial-lower-case.
2) Replaces the poll waiting for the server to become ready with
a threading.Event signal.
........
r57536 | neal.norwitz | 2007-08-27 02:58:33 +0200 (Mon, 27 Aug 2007) | 1 line
Stop using string.join (from the module) to ease upgrade to py3k
........
r57537 | neal.norwitz | 2007-08-27 03:03:18 +0200 (Mon, 27 Aug 2007) | 1 line
Make a utility function for handling (printing) an error
........
r57538 | neal.norwitz | 2007-08-27 03:15:33 +0200 (Mon, 27 Aug 2007) | 4 lines
If we can't create a certificate, print a warning, but don't fail the test.
Modified patch from what Bill Janssen sent on python-3000.
........
r57539 | facundo.batista | 2007-08-27 03:15:34 +0200 (Mon, 27 Aug 2007) | 7 lines
Ignore test failures caused by 'resource temporarily unavailable'
exceptions raised in the test server thread, since SimpleXMLRPCServer
does not gracefully handle them. Changed number of requests handled
by tests server thread to one (was 2) because no tests require more
than one request. [GSoC - Alan McIntyre]
........
r57561 | guido.van.rossum | 2007-08-27 19:19:42 +0200 (Mon, 27 Aug 2007) | 8 lines
> Regardless, building a fixed test certificate and checking it in sounds like
> the better option. Then the openssl command in the test code can be turned
> into a comment describing how the test data was pregenerated.
Here's a patch that does that.
Bill
........
r57568 | guido.van.rossum | 2007-08-27 20:42:23 +0200 (Mon, 27 Aug 2007) | 26 lines
> Some of the code sets the error string in this directly before
> returning NULL, and other pieces of the code call PySSL_SetError,
> which creates the error string. I think some of the places which set
> the string directly probably shouldn't; instead, they should call
> PySSL_SetError to cons up the error name directly from the err code.
> However, PySSL_SetError only works after the construction of an ssl
> object, which means it can't be used there... I'll take a longer look
> at it and see if there's a reasonable fix.
Here's a patch which addresses this. It also fixes the indentation in
PySSL_SetError, bringing it into line with PEP 7, fixes a compile warning
about one of the OpenSSL macros, and makes the namespace a bit more
consistent. I've tested it on FC 7 and OS X 10.4.
% ./python ./Lib/test/regrtest.py -R :1: -u all test_ssl
test_ssl
beginning 6 repetitions
123456
......
1 test OK.
[29244 refs]
%
[GvR: slightly edited to enforce 79-char line length, even if it required
violating the style guide.]
........
r57570 | guido.van.rossum | 2007-08-27 21:11:11 +0200 (Mon, 27 Aug 2007) | 2 lines
Patch 10124 by Bill Janssen, docs for the new ssl code.
........
r57574 | guido.van.rossum | 2007-08-27 22:51:00 +0200 (Mon, 27 Aug 2007) | 3 lines
Patch # 1739906 by Christian Heimes -- add reduce to functools (importing
it from __builtin__).
........
r57575 | guido.van.rossum | 2007-08-27 22:52:10 +0200 (Mon, 27 Aug 2007) | 2 lines
News about functools.reduce.
........
r57611 | georg.brandl | 2007-08-28 10:29:08 +0200 (Tue, 28 Aug 2007) | 2 lines
Document rev. 57574.
........
r57612 | sean.reifschneider | 2007-08-28 11:07:54 +0200 (Tue, 28 Aug 2007) | 2 lines
Adding basic imputil documentation.
........
r57614 | georg.brandl | 2007-08-28 12:48:18 +0200 (Tue, 28 Aug 2007) | 2 lines
Fix some glitches.
........
r57616 | lars.gustaebel | 2007-08-28 14:31:09 +0200 (Tue, 28 Aug 2007) | 5 lines
TarFile.__init__() no longer fails if no name argument is passed and
the fileobj argument has no usable name attribute (e.g. StringIO).
(will backport to 2.5)
........
r57619 | thomas.wouters | 2007-08-28 17:28:19 +0200 (Tue, 28 Aug 2007) | 22 lines
Improve extended slicing support in builtin types and classes. Specifically:
- Specialcase extended slices that amount to a shallow copy the same way as
is done for simple slices, in the tuple, string and unicode case.
- Specialcase step-1 extended slices to optimize the common case for all
involved types.
- For lists, allow extended slice assignment of differing lengths as long
as the step is 1. (Previously, 'l[:2:1] = []' failed even though
'l[:2] = []' and 'l[:2:None] = []' do not.)
- Implement extended slicing for buffer, array, structseq, mmap and
UserString.UserString.
- Implement slice-object support (but not non-step-1 slice assignment) for
UserString.MutableString.
- Add tests for all new functionality.
........
2007-08-28 18:37:11 -03:00
|
|
|
self.assertRaises(TypeError, a.__setitem__)
|
2003-12-08 07:38:45 -04:00
|
|
|
|
|
|
|
def test_delslice(self):
|
|
|
|
a = self.type2test([0, 1])
|
|
|
|
del a[1:2]
|
|
|
|
del a[0:1]
|
|
|
|
self.assertEqual(a, self.type2test([]))
|
|
|
|
|
|
|
|
a = self.type2test([0, 1])
|
2007-01-15 12:59:06 -04:00
|
|
|
del a[1:2]
|
|
|
|
del a[0:1]
|
2003-12-08 07:38:45 -04:00
|
|
|
self.assertEqual(a, self.type2test([]))
|
|
|
|
|
|
|
|
a = self.type2test([0, 1])
|
|
|
|
del a[-2:-1]
|
|
|
|
self.assertEqual(a, self.type2test([1]))
|
|
|
|
|
|
|
|
a = self.type2test([0, 1])
|
2007-01-15 12:59:06 -04:00
|
|
|
del a[-2:-1]
|
2003-12-08 07:38:45 -04:00
|
|
|
self.assertEqual(a, self.type2test([1]))
|
|
|
|
|
|
|
|
a = self.type2test([0, 1])
|
|
|
|
del a[1:]
|
|
|
|
del a[:1]
|
|
|
|
self.assertEqual(a, self.type2test([]))
|
|
|
|
|
|
|
|
a = self.type2test([0, 1])
|
2007-01-15 12:59:06 -04:00
|
|
|
del a[1:]
|
|
|
|
del a[:1]
|
2003-12-08 07:38:45 -04:00
|
|
|
self.assertEqual(a, self.type2test([]))
|
|
|
|
|
|
|
|
a = self.type2test([0, 1])
|
|
|
|
del a[-1:]
|
|
|
|
self.assertEqual(a, self.type2test([0]))
|
|
|
|
|
|
|
|
a = self.type2test([0, 1])
|
2007-01-15 12:59:06 -04:00
|
|
|
del a[-1:]
|
2003-12-08 07:38:45 -04:00
|
|
|
self.assertEqual(a, self.type2test([0]))
|
|
|
|
|
|
|
|
a = self.type2test([0, 1])
|
|
|
|
del a[:]
|
|
|
|
self.assertEqual(a, self.type2test([]))
|
|
|
|
|
|
|
|
def test_append(self):
|
|
|
|
a = self.type2test([])
|
|
|
|
a.append(0)
|
|
|
|
a.append(1)
|
|
|
|
a.append(2)
|
|
|
|
self.assertEqual(a, self.type2test([0, 1, 2]))
|
|
|
|
|
|
|
|
self.assertRaises(TypeError, a.append)
|
|
|
|
|
|
|
|
def test_extend(self):
|
|
|
|
a1 = self.type2test([0])
|
|
|
|
a2 = self.type2test((0, 1))
|
|
|
|
a = a1[:]
|
|
|
|
a.extend(a2)
|
|
|
|
self.assertEqual(a, a1 + a2)
|
|
|
|
|
|
|
|
a.extend(self.type2test([]))
|
|
|
|
self.assertEqual(a, a1 + a2)
|
|
|
|
|
|
|
|
a.extend(a)
|
|
|
|
self.assertEqual(a, self.type2test([0, 0, 1, 0, 0, 1]))
|
|
|
|
|
|
|
|
a = self.type2test("spam")
|
|
|
|
a.extend("eggs")
|
|
|
|
self.assertEqual(a, list("spameggs"))
|
|
|
|
|
|
|
|
self.assertRaises(TypeError, a.extend, None)
|
|
|
|
|
|
|
|
self.assertRaises(TypeError, a.extend)
|
|
|
|
|
|
|
|
def test_insert(self):
|
|
|
|
a = self.type2test([0, 1, 2])
|
|
|
|
a.insert(0, -2)
|
|
|
|
a.insert(1, -1)
|
|
|
|
a.insert(2, 0)
|
|
|
|
self.assertEqual(a, [-2, -1, 0, 0, 1, 2])
|
|
|
|
|
|
|
|
b = a[:]
|
|
|
|
b.insert(-2, "foo")
|
|
|
|
b.insert(-200, "left")
|
|
|
|
b.insert(200, "right")
|
|
|
|
self.assertEqual(b, self.type2test(["left",-2,-1,0,0,"foo",1,2,"right"]))
|
|
|
|
|
|
|
|
self.assertRaises(TypeError, a.insert)
|
|
|
|
|
|
|
|
def test_pop(self):
|
|
|
|
a = self.type2test([-1, 0, 1])
|
|
|
|
a.pop()
|
|
|
|
self.assertEqual(a, [-1, 0])
|
|
|
|
a.pop(0)
|
|
|
|
self.assertEqual(a, [0])
|
|
|
|
self.assertRaises(IndexError, a.pop, 5)
|
|
|
|
a.pop(0)
|
|
|
|
self.assertEqual(a, [])
|
|
|
|
self.assertRaises(IndexError, a.pop)
|
|
|
|
self.assertRaises(TypeError, a.pop, 42, 42)
|
2004-09-29 05:03:17 -03:00
|
|
|
a = self.type2test([0, 10, 20, 30, 40])
|
2003-12-08 07:38:45 -04:00
|
|
|
|
|
|
|
def test_remove(self):
|
|
|
|
a = self.type2test([0, 0, 1])
|
|
|
|
a.remove(1)
|
|
|
|
self.assertEqual(a, [0, 0])
|
|
|
|
a.remove(0)
|
|
|
|
self.assertEqual(a, [0])
|
|
|
|
a.remove(0)
|
|
|
|
self.assertEqual(a, [])
|
|
|
|
|
|
|
|
self.assertRaises(ValueError, a.remove, 0)
|
2004-01-18 17:03:23 -04:00
|
|
|
|
2003-12-08 07:38:45 -04:00
|
|
|
self.assertRaises(TypeError, a.remove)
|
|
|
|
|
|
|
|
class BadExc(Exception):
|
|
|
|
pass
|
|
|
|
|
|
|
|
class BadCmp:
|
|
|
|
def __eq__(self, other):
|
|
|
|
if other == 2:
|
|
|
|
raise BadExc()
|
|
|
|
return False
|
|
|
|
|
|
|
|
a = self.type2test([0, 1, 2, 3])
|
|
|
|
self.assertRaises(BadExc, a.remove, BadCmp())
|
|
|
|
|
2005-03-21 17:31:47 -04:00
|
|
|
class BadCmp2:
|
|
|
|
def __eq__(self, other):
|
|
|
|
raise BadExc()
|
|
|
|
|
|
|
|
d = self.type2test('abcdefghcij')
|
|
|
|
d.remove('c')
|
|
|
|
self.assertEqual(d, self.type2test('abdefghcij'))
|
|
|
|
d.remove('c')
|
|
|
|
self.assertEqual(d, self.type2test('abdefghij'))
|
|
|
|
self.assertRaises(ValueError, d.remove, 'c')
|
|
|
|
self.assertEqual(d, self.type2test('abdefghij'))
|
|
|
|
|
|
|
|
# Handle comparison errors
|
|
|
|
d = self.type2test(['a', 'b', BadCmp2(), 'c'])
|
|
|
|
e = self.type2test(d)
|
|
|
|
self.assertRaises(BadExc, d.remove, 'c')
|
|
|
|
for x, y in zip(d, e):
|
|
|
|
# verify that original order and values are retained.
|
|
|
|
self.assert_(x is y)
|
|
|
|
|
2003-12-08 07:38:45 -04:00
|
|
|
def test_count(self):
|
|
|
|
a = self.type2test([0, 1, 2])*3
|
|
|
|
self.assertEqual(a.count(0), 3)
|
|
|
|
self.assertEqual(a.count(1), 3)
|
|
|
|
self.assertEqual(a.count(3), 0)
|
|
|
|
|
|
|
|
self.assertRaises(TypeError, a.count)
|
2004-01-18 17:03:23 -04:00
|
|
|
|
2003-12-08 07:38:45 -04:00
|
|
|
class BadExc(Exception):
|
|
|
|
pass
|
|
|
|
|
|
|
|
class BadCmp:
|
|
|
|
def __eq__(self, other):
|
|
|
|
if other == 2:
|
|
|
|
raise BadExc()
|
|
|
|
return False
|
|
|
|
|
|
|
|
self.assertRaises(BadExc, a.count, BadCmp())
|
|
|
|
|
|
|
|
def test_index(self):
|
|
|
|
u = self.type2test([0, 1])
|
|
|
|
self.assertEqual(u.index(0), 0)
|
|
|
|
self.assertEqual(u.index(1), 1)
|
|
|
|
self.assertRaises(ValueError, u.index, 2)
|
|
|
|
|
|
|
|
u = self.type2test([-2, -1, 0, 0, 1, 2])
|
|
|
|
self.assertEqual(u.count(0), 2)
|
|
|
|
self.assertEqual(u.index(0), 2)
|
|
|
|
self.assertEqual(u.index(0, 2), 2)
|
|
|
|
self.assertEqual(u.index(-2, -10), 0)
|
|
|
|
self.assertEqual(u.index(0, 3), 3)
|
|
|
|
self.assertEqual(u.index(0, 3, 4), 3)
|
|
|
|
self.assertRaises(ValueError, u.index, 2, 0, -10)
|
|
|
|
|
|
|
|
self.assertRaises(TypeError, u.index)
|
|
|
|
|
|
|
|
class BadExc(Exception):
|
|
|
|
pass
|
|
|
|
|
|
|
|
class BadCmp:
|
|
|
|
def __eq__(self, other):
|
|
|
|
if other == 2:
|
|
|
|
raise BadExc()
|
|
|
|
return False
|
|
|
|
|
|
|
|
a = self.type2test([0, 1, 2, 3])
|
|
|
|
self.assertRaises(BadExc, a.index, BadCmp())
|
|
|
|
|
|
|
|
a = self.type2test([-2, -1, 0, 0, 1, 2])
|
|
|
|
self.assertEqual(a.index(0), 2)
|
|
|
|
self.assertEqual(a.index(0, 2), 2)
|
|
|
|
self.assertEqual(a.index(0, -4), 2)
|
|
|
|
self.assertEqual(a.index(-2, -10), 0)
|
|
|
|
self.assertEqual(a.index(0, 3), 3)
|
|
|
|
self.assertEqual(a.index(0, -3), 3)
|
|
|
|
self.assertEqual(a.index(0, 3, 4), 3)
|
|
|
|
self.assertEqual(a.index(0, -3, -2), 3)
|
2007-12-04 19:02:19 -04:00
|
|
|
self.assertEqual(a.index(0, -4*sys.maxsize, 4*sys.maxsize), 2)
|
|
|
|
self.assertRaises(ValueError, a.index, 0, 4*sys.maxsize,-4*sys.maxsize)
|
2003-12-08 07:38:45 -04:00
|
|
|
self.assertRaises(ValueError, a.index, 2, 0, -10)
|
|
|
|
a.remove(0)
|
|
|
|
self.assertRaises(ValueError, a.index, 2, 0, 4)
|
|
|
|
self.assertEqual(a, self.type2test([-2, -1, 0, 1, 2]))
|
|
|
|
|
2004-08-13 00:18:29 -03:00
|
|
|
# Test modifying the list during index's iteration
|
|
|
|
class EvilCmp:
|
|
|
|
def __init__(self, victim):
|
|
|
|
self.victim = victim
|
|
|
|
def __eq__(self, other):
|
|
|
|
del self.victim[:]
|
|
|
|
return False
|
|
|
|
a = self.type2test()
|
2007-05-07 19:24:25 -03:00
|
|
|
a[:] = [EvilCmp(a) for _ in range(100)]
|
2004-08-13 00:18:29 -03:00
|
|
|
# This used to seg fault before patch #1005778
|
|
|
|
self.assertRaises(ValueError, a.index, None)
|
|
|
|
|
2003-12-08 07:38:45 -04:00
|
|
|
def test_reverse(self):
|
|
|
|
u = self.type2test([-2, -1, 0, 1, 2])
|
|
|
|
u2 = u[:]
|
|
|
|
u.reverse()
|
|
|
|
self.assertEqual(u, [2, 1, 0, -1, -2])
|
|
|
|
u.reverse()
|
|
|
|
self.assertEqual(u, u2)
|
2004-01-18 17:03:23 -04:00
|
|
|
|
2003-12-08 07:38:45 -04:00
|
|
|
self.assertRaises(TypeError, u.reverse, 42)
|
|
|
|
|
|
|
|
def test_sort(self):
|
|
|
|
u = self.type2test([1, 0])
|
|
|
|
u.sort()
|
|
|
|
self.assertEqual(u, [0, 1])
|
2004-01-18 17:03:23 -04:00
|
|
|
|
2003-12-08 07:38:45 -04:00
|
|
|
u = self.type2test([2,1,0,-1,-2])
|
|
|
|
u.sort()
|
|
|
|
self.assertEqual(u, self.type2test([-2,-1,0,1,2]))
|
2004-01-18 17:03:23 -04:00
|
|
|
|
2003-12-08 07:38:45 -04:00
|
|
|
self.assertRaises(TypeError, u.sort, 42, 42)
|
|
|
|
|
|
|
|
def revcmp(a, b):
|
|
|
|
return cmp(b, a)
|
2008-01-30 16:15:17 -04:00
|
|
|
u.sort(key=CmpToKey(revcmp))
|
2003-12-08 07:38:45 -04:00
|
|
|
self.assertEqual(u, self.type2test([2,1,0,-1,-2]))
|
|
|
|
|
|
|
|
# The following dumps core in unpatched Python 1.5:
|
|
|
|
def myComparison(x,y):
|
|
|
|
return cmp(x%3, y%7)
|
|
|
|
z = self.type2test(range(12))
|
2008-01-30 16:15:17 -04:00
|
|
|
z.sort(key=CmpToKey(myComparison))
|
2004-01-18 17:03:23 -04:00
|
|
|
|
2003-12-08 07:38:45 -04:00
|
|
|
self.assertRaises(TypeError, z.sort, 2)
|
2004-01-18 17:03:23 -04:00
|
|
|
|
2003-12-08 07:38:45 -04:00
|
|
|
def selfmodifyingComparison(x,y):
|
|
|
|
z.append(1)
|
|
|
|
return cmp(x, y)
|
2008-01-30 16:15:17 -04:00
|
|
|
self.assertRaises(ValueError, z.sort, key=CmpToKey(selfmodifyingComparison))
|
2003-12-08 07:38:45 -04:00
|
|
|
|
|
|
|
self.assertRaises(TypeError, z.sort, 42, 42, 42, 42)
|
|
|
|
|
|
|
|
def test_slice(self):
|
|
|
|
u = self.type2test("spam")
|
|
|
|
u[:2] = "h"
|
|
|
|
self.assertEqual(u, list("ham"))
|
|
|
|
|
|
|
|
def test_iadd(self):
|
Merged revisions 55817-55961 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r55837 | guido.van.rossum | 2007-06-08 16:04:42 -0700 (Fri, 08 Jun 2007) | 2 lines
PEP 3119 -- the abc module.
................
r55838 | guido.van.rossum | 2007-06-08 17:38:55 -0700 (Fri, 08 Jun 2007) | 2 lines
Implement part of PEP 3119 -- One Trick Ponies.
................
r55847 | guido.van.rossum | 2007-06-09 08:28:06 -0700 (Sat, 09 Jun 2007) | 2 lines
Different way to do one trick ponies, allowing registration (per PEP strawman).
................
r55849 | guido.van.rossum | 2007-06-09 18:06:38 -0700 (Sat, 09 Jun 2007) | 3 lines
Make sure that the magic looking for __hash__ (etc.) doesn't apply to
real subclasses of Hashable.
................
r55852 | guido.van.rossum | 2007-06-10 08:29:51 -0700 (Sun, 10 Jun 2007) | 2 lines
Add some more examples, e.g. generators and dict views.
................
r55853 | guido.van.rossum | 2007-06-10 08:31:59 -0700 (Sun, 10 Jun 2007) | 2 lines
keys() and items() *are* containers -- just values() isn't.
................
r55864 | georg.brandl | 2007-06-10 15:29:40 -0700 (Sun, 10 Jun 2007) | 2 lines
PEP 3127: new octal literals, binary literals.
................
r55865 | georg.brandl | 2007-06-10 15:31:37 -0700 (Sun, 10 Jun 2007) | 2 lines
Some octal literal fixes in Tools.
................
r55866 | georg.brandl | 2007-06-10 15:37:43 -0700 (Sun, 10 Jun 2007) | 2 lines
Tokenizer changes for PEP 3127.
................
r55867 | georg.brandl | 2007-06-10 15:37:55 -0700 (Sun, 10 Jun 2007) | 2 lines
Some docs for PEP 3127.
................
r55868 | georg.brandl | 2007-06-10 15:44:39 -0700 (Sun, 10 Jun 2007) | 2 lines
Missed a place in intobject.c. Is that used anymore anyway?
................
r55871 | neal.norwitz | 2007-06-10 18:31:49 -0700 (Sun, 10 Jun 2007) | 182 lines
Merged revisions 55729-55868 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55731 | neal.norwitz | 2007-06-01 00:29:12 -0700 (Fri, 01 Jun 2007) | 7 lines
SF 1668596/1720897: distutils now copies data files
even if package_dir is empty.
This needs to be backported. I'm too tired tonight. It would be great
if someone backports this if the buildbots are ok with it. Otherwise,
I will try to get to it tomorrow.
........
r55732 | georg.brandl | 2007-06-01 04:33:33 -0700 (Fri, 01 Jun 2007) | 2 lines
Bug #1722484: remove docstrings again when running with -OO.
........
r55735 | georg.brandl | 2007-06-01 12:20:27 -0700 (Fri, 01 Jun 2007) | 2 lines
Fix wrong issue number.
........
r55739 | brett.cannon | 2007-06-01 20:02:29 -0700 (Fri, 01 Jun 2007) | 3 lines
Have configure raise an error when building on AtheOS. Code specific to AtheOS
will be removed in Python 2.7.
........
r55746 | neal.norwitz | 2007-06-02 11:33:53 -0700 (Sat, 02 Jun 2007) | 1 line
Update expected birthday of 2.6
........
r55751 | neal.norwitz | 2007-06-03 13:32:50 -0700 (Sun, 03 Jun 2007) | 10 lines
Backout the original 'fix' to 1721309 which had no effect.
Different versions of Berkeley DB handle this differently.
The comments and bug report should have the details. Memory is allocated
in 4.4 (and presumably earlier), but not in 4.5. Thus
4.5 has the free error, but not earlier versions.
Mostly update comments, plus make the free conditional.
This fix was already applied to the 2.5 branch.
........
r55752 | brett.cannon | 2007-06-03 16:13:41 -0700 (Sun, 03 Jun 2007) | 6 lines
Make _strptime.TimeRE().pattern() use ``\s+`` for matching whitespace instead
of ``\s*``. This prevents patterns from "stealing" bits from other patterns in
order to make a match work.
Closes bug #1730389. Will be backported.
........
r55766 | hyeshik.chang | 2007-06-05 11:16:52 -0700 (Tue, 05 Jun 2007) | 4 lines
Fix build on FreeBSD. Bluetooth HCI API in FreeBSD is quite different
from Linux's. Just fix the build for now but the code doesn't
support the complete capability of HCI on FreeBSD yet.
........
r55770 | hyeshik.chang | 2007-06-05 11:58:51 -0700 (Tue, 05 Jun 2007) | 4 lines
Bug #1728403: Fix a bug that CJKCodecs StreamReader hangs when it
reads a file that ends with incomplete sequence and sizehint argument
for .read() is specified.
........
r55775 | hyeshik.chang | 2007-06-05 12:28:15 -0700 (Tue, 05 Jun 2007) | 2 lines
Fix for Windows: close a temporary file before trying to delete it.
........
r55783 | guido.van.rossum | 2007-06-05 14:24:47 -0700 (Tue, 05 Jun 2007) | 2 lines
Patch by Tim Delany (missing DECREF). SF #1731330.
........
r55785 | collin.winter | 2007-06-05 17:17:35 -0700 (Tue, 05 Jun 2007) | 3 lines
Patch #1731049: make threading.py use a proper "raise" when checking internal state, rather than assert statements (which get stripped out by -O).
........
r55786 | facundo.batista | 2007-06-06 08:13:37 -0700 (Wed, 06 Jun 2007) | 4 lines
FTP.ntransfercmd method now uses create_connection when passive,
using the timeout received in connection time.
........
r55792 | facundo.batista | 2007-06-06 10:15:23 -0700 (Wed, 06 Jun 2007) | 7 lines
Added an optional timeout parameter to function urllib2.urlopen,
with tests in test_urllib2net.py (must have network resource
enabled to execute them). Also modified test_urllib2.py because
testing mock classes must take it into acount. Docs are also
updated.
........
r55793 | thomas.heller | 2007-06-06 13:19:19 -0700 (Wed, 06 Jun 2007) | 1 line
Build _ctypes and _ctypes_test in the ReleaseAMD64 configuration.
........
r55802 | georg.brandl | 2007-06-07 06:23:24 -0700 (Thu, 07 Jun 2007) | 3 lines
Disallow function calls like foo(None=1).
Backport from py3k rev. 55708 by Guido.
........
r55804 | georg.brandl | 2007-06-07 06:30:24 -0700 (Thu, 07 Jun 2007) | 2 lines
Make reindent.py executable.
........
r55805 | georg.brandl | 2007-06-07 06:34:10 -0700 (Thu, 07 Jun 2007) | 2 lines
Patch #1667860: Fix UnboundLocalError in urllib2.
........
r55821 | kristjan.jonsson | 2007-06-07 16:53:49 -0700 (Thu, 07 Jun 2007) | 1 line
Fixing changes to getbuildinfo.c that broke linux builds
........
r55828 | thomas.heller | 2007-06-08 09:10:27 -0700 (Fri, 08 Jun 2007) | 1 line
Make this test work with older Python releases where struct has no 't' format character.
........
r55829 | martin.v.loewis | 2007-06-08 10:29:20 -0700 (Fri, 08 Jun 2007) | 3 lines
Bug #1733488: Fix compilation of bufferobject.c on AIX.
Will backport to 2.5.
........
r55831 | thomas.heller | 2007-06-08 11:20:09 -0700 (Fri, 08 Jun 2007) | 2 lines
[ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur
with small modifications.
........
r55832 | thomas.heller | 2007-06-08 12:01:06 -0700 (Fri, 08 Jun 2007) | 1 line
Fix gcc warnings intruduced by passing Py_ssize_t to PyErr_Format calls.
........
r55833 | thomas.heller | 2007-06-08 12:08:31 -0700 (Fri, 08 Jun 2007) | 2 lines
Fix wrong documentation, and correct the punktuation.
Closes [1700455].
........
r55834 | thomas.heller | 2007-06-08 12:14:23 -0700 (Fri, 08 Jun 2007) | 1 line
Fix warnings by using proper function prototype.
........
r55839 | neal.norwitz | 2007-06-08 20:36:34 -0700 (Fri, 08 Jun 2007) | 7 lines
Prevent expandtabs() on string and unicode objects from causing a segfault when
a large width is passed on 32-bit platforms. Found by Google.
It would be good for people to review this especially carefully and verify
I don't have an off by one error and there is no other way to cause overflow.
........
r55841 | neal.norwitz | 2007-06-08 21:48:22 -0700 (Fri, 08 Jun 2007) | 1 line
Use macro version of GET_SIZE to avoid Coverity warning (#150) about a possible error.
........
r55842 | martin.v.loewis | 2007-06-09 00:42:52 -0700 (Sat, 09 Jun 2007) | 3 lines
Patch #1733960: Allow T_LONGLONG to accept ints.
Will backport to 2.5.
........
r55843 | martin.v.loewis | 2007-06-09 00:58:05 -0700 (Sat, 09 Jun 2007) | 2 lines
Fix Windows build.
........
r55845 | martin.v.loewis | 2007-06-09 03:10:26 -0700 (Sat, 09 Jun 2007) | 2 lines
Provide LLONG_MAX for S390.
........
r55854 | thomas.heller | 2007-06-10 08:59:17 -0700 (Sun, 10 Jun 2007) | 4 lines
First version of build scripts for Windows/AMD64 (no external
components are built yet, and 'kill_python' is disabled).
........
r55855 | thomas.heller | 2007-06-10 10:55:51 -0700 (Sun, 10 Jun 2007) | 3 lines
For now, disable the _bsddb, _sqlite3, _ssl, _testcapi, _tkinter
modules in the ReleaseAMD64 configuration because they do not compile.
........
r55856 | thomas.heller | 2007-06-10 11:27:54 -0700 (Sun, 10 Jun 2007) | 1 line
Need to set the environment variables, otherwise devenv.com is not found.
........
r55860 | thomas.heller | 2007-06-10 14:01:17 -0700 (Sun, 10 Jun 2007) | 1 line
Revert commit 55855.
........
................
r55880 | neal.norwitz | 2007-06-10 22:07:36 -0700 (Sun, 10 Jun 2007) | 5 lines
Fix the refleak counter on test_collections. The ABC metaclass creates
a registry which must be cleared on each run. Otherwise, there *seem*
to be refleaks when there really aren't any. (The class is held within
the registry even though it's no longer needed.)
................
r55884 | neal.norwitz | 2007-06-10 22:46:33 -0700 (Sun, 10 Jun 2007) | 1 line
These tests have been removed, so they are no longer needed here
................
r55886 | georg.brandl | 2007-06-11 00:26:37 -0700 (Mon, 11 Jun 2007) | 3 lines
Optimize access to True and False in the compiler (if True)
and the peepholer (LOAD_NAME True).
................
r55905 | georg.brandl | 2007-06-11 10:02:26 -0700 (Mon, 11 Jun 2007) | 5 lines
Remove __oct__ and __hex__ and use __index__ for converting
non-ints before formatting in a base.
Add a bin() builtin.
................
r55906 | georg.brandl | 2007-06-11 10:04:44 -0700 (Mon, 11 Jun 2007) | 2 lines
int(x, 0) does not "guess".
................
r55907 | georg.brandl | 2007-06-11 10:05:47 -0700 (Mon, 11 Jun 2007) | 2 lines
Add a comment to explain that nb_oct and nb_hex are nonfunctional.
................
r55908 | guido.van.rossum | 2007-06-11 10:49:18 -0700 (Mon, 11 Jun 2007) | 2 lines
Get rid of unused imports and comment.
................
r55910 | guido.van.rossum | 2007-06-11 13:05:17 -0700 (Mon, 11 Jun 2007) | 2 lines
_Abstract.__new__ now requires either no arguments or __init__ overridden.
................
r55911 | guido.van.rossum | 2007-06-11 13:07:49 -0700 (Mon, 11 Jun 2007) | 7 lines
Move the collections ABCs to a separate file, _abcoll.py, in order to avoid
needing to import _collections.so during the bootstrap (this will become
apparent in the next submit of os.py).
Add (plain and mutable) ABCs for Set, Mapping, Sequence.
................
r55912 | guido.van.rossum | 2007-06-11 13:09:31 -0700 (Mon, 11 Jun 2007) | 2 lines
Rewrite the _Environ class to use the new collections ABCs.
................
r55913 | guido.van.rossum | 2007-06-11 13:59:45 -0700 (Mon, 11 Jun 2007) | 72 lines
Merged revisions 55869-55912 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55869 | neal.norwitz | 2007-06-10 17:42:11 -0700 (Sun, 10 Jun 2007) | 1 line
Add Atul Varma for patch # 1667860
........
r55870 | neal.norwitz | 2007-06-10 18:22:03 -0700 (Sun, 10 Jun 2007) | 1 line
Ignore valgrind problems on Ubuntu from ld
........
r55872 | neal.norwitz | 2007-06-10 18:48:46 -0700 (Sun, 10 Jun 2007) | 2 lines
Ignore config.status.lineno which seems new (new autoconf?)
........
r55873 | neal.norwitz | 2007-06-10 19:14:39 -0700 (Sun, 10 Jun 2007) | 1 line
Prevent these tests from running on Win64 since they don\'t apply there either
........
r55874 | neal.norwitz | 2007-06-10 19:16:10 -0700 (Sun, 10 Jun 2007) | 5 lines
Fix a bug when there was a newline in the string expandtabs was called on.
This also catches another condition that can overflow.
Will backport.
........
r55879 | neal.norwitz | 2007-06-10 21:52:37 -0700 (Sun, 10 Jun 2007) | 1 line
Prevent hang if the port cannot be opened.
........
r55881 | neal.norwitz | 2007-06-10 22:28:45 -0700 (Sun, 10 Jun 2007) | 4 lines
Add all of the distuils modules that don't seem to have explicit tests. :-(
Move an import in mworkscompiler so that this module can be imported on
any platform. Hopefully this works on all platforms.
........
r55882 | neal.norwitz | 2007-06-10 22:35:10 -0700 (Sun, 10 Jun 2007) | 4 lines
SF #1734732, lower case the module names per PEP 8.
Will backport.
........
r55885 | neal.norwitz | 2007-06-10 23:16:48 -0700 (Sun, 10 Jun 2007) | 4 lines
Not sure why this only fails sometimes on Unix machines. Better
to disable it and only import msvccompiler on Windows since that's
the only place it can work anyways.
........
r55887 | neal.norwitz | 2007-06-11 00:29:43 -0700 (Mon, 11 Jun 2007) | 4 lines
Bug #1734723: Fix repr.Repr() so it doesn't ignore the maxtuple attribute.
Will backport
........
r55889 | neal.norwitz | 2007-06-11 00:36:24 -0700 (Mon, 11 Jun 2007) | 1 line
Reflow long line
........
r55896 | thomas.heller | 2007-06-11 08:58:33 -0700 (Mon, 11 Jun 2007) | 3 lines
Use "O&" in calls to PyArg_Parse when we need a 'void*' instead of "k"
or "K" codes.
........
r55901 | facundo.batista | 2007-06-11 09:27:08 -0700 (Mon, 11 Jun 2007) | 5 lines
Added versionchanged flag to all the methods which received
a new optional timeout parameter, and a versionadded flag to
the socket.create_connection function.
........
................
r55914 | guido.van.rossum | 2007-06-11 14:19:50 -0700 (Mon, 11 Jun 2007) | 3 lines
New super() implementation, for PEP 3135 (though the PEP is not yet updated
to this design, and small tweaks may still be made later).
................
r55923 | guido.van.rossum | 2007-06-11 21:15:24 -0700 (Mon, 11 Jun 2007) | 4 lines
I'm guessing this module broke when Neal ripped out the types module --
it used 'list' both as a local variable and as the built-in list type.
Renamed the local variable since that was easier.
................
r55924 | guido.van.rossum | 2007-06-11 21:20:05 -0700 (Mon, 11 Jun 2007) | 5 lines
Change all occurrences of super(<thisclass>, <firstarg>) to super().
Seems to have worked, all the tests still pass.
Exception: test_descr and test_descrtut, which have tons of these
and are there to test the various usages.
................
r55939 | collin.winter | 2007-06-12 13:57:33 -0700 (Tue, 12 Jun 2007) | 1 line
Patch #1735485: remove StandardError from the exception hierarchy.
................
r55954 | neal.norwitz | 2007-06-12 21:56:32 -0700 (Tue, 12 Jun 2007) | 51 lines
Merged revisions 55913-55950 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55926 | marc-andre.lemburg | 2007-06-12 02:09:58 -0700 (Tue, 12 Jun 2007) | 3 lines
Apply patch #1734945 to support TurboLinux as distribution.
........
r55927 | marc-andre.lemburg | 2007-06-12 02:26:49 -0700 (Tue, 12 Jun 2007) | 3 lines
Add patch #1726668: Windows Vista support.
........
r55929 | thomas.heller | 2007-06-12 08:36:22 -0700 (Tue, 12 Jun 2007) | 1 line
Checkout, but do not yet try to build, exernal sources.
........
r55930 | thomas.heller | 2007-06-12 09:08:27 -0700 (Tue, 12 Jun 2007) | 6 lines
Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
right thing to do?).
Set the /XP64 /RETAIL build enviroment in the makefile when building
ReleaseAMD64.
........
r55931 | thomas.heller | 2007-06-12 09:23:19 -0700 (Tue, 12 Jun 2007) | 5 lines
Revert this change, since it breaks the win32 build:
Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
right thing to do?).
........
r55934 | thomas.heller | 2007-06-12 10:28:31 -0700 (Tue, 12 Jun 2007) | 3 lines
Specify the bufferoverflowU.lib to the makefile on the command line
(for ReleaseAMD64 builds).
........
r55937 | thomas.heller | 2007-06-12 12:02:59 -0700 (Tue, 12 Jun 2007) | 3 lines
Add bufferoverflowU.lib to PCBuild\_bsddb.vcproj.
Build sqlite3.dll and bsddb.
........
r55938 | thomas.heller | 2007-06-12 12:56:12 -0700 (Tue, 12 Jun 2007) | 2 lines
Don't rebuild Berkeley DB if not needed (this was committed by accident).
........
r55948 | martin.v.loewis | 2007-06-12 20:42:19 -0700 (Tue, 12 Jun 2007) | 3 lines
Provide PY_LLONG_MAX on all systems having long long.
Will backport to 2.5.
........
................
r55959 | guido.van.rossum | 2007-06-13 09:22:41 -0700 (Wed, 13 Jun 2007) | 2 lines
Fix a compilation warning.
................
2007-06-13 15:07:49 -03:00
|
|
|
super().test_iadd()
|
2003-12-08 07:38:45 -04:00
|
|
|
u = self.type2test([0, 1])
|
|
|
|
u2 = u
|
|
|
|
u += [2, 3]
|
|
|
|
self.assert_(u is u2)
|
|
|
|
|
|
|
|
u = self.type2test("spam")
|
|
|
|
u += "eggs"
|
|
|
|
self.assertEqual(u, self.type2test("spameggs"))
|
|
|
|
|
|
|
|
self.assertRaises(TypeError, u.__iadd__, None)
|
|
|
|
|
|
|
|
def test_imul(self):
|
|
|
|
u = self.type2test([0, 1])
|
|
|
|
u *= 3
|
|
|
|
self.assertEqual(u, self.type2test([0, 1, 0, 1, 0, 1]))
|
|
|
|
u *= 0
|
|
|
|
self.assertEqual(u, self.type2test([]))
|
2004-09-29 05:03:17 -03:00
|
|
|
s = self.type2test([])
|
|
|
|
oldid = id(s)
|
|
|
|
s *= 10
|
|
|
|
self.assertEqual(id(s), oldid)
|
2003-12-08 07:38:45 -04:00
|
|
|
|
|
|
|
def test_extendedslicing(self):
|
|
|
|
# subscript
|
|
|
|
a = self.type2test([0,1,2,3,4])
|
|
|
|
|
|
|
|
# deletion
|
|
|
|
del a[::2]
|
|
|
|
self.assertEqual(a, self.type2test([1,3]))
|
|
|
|
a = self.type2test(range(5))
|
|
|
|
del a[1::2]
|
|
|
|
self.assertEqual(a, self.type2test([0,2,4]))
|
|
|
|
a = self.type2test(range(5))
|
|
|
|
del a[1::-2]
|
|
|
|
self.assertEqual(a, self.type2test([0,2,3,4]))
|
|
|
|
a = self.type2test(range(10))
|
|
|
|
del a[::1000]
|
|
|
|
self.assertEqual(a, self.type2test([1, 2, 3, 4, 5, 6, 7, 8, 9]))
|
|
|
|
# assignment
|
|
|
|
a = self.type2test(range(10))
|
|
|
|
a[::2] = [-1]*5
|
|
|
|
self.assertEqual(a, self.type2test([-1, 1, -1, 3, -1, 5, -1, 7, -1, 9]))
|
|
|
|
a = self.type2test(range(10))
|
|
|
|
a[::-4] = [10]*3
|
|
|
|
self.assertEqual(a, self.type2test([0, 10, 2, 3, 4, 10, 6, 7, 8 ,10]))
|
|
|
|
a = self.type2test(range(4))
|
|
|
|
a[::-1] = a
|
|
|
|
self.assertEqual(a, self.type2test([3, 2, 1, 0]))
|
|
|
|
a = self.type2test(range(10))
|
|
|
|
b = a[:]
|
|
|
|
c = a[:]
|
|
|
|
a[2:3] = self.type2test(["two", "elements"])
|
|
|
|
b[slice(2,3)] = self.type2test(["two", "elements"])
|
|
|
|
c[2:3:] = self.type2test(["two", "elements"])
|
|
|
|
self.assertEqual(a, b)
|
|
|
|
self.assertEqual(a, c)
|
|
|
|
a = self.type2test(range(10))
|
|
|
|
a[::2] = tuple(range(5))
|
|
|
|
self.assertEqual(a, self.type2test([0, 1, 1, 3, 2, 5, 3, 7, 4, 9]))
|
2005-08-21 08:03:59 -03:00
|
|
|
|
|
|
|
def test_constructor_exception_handling(self):
|
|
|
|
# Bug #1242657
|
|
|
|
class F(object):
|
|
|
|
def __iter__(self):
|
|
|
|
raise KeyboardInterrupt
|
|
|
|
self.assertRaises(KeyboardInterrupt, list, F())
|