[Python-modules-commits] [python-asyncssh] 04/09: 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 5c4c5b5c5ff880d6340c6e6f4a6c8fa6d5f849c6
Merge: afb06ce ded4f91
Author: Vincent Bernat <bernat at debian.org>
Date:   Sat Oct 31 23:14:50 2015 +0100

    merge patched into master

 .coveragerc                                   |    7 +
 README.rst                                    |    6 +-
 asyncssh/__init__.py                          |    2 +-
 asyncssh/asn1.py                              |   78 +-
 asyncssh/auth.py                              |  210 +++--
 asyncssh/channel.py                           |   25 +-
 asyncssh/cipher.py                            |    2 +-
 asyncssh/connection.py                        |  229 +++--
 asyncssh/crypto/__init__.py                   |   38 +-
 asyncssh/crypto/chacha.py                     |    8 +-
 asyncssh/crypto/cipher.py                     |    4 +-
 asyncssh/crypto/curve25519.py                 |   58 +-
 asyncssh/crypto/ec.py                         |  257 ++++++
 asyncssh/crypto/ecdh.py                       |   48 +
 asyncssh/crypto/pyca/cipher.py                |    3 -
 asyncssh/crypto/pyca/dsa.py                   |   80 +-
 asyncssh/crypto/pyca/ec.py                    |  118 +++
 asyncssh/crypto/pyca/rsa.py                   |   99 ++-
 asyncssh/crypto/pycrypto/__init__.py          |   15 -
 asyncssh/crypto/pycrypto/cipher.py            |   67 --
 asyncssh/crypto/pycrypto/dsa.py               |   50 --
 asyncssh/crypto/pycrypto/rsa.py               |   51 --
 asyncssh/dh.py                                |   21 +-
 asyncssh/dsa.py                               |   77 +-
 asyncssh/ec.py                                |  667 --------------
 asyncssh/{curve25519.py => ecdh.py}           |   47 +-
 asyncssh/ecdsa.py                             |  285 ++++++
 asyncssh/ed25519.py                           |   19 +-
 asyncssh/known_hosts.py                       |    7 +-
 asyncssh/packet.py                            |    9 +-
 asyncssh/pbe.py                               |  150 +---
 asyncssh/public_key.py                        |  186 ++--
 asyncssh/rsa.py                               |   86 +-
 asyncssh/saslprep.py                          |   10 +-
 asyncssh/sftp.py                              |  615 ++++++++-----
 asyncssh/version.py                           |    2 +-
 debian/.git-dpm                               |    6 +-
 debian/patches/sphinx-use-default-theme.patch |    6 +-
 docs/api.rst                                  |   14 +-
 docs/changes.rst                              |   80 ++
 pylintrc                                      |    2 +-
 setup.py                                      |    7 +-
 tests/__init__.py                             |    3 +-
 tests/test_asn1.py                            |  183 ++++
 tests/test_cipher.py                          |  105 +++
 tests/test_compression.py                     |   39 +
 tests/test_kex.py                             |  318 +++++++
 tests/test_keys.py                            |  361 --------
 tests/test_known_hosts.py                     |  190 ++++
 tests/test_mac.py                             |   47 +
 tests/test_native_ec.py                       |  138 +++
 tests/test_public_key.py                      | 1183 +++++++++++++++++++++++++
 tests/test_saslprep.py                        |   75 ++
 tests/util.py                                 |   44 +
 54 files changed, 4375 insertions(+), 2062 deletions(-)

diff --cc debian/.git-dpm
index 8547cd5,0000000..1aa0508
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
- e1735a823d97025a8fc6d95d27e8a658a2e43400
- e1735a823d97025a8fc6d95d27e8a658a2e43400
- 32620ef6bb6f20f511176629e5893b66159325b1
++ded4f917f6660caffa2af6c83fdd13ce43628198
++ded4f917f6660caffa2af6c83fdd13ce43628198
++142bd9768421394f9f6880fb63c8de0932182c5b
 +142bd9768421394f9f6880fb63c8de0932182c5b
 +python-asyncssh_1.3.0.orig.tar.gz
 +a29e90c15f00bc5ac5c68dadc7dc295fa7e68e7a
 +166641
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/sphinx-use-default-theme.patch
index 3ed9915,0000000..a875ba1
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 e1735a823d97025a8fc6d95d27e8a658a2e43400 Mon Sep 17 00:00:00 2001
++From ded4f917f6660caffa2af6c83fdd13ce43628198 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 66aad65..77fe744 100644
++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 1c2b15e..a417128 100644
++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