projects
/
naja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://ctpug.org.za/naja
[naja.git]
/
pyweek_upload.py
diff --git
a/pyweek_upload.py
b/pyweek_upload.py
index f9201bede9f0f78e2691a6fd79c50a64cc6bbbc3..15eff8746b523e1fb3fb03f31d27d96eb1778119 100644
(file)
--- a/
pyweek_upload.py
+++ b/
pyweek_upload.py
@@
-73,7
+73,7
@@
class Progress(object):
chunk = self.data.read(1024)
self.sent += len(chunk)
chunk = self.data.read(1024)
self.sent += len(chunk)
- #print (self.num, self.stepsize, self.total, self.sent, self.tosend)
+ #
print (self.num, self.stepsize, self.total, self.sent, self.tosend)
if self.num % self.stepsize:
return chunk
if self.num % self.stepsize:
return chunk
@@
-98,8
+98,8
@@
class Progress(object):
M = M % 60
S = eta % 60
if self.total:
M = M % 60
S = eta % 60
if self.total:
- s = '%s %2d%% (ETA %02d:%02d:%02d)' % (
self.info,
- self.num * 100. / self.total, H, M, S)
+ s = '%s %2d%% (ETA %02d:%02d:%02d)' % (
+ self.
info, self.
num * 100. / self.total, H, M, S)
else:
s = '%s 0%% (ETA %02d:%02d:%02d)' % (self.info, H, M, S)
elif self.total:
else:
s = '%s 0%% (ETA %02d:%02d:%02d)' % (self.info, H, M, S)
elif self.total: