[arch-commits] Commit in python-eventlet/trunk (2 files)
Levente Polyak
anthraxx at archlinux.org
Thu Jan 28 23:26:19 UTC 2016
Date: Friday, January 29, 2016 @ 00:26:19
Author: anthraxx
Revision: 159383
upgpkg: python-eventlet 0.18.1-1
Deleted:
python-eventlet/trunk/fix-mswindows-regression.patch
python-eventlet/trunk/fix-openssl.patch
--------------------------------+
fix-mswindows-regression.patch | 42 --------------------------------
fix-openssl.patch | 51 ---------------------------------------
2 files changed, 93 deletions(-)
Deleted: fix-mswindows-regression.patch
===================================================================
--- fix-mswindows-regression.patch 2016-01-28 23:26:00 UTC (rev 159382)
+++ fix-mswindows-regression.patch 2016-01-28 23:26:19 UTC (rev 159383)
@@ -1,42 +0,0 @@
-From da7f9732b6d9d52c8bca5cdbb536beb1fac14b44 Mon Sep 17 00:00:00 2001
-From: Jakub Stasiak <jakub at stasiak.at>
-Date: Wed, 4 Nov 2015 23:38:33 +0100
-Subject: [PATCH] subprocess: Fix Python 3.5 mswindows regression
-
-In Python 3.5 subprocess.mswindows no longer exists. It is renamed to
-subprocess._mswindows, I decided we don't really have to access that
-now "private" attribute in order to know if we're on MS Windows.
----
- eventlet/green/subprocess.py | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/eventlet/green/subprocess.py b/eventlet/green/subprocess.py
-index 8a2cd50..1347404 100644
---- a/eventlet/green/subprocess.py
-+++ b/eventlet/green/subprocess.py
-@@ -17,6 +17,7 @@
-
- patcher.inject('subprocess', globals(), *to_patch)
- subprocess_orig = __import__("subprocess")
-+mswindows = sys.platform == "win32"
-
-
- if getattr(subprocess_orig, 'TimeoutExpired', None) is None:
-@@ -46,7 +47,7 @@ class Popen(subprocess_orig.Popen):
- # Windows. (see eventlet.greenio.set_nonblocking()) As the sole purpose of
- # this __init__() override is to wrap the pipes for eventlet-friendly
- # non-blocking I/O, don't even bother overriding it on Windows.
-- if not subprocess_orig.mswindows:
-+ if not mswindows:
- def __init__(self, args, bufsize=0, *argss, **kwds):
- self.args = args
- # Forward the call to base-class constructor
-@@ -93,7 +94,7 @@ def wait(self, timeout=None, check_interval=0.01):
- raise
- wait.__doc__ = subprocess_orig.Popen.wait.__doc__
-
-- if not subprocess_orig.mswindows:
-+ if not mswindows:
- # don't want to rewrite the original _communicate() method, we
- # just want a version that uses eventlet.green.select.select()
- # instead of select.select().
Deleted: fix-openssl.patch
===================================================================
--- fix-openssl.patch 2016-01-28 23:26:00 UTC (rev 159382)
+++ fix-openssl.patch 2016-01-28 23:26:19 UTC (rev 159383)
@@ -1,51 +0,0 @@
-From e9f19c6df4a6e97a36a974338196a5a0bda079e4 Mon Sep 17 00:00:00 2001
-From: Victor Stinner <vstinner at redhat.com>
-Date: Mon, 29 Jun 2015 16:03:56 +0200
-Subject: [PATCH] Port eventlet.green.OpenSSL to Python 3
-
-* Fix import syntax for Python 3: use relative imports
-* Add unit test
----
- eventlet/green/OpenSSL/__init__.py | 10 +++++-----
- tests/openssl_test.py | 17 +++++++++++++++++
- 2 files changed, 22 insertions(+), 5 deletions(-)
- create mode 100644 tests/openssl_test.py
-
-diff --git a/eventlet/green/OpenSSL/__init__.py b/eventlet/green/OpenSSL/__init__.py
-index 56bfb8a..26b60d9 100644
---- a/eventlet/green/OpenSSL/__init__.py
-+++ b/eventlet/green/OpenSSL/__init__.py
-@@ -1,5 +1,5 @@
--import rand
--import crypto
--import SSL
--import tsafe
--from version import __version__
-+from . import rand
-+from . import crypto
-+from . import SSL
-+from . import tsafe
-+from .version import __version__
-diff --git a/tests/openssl_test.py b/tests/openssl_test.py
-new file mode 100644
-index 0000000..a4498dc
---- /dev/null
-+++ b/tests/openssl_test.py
-@@ -0,0 +1,17 @@
-+import tests
-+
-+
-+def test_import():
-+ # https://github.com/eventlet/eventlet/issues/238
-+ # Ensure that it's possible to import eventlet.green.OpenSSL.
-+ # Most basic test to check Python 3 compatibility.
-+ try:
-+ import OpenSSL
-+ except ImportError:
-+ raise tests.SkipTest('need pyopenssl')
-+
-+ import eventlet.green.OpenSSL.SSL
-+ import eventlet.green.OpenSSL.crypto
-+ import eventlet.green.OpenSSL.rand
-+ import eventlet.green.OpenSSL.tsafe
-+ import eventlet.green.OpenSSL.version
More information about the arch-commits
mailing list