[Python-modules-commits] [rpyc] 08/12: Remove patches applied upstream
Carl Suster
arcresu-guest at moszumanska.debian.org
Fri Dec 1 07:25:55 UTC 2017
This is an automated email from the git hooks/post-receive script.
arcresu-guest pushed a commit to branch debian/master
in repository rpyc.
commit b26b3830ebb44aa7025da21a97012727b9b87c7a
Author: Carl Suster <carl at contraflo.ws>
Date: Fri Dec 1 17:32:59 2017 +1100
Remove patches applied upstream
---
...01-correct-splitbrain-module-path-in-docs.patch | 25 ----------
...rry-pick-sort-os.listdir-before-comparing.patch | 39 ---------------
...04-cherry-pick-use-poll-instead-of-select.patch | 58 ----------------------
debian/patches/series | 3 --
4 files changed, 125 deletions(-)
diff --git a/debian/patches/0001-correct-splitbrain-module-path-in-docs.patch b/debian/patches/0001-correct-splitbrain-module-path-in-docs.patch
deleted file mode 100644
index 73b2a99..0000000
--- a/debian/patches/0001-correct-splitbrain-module-path-in-docs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 3b12835ea572c9df07fe9c4a51234801cb09e684 Mon Sep 17 00:00:00 2001
-From: Carl Suster <carl at contraflo.ws>
-Date: Mon, 9 Jan 2017 17:21:47 +1100
-Subject: correct splitbrain module path in docs
-
-The splitbrain module is in `rpyc.experimental` in the package instead
-of `rpyc.utils` as in the documentation. This change allows Sphinx to
-find the module as intended.
-
-Forwarded: https://github.com/tomerfiliba/rpyc/pull/209
----
- docs/api/utils_splitbrain.rst | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/docs/api/utils_splitbrain.rst b/docs/api/utils_splitbrain.rst
-index 9c504bb..b743358 100644
---- a/docs/api/utils_splitbrain.rst
-+++ b/docs/api/utils_splitbrain.rst
-@@ -3,5 +3,5 @@
- Splitbrain Python
- =================
-
--.. automodule:: rpyc.utils.splitbrain
-+.. automodule:: rpyc.experimental.splitbrain
- :members:
diff --git a/debian/patches/0003-cherry-pick-sort-os.listdir-before-comparing.patch b/debian/patches/0003-cherry-pick-sort-os.listdir-before-comparing.patch
deleted file mode 100644
index e7f3042..0000000
--- a/debian/patches/0003-cherry-pick-sort-os.listdir-before-comparing.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From f17e12745af3e55dbac265ab5b74e08e6be7a4c3 Mon Sep 17 00:00:00 2001
-From: Carl Suster <carl at contraflo.ws>
-Date: Mon, 9 Jan 2017 18:43:09 +1100
-Subject: cherry pick: sort os.listdir() before comparing
-
-Upstream commits:
-
- 926fd0b07c53cadece8d8fae117311dafbd18e71
- tomerfiliba committed on 21 Oct 2014
- Tests: another fix for os.listdir
-
- aa9ee566359bc492f361db119ea4994da3ca07f5
- tomerfiliba committed on 21 Oct 2014
- test: fix test_remoting issue
-
-These are necessary to run the test suite.
-
-Origin: upstream, https://github.com/tomerfiliba/rpyc/compare/aa9ee566359bc492f361db119ea4994da3ca07f5~1...926fd0b07c53cadece8d8fae117311dafbd18e71
----
- tests/test_remoting.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_remoting.py b/tests/test_remoting.py
-index 553cb1a..af4576c 100644
---- a/tests/test_remoting.py
-+++ b/tests/test_remoting.py
-@@ -25,10 +25,10 @@ class Test_Remoting(unittest.TestCase):
- os.mkdir(os.path.join(base1, "somedir1"))
-
- rpyc.classic.upload(self.conn, base1, base2)
-- self.assertEqual(os.listdir(base1), os.listdir(base2))
-+ self.assertEqual(sorted(os.listdir(base1)), sorted(os.listdir(base2)))
-
- rpyc.classic.download(self.conn, base2, base3)
-- self.assertEqual(os.listdir(base2), os.listdir(base3))
-+ self.assertEqual(sorted(os.listdir(base2)), sorted(os.listdir(base3)))
-
- shutil.rmtree(base)
-
diff --git a/debian/patches/0004-cherry-pick-use-poll-instead-of-select.patch b/debian/patches/0004-cherry-pick-use-poll-instead-of-select.patch
deleted file mode 100644
index e96e973..0000000
--- a/debian/patches/0004-cherry-pick-use-poll-instead-of-select.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From f6a26e46066e8c98bddddab50a6711cf1d9ed130 Mon Sep 17 00:00:00 2001
-From: Carl Suster <carl at contraflo.ws>
-Date: Mon, 9 Jan 2017 18:54:58 +1100
-Subject: cherry pick: use poll() instead of select()
-
-Upstream commit:
-
- 28ef9b694363c455afd4f513afabce778d9cc838
- Giuseppe Lo Presti committed on 11 Dec 2015
- Fixed bug #182: Stream uses select() and it is prone to its
- limitations
-
-This was causing errors about negative file descriptors sometimes.
-
-Origin: upstream, https://github.com/tomerfiliba/rpyc/commit/28ef9b694363c455afd4f513afabce778d9cc838
----
- rpyc/core/stream.py | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/rpyc/core/stream.py b/rpyc/core/stream.py
-index 699d0d6..3aa7dbf 100644
---- a/rpyc/core/stream.py
-+++ b/rpyc/core/stream.py
-@@ -8,7 +8,7 @@ import socket
- import time
- import errno
- from rpyc.lib import safe_import
--from rpyc.lib.compat import select, select_error, BYTES_LITERAL, get_exc_errno, maxint
-+from rpyc.lib.compat import poll, select_error, BYTES_LITERAL, get_exc_errno, maxint
- win32file = safe_import("win32file")
- win32pipe = safe_import("win32pipe")
- msvcrt = safe_import("msvcrt")
-@@ -36,9 +36,11 @@ class Stream(object):
- """indicates whether the stream has data to read (within *timeout*
- seconds)"""
- try:
-+ p = poll() # from lib.compat, it may be a select object on non-Unix platforms
-+ p.register(self.fileno(), "r")
- while True:
- try:
-- rl, _, _ = select([self], [], [], timeout)
-+ rl = p.poll(timeout)
- except select_error as ex:
- if ex[0] == errno.EINTR:
- continue
-@@ -47,8 +49,10 @@ class Stream(object):
- else:
- break
- except ValueError as ex:
-- # i get this some times: "ValueError: file descriptor cannot be a negative integer (-1)"
-- # let's translate it to select.error
-+ # if the underlying call is a select(), then the following errors may happen:
-+ # - "ValueError: filedescriptor cannot be a negative integer (-1)"
-+ # - "ValueError: filedescriptor out of range in select()"
-+ # let's translate them to select.error
- raise select_error(str(ex))
- return bool(rl)
- def read(self, count):
diff --git a/debian/patches/series b/debian/patches/series
index ebcb444..d128bc5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
-0001-correct-splitbrain-module-path-in-docs.patch
0002-skip-SSH-tests-Test_Ssh-and-Test_Deploy.patch
-0003-cherry-pick-sort-os.listdir-before-comparing.patch
-0004-cherry-pick-use-poll-instead-of-select.patch
0005-connect-client-and-server-IP-in-TestUdpRegistry.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/rpyc.git
More information about the Python-modules-commits
mailing list