mirror of
https://github.com/python/cpython.git
synced 2025-08-04 00:48:58 +00:00
Merged revisions 65012,65035,65037-65040,65048,65057,65077,65091-65095,65097-65099,65127-65128,65131,65133-65136,65139,65149-65151,65155,65158-65159,65176-65178,65183-65184,65187-65190,65192,65194 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r65012 | jesse.noller | 2008-07-16 15:24:06 +0200 (Wed, 16 Jul 2008) | 2 lines Apply patch for issue 3090: ARCHFLAGS parsing incorrect ........ r65035 | georg.brandl | 2008-07-16 23:19:28 +0200 (Wed, 16 Jul 2008) | 2 lines #3045: fix pydoc behavior for TEMP path with spaces. ........ r65037 | georg.brandl | 2008-07-16 23:31:41 +0200 (Wed, 16 Jul 2008) | 2 lines #1608818: errno can get set by every call to readdir(). ........ r65038 | georg.brandl | 2008-07-17 00:04:20 +0200 (Thu, 17 Jul 2008) | 2 lines #3305: self->stream can be NULL. ........ r65039 | georg.brandl | 2008-07-17 00:09:17 +0200 (Thu, 17 Jul 2008) | 2 lines #3345: fix docstring. ........ r65040 | georg.brandl | 2008-07-17 00:33:18 +0200 (Thu, 17 Jul 2008) | 2 lines #3312: fix two sqlite3 crashes. ........ r65048 | georg.brandl | 2008-07-17 01:35:54 +0200 (Thu, 17 Jul 2008) | 2 lines #3388: add a paragraph about using "with" for file objects. ........ r65057 | gregory.p.smith | 2008-07-17 05:13:05 +0200 (Thu, 17 Jul 2008) | 2 lines news note for r63052 ........ r65077 | jesse.noller | 2008-07-17 23:01:05 +0200 (Thu, 17 Jul 2008) | 3 lines Fix issue 3395, update _debugInfo to be _debug_info ........ r65091 | ronald.oussoren | 2008-07-18 07:48:03 +0200 (Fri, 18 Jul 2008) | 2 lines Last bit of a fix for issue3381 (addon for my patch in r65061) ........ r65092 | vinay.sajip | 2008-07-18 10:59:06 +0200 (Fri, 18 Jul 2008) | 1 line Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch. ........ r65093 | vinay.sajip | 2008-07-18 11:00:00 +0200 (Fri, 18 Jul 2008) | 1 line Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch. ........ r65094 | vinay.sajip | 2008-07-18 11:00:35 +0200 (Fri, 18 Jul 2008) | 1 line Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch. ........ r65095 | vinay.sajip | 2008-07-18 11:01:10 +0200 (Fri, 18 Jul 2008) | 1 line Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch. ........ r65097 | georg.brandl | 2008-07-18 12:20:59 +0200 (Fri, 18 Jul 2008) | 2 lines Remove duplicate entry in __all__. ........ r65098 | georg.brandl | 2008-07-18 12:29:30 +0200 (Fri, 18 Jul 2008) | 2 lines Correct attribute name. ........ r65099 | georg.brandl | 2008-07-18 13:15:06 +0200 (Fri, 18 Jul 2008) | 3 lines Document the different meaning of precision for {:f} and {:g}. Also document how inf and nan are formatted. #3404. ........ r65127 | raymond.hettinger | 2008-07-19 02:42:03 +0200 (Sat, 19 Jul 2008) | 1 line Improve accuracy of gamma test function ........ r65128 | raymond.hettinger | 2008-07-19 02:43:00 +0200 (Sat, 19 Jul 2008) | 1 line Add recipe to the itertools docs. ........ r65131 | georg.brandl | 2008-07-19 12:08:55 +0200 (Sat, 19 Jul 2008) | 2 lines #3378: in case of no memory, don't leak even more memory. :) ........ r65133 | georg.brandl | 2008-07-19 14:39:10 +0200 (Sat, 19 Jul 2008) | 3 lines #3302: fix segfaults when passing None for arguments that can't be NULL for the C functions. ........ r65134 | georg.brandl | 2008-07-19 14:46:12 +0200 (Sat, 19 Jul 2008) | 2 lines #3303: fix crash with invalid Py_DECREF in strcoll(). ........ r65135 | georg.brandl | 2008-07-19 15:00:22 +0200 (Sat, 19 Jul 2008) | 3 lines #3319: don't raise ZeroDivisionError if number of rounds is so low that benchtime is zero. ........ r65136 | georg.brandl | 2008-07-19 15:09:42 +0200 (Sat, 19 Jul 2008) | 3 lines #3323: mention that if inheriting from a class without __slots__, the subclass will have a __dict__ available too. ........ r65139 | georg.brandl | 2008-07-19 15:48:44 +0200 (Sat, 19 Jul 2008) | 2 lines Add ordering info for findall and finditer. ........ r65149 | raymond.hettinger | 2008-07-20 01:21:57 +0200 (Sun, 20 Jul 2008) | 1 line Fix compress() recipe in docs to use itertools. ........ r65150 | raymond.hettinger | 2008-07-20 01:58:47 +0200 (Sun, 20 Jul 2008) | 1 line Clean-up itertools docs and recipes. ........ r65151 | gregory.p.smith | 2008-07-20 02:22:08 +0200 (Sun, 20 Jul 2008) | 9 lines fix issue3120 - don't truncate handles on 64-bit Windows. This is still messy, realistically PC/_subprocess.c should never cast pointers to python numbers and back at all. I don't have a 64-bit windows build environment because microsoft apparently thinks that should cost money. Time to watch the buildbots. It builds and passes tests on 32-bit windows. ........ r65155 | georg.brandl | 2008-07-20 13:50:29 +0200 (Sun, 20 Jul 2008) | 2 lines #926501: add info where to put the docstring. ........ r65158 | neal.norwitz | 2008-07-20 21:35:23 +0200 (Sun, 20 Jul 2008) | 1 line Fix a couple of names in error messages that were wrong ........ r65159 | neal.norwitz | 2008-07-20 22:39:36 +0200 (Sun, 20 Jul 2008) | 1 line Fix misspeeld method name (negative) ........ r65176 | amaury.forgeotdarc | 2008-07-21 23:36:24 +0200 (Mon, 21 Jul 2008) | 4 lines Increment version number in NEWS file, and move items that were added after 2.6b2. (I thought there was a script to automate this kind of updates) ........ r65177 | amaury.forgeotdarc | 2008-07-22 00:00:38 +0200 (Tue, 22 Jul 2008) | 5 lines Issue2378: pdb would delete free variables when stepping into a class statement. The problem was introduced by r53954, the correction is to restore the symmetry between PyFrame_FastToLocals and PyFrame_LocalsToFast ........ r65178 | benjamin.peterson | 2008-07-22 00:05:34 +0200 (Tue, 22 Jul 2008) | 1 line don't use assert statement ........ r65183 | ronald.oussoren | 2008-07-22 09:06:00 +0200 (Tue, 22 Jul 2008) | 2 lines Fix buglet in fix for issue3381 ........ r65184 | ronald.oussoren | 2008-07-22 09:06:33 +0200 (Tue, 22 Jul 2008) | 2 lines Fix build issue on OSX 10.4, somehow this wasn't committed before. ........ r65187 | raymond.hettinger | 2008-07-22 20:54:02 +0200 (Tue, 22 Jul 2008) | 1 line Remove out-of-date section on Exact/Inexact. ........ r65188 | raymond.hettinger | 2008-07-22 21:00:47 +0200 (Tue, 22 Jul 2008) | 1 line Tuples now have both count() and index(). ........ r65189 | raymond.hettinger | 2008-07-22 21:03:05 +0200 (Tue, 22 Jul 2008) | 1 line Fix credits for math.sum() ........ r65190 | raymond.hettinger | 2008-07-22 21:18:50 +0200 (Tue, 22 Jul 2008) | 1 line One more attribution. ........ r65192 | benjamin.peterson | 2008-07-23 01:44:37 +0200 (Wed, 23 Jul 2008) | 1 line remove unneeded import ........ r65194 | benjamin.peterson | 2008-07-23 15:25:06 +0200 (Wed, 23 Jul 2008) | 1 line use isinstance ........
This commit is contained in:
Georg Brandl
parent
4f6f34fb0b
commit
3dbca81c9b
35 changed files with 305 additions and 210 deletions
|
|
@ -128,7 +128,11 @@ def Proc0(loops=LOOPS):
|
|||
IntLoc1 = Proc2(IntLoc1)
|
||||
|
||||
benchtime = clock() - starttime - nulltime
|
||||
return benchtime, (loops / benchtime)
|
||||
if benchtime == 0.0:
|
||||
loopsPerBenchtime = 0.0
|
||||
else:
|
||||
loopsPerBenchtime = (loops / benchtime)
|
||||
return benchtime, loopsPerBenchtime
|
||||
|
||||
def Proc1(PtrParIn):
|
||||
PtrParIn.PtrComp = NextRecord = PtrGlb.copy()
|
||||
|
|
|
|||
|
|
@ -163,7 +163,7 @@ class TestAudioop(unittest.TestCase):
|
|||
self.assertEqual(audioop.getsample(data[1], 2, i), i)
|
||||
self.assertEqual(audioop.getsample(data[2], 4, i), i)
|
||||
|
||||
def test_negavitelen(self):
|
||||
def test_negativelen(self):
|
||||
# from issue 3306, previously it segfaulted
|
||||
self.assertRaises(audioop.error,
|
||||
audioop.findmax, ''.join(chr(x) for x in range(256)), -2392392)
|
||||
|
|
|
|||
|
|
@ -1204,52 +1204,32 @@ Samuele
|
|||
[22]
|
||||
[25, 26, 27, 28]
|
||||
|
||||
>>> def take(n, seq):
|
||||
... return list(islice(seq, n))
|
||||
>>> def take(n, iterable):
|
||||
... "Return first n items of the iterable as a list"
|
||||
... return list(islice(iterable, n))
|
||||
|
||||
>>> def enumerate(iterable):
|
||||
... return zip(count(), iterable)
|
||||
>>> def enumerate(iterable, start=0):
|
||||
... return zip(count(start), iterable)
|
||||
|
||||
>>> def tabulate(function):
|
||||
>>> def tabulate(function, start=0):
|
||||
... "Return function(0), function(1), ..."
|
||||
... return map(function, count())
|
||||
|
||||
>>> def iteritems(mapping):
|
||||
... return zip(mapping.keys(), mapping.values())
|
||||
... return map(function, count(start))
|
||||
|
||||
>>> def nth(iterable, n):
|
||||
... "Returns the nth item"
|
||||
... "Returns the nth item or empty list"
|
||||
... return list(islice(iterable, n, n+1))
|
||||
|
||||
>>> def all(seq, pred=None):
|
||||
... "Returns True if pred(x) is true for every element in the iterable"
|
||||
... for elem in filterfalse(pred, seq):
|
||||
... return False
|
||||
... return True
|
||||
>>> def quantify(iterable, pred=bool):
|
||||
... "Count how many times the predicate is true"
|
||||
... return sum(map(pred, iterable))
|
||||
|
||||
>>> def any(seq, pred=None):
|
||||
... "Returns True if pred(x) is true for at least one element in the iterable"
|
||||
... for elem in filter(pred, seq):
|
||||
... return True
|
||||
... return False
|
||||
|
||||
>>> def no(seq, pred=None):
|
||||
... "Returns True if pred(x) is false for every element in the iterable"
|
||||
... for elem in filter(pred, seq):
|
||||
... return False
|
||||
... return True
|
||||
|
||||
>>> def quantify(seq, pred=None):
|
||||
... "Count how many times the predicate is true in the sequence"
|
||||
... return sum(map(pred, seq))
|
||||
|
||||
>>> def padnone(seq):
|
||||
>>> def padnone(iterable):
|
||||
... "Returns the sequence elements and then returns None indefinitely"
|
||||
... return chain(seq, repeat(None))
|
||||
... return chain(iterable, repeat(None))
|
||||
|
||||
>>> def ncycles(seq, n):
|
||||
... "Returns the sequence elements n times"
|
||||
... return chain(*repeat(seq, n))
|
||||
>>> def ncycles(iterable, n):
|
||||
... "Returns the seqeuence elements n times"
|
||||
... return chain(*repeat(iterable, n))
|
||||
|
||||
>>> def dotproduct(vec1, vec2):
|
||||
... return sum(map(operator.mul, vec1, vec2))
|
||||
|
|
@ -1302,9 +1282,24 @@ Samuele
|
|||
|
||||
>>> def compress(data, selectors):
|
||||
... "compress('abcdef', [1,0,1,0,1,1]) --> a c e f"
|
||||
... for d, s in zip(data, selectors):
|
||||
... if s:
|
||||
... yield d
|
||||
... decorated = zip(data, selectors)
|
||||
... filtered = filter(operator.itemgetter(1), decorated)
|
||||
... return map(operator.itemgetter(0), filtered)
|
||||
|
||||
>>> def combinations_with_replacement(iterable, r):
|
||||
... "combinations_with_replacement('ABC', 3) --> AA AB AC BB BC CC"
|
||||
... pool = tuple(iterable)
|
||||
... n = len(pool)
|
||||
... indices = [0] * r
|
||||
... yield tuple(pool[i] for i in indices)
|
||||
... while 1:
|
||||
... for i in reversed(range(r)):
|
||||
... if indices[i] != n - 1:
|
||||
... break
|
||||
... else:
|
||||
... return
|
||||
... indices[i:] = [indices[i] + 1] * (r - i)
|
||||
... yield tuple(pool[i] for i in indices)
|
||||
|
||||
This is not part of the examples but it tests to make sure the definitions
|
||||
perform as purported.
|
||||
|
|
@ -1321,24 +1316,6 @@ perform as purported.
|
|||
>>> nth('abcde', 3)
|
||||
['d']
|
||||
|
||||
>>> all([2, 4, 6, 8], lambda x: x%2==0)
|
||||
True
|
||||
|
||||
>>> all([2, 3, 6, 8], lambda x: x%2==0)
|
||||
False
|
||||
|
||||
>>> any([2, 4, 6, 8], lambda x: x%2==0)
|
||||
True
|
||||
|
||||
>>> any([1, 3, 5, 9], lambda x: x%2==0,)
|
||||
False
|
||||
|
||||
>>> no([1, 3, 5, 9], lambda x: x%2==0)
|
||||
True
|
||||
|
||||
>>> no([1, 2, 5, 9], lambda x: x%2==0)
|
||||
False
|
||||
|
||||
>>> quantify(range(99), lambda x: x%2==0)
|
||||
50
|
||||
|
||||
|
|
@ -1383,6 +1360,9 @@ False
|
|||
>>> list(compress('abcdef', [1,0,1,0,1,1]))
|
||||
['a', 'c', 'e', 'f']
|
||||
|
||||
>>> list(combinations_with_replacement('abc', 2))
|
||||
[('a', 'a'), ('a', 'b'), ('a', 'c'), ('b', 'b'), ('b', 'c'), ('c', 'c')]
|
||||
|
||||
"""
|
||||
|
||||
__test__ = {'libreftest' : libreftest}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
from test.support import verbose, TestSkipped
|
||||
from test.support import verbose, TestSkipped, TestFailed
|
||||
import locale
|
||||
import sys
|
||||
|
||||
|
|
@ -78,3 +78,12 @@ try:
|
|||
|
||||
finally:
|
||||
locale.setlocale(locale.LC_NUMERIC, oldlocale)
|
||||
|
||||
if hasattr(locale, "strcoll"):
|
||||
# test crasher from bug #3303
|
||||
try:
|
||||
locale.strcoll("a", None)
|
||||
except TypeError:
|
||||
pass
|
||||
else:
|
||||
raise TestFailed("TypeError not raised")
|
||||
|
|
|
|||
|
|
@ -584,6 +584,9 @@ class ConfigFileTest(BaseTest):
|
|||
datefmt=
|
||||
"""
|
||||
|
||||
# config5 specifies a custom handler class to be loaded
|
||||
config5 = config1.replace('class=StreamHandler', 'class=logging.StreamHandler')
|
||||
|
||||
def apply_config(self, conf):
|
||||
try:
|
||||
fn = tempfile.mktemp(".ini")
|
||||
|
|
@ -609,10 +612,10 @@ class ConfigFileTest(BaseTest):
|
|||
# Original logger output is empty.
|
||||
self.assert_log_lines([])
|
||||
|
||||
def test_config1_ok(self):
|
||||
def test_config1_ok(self, config=config1):
|
||||
# A config file defining a sub-parser as well.
|
||||
with captured_stdout() as output:
|
||||
self.apply_config(self.config1)
|
||||
self.apply_config(config)
|
||||
logger = logging.getLogger("compiler.parser")
|
||||
# Both will output a message
|
||||
logger.info(self.next_message())
|
||||
|
|
@ -647,6 +650,8 @@ class ConfigFileTest(BaseTest):
|
|||
# Original logger output is empty
|
||||
self.assert_log_lines([])
|
||||
|
||||
def test_config5_ok(self):
|
||||
self.test_config1_ok(config=self.config5)
|
||||
|
||||
class LogRecordStreamHandler(StreamRequestHandler):
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ from test import support
|
|||
from test import test_multibytecodec_support
|
||||
from test.support import TESTFN
|
||||
import unittest, io, codecs, sys, os
|
||||
import _multibytecodec
|
||||
|
||||
ALL_CJKENCODINGS = [
|
||||
# _codecs_cn
|
||||
|
|
@ -53,6 +54,14 @@ class Test_MultibyteCodec(unittest.TestCase):
|
|||
finally:
|
||||
support.unlink(TESTFN)
|
||||
|
||||
def test_init_segfault(self):
|
||||
# bug #3305: this used to segfault
|
||||
self.assertRaises(AttributeError,
|
||||
_multibytecodec.MultibyteStreamReader, None)
|
||||
self.assertRaises(AttributeError,
|
||||
_multibytecodec.MultibyteStreamWriter, None)
|
||||
|
||||
|
||||
class Test_IncrementalEncoder(unittest.TestCase):
|
||||
|
||||
def test_stateless(self):
|
||||
|
|
|
|||
|
|
@ -1038,7 +1038,7 @@ class _TestZZZNumberOfObjects(BaseTestCase):
|
|||
gc.collect() # do garbage collection
|
||||
refs = self.manager._number_of_objects()
|
||||
if refs != EXPECTED_NUMBER:
|
||||
print(self.manager._debugInfo())
|
||||
print(self.manager._debug_info())
|
||||
|
||||
self.assertEqual(refs, EXPECTED_NUMBER)
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import random
|
|||
import time
|
||||
import pickle
|
||||
import warnings
|
||||
from math import log, exp, sqrt, pi
|
||||
from math import log, exp, sqrt, pi, sum as msum
|
||||
from test import support
|
||||
|
||||
class TestBasicOps(unittest.TestCase):
|
||||
|
|
@ -389,11 +389,9 @@ _gammacoeff = (0.9999999999995183, 676.5203681218835, -1259.139216722289,
|
|||
|
||||
def gamma(z, cof=_gammacoeff, g=7):
|
||||
z -= 1.0
|
||||
sum = cof[0]
|
||||
for i in range(1,len(cof)):
|
||||
sum += cof[i] / (z+i)
|
||||
s = msum([cof[0]] + [cof[i] / (z+i) for i in range(1,len(cof))])
|
||||
z += 0.5
|
||||
return (z+g)**z / exp(z+g) * sqrt(2*pi) * sum
|
||||
return (z+g)**z / exp(z+g) * sqrt(2.0*pi) * s
|
||||
|
||||
class TestDistributions(unittest.TestCase):
|
||||
def test_zeroinputs(self):
|
||||
|
|
|
|||
|
|
@ -139,7 +139,8 @@ RobotTest(7, doc, good, bad)
|
|||
class NetworkTestCase(unittest.TestCase):
|
||||
|
||||
def testPasswordProtectedSite(self):
|
||||
support.requires('network')
|
||||
if not support.is_resource_enabled('network'):
|
||||
return
|
||||
# whole site is password-protected.
|
||||
url = 'http://mueblesmoraleda.com'
|
||||
parser = urllib.robotparser.RobotFileParser()
|
||||
|
|
@ -148,7 +149,8 @@ class NetworkTestCase(unittest.TestCase):
|
|||
self.assertEqual(parser.can_fetch("*", url+"/robots.txt"), False)
|
||||
|
||||
def testPythonOrg(self):
|
||||
support.requires('network')
|
||||
if not support.is_resource_enabled('network'):
|
||||
return
|
||||
parser = urllib.robotparser.RobotFileParser(
|
||||
"http://www.python.org/robots.txt")
|
||||
parser.read()
|
||||
|
|
@ -160,5 +162,5 @@ def test_main():
|
|||
support.run_unittest(tests)
|
||||
|
||||
if __name__=='__main__':
|
||||
support.Verbose = 1
|
||||
support.verbose = 1
|
||||
test_main()
|
||||
|
|
|
|||
|
|
@ -495,6 +495,24 @@ self.assert_(X.passed)
|
|||
self.assert_("x" not in varnames)
|
||||
self.assert_("y" in varnames)
|
||||
|
||||
def testLocalsClass_WithTrace(self):
|
||||
# Issue23728: after the trace function returns, the locals()
|
||||
# dictionary is used to update all variables, this used to
|
||||
# include free variables. But in class statements, free
|
||||
# variables are not inserted...
|
||||
import sys
|
||||
sys.settrace(lambda a,b,c:None)
|
||||
try:
|
||||
x = 12
|
||||
|
||||
class C:
|
||||
def f(self):
|
||||
return x
|
||||
|
||||
self.assertEquals(x, 12) # Used to raise UnboundLocalError
|
||||
finally:
|
||||
sys.settrace(None)
|
||||
|
||||
def testBoundAndFree(self):
|
||||
# var is bound and free in class
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue