From jython-checkins at python.org Sun Sep 4 03:25:56 2016 From: jython-checkins at python.org (jeff.allen) Date: Sun, 04 Sep 2016 07:25:56 +0000 Subject: [Jython-checkins] =?utf-8?q?jython=3A_Formatting_only_=28crlf-=3E?= =?utf-8?q?lf=29_in_test=5Fsocketserver=5Fjython?= Message-ID: <20160904072546.9549.40827.15BF33C9@psf.io> https://hg.python.org/jython/rev/2be0f5da0aff changeset: 7957:2be0f5da0aff user: Jeff Allen date: Sat Sep 03 17:43:02 2016 +0100 summary: Formatting only (crlf->lf) in test_socketserver_jython files: Lib/test/test_socketserver_jython.py | 33 +++++++-------- 1 files changed, 16 insertions(+), 17 deletions(-) diff --git a/Lib/test/test_socketserver_jython.py b/Lib/test/test_socketserver_jython.py --- a/Lib/test/test_socketserver_jython.py +++ b/Lib/test/test_socketserver_jython.py @@ -1,17 +1,16 @@ -# -*- coding: windows-1252 -*- - -import unittest - -import SocketServer - -class TestSocketServer(unittest.TestCase): - - def testEphemeralPort(self): - """ Test that an ephemeral port is set correctly """ - host, port = "localhost", 0 # If we specify 0, system should pick an emphemeral port - server = SocketServer.TCPServer( (host, port), None) # Request handler never instantiated - server_host, server_port = server.server_address - self.failIfEqual(server_port, 0, "System assigned ephemeral port should not be zero") - -if __name__ == "__main__": - unittest.main() +import unittest +import SocketServer + +class TestSocketServer(unittest.TestCase): + + def testEphemeralPort(self): + """ Test that an ephemeral port is set correctly """ + # If we specify 0, system should pick an emphemeral port + host, port = "localhost", 0 + # Request handler never instantiated + server = SocketServer.TCPServer( (host, port), None) + server_host, server_port = server.server_address + self.failIfEqual(server_port, 0, "System assigned ephemeral port should not be zero") + +if __name__ == "__main__": + unittest.main() -- Repository URL: https://hg.python.org/jython From jython-checkins at python.org Sun Sep 4 03:25:56 2016 From: jython-checkins at python.org (jeff.allen) Date: Sun, 04 Sep 2016 07:25:56 +0000 Subject: [Jython-checkins] =?utf-8?q?jython=3A_Always_close_the_file_in_El?= =?utf-8?q?ementTree=2Ewrite=28=29=2E_Fixes_=232413=2E?= Message-ID: <20160904072546.9581.86129.A8F30239@psf.io> https://hg.python.org/jython/rev/c168765aae66 changeset: 7956:c168765aae66 user: Jeff Allen date: Sat Sep 03 13:56:53 2016 +0100 summary: Always close the file in ElementTree.write(). Fixes #2413. Also adds test. This makes it necessary for Jython to have its own ElementTree.py, as long as CPython stdlib does not explicitly close the file. files: Lib/test/test_xml_etree_jy.py | 16 ++++++++- Lib/xml/etree/ElementTree.py | 40 ++++++++++++---------- NEWS | 1 + 3 files changed, 37 insertions(+), 20 deletions(-) diff --git a/Lib/test/test_xml_etree_jy.py b/Lib/test/test_xml_etree_jy.py --- a/Lib/test/test_xml_etree_jy.py +++ b/Lib/test/test_xml_etree_jy.py @@ -750,7 +750,7 @@ Entity name: entity """ -def test_close_files(): +def test_close_file_iss1479(): # http://bugs.jython.org/issue1479 """ >>> import os @@ -767,5 +767,19 @@ >>> os.remove(test_support.TESTFN) """ +def test_close_file_iss2413(): + # http://bugs.jython.org/issue2413 + """ + >>> import os + >>> from test import test_support + >>> from xml.etree import ElementTree as ET + + >>> tree = ET.ElementTree(ET.XML('')) + >>> tree.write(test_support.TESTFN, encoding='an_unknown_encoding') + Traceback (most recent call last): + LookupError: unknown encoding 'an_unknown_encoding' + >>> os.remove(test_support.TESTFN) + """ + if __name__ == "__main__": doctest.testmod() diff --git a/Lib/xml/etree/ElementTree.py b/Lib/xml/etree/ElementTree.py --- a/Lib/xml/etree/ElementTree.py +++ b/Lib/xml/etree/ElementTree.py @@ -800,26 +800,28 @@ file = file_or_filename else: file = open(file_or_filename, "wb") - write = file.write - if not encoding: - if method == "c14n": - encoding = "utf-8" + try: + write = file.write + if not encoding: + if method == "c14n": + encoding = "utf-8" + else: + encoding = "us-ascii" + elif xml_declaration or (xml_declaration is None and + encoding not in ("utf-8", "us-ascii")): + if method == "xml": + write("\n" % encoding) + if method == "text": + _serialize_text(write, self._root, encoding) else: - encoding = "us-ascii" - elif xml_declaration or (xml_declaration is None and - encoding not in ("utf-8", "us-ascii")): - if method == "xml": - write("\n" % encoding) - if method == "text": - _serialize_text(write, self._root, encoding) - else: - qnames, namespaces = _namespaces( - self._root, encoding, default_namespace - ) - serialize = _serialize[method] - serialize(write, self._root, encoding, qnames, namespaces) - if file_or_filename is not file: - file.close() + qnames, namespaces = _namespaces( + self._root, encoding, default_namespace + ) + serialize = _serialize[method] + serialize(write, self._root, encoding, qnames, namespaces) + finally: + if file_or_filename is not file: + file.close() def write_c14n(self, file): # lxml.etree compatibility. use output method instead diff --git a/NEWS b/NEWS --- a/NEWS +++ b/NEWS @@ -4,6 +4,7 @@ Jython 2.7.1rc Bugs fixed + - [ 2413 ] ElementTree.write doesn't close files if used with invalid encoding - [ 2488 ] Always join on subprocess coupler threads - [ 2480 ] Repeating from import results in reload - [ 2472 ] Importing simplejson fails with: 'NoneType' object has no -- Repository URL: https://hg.python.org/jython From jython-checkins at python.org Sun Sep 4 03:25:56 2016 From: jython-checkins at python.org (jeff.allen) Date: Sun, 04 Sep 2016 07:25:56 +0000 Subject: [Jython-checkins] =?utf-8?q?jython=3A_Added_itervalues_and_iterke?= =?utf-8?q?ys_to_map_proxy=2E_Fixes_=232443?= Message-ID: <20160904072546.8656.40945.4A0E88BA@psf.io> https://hg.python.org/jython/rev/d65e8b762307 changeset: 7954:d65e8b762307 parent: 7951:a8fef10e48a5 user: Douglas Clayton date: Wed Aug 31 08:09:49 2016 +0100 summary: Added itervalues and iterkeys to map proxy. Fixes #2443 files: Lib/test/test_dict_jy.py | 2 + NEWS | 1 + src/org/python/core/JavaProxyMap.java | 36 +++++++++++++++ 3 files changed, 39 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_dict_jy.py b/Lib/test/test_dict_jy.py --- a/Lib/test/test_dict_jy.py +++ b/Lib/test/test_dict_jy.py @@ -137,6 +137,8 @@ x['a'] = 1 x[(1, 2)] = 'xyz' self.assertEqual({tup for tup in x.iteritems()}, {('a', 1), ((1, 2), 'xyz')}) + self.assertEqual({tup for tup in x.itervalues()}, {1, 'xyz'}) + self.assertEqual({tup for tup in x.iterkeys()}, {'a', (1, 2)}) self.assertEqual(str(x), repr(x)) self.assertEqual(type(str(x)), type(repr(x))) diff --git a/NEWS b/NEWS --- a/NEWS +++ b/NEWS @@ -18,6 +18,7 @@ - [ 2112 ] time.strptime() has different default year in Jython and CPython - [ 1767 ] Rich comparisons - [ 2314 ] Failures in test_shutil on Windows + - [ 2443 ] java.util.Map derived classes lack iterkeys, itervalues methods New Features - Added uname function to posix module. The mostly Java-based implementation even diff --git a/src/org/python/core/JavaProxyMap.java b/src/org/python/core/JavaProxyMap.java --- a/src/org/python/core/JavaProxyMap.java +++ b/src/org/python/core/JavaProxyMap.java @@ -223,6 +223,40 @@ }; } }; + private static final PyBuiltinMethodNarrow mapIterKeysProxy = new MapMethod("iterkeys", 0) { + @Override + public PyObject __call__() { + final Iterator