[Python-modules-commits] [python-asyncssh] 04/08: 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 9416f7e6ed263b58926ea3ea265feca1bac1eff5
Merge: 5f77384 3490e4f
Author: Vincent Bernat <bernat at debian.org>
Date:   Sun Jan 3 17:43:35 2016 +0100

    merge patched into master

 README.rst                                       |   2 +-
 asyncssh/__init__.py                             |   1 +
 asyncssh/asn1.py                                 |   8 +-
 asyncssh/auth.py                                 |  74 ++--
 asyncssh/auth_keys.py                            |   3 +
 asyncssh/channel.py                              |  16 +-
 asyncssh/connection.py                           | 195 +++++++--
 asyncssh/crypto/__init__.py                      |   8 +-
 asyncssh/crypto/curve25519.py                    |   2 -
 asyncssh/crypto/ec.py                            | 207 +--------
 asyncssh/crypto/ecdh.py                          |  48 ---
 asyncssh/crypto/pyca/ec.py                       |  44 +-
 asyncssh/dsa.py                                  |   6 +-
 asyncssh/ecdsa.py                                |   8 +-
 asyncssh/ed25519.py                              |   2 +-
 asyncssh/misc.py                                 |  38 +-
 asyncssh/public_key.py                           |  46 +-
 asyncssh/rsa.py                                  |   6 +-
 asyncssh/sftp.py                                 |   2 +-
 asyncssh/stream.py                               |  25 +-
 asyncssh/version.py                              |   2 +-
 debian/.git-dpm                                  |   6 +-
 debian/patches/do-not-test-chacha20-cipher.patch |  42 --
 debian/patches/series                            |   1 -
 debian/patches/sphinx-use-default-theme.patch    |   2 +-
 docs/api.rst                                     |   8 +-
 docs/changes.rst                                 |  50 ++-
 docs/conf.py                                     |   4 +-
 setup.py                                         |   2 +-
 tests/test_auth.py                               | 511 +++++++++++++++++++++++
 tests/test_auth_keys.py                          | 146 +++++++
 tests/test_cipher.py                             |  38 +-
 tests/test_kex.py                                | 135 +++---
 tests/test_native_ec.py                          | 138 ------
 tests/test_public_key.py                         |  60 ++-
 tests/util.py                                    | 116 ++++-
 36 files changed, 1262 insertions(+), 740 deletions(-)

diff --cc debian/.git-dpm
index c162c41,0000000..8926393
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
- 942c19c5bd0357654715092a2b271f005f48a40c
- 942c19c5bd0357654715092a2b271f005f48a40c
- 142bd9768421394f9f6880fb63c8de0932182c5b
++3490e4f87b75393e96d6c081b7999f4870ae09b4
++3490e4f87b75393e96d6c081b7999f4870ae09b4
++9a16010d1a050309e546d35f0996837f75780394
 +9a16010d1a050309e546d35f0996837f75780394
 +asyncssh-1.3.2.orig.tar.gz
 +0ad9ce3289e1a75292f39e51a925045fef9b34cf
 +170304
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/series
index bf9e675,0000000..5baf5a8
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
 +sphinx-use-default-theme.patch
- do-not-test-chacha20-cipher.patch
diff --cc debian/patches/sphinx-use-default-theme.patch
index a875ba1,0000000..2fdd540
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 ded4f917f6660caffa2af6c83fdd13ce43628198 Mon Sep 17 00:00:00 2001
++From 3490e4f87b75393e96d6c081b7999f4870ae09b4 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