From 4e5f88ef5f66baeb80a3cf2a1910e511f6e02fbf Mon Sep 17 00:00:00 2001
From: Richard O'Dwyer <richard@richard.do>
Date: Thu, 17 Oct 2019 21:02:52 +0100
Subject: [PATCH] Python 3 bugfix to ``upload`` method.

---
 HISTORY.rst      |  2 +-
 src/mega/mega.py | 36 +++++++++++++++++++++++++-----------
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index c4c0c92..da83a5a 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -6,7 +6,7 @@ Release History
 0.9.20 (unreleased)
 +++++++++++++++++++
 
-- Nothing changed yet.
+- Python 3 bugfix to ``upload`` method.
 
 
 0.9.19 (2019-10-16)
diff --git a/src/mega/mega.py b/src/mega/mega.py
index 9b7b401..6fb2557 100644
--- a/src/mega/mega.py
+++ b/src/mega/mega.py
@@ -4,6 +4,7 @@ from Crypto.Cipher import AES
 from Crypto.PublicKey import RSA
 from Crypto.Util import Counter
 import os
+import sys
 import random
 import binascii
 import requests
@@ -12,10 +13,12 @@ from .errors import ValidationError, RequestError
 from .crypto import (
     a32_to_base64, encrypt_key, base64_url_encode, encrypt_attr, base64_to_a32,
     base64_url_decode, decrypt_attr, a32_to_str, get_chunks, str_to_a32,
-    decrypt_key, mpi_to_int, stringhash, prepare_key, make_id,
+    decrypt_key, mpi_to_int, stringhash, prepare_key, make_id, makebyte
 )
 import tempfile
 
+PYTHON2 = sys.version_info < (3, )
+
 
 class Mega(object):
     def __init__(self, options=None):
@@ -90,11 +93,15 @@ class Mega(object):
 
             private_key = a32_to_str(rsa_private_key)
             self.rsa_private_key = [0, 0, 0, 0]
-
             for i in range(4):
-                l = (
-                    (ord(private_key[0]) * 256 + ord(private_key[1]) + 7) / 8
-                ) + 2
+                if PYTHON2:
+                    l = (
+                        (ord(private_key[0]) * 256 + ord(private_key[1]) + 7) / 8
+                    ) + 2
+                else:
+                    l = int(
+                        ((private_key[0]) * 256 + (private_key[1]) + 7) / 8
+                    ) + 2
                 self.rsa_private_key[i] = mpi_to_int(private_key[:l])
                 private_key = private_key[l:]
 
@@ -671,16 +678,23 @@ class Mega(object):
 
                 block = chunk[i:i + 16]
                 if len(block) % 16:
-                    block += '\0' * (16 - len(block) % 16)
+                    block += makebyte('\0' * (16 - len(block) % 16))
                 mac_str = mac_encryptor.encrypt(encryptor.encrypt(block))
 
                 # encrypt file and upload
                 chunk = aes.encrypt(chunk)
-                output_file = requests.post(
-                    ul_url + "/" + str(chunk_start),
-                    data=chunk,
-                    timeout=self.timeout
-                )
+                try:
+                    output_file = requests.post(
+                        ul_url + "/" + str(chunk_start),
+                        data=chunk,
+                        timeout=self.timeout
+                    )
+                except:
+                    output_file = requests.post(
+                        ul_url + "/" + str(chunk_start),
+                        data=chunk,
+                        timeout=self.timeout
+                    )
                 completion_file_handle = output_file.text
 
                 if self.options.get('verbose') is True: