Mailman 3 April 2011 - Python-checkins

cpython: Issue #11811: ssl.get_server_certificate() is now IPv6-compatible. Patch
by antoine.pitrou April 28, 2011

April 28, 2011

http://hg.python.org/cpython/rev/d3166c359714 changeset: 69673:d3166c359714 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Thu Apr 28 19:23:55 2011 +0200 summary: Issue #11811: ssl.get_server_certificate() is now IPv6-compatible. Patch by Charles-François Natali. files: Doc/library/ssl.rst | 3 ++ Lib/ssl.py | 6 ++-- Lib/test/test_ssl.py | 41 +++++++++++++++++-------------- Misc/NEWS | 3 ++ 4 files changed, 32 insertions(+), 21 deletions(-) diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -239,6 +239,9 @@ will attempt to validate the server certificate against that set of root certificates, and will fail if the validation attempt fails. + .. versionchanged:: 3.3 + This function is now IPv6-compatible. + .. function:: DER_cert_to_PEM_cert(DER_cert_bytes) Given a certificate as a DER-encoded blob of bytes, returns a PEM-encoded diff --git a/Lib/ssl.py b/Lib/ssl.py --- a/Lib/ssl.py +++ b/Lib/ssl.py @@ -81,7 +81,7 @@ from socket import getnameinfo as _getnameinfo from socket import error as socket_error -from socket import socket, AF_INET, SOCK_STREAM +from socket import socket, AF_INET, SOCK_STREAM, create_connection import base64 # for DER-to-PEM translation import traceback import errno @@ -543,9 +543,9 @@ cert_reqs = CERT_REQUIRED else: cert_reqs = CERT_NONE - s = wrap_socket(socket(), ssl_version=ssl_version, + s = create_connection(addr) + s = wrap_socket(s, ssl_version=ssl_version, cert_reqs=cert_reqs, ca_certs=ca_certs) - s.connect(addr) dercert = s.getpeercert(True) s.close() return DER_cert_to_PEM_cert(dercert) diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -604,25 +604,30 @@ sys.stdout.write("\nNeeded %d calls to do_handshake() to establish session.\n" % count) def test_get_server_certificate(self): - with support.transient_internet("svn.python.org"): - pem = ssl.get_server_certificate(("svn.python.org", 443)) - if not pem: - self.fail("No server certificate on svn.python.org:443!") + def _test_get_server_certificate(host, port, cert=None): + with support.transient_internet(host): + pem = ssl.get_server_certificate((host, port)) + if not pem: + self.fail("No server certificate on %s:%s!" % (host, port)) + + try: + pem = ssl.get_server_certificate((host, port), ca_certs=CERTFILE) + except ssl.SSLError as x: + #should fail + if support.verbose: + sys.stdout.write("%s\n" % x) + else: + self.fail("Got server certificate %s for %s:%s!" % (pem, host, port)) + + pem = ssl.get_server_certificate((host, port), ca_certs=cert) + if not pem: + self.fail("No server certificate on %s:%s!" % (host, port)) + if support.verbose: + sys.stdout.write("\nVerified certificate for %s:%s is\n%s\n" % (host, port ,pem)) - try: - pem = ssl.get_server_certificate(("svn.python.org", 443), ca_certs=CERTFILE) - except ssl.SSLError as x: - #should fail - if support.verbose: - sys.stdout.write("%s\n" % x) - else: - self.fail("Got server certificate %s for svn.python.org!" % pem) - - pem = ssl.get_server_certificate(("svn.python.org", 443), ca_certs=SVN_PYTHON_ORG_ROOT_CERT) - if not pem: - self.fail("No server certificate on svn.python.org:443!") - if support.verbose: - sys.stdout.write("\nVerified certificate for svn.python.org:443 is\n%s\n" % pem) + _test_get_server_certificate('svn.python.org', 443, SVN_PYTHON_ORG_ROOT_CERT) + if support.IPV6_ENABLED: + _test_get_server_certificate('ipv6.google.com', 443) def test_ciphers(self): remote = ("svn.python.org", 443) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -127,6 +127,9 @@ Library ------- +- Issue #11811: ssl.get_server_certificate() is now IPv6-compatible. Patch + by Charles-François Natali. + - Issue #11763: don't use difflib in TestCase.assertMultiLineEqual if the strings are too long. -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Fix whitespace
by antoine.pitrou April 28, 2011

