[Jython-checkins] jython (merge default -> default): Merge
darjus.loktevic
jython-checkins at python.org
Fri Nov 20 19:54:34 EST 2015
https://hg.python.org/jython/rev/12201b356322
changeset: 7819:12201b356322
parent: 7818:636b124a7587
parent: 7816:37578797caba
user: Darjus Loktevic <darjus at gmail.com>
date: Sat Nov 21 11:54:25 2015 +1100
summary:
Merge
files:
Lib/_socket.py | 2 +
Lib/test/test_socket_jy.py | 3 -
build.xml | 20 +++++-----
extlibs/netty-buffer-4.0.31.Final.jar | Bin
extlibs/netty-buffer-4.0.33.Final.jar | Bin
extlibs/netty-codec-4.0.31.Final.jar | Bin
extlibs/netty-codec-4.0.33.Final.jar | Bin
extlibs/netty-common-4.0.31.Final.jar | Bin
extlibs/netty-common-4.0.33.Final.jar | Bin
extlibs/netty-handler-4.0.31.Final.jar | Bin
extlibs/netty-handler-4.0.33.Final.jar | Bin
extlibs/netty-transport-4.0.31.Final.jar | Bin
extlibs/netty-transport-4.0.33.Final.jar | Bin
13 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/Lib/_socket.py b/Lib/_socket.py
--- a/Lib/_socket.py
+++ b/Lib/_socket.py
@@ -1080,6 +1080,8 @@
self.channel.pipeline().remove(self.python_inbound_handler)
except NoSuchElementException:
pass # already removed, can safely ignore (presumably)
+ except AttributeError:
+ pass # inbound handler never set up, also ignore
if how & SHUT_WR or how & SHUT_RDWR:
self._can_write = False
diff --git a/Lib/test/test_socket_jy.py b/Lib/test/test_socket_jy.py
--- a/Lib/test/test_socket_jy.py
+++ b/Lib/test/test_socket_jy.py
@@ -67,9 +67,6 @@
"""Verify connect_ex states go through EINPROGRESS?, EALREADY*, EISCONN"""
# Tests fix for http://bugs.jython.org/issue2428; based in part on the
# code showing failure that was submitted with that bug
-
- #self.httpd, self.server_thread = start_server()
- #self.address = self.httpd.server_name, self.httpd.server_port
for result in self.do_workout():
self.assertIn(result[0], {errno.EINPROGRESS, errno.EISCONN})
self.assertEqual(result[-1], errno.EISCONN)
diff --git a/build.xml b/build.xml
--- a/build.xml
+++ b/build.xml
@@ -177,11 +177,11 @@
<pathelement path="${extlibs.dir}/jnr-posix-3.0.20.jar"/>
<pathelement path="${extlibs.dir}/jnr-constants-0.9.0.jar"/>
<pathelement path="${extlibs.dir}/jline-2.12.1.jar"/>
- <pathelement path="${extlibs.dir}/netty-buffer-4.0.31.Final.jar"/>
- <pathelement path="${extlibs.dir}/netty-codec-4.0.31.Final.jar"/>
- <pathelement path="${extlibs.dir}/netty-common-4.0.31.Final.jar"/>
- <pathelement path="${extlibs.dir}/netty-handler--4.0.31.Final.jar"/>
- <pathelement path="${extlibs.dir}/netty-transport-4.0.31.Final.jar"/>
+ <pathelement path="${extlibs.dir}/netty-buffer-4.0.33.Final.jar"/>
+ <pathelement path="${extlibs.dir}/netty-codec-4.0.33.Final.jar"/>
+ <pathelement path="${extlibs.dir}/netty-common-4.0.33.Final.jar"/>
+ <pathelement path="${extlibs.dir}/netty-handler--4.0.33.Final.jar"/>
+ <pathelement path="${extlibs.dir}/netty-transport-4.0.33.Final.jar"/>
</path>
<available property="informix.present" classname="com.informix.jdbc.IfxDriver" classpath="${informix.jar}" />
@@ -587,15 +587,15 @@
<rule pattern="com.google.**" result="org.python.google. at 1"/>
<zipfileset src="extlibs/icu4j-54_1_1.jar"/>
<rule pattern="com.ibm.icu.**" result="org.python.icu. at 1"/>
- <zipfileset src="extlibs/netty-buffer-4.0.31.Final.jar" excludes="META-INF/**"/>
+ <zipfileset src="extlibs/netty-buffer-4.0.33.Final.jar" excludes="META-INF/**"/>
<rule pattern="io.netty.**" result="org.python.netty. at 1"/>
- <zipfileset src="extlibs/netty-codec-4.0.31.Final.jar" excludes="META-INF/**"/>
+ <zipfileset src="extlibs/netty-codec-4.0.33.Final.jar" excludes="META-INF/**"/>
<rule pattern="io.netty.**" result="org.python.netty. at 1"/>
- <zipfileset src="extlibs/netty-common-4.0.31.Final.jar" excludes="META-INF/**"/>
+ <zipfileset src="extlibs/netty-common-4.0.33.Final.jar" excludes="META-INF/**"/>
<rule pattern="io.netty.**" result="org.python.netty. at 1"/>
- <zipfileset src="extlibs/netty-handler-4.0.31.Final.jar" excludes="META-INF/**"/>
+ <zipfileset src="extlibs/netty-handler-4.0.33.Final.jar" excludes="META-INF/**"/>
<rule pattern="io.netty.**" result="org.python.netty. at 1"/>
- <zipfileset src="extlibs/netty-transport-4.0.31.Final.jar" excludes="META-INF/**"/>
+ <zipfileset src="extlibs/netty-transport-4.0.33.Final.jar" excludes="META-INF/**"/>
<rule pattern="io.netty.**" result="org.python.netty. at 1"/>
<zipfileset src="extlibs/jffi-arm-Linux.jar"/>
<zipfileset src="extlibs/jffi-Darwin.jar"/>
diff --git a/extlibs/netty-buffer-4.0.31.Final.jar b/extlibs/netty-buffer-4.0.31.Final.jar
deleted file mode 100644
index 759696378f5a57652b4db83462043bc5bca8b542..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/netty-buffer-4.0.33.Final.jar b/extlibs/netty-buffer-4.0.33.Final.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..5e644b4aa8aa4cb736415d71e6a53929fae23005
GIT binary patch
[stripped]
diff --git a/extlibs/netty-codec-4.0.31.Final.jar b/extlibs/netty-codec-4.0.31.Final.jar
deleted file mode 100644
index a943e6bf7361835342c8637c8db3588e87d70e19..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/netty-codec-4.0.33.Final.jar b/extlibs/netty-codec-4.0.33.Final.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..b58013e04bcbcdf8eca12e986b1cd4704cadd1c5
GIT binary patch
[stripped]
diff --git a/extlibs/netty-common-4.0.31.Final.jar b/extlibs/netty-common-4.0.31.Final.jar
deleted file mode 100644
index ed507f2d323abfbd593442e32d9ecbd2ace149b4..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/netty-common-4.0.33.Final.jar b/extlibs/netty-common-4.0.33.Final.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..b4990abb33b774c96ee0922b2b5505285fade9d5
GIT binary patch
[stripped]
diff --git a/extlibs/netty-handler-4.0.31.Final.jar b/extlibs/netty-handler-4.0.31.Final.jar
deleted file mode 100644
index 1a002fb26d8b46e7e132eabf952ba127d9ac2bb3..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/netty-handler-4.0.33.Final.jar b/extlibs/netty-handler-4.0.33.Final.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..ea26491f786d9d4463e1f09a8f7ddebacd9e8763
GIT binary patch
[stripped]
diff --git a/extlibs/netty-transport-4.0.31.Final.jar b/extlibs/netty-transport-4.0.31.Final.jar
deleted file mode 100644
index 87881ca0beac4e5c5aecb099acffd4d673922d55..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/netty-transport-4.0.33.Final.jar b/extlibs/netty-transport-4.0.33.Final.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..7be560332f0c25040e9def2f66ee5f7d7b0cec6c
GIT binary patch
[stripped]
--
Repository URL: https://hg.python.org/jython
More information about the Jython-checkins
mailing list