[Python-modules-commits] [python-progressbar] 03/09: merge patched into master

[Sandro Tosi]

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

morph pushed a commit to branch master
in repository python-progressbar.

commit bef76d4f95a0769fbf338454f2959f48ecf66f10
Merge: e5bc8d9 e9949ea
Author: Sandro Tosi <morph at debian.org>
Date:   Fri Apr 15 21:21:17 2016 +0100

    merge patched into master

 debian/.git-dpm                                     |  4 ++--
 .../0002-write-to-stdout-in-the-example.patch       | 19 +++++++++++++++++++
 debian/patches/0003-flush-upon-write.patch          | 21 +++++++++++++++++++++
 debian/patches/series                               |  2 ++
 examples.py                                         |  2 +-
 progressbar/__init__.py                             |  1 +
 6 files changed, 46 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index efdb0f1,0000000..c2b994f
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
- 548a9e1e94498e0a42826cf6ed21239f1b8aeb17
- 548a9e1e94498e0a42826cf6ed21239f1b8aeb17
++e9949ea61326344b9a2deb272ca4803c9f2ac6fa
++e9949ea61326344b9a2deb272ca4803c9f2ac6fa
 +a65842e5dd8adca93724a0dafddd3f156e5a9e24
 +a65842e5dd8adca93724a0dafddd3f156e5a9e24
 +python-progressbar_2.3.orig.tar.gz
 +aebb94b452990468c77090fb43b335cf0a724353
 +9802
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-write-to-stdout-in-the-example.patch
index 0000000,0000000..6d9fea4
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-write-to-stdout-in-the-example.patch
@@@ -1,0 -1,0 +1,19 @@@
++From 887508a1f5cae93accc5e3c334cf786ca9a612b7 Mon Sep 17 00:00:00 2001
++From: Sandro Tosi <morph at debian.org>
++Date: Fri, 15 Apr 2016 21:20:13 +0100
++Subject: write() to stdout in the example
++
++---
++ examples.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/examples.py b/examples.py
++index b387c41..e07232d 100644
++--- a/examples.py
+++++ b/examples.py
++@@ -191,4 +191,4 @@ if __name__ == '__main__':
++     try:
++         for example in examples: example()
++     except KeyboardInterrupt:
++-        sys.stdout('\nQuitting examples.\n')
+++        sys.stdout.write('\nQuitting examples.\n')
diff --cc debian/patches/0003-flush-upon-write.patch
index 0000000,0000000..76e40e7
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-flush-upon-write.patch
@@@ -1,0 -1,0 +1,21 @@@
++From e9949ea61326344b9a2deb272ca4803c9f2ac6fa Mon Sep 17 00:00:00 2001
++From: Sandro Tosi <morph at debian.org>
++Date: Fri, 15 Apr 2016 21:21:13 +0100
++Subject: flush upon write
++
++---
++ progressbar/__init__.py | 1 +
++ 1 file changed, 1 insertion(+)
++
++diff --git a/progressbar/__init__.py b/progressbar/__init__.py
++index ca98e44..92d96aa 100644
++--- a/progressbar/__init__.py
+++++ b/progressbar/__init__.py
++@@ -281,6 +281,7 @@ class ProgressBar(object):
++         self.seconds_elapsed = now - self.start_time
++         self.next_update = self.currval + self.update_interval
++         self.fd.write(self._format_line() + '\r')
+++        self.fd.flush()
++         self.last_update_time = now
++ 
++ 
diff --cc debian/patches/series
index e37208f,0000000..db0a470
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,3 @@@
 +10_python3.3_compat.patch
++0002-write-to-stdout-in-the-example.patch
++0003-flush-upon-write.patch

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