[Python-modules-commits] [python-asyncssh] 11/14: 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 2691df3114eb0180eda05930f4240223be26391c
Merge: 740da8d 80b0b9d
Author: Vincent Bernat <bernat at debian.org>
Date:   Sat Sep 10 13:55:48 2016 +0200

    merge patched into master

 asyncssh/dsa.py                                    |   2 +-
 asyncssh/ecdsa.py                                  |   2 +-
 asyncssh/ed25519.py                                |   2 +-
 asyncssh/public_key.py                             | 534 ++++++++++++++++++---
 asyncssh/rsa.py                                    |   2 +-
 asyncssh/version.py                                |   2 +-
 debian/.git-dpm                                    |   6 +-
 .../0002-skip-tests-requiring-network-access.patch |   2 +-
 debian/patches/sphinx-use-default-theme.patch      |   2 +-
 docs/api.rst                                       |  41 +-
 docs/changes.rst                                   |  12 +
 tests/test_editor.py                               |  11 +-
 tests/test_public_key.py                           | 100 +++-
 tests/util.py                                      |   9 +-
 14 files changed, 634 insertions(+), 93 deletions(-)

diff --cc debian/.git-dpm
index e584f27,0000000..aa1259b
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
- 01fec57f57dd66584f177cdddd495a9f3fbc077b
- 01fec57f57dd66584f177cdddd495a9f3fbc077b
- 55a6973e7d0211c26482de87ab852adc39cea592
++80b0b9d365c3e098544dae34ad4712aad73771fc
++80b0b9d365c3e098544dae34ad4712aad73771fc
++c29d1479a0acc9e21fd871c7bc0d4121d76da1fe
 +c29d1479a0acc9e21fd871c7bc0d4121d76da1fe
 +python-asyncssh_1.6.2.orig.tar.gz
 +65de521f7881e240a803c25837a0c7fbb9802e5c
 +238673
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-skip-tests-requiring-network-access.patch
index de84858,0000000..1c6b5e2
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 01fec57f57dd66584f177cdddd495a9f3fbc077b Mon Sep 17 00:00:00 2001
++From 80b0b9d365c3e098544dae34ad4712aad73771fc 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 c103728faa89..f5984f95dd76 100644
 +--- a/tests/test_auth_keys.py
 ++++ b/tests/test_auth_keys.py
 +@@ -18,6 +18,7 @@
 + """
 + 
 + from unittest.mock import patch
 ++import unittest
 + 
 + from asyncssh import import_public_key
 + from asyncssh.auth_keys import import_authorized_keys, read_authorized_keys
 +@@ -67,6 +68,7 @@ class _TestAuthorizedKeys(TempDirTestCase):
 +         else:
 +             return 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 78aadfa,0000000..13f5f6c
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 e5a82a48c8c91d7e464173b0482f26dd89887776 Mon Sep 17 00:00:00 2001
++From 3ddd1a95c6c008e5968d1655e36c500b167e6b11 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