Mailman 3 April 2012 - Python-checkins

cpython (merge 3.2 -> default): httplib - minor update to check empty response
by senthil.kumaran April 29, 2012

April 29, 2012

http://hg.python.org/cpython/rev/6c227c1a80dd changeset: 76607:6c227c1a80dd parent: 76605:cfff6a53f4a3 parent: 76606:1a9d38966395 user: Senthil Kumaran <senthil(a)uthcode.com> date: Sun Apr 29 10:40:23 2012 +0800 summary: httplib - minor update to check empty response files: Lib/http/client.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/http/client.py b/Lib/http/client.py --- a/Lib/http/client.py +++ b/Lib/http/client.py @@ -557,7 +557,7 @@ # a vanishingly small number of sites EOF without # sending the trailer break - if line == b"\r\n": + if line in (b'\r\n', b'\n', b''): break def _readall_chunked(self): @@ -789,7 +789,7 @@ if not line: # for sites which EOF without sending a trailer break - if line == b'\r\n': + if line in (b'\r\n', b'\n', b''): break def connect(self): -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): httplib - minor update to check empty response
by senthil.kumaran April 29, 2012

April 29, 2012

http://hg.python.org/cpython/rev/1a9d38966395 changeset: 76606:1a9d38966395 branch: 3.2 parent: 76604:afabb0635b15 user: Senthil Kumaran <senthil(a)uthcode.com> date: Sun Apr 29 10:39:49 2012 +0800 summary: httplib - minor update to check empty response files: Lib/http/client.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/http/client.py b/Lib/http/client.py --- a/Lib/http/client.py +++ b/Lib/http/client.py @@ -563,7 +563,7 @@ # a vanishingly small number of sites EOF without # sending the trailer break - if line == b"\r\n": + if line in (b'\r\n', b'\n', b''): break # we read everything; close the "file" @@ -718,7 +718,7 @@ if not line: # for sites which EOF without sending a trailer break - if line == b'\r\n': + if line in (b'\r\n', b'\n', b''): break def connect(self): -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): httplib test for early eof response. related to Issue13684
by senthil.kumaran April 29, 2012

April 29, 2012

http://hg.python.org/cpython/rev/cfff6a53f4a3 changeset: 76605:cfff6a53f4a3 parent: 76602:b1f29667a3c7 parent: 76604:afabb0635b15 user: Senthil Kumaran <senthil(a)uthcode.com> date: Sun Apr 29 10:21:26 2012 +0800 summary: httplib test for early eof response. related to Issue13684 files: Lib/test/test_httplib.py | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py --- a/Lib/test/test_httplib.py +++ b/Lib/test/test_httplib.py @@ -489,6 +489,15 @@ resp.begin() self.assertRaises(client.LineTooLong, resp.read) + def test_early_eof(self): + # Test httpresponse with no \r\n termination, + body = "HTTP/1.1 200 Ok" + sock = FakeSocket(body) + resp = client.HTTPResponse(sock) + resp.begin() + self.assertEqual(resp.read(), b'') + self.assertTrue(resp.isclosed()) + class OfflineTest(TestCase): def test_responses(self): self.assertEqual(client.responses[client.NOT_FOUND], "Not Found") -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): httplib test for early eof response. related to Issue13684
by senthil.kumaran April 29, 2012

April 29, 2012

http://hg.python.org/cpython/rev/685c1db976c4 changeset: 76603:685c1db976c4 branch: 2.7 parent: 76600:142297db28f1 user: Senthil Kumaran <senthil(a)uthcode.com> date: Sun Apr 29 10:15:31 2012 +0800 summary: httplib test for early eof response. related to Issue13684 files: Lib/test/test_httplib.py | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py --- a/Lib/test/test_httplib.py +++ b/Lib/test/test_httplib.py @@ -349,6 +349,14 @@ resp.begin() self.assertRaises(httplib.LineTooLong, resp.read) + def test_early_eof(self): + # Test httpresponse with no \r\n termination, + body = "HTTP/1.1 200 Ok" + sock = FakeSocket(body) + resp = httplib.HTTPResponse(sock) + resp.begin() + self.assertEqual(resp.read(), '') + self.assertTrue(resp.isclosed()) class OfflineTest(TestCase): def test_responses(self): -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): httplib test for early eof response. related to Issue13684
by senthil.kumaran April 29, 2012

April 29, 2012