April 28, 2011

http://hg.python.org/cpython/rev/19ab4d6d313f changeset: 69674:19ab4d6d313f user: Antoine Pitrou <solipsis(a)pitrou.net> date: Thu Apr 28 19:24:46 2011 +0200 summary: Fix whitespace files: Lib/test/test_ssl.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -609,7 +609,7 @@ pem = ssl.get_server_certificate((host, port)) if not pem: self.fail("No server certificate on %s:%s!" % (host, port)) - + try: pem = ssl.get_server_certificate((host, port), ca_certs=CERTFILE) except ssl.SSLError as x: @@ -617,13 +617,13 @@ if support.verbose: sys.stdout.write("%s\n" % x) else: - self.fail("Got server certificate %s for %s:%s!" % (pem, host, port)) - + self.fail("Got server certificate %s for %s:%s!" % (pem, host, port)) + pem = ssl.get_server_certificate((host, port), ca_certs=cert) if not pem: - self.fail("No server certificate on %s:%s!" % (host, port)) + self.fail("No server certificate on %s:%s!" % (host, port)) if support.verbose: - sys.stdout.write("\nVerified certificate for %s:%s is\n%s\n" % (host, port ,pem)) + sys.stdout.write("\nVerified certificate for %s:%s is\n%s\n" % (host, port ,pem)) _test_get_server_certificate('svn.python.org', 443, SVN_PYTHON_ORG_ROOT_CERT) if support.IPV6_ENABLED: -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #11811: Factor out detection of IPv6 support on the current host
by antoine.pitrou April 28, 2011

April 28, 2011

