openstack
/
deb-python-eventlet
Code Issues Proposed changes

New upstream release.

This commit is contained in:
Ondřej Nový 2016-02-14 15:38:22 +01:00 committed by Thomas Goirand
parent 32f9475dde
commit 6e239ac863
7 changed files with 40 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
debian/changelog vendored
View File

@ -1,3 +1,16 @@
python-eventlet (0.18.3-1) UNRELEASED; urgency=medium
* New upstream release.
* Removed greenio_send_was_running_empty_loop_on_ENOTCONN.patch
(Applied upstream)
* Rebased use-packaged-python-mock-rather-than-embedded.patch
* Rebased set-defaults-to-be-tlsv1-not-sslv23.patch
* Rebased remove-self.assert-in-tests.patcher_test.py.patch
* Added python(3)-dnspython build dependency.
* Fixed VCS URLs (https).
-- Ondřej Nový <novy@ondrej.org> Sun, 14 Feb 2016 14:56:08 +0100
python-eventlet (0.17.4-2) unstable; urgency=medium
* Added greenio_send_was_running_empty_loop_on_ENOTCONN.patch.

8
debian/control vendored
View File

@ -12,12 +12,14 @@ Build-Depends: debhelper (>= 9),
python-sphinx,
python3-all,
python3-setuptools,
Build-Depends-Indep: python-greenlet,
Build-Depends-Indep: python-dnspython,
python-greenlet,
python-httplib2,
python-mock,
python-nose,
python-openssl,
python-zmq,
python3-dnspython,
python3-greenlet,
python3-httplib2,
python3-mock,
@ -25,8 +27,8 @@ Build-Depends-Indep: python-greenlet,
python3-openssl,
python3-zmq,
Standards-Version: 3.9.6
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-eventlet.git;a=summary
Vcs-Git: git://anonscm.debian.org/openstack/python-eventlet.git
Vcs-Browser: https://anonscm.debian.org/cgit/openstack/python-eventlet.git/
Vcs-Git: https://anonscm.debian.org/git/openstack/python-eventlet.git
Homepage: http://eventlet.net
Package: python-eventlet

29
debian/patches/greenio_send_was_running_empty_loop_on_ENOTCONN.patch vendored
View File

@ -1,29 +0,0 @@
Description: greenio: send() was running empty loop on ENOTCONN
Thanks to Seyeong Kim
https://github.com/eventlet/eventlet/issues/192
Author: Sergey Shepelev <temotor@gmail.com>
Date: Fri, 15 May 2015 03:56:04 +0300
diff --git a/AUTHORS b/AUTHORS
index e0ab0e2..c57f010 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -119,3 +119,4 @@ Thanks To
* Sean Dague, wsgi: Provide python logging compatibility
* Tim Simmons, Use _socket_nodns and select in dnspython support
* Antonio Cuni, fix fd double close on PyPy
+* Seyeong Kim
diff --git a/eventlet/greenio/base.py b/eventlet/greenio/base.py
index 8da51ca..1e43176 100644
--- a/eventlet/greenio/base.py
+++ b/eventlet/greenio/base.py
@@ -358,7 +358,8 @@ def send(self, data, flags=0):
try:
total_sent += fd.send(data[total_sent:], flags)
except socket.error as e:
- if get_errno(e) not in SOCKET_BLOCKING:
+ eno = get_errno(e)
+ if eno == errno.ENOTCONN or eno not in SOCKET_BLOCKING:
raise
if total_sent == len_data:

16
debian/patches/remove-self.assert-in-tests.patcher_test.py.patch vendored
View File

@ -3,20 +3,18 @@ Author: Thomas Goirand <zigo@debian.org>
Forwarded: no
Last-Update: 2014-09-07
Index: python-eventlet-0.17.3/tests/patcher_test.py
===================================================================
--- python-eventlet-0.17.3.orig/tests/patcher_test.py
+++ python-eventlet-0.17.3/tests/patcher_test.py
@@ -325,7 +325,7 @@ print(len(_threading._active))
--- a/tests/patcher_test.py
+++ b/tests/patcher_test.py
@@ -327,7 +327,7 @@
self.assertEqual(len(lines), 4, "\n".join(lines))
assert lines[0].startswith('<Thread'), lines[0]
self.assertEqual(lines[1], "1", lines[1])
- self.assertEqual(lines[2], "1", lines[2])
+ #self.assertEqual(lines[2], "1", lines[2])
assert lines[1] == '1', lines
- assert lines[2] == '1', lines
+ #assert lines[2] == '1', lines
def test_threading(self):
new_mod = """import eventlet
@@ -356,7 +356,7 @@ print(len(threading._active))
@@ -358,7 +358,7 @@
"""
self.write_to_tempfile("newmod", new_mod)
output, lines = self.launch_subprocess('newmod')

1
debian/patches/series vendored
View File

@ -4,4 +4,3 @@ use-packaged-python-mock-rather-than-embedded.patch
enforce-tlsv1-always.patch
set-defaults-to-be-tlsv1-not-sslv23.patch
fixed-privacy-breach-in-examples.patch
greenio_send_was_running_empty_loop_on_ENOTCONN.patch

6
debian/patches/set-defaults-to-be-tlsv1-not-sslv23.patch vendored
View File

@ -4,9 +4,9 @@ Author: Thomas Goirand <zigo@debian.org>
Forwarded: no
Last-Update: 2015-05-21
--- python-eventlet-0.17.3.orig/eventlet/green/ssl.py
+++ python-eventlet-0.17.3/eventlet/green/ssl.py
@@ -46,7 +46,7 @@ class GreenSSLSocket(_original_sslsocket
--- a/eventlet/green/ssl.py
+++ b/eventlet/green/ssl.py
@@ -48,7 +48,7 @@
def __init__(self, sock, keyfile=None, certfile=None,
server_side=False, cert_reqs=CERT_NONE,

25
debian/patches/use-packaged-python-mock-rather-than-embedded.patch vendored
View File

@ -4,27 +4,26 @@ Author: Thomas Goirand <zigo@debian.org>
Forwarded: no
Last-Update: 2015-02-08
--- python-eventlet-0.16.1.orig/tests/db_pool_test.py
+++ python-eventlet-0.16.1/tests/db_pool_test.py
@@ -7,7 +7,8 @@ import os
--- a/tests/db_pool_test.py
+++ b/tests/db_pool_test.py
@@ -7,7 +7,8 @@
import traceback
from unittest import TestCase, main
-from tests import mock, skipped, skip_unless, skip_with_pyevent, get_database_auth
-from tests import mock, skip_unless, skip_with_pyevent, get_database_auth
+import mock
+from tests import skipped, skip_unless, skip_with_pyevent, get_database_auth
+from tests import skip_unless, skip_with_pyevent, get_database_auth
from eventlet import event
from eventlet import db_pool
from eventlet.support import six
--- python-eventlet-0.16.1.orig/tests/websocket_test.py
+++ python-eventlet-0.16.1/tests/websocket_test.py
@@ -8,7 +8,8 @@ from eventlet.green import httplib
from eventlet.support import six
--- a/tests/websocket_test.py
+++ b/tests/websocket_test.py
@@ -9,7 +9,7 @@
from eventlet.websocket import WebSocket, WebSocketWSGI
-from tests import certificate_file, LimitedTestCase, mock, private_key_file
import tests
-from tests import mock
+import mock
+from tests import certificate_file, LimitedTestCase, private_key_file
from tests import skip_if_no_ssl
from tests.wsgi_test import _TestBase
import tests.wsgi_test