diff options
Diffstat (limited to 'progress.py')
-rw-r--r-- | progress.py | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/progress.py b/progress.py index d2ed4bae..8a643db2 100644 --- a/progress.py +++ b/progress.py | |||
@@ -53,9 +53,9 @@ class Progress(object): | |||
53 | 53 | ||
54 | if self._total <= 0: | 54 | if self._total <= 0: |
55 | sys.stderr.write('%s\r%s: %d,' % ( | 55 | sys.stderr.write('%s\r%s: %d,' % ( |
56 | CSI_ERASE_LINE, | 56 | CSI_ERASE_LINE, |
57 | self._title, | 57 | self._title, |
58 | self._done)) | 58 | self._done)) |
59 | sys.stderr.flush() | 59 | sys.stderr.flush() |
60 | else: | 60 | else: |
61 | p = (100 * self._done) / self._total | 61 | p = (100 * self._done) / self._total |
@@ -63,13 +63,13 @@ class Progress(object): | |||
63 | if self._lastp != p or self._always_print_percentage: | 63 | if self._lastp != p or self._always_print_percentage: |
64 | self._lastp = p | 64 | self._lastp = p |
65 | sys.stderr.write('%s\r%s: %3d%% (%d%s/%d%s)%s%s%s' % ( | 65 | sys.stderr.write('%s\r%s: %3d%% (%d%s/%d%s)%s%s%s' % ( |
66 | CSI_ERASE_LINE, | 66 | CSI_ERASE_LINE, |
67 | self._title, | 67 | self._title, |
68 | p, | 68 | p, |
69 | self._done, self._units, | 69 | self._done, self._units, |
70 | self._total, self._units, | 70 | self._total, self._units, |
71 | ' ' if msg else '', msg, | 71 | ' ' if msg else '', msg, |
72 | "\n" if self._print_newline else "")) | 72 | "\n" if self._print_newline else "")) |
73 | sys.stderr.flush() | 73 | sys.stderr.flush() |
74 | 74 | ||
75 | def end(self): | 75 | def end(self): |
@@ -78,16 +78,16 @@ class Progress(object): | |||
78 | 78 | ||
79 | if self._total <= 0: | 79 | if self._total <= 0: |
80 | sys.stderr.write('%s\r%s: %d, done.\n' % ( | 80 | sys.stderr.write('%s\r%s: %d, done.\n' % ( |
81 | CSI_ERASE_LINE, | 81 | CSI_ERASE_LINE, |
82 | self._title, | 82 | self._title, |
83 | self._done)) | 83 | self._done)) |
84 | sys.stderr.flush() | 84 | sys.stderr.flush() |
85 | else: | 85 | else: |
86 | p = (100 * self._done) / self._total | 86 | p = (100 * self._done) / self._total |
87 | sys.stderr.write('%s\r%s: %3d%% (%d%s/%d%s), done.\n' % ( | 87 | sys.stderr.write('%s\r%s: %3d%% (%d%s/%d%s), done.\n' % ( |
88 | CSI_ERASE_LINE, | 88 | CSI_ERASE_LINE, |
89 | self._title, | 89 | self._title, |
90 | p, | 90 | p, |
91 | self._done, self._units, | 91 | self._done, self._units, |
92 | self._total, self._units)) | 92 | self._total, self._units)) |
93 | sys.stderr.flush() | 93 | sys.stderr.flush() |