http://hg.python.org/cpython/rev/0518f32cb747 changeset: 69672:0518f32cb747 parent: 69669:de7dc59260b1 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Thu Apr 28 19:18:10 2011 +0200 summary: Issue #11811: Factor out detection of IPv6 support on the current host and make it available as `test.support.IPV6_ENABLED`. Patch by Charles-François Natali. files: Lib/test/support.py | 30 +++++++++++++++++++++------- Lib/test/test_ftplib.py | 2 +- Lib/test/test_socket.py | 15 +------------- Misc/NEWS | 4 +++ 4 files changed, 28 insertions(+), 23 deletions(-) diff --git a/Lib/test/support.py b/Lib/test/support.py --- a/Lib/test/support.py +++ b/Lib/test/support.py @@ -33,16 +33,15 @@ "verbose", "use_resources", "max_memuse", "record_original_stdout", "get_original_stdout", "unload", "unlink", "rmtree", "forget", "is_resource_enabled", "requires", "find_unused_port", "bind_port", - "is_jython", "TESTFN", "HOST", "SAVEDCWD", "temp_cwd", + "IPV6_ENABLED", "is_jython", "TESTFN", "HOST", "SAVEDCWD", "temp_cwd", "findfile", "sortdict", "check_syntax_error", "open_urlresource", "check_warnings", "CleanImport", "EnvironmentVarGuard", - "TransientResource", "captured_output", "captured_stdout", - "time_out", "socket_peer_reset", "ioerror_peer_reset", - "run_with_locale", 'temp_umask', "transient_internet", - "set_memlimit", "bigmemtest", "bigaddrspacetest", "BasicTestRunner", - "run_unittest", "run_doctest", "threading_setup", "threading_cleanup", - "reap_children", "cpython_only", "check_impl_detail", "get_attribute", - "swap_item", "swap_attr", "requires_IEEE_754", + "TransientResource", "captured_output", "captured_stdout", "time_out", + "socket_peer_reset", "ioerror_peer_reset", "run_with_locale", 'temp_umask', + "transient_internet", "set_memlimit", "bigmemtest", "bigaddrspacetest", + "BasicTestRunner", "run_unittest", "run_doctest", "threading_setup", + "threading_cleanup", "reap_children", "cpython_only", "check_impl_detail", + "get_attribute", "swap_item", "swap_attr", "requires_IEEE_754", "TestHandler", "Matcher", "can_symlink", "skip_unless_symlink"] @@ -381,6 +380,21 @@ port = sock.getsockname()[1] return port +def _is_ipv6_enabled(): + """Check whether IPv6 is enabled on this host.""" + if socket.has_ipv6: + try: + sock = socket.socket(socket.AF_INET6, socket.SOCK_STREAM) + sock.bind(('::1', 0)) + except (socket.error, socket.gaierror): + pass + else: + sock.close() + return True + return False + +IPV6_ENABLED = _is_ipv6_enabled() + # decorator for skipping tests on non-IEEE 754 platforms requires_IEEE_754 = unittest.skipUnless( float.__getformat__("double").startswith("IEEE"), diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py --- a/Lib/test/test_ftplib.py +++ b/Lib/test/test_ftplib.py @@ -873,7 +873,7 @@ def test_main(): tests = [TestFTPClass, TestTimeouts] - if socket.has_ipv6: + if support.IPV6_ENABLED: try: DummyFTPServer((HOST, 0), af=socket.AF_INET6) except socket.error: diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -24,18 +24,6 @@ except ImportError: fcntl = False -def try_address(host, port=0, family=socket.AF_INET): - """Try to bind a socket on the given host:port and return True - if that has been possible.""" - try: - sock = socket.socket(family, socket.SOCK_STREAM) - sock.bind((host, port)) - except (socket.error, socket.gaierror): - return False - else: - sock.close() - return True - def linux_version(): try: # platform.release() is something like '2.6.33.7-desktop-2mnb' @@ -46,7 +34,6 @@ HOST = support.HOST MSG = 'Michael Gilfix was here\u1234\r\n'.encode('utf-8') ## test unicode string and carriage return -SUPPORTS_IPV6 = socket.has_ipv6 and try_address('::1', family=socket.AF_INET6) try: import _thread as thread @@ -645,7 +632,7 @@ socket.getaddrinfo('localhost', 80) socket.getaddrinfo('127.0.0.1', 80) socket.getaddrinfo(None, 80) - if SUPPORTS_IPV6: + if support.IPV6_ENABLED: socket.getaddrinfo('::1', 80) # port can be a string service name such as "http", a numeric # port number or None diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -523,6 +523,10 @@ Tests ----- +- Issue #11811: Factor out detection of IPv6 support on the current host + and make it available as ``test.support.IPV6_ENABLED``. Patch by + Charles-François Natali. + - Issue #10914: Add a minimal embedding test to test_capi. - Issue #11223: Skip test_lock_acquire_interruption() and -- Repository URL: http://hg.python.org/cpython

1 0

Re: [Python-checkins] [Python-Dev] cpython (2.7): Fix closes issue10761: tarfile.extractall failure when symlinked files are
by Nadeem Vawda April 28, 2011

April 28, 2011

On Thu, Apr 28, 2011 at 4:44 PM, Senthil Kumaran <orsenthil(a)gmail.com> wrote: > On Thu, Apr 28, 2011 at 04:20:06PM +0200, Éric Araujo wrote: >> > if hasattr(os, "symlink") and hasattr(os, "link"): >> > # For systems that support symbolic and hard links. >> > if tarinfo.issym(): >> > + if os.path.exists(targetpath): >> > + os.unlink(targetpath) >> >> Is there a race condition here? > > The lock to avoid race conditions (if you were thinking along those > lines) would usually be implemented at the higher level code which is > using extractall in threads. > > Checking that no one else is accessing the file before unlinking may > not be suitable for the library method and of course, we cannot check > if someone is waiting to act on that file. I think Éric is referring to the possibility of another process creating or deleting targetpath between the calls to os.path.exists() and os.unlink(). This would result in symlink() or unlink() raising an exception. The deletion case could be handled like this: if tarinfo.issym(): + try: + os.unlink(targetpath) + except OSError as e: + if e.errno != errno.ENOENT: + raise os.symlink(tarinfo.linkname, targetpath) I'm not sure what the best way of handling the creation case is. The obvious solution would be to try the above code in a loop, repeating until we succeed (or fail for a different reason), but this would not be guaranteed to terminate. Cheers, Nadeem

2 1

cpython (merge 2.6 -> 2.7): Merged solution for #11786 from 2.6
by lukasz.langa April 28, 2011

April 28, 2011

http://hg.python.org/cpython/rev/a6b772599594 changeset: 69671:a6b772599594 branch: 2.7 parent: 69658:e19d2e3a3a58 parent: 69670:c7ce67c9237a user: Łukasz Langa <lukasz(a)langa.pl> date: Thu Apr 28 17:40:19 2011 +0200 summary: Merged solution for #11786 from 2.6 files: Doc/library/configparser.rst | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst --- a/Doc/library/configparser.rst +++ b/Doc/library/configparser.rst @@ -96,6 +96,9 @@ This class does not support the magical interpolation behavior. + All option names are passed through the :meth:`optionxform` method. Its + default implementation converts option names to lower case. + .. versionadded:: 2.3 .. versionchanged:: 2.6 @@ -116,10 +119,9 @@ *defaults*. All option names used in interpolation will be passed through the - :meth:`optionxform` method just like any other option name reference. For - example, using the default implementation of :meth:`optionxform` (which converts - option names to lower case), the values ``foo %(bar)s`` and ``foo %(BAR)s`` are - equivalent. + :meth:`optionxform` method just like any other option name reference. Using + the default implementation of :meth:`optionxform`, the values ``foo %(bar)s`` + and ``foo %(BAR)s`` are equivalent. .. versionadded:: 2.3 -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.6): Closes #11786: ConfigParser.[Raw]ConfigParser optionxform().
by lukasz.langa April 28, 2011

April 28, 2011

http://hg.python.org/cpython/rev/c7ce67c9237a changeset: 69670:c7ce67c9237a branch: 2.6 parent: 69410:4bd47815e6c5 user: Łukasz Langa <lukasz(a)langa.pl> date: Thu Apr 28 17:27:59 2011 +0200 summary: Closes #11786: ConfigParser.[Raw]ConfigParser optionxform(). files: Doc/library/configparser.rst | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst --- a/Doc/library/configparser.rst +++ b/Doc/library/configparser.rst @@ -79,9 +79,12 @@ The basic configuration object. When *defaults* is given, it is initialized into the dictionary of intrinsic defaults. When *dict_type* is given, it will be used to create the dictionary objects for the list of sections, for the - options within a section, and for the default values. This class does not + options within a section, and for the default values. This class does not support the magical interpolation behavior. + All option names are passed through the :meth:`optionxform` method. Its + default implementation converts option names to lower case. + .. versionadded:: 2.3 .. versionchanged:: 2.6 @@ -98,10 +101,9 @@ *defaults*. All option names used in interpolation will be passed through the - :meth:`optionxform` method just like any other option name reference. For - example, using the default implementation of :meth:`optionxform` (which converts - option names to lower case), the values ``foo %(bar)s`` and ``foo %(BAR)s`` are - equivalent. + :meth:`optionxform` method just like any other option name reference. Using + the default implementation of :meth:`optionxform`, the values ``foo %(bar)s`` + and ``foo %(BAR)s`` are equivalent. .. class:: SafeConfigParser([defaults[, dict_type]]) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Merged solution for #11324 from 3.2.
by lukasz.langa April 28, 2011

April 28, 2011

http://hg.python.org/cpython/rev/de7dc59260b1 changeset: 69669:de7dc59260b1 parent: 69667:062ca988cbf6 parent: 69668:32031e33d793 user: Łukasz Langa <lukasz(a)langa.pl> date: Thu Apr 28 17:04:25 2011 +0200 summary: Merged solution for #11324 from 3.2. files: Lib/configparser.py | 9 +++-- Lib/test/test_configparser.py | 38 +++++++++++++++++++++++ Misc/ACKS | 1 + 3 files changed, 44 insertions(+), 4 deletions(-) diff --git a/Lib/configparser.py b/Lib/configparser.py --- a/Lib/configparser.py +++ b/Lib/configparser.py @@ -624,11 +624,12 @@ self._strict = strict self._allow_no_value = allow_no_value self._empty_lines_in_values = empty_lines_in_values - if interpolation is _UNSET: + self.default_section=default_section + self._interpolation = interpolation + if self._interpolation is _UNSET: self._interpolation = self._DEFAULT_INTERPOLATION - else: - self._interpolation = interpolation - self.default_section=default_section + if self._interpolation is None: + self._interpolation = Interpolation() def defaults(self): return self._defaults diff --git a/Lib/test/test_configparser.py b/Lib/test/test_configparser.py --- a/Lib/test/test_configparser.py +++ b/Lib/test/test_configparser.py @@ -864,6 +864,43 @@ cf = self.newconfig() self.assertRaises(ValueError, cf.add_section, self.default_section) + +class ConfigParserTestCaseNoInterpolation(BasicTestCase): + config_class = configparser.ConfigParser + interpolation = None + ini = textwrap.dedent(""" + [numbers] + one = 1 + two = %(one)s * 2 + three = ${common:one} * 3 + + [hexen] + sixteen = ${numbers:two} * 8 + """).strip() + + def assertMatchesIni(self, cf): + self.assertEqual(cf['numbers']['one'], '1') + self.assertEqual(cf['numbers']['two'], '%(one)s * 2') + self.assertEqual(cf['numbers']['three'], '${common:one} * 3') + self.assertEqual(cf['hexen']['sixteen'], '${numbers:two} * 8') + + def test_no_interpolation(self): + cf = self.fromstring(self.ini) + self.assertMatchesIni(cf) + + def test_empty_case(self): + cf = self.newconfig() + self.assertIsNone(cf.read_string("")) + + def test_none_as_default_interpolation(self): + class CustomConfigParser(configparser.ConfigParser): + _DEFAULT_INTERPOLATION = None + + cf = CustomConfigParser() + cf.read_string(self.ini) + self.assertMatchesIni(cf) + + class ConfigParserTestCaseLegacyInterpolation(ConfigParserTestCase): config_class = configparser.ConfigParser interpolation = configparser.LegacyInterpolation() @@ -1444,6 +1481,7 @@ ConfigParserTestCaseNoValue, ConfigParserTestCaseExtendedInterpolation, ConfigParserTestCaseLegacyInterpolation, + ConfigParserTestCaseNoInterpolation, ConfigParserTestCaseTrickyFile, MultilineValuesTestCase, RawConfigParserTestCase, diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -115,6 +115,7 @@ Brian Brazil Dave Brennan Tom Bridgman +Tobias Brink Richard Brodie Michael Broghton Daniel Brotsky -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Closes #11324: ConfigParser(interpolation=None) doesn't work.
by lukasz.langa April 28, 2011

April 28, 2011