http://hg.python.org/cpython/rev/afabb0635b15 changeset: 76604:afabb0635b15 branch: 3.2 parent: 76601:f4b167309bee user: Senthil Kumaran <senthil(a)uthcode.com> date: Sun Apr 29 10:20:46 2012 +0800 summary: httplib test for early eof response. related to Issue13684 files: Lib/test/test_httplib.py | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py --- a/Lib/test/test_httplib.py +++ b/Lib/test/test_httplib.py @@ -369,6 +369,15 @@ resp.begin() self.assertRaises(client.LineTooLong, resp.read) + def test_early_eof(self): + # Test httpresponse with no \r\n termination, + body = "HTTP/1.1 200 Ok" + sock = FakeSocket(body) + resp = client.HTTPResponse(sock) + resp.begin() + self.assertEqual(resp.read(), b'') + self.assertTrue(resp.isclosed()) + class OfflineTest(TestCase): def test_responses(self): self.assertEqual(client.responses[client.NOT_FOUND], "Not Found") -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): #14155: add a note about \b.
by ezio.melotti April 29, 2012

April 29, 2012

http://hg.python.org/cpython/rev/f4b167309bee changeset: 76601:f4b167309bee branch: 3.2 parent: 76592:a5a0d47e6e78 user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Sun Apr 29 04:52:30 2012 +0300 summary: #14155: add a note about \b. files: Doc/library/re.rst | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/Doc/library/re.rst b/Doc/library/re.rst --- a/Doc/library/re.rst +++ b/Doc/library/re.rst @@ -417,6 +417,9 @@ \r \t \v \x \\ +(Note that ``\b`` is used to represent word boundaries, and means "backspace" +only inside character classes.) + Octal escapes are included in a limited form. If the first digit is a 0, or if there are three octal digits, it is considered an octal escape. Otherwise, it is a group reference. As for string literals, octal escapes are always at most -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): #14155: merge note about \b from 3.2.
by ezio.melotti April 29, 2012

April 29, 2012

http://hg.python.org/cpython/rev/b1f29667a3c7 changeset: 76602:b1f29667a3c7 parent: 76599:bd195749c0a2 parent: 76601:f4b167309bee user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Sun Apr 29 04:53:20 2012 +0300 summary: #14155: merge note about \b from 3.2. files: Doc/library/re.rst | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/Doc/library/re.rst b/Doc/library/re.rst --- a/Doc/library/re.rst +++ b/Doc/library/re.rst @@ -417,6 +417,9 @@ \r \t \v \x \\ +(Note that ``\b`` is used to represent word boundaries, and means "backspace" +only inside character classes.) + Octal escapes are included in a limited form. If the first digit is a 0, or if there are three octal digits, it is considered an octal escape. Otherwise, it is a group reference. As for string literals, octal escapes are always at most -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): #14155: add a note about \b.
by ezio.melotti April 29, 2012

April 29, 2012

http://hg.python.org/cpython/rev/142297db28f1 changeset: 76600:142297db28f1 branch: 2.7 parent: 76595:707905b3f8df user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Sun Apr 29 04:46:34 2012 +0300 summary: #14155: add a note about \b. files: Doc/library/re.rst | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/Doc/library/re.rst b/Doc/library/re.rst --- a/Doc/library/re.rst +++ b/Doc/library/re.rst @@ -398,6 +398,9 @@ \r \t \v \x \\ +(Note that ``\b`` is used to represent word boundaries, and means "backspace" +only inside character classes.) + Octal escapes are included in a limited form: If the first digit is a 0, or if there are three octal digits, it is considered an octal escape. Otherwise, it is a group reference. As for string literals, octal escapes are always at most -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #14428: Use the new time.perf_counter() and time.process_time() functions
by victor.stinner April 29, 2012

April 29, 2012

