[Python-modules-commits] [python-asyncssh] 05/06: merge patched into master

[Vincent Bernat]

This is an automated email from the git hooks/post-receive script.

bernat pushed a commit to branch master
in repository python-asyncssh.

commit 1ad331c608df33eadcf919dad22ce70c2cf60304
Merge: a0d8481 3733cdd
Author: Vincent Bernat <bernat at debian.org>
Date:   Sun Jan 8 17:44:46 2017 +0100

    merge patched into master

 README.rst                                         |  31 +-
 asyncssh/agent.py                                  |  78 ++-
 asyncssh/agent_unix.py                             |  33 +
 asyncssh/agent_win32.py                            | 115 ++++
 asyncssh/channel.py                                | 184 +++++-
 asyncssh/connection.py                             | 223 ++++++-
 asyncssh/constants.py                              |   1 +
 asyncssh/crypto/__init__.py                        |   6 +
 asyncssh/crypto/umac.py                            | 117 ++++
 asyncssh/ecdh.py                                   |  19 +-
 asyncssh/listener.py                               |  22 +-
 asyncssh/mac.py                                    |  98 ++-
 asyncssh/sftp.py                                   |  13 +-
 asyncssh/stream.py                                 |  89 ++-
 asyncssh/version.py                                |   2 +-
 asyncssh/x11.py                                    | 518 ++++++++++++++++
 debian/.git-dpm                                    |   6 +-
 .../0002-skip-tests-requiring-network-access.patch |   2 +-
 debian/patches/sphinx-use-default-theme.patch      |   2 +-
 docs/api.rst                                       |  50 +-
 docs/changes.rst                                   |  59 ++
 setup.py                                           |   5 +-
 tests/server.py                                    |   6 +-
 tests/test_channel.py                              | 104 +++-
 tests/test_connection.py                           |  20 +-
 tests/test_forward.py                              |   6 +-
 tests/test_mac.py                                  |  34 +-
 tests/test_stream.py                               |  42 ++
 tests/test_x11.py                                  | 672 +++++++++++++++++++++
 29 files changed, 2367 insertions(+), 190 deletions(-)

diff --cc debian/.git-dpm
index 0b491cc,0000000..caad869
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 63afe83bc40980a6f3f507acdd1a3ba54f40d2bd
- 63afe83bc40980a6f3f507acdd1a3ba54f40d2bd
- 46e25dbe90822ebc8bc2aef1fd21acb0ccce11bd
++3733cdd03556921c2440c8b94ce203724f7c550b
++3733cdd03556921c2440c8b94ce203724f7c550b
++ba570a9963219db1000e6e051f60ad5e81692438
 +ba570a9963219db1000e6e051f60ad5e81692438
 +python-asyncssh_1.8.1.orig.tar.gz
 +d2de6e3b46e524d05f8db750be8fbbcb906a8a48
 +260305
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-skip-tests-requiring-network-access.patch
index 5cbbea1,0000000..e1fca74
mode 100644,000000..100644
--- a/debian/patches/0002-skip-tests-requiring-network-access.patch
+++ b/debian/patches/0002-skip-tests-requiring-network-access.patch
@@@ -1,29 -1,0 +1,29 @@@
- From 63afe83bc40980a6f3f507acdd1a3ba54f40d2bd Mon Sep 17 00:00:00 2001
++From 3733cdd03556921c2440c8b94ce203724f7c550b Mon Sep 17 00:00:00 2001
 +From: Vincent Bernat <vincent at bernat.im>
 +Date: Sun, 3 Jan 2016 18:11:46 +0100
 +Subject: skip tests requiring network access
 +
 +---
 + tests/test_auth_keys.py | 2 ++
 + 1 file changed, 2 insertions(+)
 +
 +diff --git a/tests/test_auth_keys.py b/tests/test_auth_keys.py
 +index 0bb50febc175..d36ef50136e0 100644
 +--- a/tests/test_auth_keys.py
 ++++ b/tests/test_auth_keys.py
 +@@ -13,6 +13,7 @@
 + """Unit tests for matching against authorized_keys file"""
 + 
 + from unittest.mock import patch
 ++import unittest
 + 
 + import asyncssh
 + 
 +@@ -55,6 +56,7 @@ class _TestAuthorizedKeys(TempDirTestCase):
 +         else:
 +             return asyncssh.import_authorized_keys(auth_keys)
 + 
 ++    @unittest.skip("network access is required for those tests")
 +     def test_matches(self):
 +         """Test authorized keys matching"""
 + 
diff --cc debian/patches/sphinx-use-default-theme.patch
index b4986d7,0000000..49bec65
mode 100644,000000..100644
--- a/debian/patches/sphinx-use-default-theme.patch
+++ b/debian/patches/sphinx-use-default-theme.patch
@@@ -1,36 -1,0 +1,36 @@@
- From 362b2f5457f02a4dc6f02a1607e8c7407959996d Mon Sep 17 00:00:00 2001
++From ad44f82dba68d9f2829f4915fafd8abd8781c5af Mon Sep 17 00:00:00 2001
 +From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
 +Date: Thu, 8 Oct 2015 11:09:41 -0700
 +Subject: make Sphinx use default theme
 +
 +Forwarded: not-needed
 +
 +The "classic" theme is introduced in Sphinx 1.3 and not available in
 +Sphinx 1.2.
 +
 +Patch-Name: sphinx-use-default-theme.patch
 +---
 + docs/rftheme/static/rftheme.css_t | 2 +-
 + docs/rftheme/theme.conf           | 2 +-
 + 2 files changed, 2 insertions(+), 2 deletions(-)
 +
 +diff --git a/docs/rftheme/static/rftheme.css_t b/docs/rftheme/static/rftheme.css_t
 +index 66aad65ff6f4..77fe744d83d8 100644
 +--- a/docs/rftheme/static/rftheme.css_t
 ++++ b/docs/rftheme/static/rftheme.css_t
 +@@ -1,4 +1,4 @@
 +- at import url("classic.css");
 ++ at import url("default.css");
 + 
 + .tight-list * {
 +     line-height: 110% !important;
 +diff --git a/docs/rftheme/theme.conf b/docs/rftheme/theme.conf
 +index 1c2b15e426cf..a417128664b1 100644
 +--- a/docs/rftheme/theme.conf
 ++++ b/docs/rftheme/theme.conf
 +@@ -1,4 +1,4 @@
 + [theme]
 +-inherit = classic
 ++inherit = default
 + stylesheet = rftheme.css
 + pygments_style = sphinx

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-asyncssh.git