walkero
/
speedtest-cli
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix python3 issues

This commit is contained in:
Matt Martz 2014-03-10 12:18:47 -05:00
parent 5ec8fa590d
commit 0e7160e8e6
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
speedtest_cli.py
View File

@ -296,14 +296,15 @@ class HTTPUploaderData(object):
chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ' chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'
data = chars * (int(round(int(length) / 36.0))) data = chars * (int(round(int(length) / 36.0)))
self.data = StringIO() self.data = StringIO()
self.data.write(('content1=%s' % data[0:int(length) - 9]).encode()) self.data.write('content1=%s' % data[0:int(length) - 9])
del data
self.data.seek(0) self.data.seek(0)
self.total = [0] self.total = [0]
def read(self, n=10240): def read(self, n=10240):
if (time.time() - self.start) <= self.timeout: if (time.time() - self.start) <= self.timeout:
chunk = self.data.read(n) chunk = self.data.read(n).encode()
self.total.append(len(chunk)) self.total.append(len(chunk))
return chunk return chunk
else: else:
@ -556,7 +557,7 @@ class Speedtest(object):
if desc.startswith('ul'): if desc.startswith('ul'):
sizes['upload'].append(int(size)) sizes['upload'].append(int(size))
elif desc.startswith('dl'): elif desc.startswith('dl'):
sizes['download'].append(int(size) / 10000) sizes['download'].append(int(int(size) / 10000))
sizes['upload'].sort() sizes['upload'].sort()
sizes['download'].sort() sizes['download'].sort()