http://hg.python.org/cpython/rev/bd195749c0a2 changeset: 76599:bd195749c0a2 user: Victor Stinner <victor.stinner(a)gmail.com> date: Sun Apr 29 03:01:20 2012 +0200 summary: Issue #14428: Use the new time.perf_counter() and time.process_time() functions * Replace "time.clock on windows, or time.time" with time.perf_counter() * profile module: only use time.process_time() instead of trying different functions providing the process time * timeit module: use time.perf_counter() by default, time.time() and time.clock() can still be used using --time and --clock options * pybench program: use time.perf_counter() by default, add support for the new time.process_time() and time.perf_counter() functions, but stay backward compatible. Use also time.get_clock_info() to display information of the timer. files: Doc/includes/mp_benchmarks.py | 6 +--- Lib/idlelib/ColorDelegator.py | 4 +- Lib/profile.py | 36 +--------------------- Lib/test/reperf.py | 4 +- Lib/test/sortperf.py | 4 +- Lib/timeit.py | 12 +----- Tools/pybench/pybench.py | 21 ++++++++++++- 7 files changed, 32 insertions(+), 55 deletions(-) diff --git a/Doc/includes/mp_benchmarks.py b/Doc/includes/mp_benchmarks.py --- a/Doc/includes/mp_benchmarks.py +++ b/Doc/includes/mp_benchmarks.py @@ -6,16 +6,12 @@ # import time -import sys import multiprocessing import threading import queue import gc -if sys.platform == 'win32': - _timer = time.clock -else: - _timer = time.time +_timer = time.perf_counter delta = 1 diff --git a/Lib/idlelib/ColorDelegator.py b/Lib/idlelib/ColorDelegator.py --- a/Lib/idlelib/ColorDelegator.py +++ b/Lib/idlelib/ColorDelegator.py @@ -149,9 +149,9 @@ self.stop_colorizing = False self.colorizing = True if DEBUG: print("colorizing...") - t0 = time.clock() + t0 = time.perf_counter() self.recolorize_main() - t1 = time.clock() + t1 = time.perf_counter() if DEBUG: print("%.3f seconds" % (t1-t0)) finally: self.colorizing = False diff --git a/Lib/profile.py b/Lib/profile.py --- a/Lib/profile.py +++ b/Lib/profile.py @@ -83,26 +83,6 @@ else: return prof.print_stats(sort) -if hasattr(os, "times"): - def _get_time_times(timer=os.times): - t = timer() - return t[0] + t[1] - -# Using getrusage(3) is better than clock(3) if available: -# on some systems (e.g. FreeBSD), getrusage has a higher resolution -# Furthermore, on a POSIX system, returns microseconds, which -# wrap around after 36min. -_has_res = 0 -try: - import resource - resgetrusage = lambda: resource.getrusage(resource.RUSAGE_SELF) - def _get_time_resource(timer=resgetrusage): - t = timer() - return t[0] + t[1] - _has_res = 1 -except ImportError: - pass - class Profile: """Profiler class. @@ -155,20 +135,8 @@ self.bias = bias # Materialize in local dict for lookup speed. if not timer: - if _has_res: - self.timer = resgetrusage - self.dispatcher = self.trace_dispatch - self.get_time = _get_time_resource - elif hasattr(time, 'clock'): - self.timer = self.get_time = time.clock - self.dispatcher = self.trace_dispatch_i - elif hasattr(os, 'times'): - self.timer = os.times - self.dispatcher = self.trace_dispatch - self.get_time = _get_time_times - else: - self.timer = self.get_time = time.time - self.dispatcher = self.trace_dispatch_i + self.timer = self.get_time = time.process_time + self.dispatcher = self.trace_dispatch_i else: self.timer = timer t = self.timer() # test out timer function diff --git a/Lib/test/reperf.py b/Lib/test/reperf.py --- a/Lib/test/reperf.py +++ b/Lib/test/reperf.py @@ -9,13 +9,13 @@ timefunc(10, p.findall, s) def timefunc(n, func, *args, **kw): - t0 = time.clock() + t0 = time.perf_counter() try: for i in range(n): result = func(*args, **kw) return result finally: - t1 = time.clock() + t1 = time.perf_counter() if n > 1: print(n, "times", end=' ') print(func.__name__, "%.3f" % (t1-t0), "CPU seconds") diff --git a/Lib/test/sortperf.py b/Lib/test/sortperf.py --- a/Lib/test/sortperf.py +++ b/Lib/test/sortperf.py @@ -57,9 +57,9 @@ sys.stdout.flush() def doit(L): - t0 = time.clock() + t0 = time.perf_counter() L.sort() - t1 = time.clock() + t1 = time.perf_counter() print("%6.2f" % (t1-t0), end=' ') flush() diff --git a/Lib/timeit.py b/Lib/timeit.py --- a/Lib/timeit.py +++ b/Lib/timeit.py @@ -15,8 +15,8 @@ -n/--number N: how many times to execute 'statement' (default: see below) -r/--repeat N: how many times to repeat the timer (default 3) -s/--setup S: statement to be executed once initially (default 'pass') - -t/--time: use time.time() (default on Unix) - -c/--clock: use time.clock() (default on Windows) + -t/--time: use time.time() + -c/--clock: use time.clock() -v/--verbose: print raw timing results; repeat for more digits precision -h/--help: print this usage message and exit --: separate options from statement, use when statement starts with - @@ -66,13 +66,7 @@ dummy_src_name = "<timeit-src>" default_number = 1000000 default_repeat = 3 - -if sys.platform == "win32": - # On Windows, the best timer is time.clock() - default_timer = time.clock -else: - # On most other platforms the best timer is time.time() - default_timer = time.time +default_timer = time.perf_counter # Don't change the indentation of the template; the reindent() calls # in Timer.__init__() depend on setup being indented 4 spaces and stmt diff --git a/Tools/pybench/pybench.py b/Tools/pybench/pybench.py --- a/Tools/pybench/pybench.py +++ b/Tools/pybench/pybench.py @@ -73,11 +73,15 @@ # Timer types TIMER_TIME_TIME = 'time.time' +TIMER_TIME_PROCESS_TIME = 'time.process_time' +TIMER_TIME_PERF_COUNTER = 'time.perf_counter' TIMER_TIME_CLOCK = 'time.clock' TIMER_SYSTIMES_PROCESSTIME = 'systimes.processtime' # Choose platform default timer -if sys.platform[:3] == 'win': +if hasattr(time, 'perf_counter'): + TIMER_PLATFORM_DEFAULT = TIMER_TIME_PERF_COUNTER +elif sys.platform[:3] == 'win': # On WinXP this has 2.5ms resolution TIMER_PLATFORM_DEFAULT = TIMER_TIME_CLOCK else: @@ -93,6 +97,10 @@ if timertype == TIMER_TIME_TIME: return time.time + elif timertype == TIMER_TIME_PROCESS_TIME: + return time.process_time + elif timertype == TIMER_TIME_PERF_COUNTER: + return time.perf_counter elif timertype == TIMER_TIME_CLOCK: return time.clock elif timertype == TIMER_SYSTIMES_PROCESSTIME: @@ -866,7 +874,18 @@ print('* using timer: systimes.processtime (%s)' % \ systimes.SYSTIMES_IMPLEMENTATION) else: + # Check that the clock function does exist + try: + get_timer(timer) + except TypeError: + print("* Error: Unknown timer: %s" % timer) + return + print('* using timer: %s' % timer) + if hasattr(time, 'get_clock_info'): + info = time.get_clock_info(timer[5:]) + print('* timer: resolution=%s, implementation=%s' + % (info.resolution, info.implementation)) print() -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Close #14309: Deprecate time.clock()
by victor.stinner April 29, 2012

