[Python-modules-commits] [python-blessed] 04/07: merge patched into master

[Pierre-Elliott Bécue]

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

peb-guest pushed a commit to branch master
in repository python-blessed.

commit f911462cd21ddd1fc014afcc6f99f789a564ae84
Merge: c7c1483 82a0e80
Author: Pierre-Elliott Bécue <becue at crans.org>
Date:   Sun Dec 31 13:58:00 2017 +0100

    merge patched into master

 PKG-INFO                                           |  2 +-
 blessed.egg-info/PKG-INFO                          |  2 +-
 blessed/__init__.py                                |  1 +
 blessed/_capabilities.py                           |  4 +++
 blessed/terminal.py                                | 31 +++++++++++++---------
 blessed/tests/test_formatters.py                   |  4 +--
 debian/.git-dpm                                    |  6 ++---
 ...-time-based-assertion-when-timeout-is-0-i.patch |  2 +-
 docs/contributing.rst                              |  3 +--
 docs/history.rst                                   |  4 +++
 docs/overview.rst                                  | 28 ++++++++++++++-----
 setup.cfg                                          |  2 +-
 version.json                                       |  2 +-
 13 files changed, 59 insertions(+), 32 deletions(-)

diff --cc debian/.git-dpm
index a90f6c4,0000000..2aa646c
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
- 86299fc51791ee29c36c7fba488e1429fe8e73df
- 86299fc51791ee29c36c7fba488e1429fe8e73df
- fe6c0dbd3b113c06f9364a1f2ad53a7266e2fccf
++82a0e807c403b62d9efe17766d04c47e6c3ccbe3
++82a0e807c403b62d9efe17766d04c47e6c3ccbe3
++9cf4b2b68909af9ef45a3cc7689f9f3995b0aefa
 +9cf4b2b68909af9ef45a3cc7689f9f3995b0aefa
 +python-blessed_1.14.2.orig.tar.gz
 +b21cb37a5bcf9278d040c1da43e7e5cc6252ef39
 +82942
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Removes-the-time-based-assertion-when-timeout-is-0-i.patch
index 526e3ba,0000000..bf0faa6
mode 100644,000000..100644
--- a/debian/patches/0001-Removes-the-time-based-assertion-when-timeout-is-0-i.patch
+++ b/debian/patches/0001-Removes-the-time-based-assertion-when-timeout-is-0-i.patch
@@@ -1,26 -1,0 +1,26 @@@
- From 86299fc51791ee29c36c7fba488e1429fe8e73df Mon Sep 17 00:00:00 2001
++From 82a0e807c403b62d9efe17766d04c47e6c3ccbe3 Mon Sep 17 00:00:00 2001
 +From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= <becue at crans.org>
 +Date: Sun, 31 Dec 2017 13:12:44 +0100
 +Subject: Removes the time based assertion when timeout is 0 in
 + test_keyboard.py
 +
 + * Expecting the duration time for the test to be between 34 and 45 ms
 +   is hardware-dependant, and so irrelevant for real conditions testing.
 +   The previous assertion expects that the test takes less than 1 second
 +   which is really reasonable.
 +---
 + blessed/tests/test_keyboard.py | 1 -
 + 1 file changed, 1 deletion(-)
 +
 +diff --git a/blessed/tests/test_keyboard.py b/blessed/tests/test_keyboard.py
 +index 9df528d..d4f5a75 100644
 +--- a/blessed/tests/test_keyboard.py
 ++++ b/blessed/tests/test_keyboard.py
 +@@ -459,7 +459,6 @@ def test_esc_delay_cbreak_035():
 +     assert key_name == u'KEY_ESCAPE'
 +     assert os.WEXITSTATUS(status) == 0
 +     assert math.floor(time.time() - stime) == 0.0
 +-    assert 34 <= int(duration_ms) <= 45, duration_ms
 + 
 + 
 + @pytest.mark.skipif(os.environ.get('TEST_QUICK', None) is not None,

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