From 1df0cf239f0c872a7b1690b10c127339283b5bcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mihai=20Capot=C4=83?= <mihai@mihaic.ro>
Date: Mon, 15 Apr 2013 14:03:10 +0200
Subject: [PATCH] Use 1000 as multiplier for Mbit/s and kbit/s

Speedtest.net defines Mbit/s and kbit/s using 1000 as multiplier, <https://support.speedtest.net/entries/21057567-What-do-mbps-and-kbps-mean->.
---
 speedtest-cli   | 10 +++++-----
 speedtest-cli-3 | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/speedtest-cli b/speedtest-cli
index b47f028..27ed869 100755
--- a/speedtest-cli
+++ b/speedtest-cli
@@ -352,9 +352,9 @@ def speedtest():
     dlspeed = downloadSpeed(urls, args.simple)
     if not args.simple:
         print
-    print 'Download: %0.2f Mbit/s' % ((dlspeed / 1024 / 1024) * 8)
+    print 'Download: %0.2f Mbit/s' % ((dlspeed / 1000 / 1000) * 8)
 
-    sizesizes = [int(.25 * 1024 * 1024), int(.5 * 1024 * 1024)]
+    sizesizes = [int(.25 * 1000 * 1000), int(.5 * 1000 * 1000)]
     sizes = []
     for size in sizesizes:
         for i in xrange(0, 25):
@@ -364,12 +364,12 @@ def speedtest():
     ulspeed = uploadSpeed(best['url'], sizes, args.simple)
     if not args.simple:
         print
-    print 'Upload: %0.2f Mbit/s' % ((ulspeed / 1024 / 1024) * 8)
+    print 'Upload: %0.2f Mbit/s' % ((ulspeed / 1000 / 1000) * 8)
 
     if args.share:
-        dlspeedk = int(round((dlspeed / 1024) * 8, 0))
+        dlspeedk = int(round((dlspeed / 1000) * 8, 0))
         ping = int(round(best['latency'], 0))
-        ulspeedk = int(round((ulspeed / 1024) * 8, 0))
+        ulspeedk = int(round((ulspeed / 1000) * 8, 0))
 
         apiData = [
             'download=%s' % dlspeedk,
diff --git a/speedtest-cli-3 b/speedtest-cli-3
index 728d01a..f0c9487 100755
--- a/speedtest-cli-3
+++ b/speedtest-cli-3
@@ -329,9 +329,9 @@ def speedtest():
     dlspeed = downloadSpeed(urls, args.simple)
     if not args.simple:
         print()
-    print('Download: %0.2f Mbit/s' % ((dlspeed / 1024 / 1024) * 8))
+    print('Download: %0.2f Mbit/s' % ((dlspeed / 1000 / 1000) * 8))
 
-    sizesizes = [int(.25 * 1024 * 1024), int(.5 * 1024 * 1024)]
+    sizesizes = [int(.25 * 1000 * 1000), int(.5 * 1000 * 1000)]
     sizes = []
     for size in sizesizes:
         for i in range(0, 25):
@@ -341,12 +341,12 @@ def speedtest():
     ulspeed = uploadSpeed(best['url'], sizes, args.simple)
     if not args.simple:
         print()
-    print('Upload: %0.2f Mbit/s' % ((ulspeed / 1024 / 1024) * 8))
+    print('Upload: %0.2f Mbit/s' % ((ulspeed / 1000 / 1000) * 8))
 
     if args.share:
-        dlspeedk = int(round((dlspeed / 1024) * 8, 0))
+        dlspeedk = int(round((dlspeed / 1000) * 8, 0))
         ping = int(round(best['latency'], 0))
-        ulspeedk = int(round((ulspeed / 1024) * 8, 0))
+        ulspeedk = int(round((ulspeed / 1000) * 8, 0))
 
         apiData = [
             'download=%s' % dlspeedk,