April 29, 2012

http://hg.python.org/cpython/rev/314c3faea2fb changeset: 76598:314c3faea2fb user: Victor Stinner <victor.stinner(a)gmail.com> date: Sun Apr 29 02:52:39 2012 +0200 summary: Close #14309: Deprecate time.clock() Use time.perf_counter() or time.process_time() instead. files: Doc/library/time.rst | 5 +++++ Doc/whatsnew/3.3.rst | 3 +++ Misc/NEWS | 3 +++ 3 files changed, 11 insertions(+), 0 deletions(-) diff --git a/Doc/library/time.rst b/Doc/library/time.rst --- a/Doc/library/time.rst +++ b/Doc/library/time.rst @@ -136,6 +136,11 @@ :c:func:`QueryPerformanceCounter`. The resolution is typically better than one microsecond. + .. deprecated:: 3.3 + The behaviour of this function depends on the platform: use + :func:`perf_counter` or :func:`process_time` instead, depending on your + requirements, to have a well defined behaviour. + .. function:: clock_getres(clk_id) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -1188,6 +1188,9 @@ the ANSI code page anymore and to support any filename. * :issue:`13988`: The :mod:`xml.etree.cElementTree` module is deprecated. The accelerator is used automatically whenever available. +* The behaviour of :func:`time.clock` depends on the platform: use the new + :func:`time.perf_counter` or :func:`time.process_time` function instead, + depending on your requirements, to have a well defined behaviour. Deprecated functions and types of the C API diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -81,6 +81,9 @@ Library ------- +- Issue #14309: Deprecate time.clock(), use time.perf_counter() or + time.process_time() instead. + - Issue #14428: Implement the PEP 418. Add time.get_clock_info(), time.perf_counter() and time.process_time() functions, and rename time.steady() to time.monotonic(). -- Repository URL: http://hg.python.org/cpython

1 0