http://hg.python.org/cpython/rev/32031e33d793 changeset: 69668:32031e33d793 branch: 3.2 parent: 69666:17b4378689e6 user: Łukasz Langa <lukasz(a)langa.pl> date: Thu Apr 28 17:03:45 2011 +0200 summary: Closes #11324: ConfigParser(interpolation=None) doesn't work. Initial patches by Tobias Brink. Thanks! files: Lib/configparser.py | 9 +++-- Lib/test/test_cfgparser.py | 38 ++++++++++++++++++++++++++ Misc/ACKS | 1 + 3 files changed, 44 insertions(+), 4 deletions(-) diff --git a/Lib/configparser.py b/Lib/configparser.py --- a/Lib/configparser.py +++ b/Lib/configparser.py @@ -623,11 +623,12 @@ self._strict = strict self._allow_no_value = allow_no_value self._empty_lines_in_values = empty_lines_in_values - if interpolation is _UNSET: + self.default_section=default_section + self._interpolation = interpolation + if self._interpolation is _UNSET: self._interpolation = self._DEFAULT_INTERPOLATION - else: - self._interpolation = interpolation - self.default_section=default_section + if self._interpolation is None: + self._interpolation = Interpolation() def defaults(self): return self._defaults diff --git a/Lib/test/test_cfgparser.py b/Lib/test/test_cfgparser.py --- a/Lib/test/test_cfgparser.py +++ b/Lib/test/test_cfgparser.py @@ -864,6 +864,43 @@ cf = self.newconfig() self.assertRaises(ValueError, cf.add_section, self.default_section) + +class ConfigParserTestCaseNoInterpolation(BasicTestCase): + config_class = configparser.ConfigParser + interpolation = None + ini = textwrap.dedent(""" + [numbers] + one = 1 + two = %(one)s * 2 + three = ${common:one} * 3 + + [hexen] + sixteen = ${numbers:two} * 8 + """).strip() + + def assertMatchesIni(self, cf): + self.assertEqual(cf['numbers']['one'], '1') + self.assertEqual(cf['numbers']['two'], '%(one)s * 2') + self.assertEqual(cf['numbers']['three'], '${common:one} * 3') + self.assertEqual(cf['hexen']['sixteen'], '${numbers:two} * 8') + + def test_no_interpolation(self): + cf = self.fromstring(self.ini) + self.assertMatchesIni(cf) + + def test_empty_case(self): + cf = self.newconfig() + self.assertIsNone(cf.read_string("")) + + def test_none_as_default_interpolation(self): + class CustomConfigParser(configparser.ConfigParser): + _DEFAULT_INTERPOLATION = None + + cf = CustomConfigParser() + cf.read_string(self.ini) + self.assertMatchesIni(cf) + + class ConfigParserTestCaseLegacyInterpolation(ConfigParserTestCase): config_class = configparser.ConfigParser interpolation = configparser.LegacyInterpolation() @@ -1444,6 +1481,7 @@ ConfigParserTestCaseNoValue, ConfigParserTestCaseExtendedInterpolation, ConfigParserTestCaseLegacyInterpolation, + ConfigParserTestCaseNoInterpolation, ConfigParserTestCaseTrickyFile, MultilineValuesTestCase, RawConfigParserTestCase, diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -113,6 +113,7 @@ Brian Brazil Dave Brennan Tom Bridgman +Tobias Brink Richard Brodie Michael Broghton Daniel Brotsky -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Refined time test in test_logging.
by vinay.sajip April 28, 2011

April 28, 2011

http://hg.python.org/cpython/rev/5185e1d91f3d changeset: 69578:5185e1d91f3d user: Vinay Sajip <vinay_sajip(a)yahoo.co.uk> date: Tue Apr 26 20:26:41 2011 +0100 summary: Refined time test in test_logging. files: Lib/test/test_logging.py | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py --- a/Lib/test/test_logging.py +++ b/Lib/test/test_logging.py @@ -43,6 +43,7 @@ from test.support import captured_stdout, run_with_locale, run_unittest, patch from test.support import TestHandler, Matcher import textwrap +import time import unittest import warnings import weakref @@ -2190,6 +2191,18 @@ self.assertTrue(handler.matches(levelno=logging.ERROR, message='2')) self.assertTrue(handler.matches(levelno=logging.CRITICAL, message='3')) +ZERO = datetime.timedelta(0) + +class UTC(datetime.tzinfo): + def utcoffset(self, dt): + return ZERO + + dst = utcoffset + + def tzname(self, dt): + return 'UTC' + +utc = UTC() class FormatterTest(unittest.TestCase): def setUp(self): @@ -2268,9 +2281,11 @@ def test_time(self): r = self.get_record() - r.created = 735375780.0 # 21 April 1993 08:03:00 + dt = datetime.datetime(1993,4,21,8,3,0,0,utc) + r.created = time.mktime(dt.utctimetuple()) r.msecs = 123 f = logging.Formatter('%(asctime)s %(message)s') + f.converter = time.gmtime self.assertEqual(f.formatTime(r), '1993-04-21 08:03:00,123') self.assertEqual(f.formatTime(r, '%Y:%d'), '1993:21') f.format(r) -- Repository URL: http://hg.python.org/cpython

2 1

cpython (3.2): Closes #11858: configparser.ExtendedInterpolation and section case.
by lukasz.langa April 28, 2011

April 28, 2011

http://hg.python.org/cpython/rev/57c076ab4bbd changeset: 69657:57c076ab4bbd branch: 3.2 parent: 69655:492823e935b3 user: Łukasz Langa <lukasz(a)langa.pl> date: Thu Apr 28 10:58:57 2011 +0200 summary: Closes #11858: configparser.ExtendedInterpolation and section case. Patch by ゆかりぴんく魔女. Thanks! files: Lib/configparser.py | 8 +- Lib/test/test_cfgparser.py | 70 ++++++++++++++++++++++++- 2 files changed, 72 insertions(+), 6 deletions(-) diff --git a/Lib/configparser.py b/Lib/configparser.py --- a/Lib/configparser.py +++ b/Lib/configparser.py @@ -481,17 +481,17 @@ if m is None: raise InterpolationSyntaxError(option, section, "bad interpolation variable reference %r" % rest) - path = parser.optionxform(m.group(1)).split(':') + path = m.group(1).split(':') rest = rest[m.end():] sect = section opt = option try: if len(path) == 1: - opt = path[0] + opt = parser.optionxform(path[0]) v = map[opt] elif len(path) == 2: sect = path[0] - opt = path[1] + opt = parser.optionxform(path[1]) v = parser.get(sect, opt, raw=True) else: raise InterpolationSyntaxError( @@ -1056,6 +1056,8 @@ if not optname: e = self._handle_error(e, fpname, lineno, line) optname = self.optionxform(optname.rstrip()) + if hasattr(self, '__ping__'): + import pdb; pdb.set_trace() if (self._strict and (sectname, optname) in elements_added): raise DuplicateOptionError(sectname, optname, diff --git a/Lib/test/test_cfgparser.py b/Lib/test/test_cfgparser.py --- a/Lib/test/test_cfgparser.py +++ b/Lib/test/test_cfgparser.py @@ -20,10 +20,16 @@ def values(self): return [i[1] for i in self.items()] - def iteritems(self): return iter(self.items()) - def iterkeys(self): return iter(self.keys()) + def iteritems(self): + return iter(self.items()) + + def iterkeys(self): + return iter(self.keys()) + + def itervalues(self): + return iter(self.values()) + __iter__ = iterkeys - def itervalues(self): return iter(self.values()) class CfgParserTestCaseClass(unittest.TestCase): @@ -986,6 +992,14 @@ config_class = configparser.ConfigParser interpolation = configparser.ExtendedInterpolation() default_section = 'common' + strict = True + + def fromstring(self, string, defaults=None, optionxform=None): + cf = self.newconfig(defaults) + if optionxform: + cf.optionxform = optionxform + cf.read_string(string) + return cf def test_extended_interpolation(self): cf = self.fromstring(textwrap.dedent(""" @@ -1070,6 +1084,56 @@ self.assertEqual(cm.exception.reference, 'dollars:${sick') self.assertEqual(cm.exception.args[2], '}') #rawval + def test_case_sensitivity_basic(self): + ini = textwrap.dedent(""" + [common] + optionlower = value + OptionUpper = Value + + [Common] + optionlower = a better ${common:optionlower} + OptionUpper = A Better ${common:OptionUpper} + + [random] + foolower = ${common:optionlower} redefined + FooUpper = ${Common:OptionUpper} Redefined + """).strip() + + cf = self.fromstring(ini) + eq = self.assertEqual + eq(cf['common']['optionlower'], 'value') + eq(cf['common']['OptionUpper'], 'Value') + eq(cf['Common']['optionlower'], 'a better value') + eq(cf['Common']['OptionUpper'], 'A Better Value') + eq(cf['random']['foolower'], 'value redefined') + eq(cf['random']['FooUpper'], 'A Better Value Redefined') + + def test_case_sensitivity_conflicts(self): + ini = textwrap.dedent(""" + [common] + option = value + Option = Value + + [Common] + option = a better ${common:option} + Option = A Better ${common:Option} + + [random] + foo = ${common:option} redefined + Foo = ${Common:Option} Redefined + """).strip() + with self.assertRaises(configparser.DuplicateOptionError): + cf = self.fromstring(ini) + + # raw options + cf = self.fromstring(ini, optionxform=lambda opt: opt) + eq = self.assertEqual + eq(cf['common']['option'], 'value') + eq(cf['common']['Option'], 'Value') + eq(cf['Common']['option'], 'a better value') + eq(cf['Common']['Option'], 'A Better Value') + eq(cf['random']['foo'], 'value redefined') + eq(cf['random']['Foo'], 'A Better Value Redefined') def test_other_errors(self): cf = self.fromstring(""" -- Repository URL: http://hg.python.org/cpython

2 1