Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	README.md
#	src/mega/crypto.py
#	src/mega/errors.py
#	src/mega/mega.py

.travis.yml

@@ -1,8 +1,6 @@
 sudo: false
 language: python
 python:
-    - 3.6
-    - 3.7
     - 3.8
 env:
   - TOXENV=py-normal

HISTORY.md

@@ -0,0 +1,92 @@
+Release History
+===============
+
+1.0.9 (unreleased)
+------------------
+
+- Nothing changed yet.
+
+
+1.0.8 (2020-06-25)
+------------------
+
+-   Fixes find method returning the wrong file when more than one file
+    exists with that name.
+-   Handle new shared file URLS.
+
+1.0.7 (2020-03-25)
+------------------
+
+-   Fix login by calculating public RSA exponent instead of hardcoding.
+
+1.0.6 (2020-02-03)
+------------------
+
+-   Fixes RSA public exponent issue.
+-   Switches dependency pycrypto to pycryptodome.
+
+1.0.5 (2019-11-18)
+------------------
+
+-   Increase the wait time in between failed API request retries.
+
+1.0.4 (2019-11-18)
+------------------
+
+-   Increase the wait time in between failed API request retries.
+
+1.0.3 (2019-11-12)
+------------------
+
+-   Fixes broken `download` method.
+-   Changes `download` and `download_url` methods to return the path to
+    the downloaded file, previously returned `None`.
+-   Added LICENSE.
+
+1.0.2 (2019-11-07)
+------------------
+
+-   Reverts, "Replace pycrypto dependency with pycryptodome" as breaks
+    login process.
+
+1.0.1 (2019-11-06)
+------------------
+
+-   When a request fails due to EAGAIN response, retry with exp backoff
+    up to 20 seconds.
+-   Adds logging, removes print statements.
+-   Replace pycrypto dependency with pycryptodome.
+-   Removes Python 2 specific code.
+
+1.0.0 (2019-10-31)
+------------------
+
+-   Removes broken method `get_contacts()`.
+-   Adds support for login with a v2 Mega user account.
+-   Adds `export()` method to share a file or folder, returning public
+    share URL with key.
+-   Adds code, message attrs to RequestError exception, makes message in
+    raised exceptions include more details.
+-   Alters `create_folder()` to accept a path including multiple sub
+    directories, adds support to create them all (similar to 'mkdir -p'
+    on unix systems).
+-   Adds `exclude_deleted=True` optional arg to `find()` method, to
+    exclude deleted nodes from results.
+
+0.9.20 (2019-10-17)
+-------------------
+
+-   Python 3 bugfix to `upload` method.
+
+0.9.19 (2019-10-16)
+-------------------
+
+-   Python 3 support and bugfixes.
+-   Update packaging code.
+-   Added changelog.
+
+0.9.18 (2013-07-04)
+-------------------
+
+-   Unknown
+

HISTORY.rst

@@ -1,79 +0,0 @@
-.. :changelog:
-
-Release History
-===============
-
-1.0.7 (unreleased)
-------------------
-
-- Fix login by calculating public RSA exponent instead of hardcoding.
-
-
-1.0.6 (2020-02-03)
-------------------
-
-- Fixes RSA public exponent issue.
-- Switches dependency pycrypto to pycryptodome. 
-
-
-1.0.5 (2019-11-18)
-------------------
-
-- Increase the wait time in between failed API request retries.
-
-
-1.0.4 (2019-11-18)
-------------------
-
-- Increase the wait time in between failed API request retries.
-
-
-1.0.3 (2019-11-12)
-------------------
-
-- Fixes broken ``download`` method.
-- Changes ``download`` and ``download_url`` methods to return the path to the downloaded file, previously returned ``None``.
-- Added LICENSE.
-
-
-1.0.2 (2019-11-07)
-------------------
-
-- Reverts, "Replace pycrypto dependency with pycryptodome" as breaks login process.
-
-
-1.0.1 (2019-11-06)
-------------------
-
-- When a request fails due to EAGAIN response, retry with exp backoff up to 20 seconds.
-- Adds logging, removes print statements.
-- Replace pycrypto dependency with pycryptodome.
-- Removes Python 2 specific code.
-
-
-1.0.0 (2019-10-31)
-------------------
-
-- Removes broken method ``get_contacts()``.
-- Adds support for login with a v2 Mega user account.
-- Adds ``export()`` method to share a file or folder, returning public share URL with key.
-- Adds code, message attrs to RequestError exception, makes message in raised exceptions include more details.
-- Alters ``create_folder()`` to accept a path including multiple sub directories, adds support to create them all (similar to 'mkdir -p' on unix systems).
-- Adds ``exclude_deleted=True`` optional arg to ``find()`` method, to exclude deleted nodes from results.
-
-0.9.20 (2019-10-17)
--------------------
-
-- Python 3 bugfix to ``upload`` method.
-
-0.9.19 (2019-10-16)
--------------------
-
-- Python 3 support and bugfixes.
-- Update packaging code.
-- Added changelog.
-
-0.9.18 (2013-07-04)
--------------------
-
-- Unknown

MANIFEST.in

@@ -1,9 +1,9 @@
-include HISTORY.rst
+include HISTORY.md
-include README.rst
+include README.md
 include requirements.txt
 
 recursive-include tests *
 recursive-exclude * __pycache__
 recursive-exclude * *.py[co]
 
-recursive-include docs *.rst conf.py Makefile make.bat
+recursive-include docs *.md conf.py Makefile make.bat

examples.py

@@ -1,4 +1,5 @@
 import os
+import uuid
 from mega import Mega
 
 
@@ -8,7 +9,7 @@ def test():
     comment/uncomment lines to test various parts of the API
     see readme.md for more information
     """
-
+    unique = str(uuid.uuid4())
     # user details
     email = os.environ['EMAIL']
     password = os.environ['PASS']
@@ -36,10 +37,11 @@ def test():
         print((files[file]))
 
     # upload file
-    print((m.upload('examples.py')))
+    print((m.upload(filename='examples.py',
+                    dest_filename=f'examples_{unique}.py')))
 
     # search for a file in account
-    file = m.find('examples.py')
+    file = m.find(f'examples_{unique}.py')
 
     if file:
         # get public link

requirements-dev.txt

@@ -1,17 +1,20 @@
 -r requirements.txt
-pytest
+pytest==5.4.3
-ipdb
+ipdb==0.13.3
-flake8
+flake8==3.8.3
-pep8-naming
+pep8-naming==0.11.1
-autoflake
+autoflake==1.3.1
-mccabe
+mccabe==0.6.1
-yapf
+brunette==0.1.5
-tox
+tox==3.15.2
-coverage
+coverage==5.1
-pytest-cov
+pytest-cov==2.10.0
-zest.releaser
+zest.releaser==6.20.1
-setuptools
+setuptools==47.3.1
-twine
+twine==3.2.0
-wheel
+wheel==0.34.2
-rope
+rope==0.17.0
-pytest-mock
+pytest-mock==3.1.1
+brunette==0.1.5
+lock-requirements==0.1.1
+requests-mock==1.8.0

setup.cfg

@@ -11,20 +11,12 @@ norecursedirs = .git
 [flake8]
 exclude = .git,__pycache__,legacy,build,dist,.tox
 max-complexity = 15
-ignore = E741,W504
+ignore = E741,W504,W503
 
-[yapf]
+[tool:brunette]
-based_on_style = pep8
+line-length = 79
-spaces_before_comment = 2
+verbose = true
-split_before_logical_operator = true
+single-quotes = true
-indent_width = 4
-split_complex_comprehension = true
-column_limit = 79
-dedent_closing_brackets = true
-spaces_around_power_operator = true
-no_spaces_around_selected_binary_operators = false
-split_penalty_import_names = 500
-join_multiple_lines = true
 
 [coverage:run]
 omit =

setup.py

@@ -14,23 +14,24 @@ os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
 with open('requirements.txt') as f:
     install_requires = f.read().splitlines()
 
-with open('README.rst', 'r', encoding='utf-8') as rm_file:
+with open('README.md', 'r', encoding='utf-8') as rm_file:
     readme = rm_file.read()
 
-with open('HISTORY.rst', 'r', encoding='utf-8') as hist_file:
+with open('HISTORY.md', 'r', encoding='utf-8') as hist_file:
     history = hist_file.read()
 
-setup(
+setup(name='mega.py',
-    name='mega.py',
+      version='1.0.9.dev0',
-    version='1.0.7.dev0',
       packages=find_packages('src', exclude=('tests', )),
       package_dir={'': 'src'},
       include_package_data=True,
       zip_safe=False,
+      url='https://github.com/odwyersoftware/mega.py',
       description='Python lib for the Mega.co.nz API',
       long_description=readme + '\n\n' + history,
-    author='Richard O\'Dwyer',
+      long_description_content_type='text/markdown',
-    author_email='richard@richard.do',
+      author='O\'Dwyer Software',
+      author_email='hello@odwyer.software',
       license='Creative Commons Attribution-Noncommercial-Share Alike license',
       install_requires=install_requires,
       classifiers=[
@@ -38,9 +39,5 @@ setup(
           'Operating System :: OS Independent',
           'Programming Language :: Python',
           'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.8',
           'Topic :: Internet :: WWW/HTTP',
-    ]
+      ])
-)

src/mega/crypto.py

@@ -23,29 +23,24 @@ else:
     def makestring(x):
         return codecs.latin_1_decode(x)[0]
 
-
 def aes_cbc_encrypt(data, key):
     aes_cipher = AES.new(key, AES.MODE_CBC, makebyte('\0' * 16))
     return aes_cipher.encrypt(data)
 
-
 def aes_cbc_decrypt(data, key):
     aes_cipher = AES.new(key, AES.MODE_CBC, makebyte('\0' * 16))
     return aes_cipher.decrypt(data)
 
-
 def aes_cbc_encrypt_a32(data, key):
     return str_to_a32(aes_cbc_encrypt(a32_to_str(data), a32_to_str(key)))
 
-
 def aes_cbc_decrypt_a32(data, key):
     return str_to_a32(aes_cbc_decrypt(a32_to_str(data), a32_to_str(key)))
 
-
 def stringhash(str, aeskey):
-    """
+    '''
     As defined by MEGA's weblient crypto.js. Search for "function stringhash".
-    """
+    '''
     s32 = str_to_a32(str)
     h32 = [0, 0, 0, 0]
     for (index, word) in enumerate(s32):
@@ -54,7 +49,6 @@ def stringhash(str, aeskey):
         h32 = aes_cbc_encrypt_a32(h32, aeskey)
     return a32_to_base64((h32[0], h32[2]))
 
-
 def prepare_key(arr):
     pkey = [0x93C467E3, 0x7DB0C7A4, 0xD1BE3F81, 0x0152CB56]
     for r in range(0x10000):
@@ -66,7 +60,6 @@ def prepare_key(arr):
             pkey = aes_cbc_encrypt_a32(pkey, key)
     return pkey
 
-
 def encrypt_key(a, key):
     encrypted = tuple(
         piece
@@ -83,25 +76,21 @@ def decrypt_key(a, key):
     )
     return decrypted
 
-
 def encrypt_attr(attr, key):
     attr = makebyte('MEGA' + json.dumps(attr))
     if len(attr) % 16:
         attr += b'\0' * (16 - len(attr) % 16)
     return aes_cbc_encrypt(attr, a32_to_str(key))
 
-
 def decrypt_attr(attr, key):
     attr = aes_cbc_decrypt(attr, a32_to_str(key))
     attr = makestring(attr)
     attr = attr.rstrip('\0')
     return json.loads(attr[4:]) if attr[:6] == 'MEGA{"' else False
 
-
 def a32_to_str(a):
     return struct.pack('>%dI' % len(a), *a)
 
-
 def str_to_a32(b):
     if isinstance(b, str):
         b = makebyte(b)
@@ -110,7 +99,6 @@ def str_to_a32(b):
         b += b'\0' * (4 - len(b) % 4)
     return struct.unpack('>%dI' % (len(b) / 4), b)
 
-
 def mpi_to_int(s):
     '''
     A Multi-precision integer is encoded as a series of bytes in big-endian
@@ -127,10 +115,6 @@ def extended_gcd(a, b):
         return (g, x - (b // a) * y, y)
 
 def modular_inverse(a, m):
-    '''
-    Thank you Mart Bakhoff for this solution.
-    https://stackoverflow.com/a/9758173
-    '''
     g, x, y = extended_gcd(a, m)
     if g != 1:
         raise Exception('modular inverse does not exist')
@@ -146,11 +130,9 @@ def base64_url_decode(data):
         data = data.replace(search, replace)
     return base64.b64decode(data)
 
-
 def base64_to_a32(s):
     return str_to_a32(base64_url_decode(s))
 
-
 def base64_url_encode(data):
     data = base64.b64encode(data)
     data = makestring(data)
@@ -158,16 +140,14 @@ def base64_url_encode(data):
         data = data.replace(search, replace)
     return data
 
-
 def a32_to_base64(a):
     return base64_url_encode(a32_to_str(a))
 
-
 def get_chunks(size):
-    """
+    '''
     Given the size of a file in bytes, return tuples (chunk_start, chunk_size)
     for the purposes of downloading or uploading a file in chunks.
-    """
+    '''
     chunk_start = 0
     chunk_size = 0x20000
     while chunk_start + chunk_size < size:
@@ -178,7 +158,6 @@ def get_chunks(size):
             chunk_size += 0x20000
     yield (chunk_start, size - chunk_start)
 
-
 def make_id(length):
     possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
     text = ''.join(random.choice(possible) for i in range(length))

src/mega/errors.py

@@ -4,7 +4,6 @@ class ValidationError(Exception):
     """
     pass
 
-
 class RequestError(Exception):
     """
     Error in API request
@@ -18,7 +17,6 @@ class RequestError(Exception):
     def __str__(self):
         return self.message
 
-
 class EINTERNAL(RequestError):
     code = -1
     message = (
@@ -152,7 +150,6 @@ _CODE_TO_CLASSES = {
     -22: EAPPKEY,
 }
 
-
 def error_for_code(code):
     cls = _CODE_TO_CLASSES[code]
     return cls()

src/mega/mega.py

@@ -16,7 +16,6 @@ from Crypto.Cipher import AES
 from Crypto.PublicKey import RSA
 from Crypto.Util import Counter
 
-
 from . import crypto
 from . import errors
 
@@ -223,20 +222,25 @@ class Mega:
         (fileid, filekey).
         """
         # File urls are '#!', Folder urls are '#F!'
+        if '/file/' in url:
+            # V2 URL structure
+            url = url.replace(' ', '')
+            file_id = re.findall(r'\W\w\w\w\w\w\w\w\w\W', url)[0][1:-1]
+            id_index = re.search(file_id, url).end()
+            key = url[id_index + 1:]
+            return f'{file_id}!{key}'
+        elif '!' in url:
             match = re.findall(r'/#F?!(.*)!(.*)', url)
             if not match:
                 raise errors.ValidationError('Invalid public url. Should have /#!id!key')
-
             (public_handle, decryption_key) = match[0]
             return (public_handle, decryption_key)
 
     def _process_file(self, file):
         if file['t'] in [NODE_TYPE_FILE, NODE_TYPE_DIR]:
             keys = dict(
-                keypart.split(':', 1)
+                keypart.split(':', 1) for keypart in file['k'].split('/')
-                for keypart in file['k'].split('/')
+                if ':' in keypart)
-                if ':' in keypart
-            )
             uid = file['u']
             key = None
             # my objects
@@ -329,11 +333,8 @@ class Mega:
         for foldername in paths:
             if foldername != '':
                 for file in files.items():
-                    if (
+                    if (file[1]['a'] and file[1]['t']
-                        file[1]['a'] and
+                            and file[1]['a']['n'] == foldername):
-                        file[1]['t'] and
-                        file[1]['a']['n'] == foldername
-                    ):
                         if parent_desc == file[1]['p']:
                             parent_desc = file[0]
                             found = True
@@ -355,31 +356,25 @@ class Mega:
         parent_dir_name = path.parent.name
         for file in list(files.items()):
             parent_node_id = None
+            try:
                 if parent_dir_name:
-                parent_node_id = self.find_path_descriptor(
+                    parent_node_id = self.find_path_descriptor(parent_dir_name,
-                    parent_dir_name, files=files
+                                                               files=files)
-                )
+                    if (filename and parent_node_id and file[1]['a']
-                if (
+                            and file[1]['a']['n'] == filename
-                    filename and parent_node_id and
+                            and parent_node_id == file[1]['p']):
-                    file[1]['a'] and file[1]['a']['n'] == filename and
+                        if (exclude_deleted and self._trash_folder_node_id
-                    parent_node_id == file[1]['p']
+                                == file[1]['p']):
-                ):
-                    if (
-                        exclude_deleted and
-                        self._trash_folder_node_id == file[1]['p']
-                    ):
                             continue
                         return file
-            if (
+                elif (filename and file[1]['a']
-                filename and
+                      and file[1]['a']['n'] == filename):
-                file[1]['a'] and file[1]['a']['n'] == filename
+                    if (exclude_deleted
-            ):
+                            and self._trash_folder_node_id == file[1]['p']):
-                if (
-                    exclude_deleted and
-                    self._trash_folder_node_id == file[1]['p']
-                ):
                         continue
                     return file
+            except TypeError:
+                continue
 
     def get_files(self, public_folder_handle=None):
         logger.info('Getting all files...')
@@ -416,10 +411,8 @@ class Mega:
                 f'/#!{public_handle}!{decrypted_key}'
             )
         else:
-            raise ValueError(
+            raise ValueError('''Upload() response required as input,
-                '''Upload() response required as input,
+                            use get_link() for regular file input''')
-                            use get_link() for regular file input'''
-            )
 
     def get_link(self, file):
         """
@@ -617,24 +610,20 @@ class Mega:
         """
         Download a file by it's file object
         """
-        return self._download_file(
+        return self._download_file(file_handle=None,
-            file_handle=None,
                                    file_key=None,
                                    file=file[1],
                                    dest_path=dest_path,
                                    dest_filename=dest_filename,
-            is_public=False
+                                   is_public=False)
-        )
 
     def _export_file(self, node):
         node_data = self._node_data(node)
-        self._api_request([
+        self._api_request([{
-            {
             'a': 'l',
             'n': node_data['h'],
             'i': self.request_id
-            }
+        }])
-        ])
         return self.get_link(node)
 
     def export(self, path=None, node_id=None):
@@ -670,20 +659,23 @@ class Mega:
         )
 
         node_id = node_data['h']
-        request_body = [
+        request_body = [{
-            {
+            'a':
-                'a': 's2',
+            's2',
-                'n': node_id,
+            'n':
+            node_id,
             's': [{
                 'u': 'EXP',
                 'r': 0
             }],
-                'i': self.request_id,
+            'i':
-                'ok': ok,
+            self.request_id,
-                'ha': ha,
+            'ok':
+            ok,
+            'ha':
+            ha,
             'cr': [[node_id], [node_id], [0, 0, encrypted_node_key]]
-            }
+        }]
-        ]
         self._api_request(request_body)
         nodes = self.get_files()
         return self.get_folder_link(nodes[node_id])
@@ -701,15 +693,13 @@ class Mega:
             is_public=True,
         )
 
-    def _download_file(
+    def _download_file(self,
-        self,
                        file_handle,
                        file_key,
                        dest_path=None,
                        dest_filename=None,
                        is_public=False,
-        file=None
+                       file=None):
-    ):
         if file is None:
             if is_public:
                 file_key = crypto.base64_to_a32(file_key)
@@ -725,7 +715,6 @@ class Mega:
                     'n': file_handle
                 }
             file_data = self._api_request(request)
-
             k = crypto.interleave_xor_8(file_key)
             iv = file_key[4:6] + (0, 0)
             meta_mac = file_key[6:8]
@@ -757,15 +746,15 @@ class Mega:
         else:
             dest_path += '/'
 
-        with tempfile.NamedTemporaryFile(
+        temp_output_file = tempfile.NamedTemporaryFile(
             mode='w+b', prefix='megapy_', delete=False
-        ) as temp_output_file:
+        )
+        with temp_output_file:
             k_str = crypto.a32_to_str(k)
             counter = Counter.new(
                 128, initial_value=((iv[0] << 32) + iv[1]) << 64
             )
             aes = AES.new(k_str, AES.MODE_CTR, counter=counter)
-
             mac_str = '\0' * 16
             mac_encryptor = AES.new(k_str, AES.MODE_CBC, mac_str.encode("utf8"))
             iv_str = crypto.a32_to_str([iv[0], iv[1], iv[0], iv[1]])
@@ -797,9 +786,8 @@ class Mega:
                 )
             file_mac = crypto.str_to_a32(mac_str)
             # check mac integrity
-            if (
+            if (file_mac[0] ^ file_mac[1],
-                file_mac[0] ^ file_mac[1], file_mac[2] ^ file_mac[3]
+                    file_mac[2] ^ file_mac[3]) != meta_mac:
-            ) != meta_mac:
                 raise ValueError('Mismatched mac')
             output_path = pathlib.Path(dest_path + file_name)
             shutil.move(temp_output_file.name, output_path)
@@ -822,8 +810,7 @@ class Mega:
             ul_key = [random.randint(0, 0xFFFFFFFF) for _ in range(6)]
             k_str = crypto.a32_to_str(ul_key[:4])
             count = Counter.new(
-                128, initial_value=((ul_key[4] << 32) + ul_key[5]) << 64
+                128, initial_value=((ul_key[4] << 32) + ul_key[5]) << 64)
-            )
             aes = AES.new(k_str, AES.MODE_CTR, counter=count)
 
             upload_progress = 0
@@ -855,19 +842,17 @@ class Mega:
 
                     # encrypt file and upload
                     chunk = aes.encrypt(chunk)
-                    output_file = requests.post(
+                    output_file = requests.post(ul_url + "/" +
-                        ul_url + "/" + str(chunk_start),
+                                                str(chunk_start),
                                                 data=chunk,
-                        timeout=self.timeout
+                                                timeout=self.timeout)
-                    )
                     completion_file_handle = output_file.text
-                    logger.info(
+                    logger.info('%s of %s uploaded', upload_progress,
-                        '%s of %s uploaded', upload_progress, file_size
+                                file_size)
-                    )
             else:
-                output_file = requests.post(
+                output_file = requests.post(ul_url + "/0",
-                    ul_url + "/0", data='', timeout=self.timeout
+                                            data='',
-                )
+                                            timeout=self.timeout)
                 completion_file_handle = output_file.text
 
             logger.info('Chunks uploaded')
@@ -955,9 +940,8 @@ class Mega:
                     parent_node_id = dest
             else:
                 parent_node_id = folder_node_ids[idx - 1]
-            created_node = self._mkdir(
+            created_node = self._mkdir(name=directory_name,
-                name=directory_name, parent_node_id=parent_node_id
+                                       parent_node_id=parent_node_id)
-            )
             node_id = created_node['f'][0]['h']
             folder_node_ids[idx] = node_id
         return dict(zip(dirs, folder_node_ids.values()))
@@ -1185,9 +1169,11 @@ class Mega:
         result = {'size': size, 'name': unencrypted_attrs['n']}
         return result
 
-    def import_public_file(
+    def import_public_file(self,
-        self, file_handle, file_key, dest_node=None, dest_name=None
+                           file_handle,
-    ):
+                           file_key,
+                           dest_node=None,
+                           dest_name=None):
         """
         Import the public file into user account
         """
@@ -1202,7 +1188,6 @@ class Mega:
 
         key = crypto.base64_to_a32(file_key)
         k = crypto.interleave_xor_8(key)
-
         encrypted_key = crypto.a32_to_base64(crypto.encrypt_key(key, self.master_key))
         encrypted_name = crypto.base64_url_encode(crypto.encrypt_attr({'n': dest_name}, k))
         request = {

src/tests/test_crypto.py

@@ -3,39 +3,17 @@ import pytest
 from mega.crypto import get_chunks
 
 
-@pytest.mark.parametrize(
+@pytest.mark.parametrize('file_size, exp_result', [
-    'file_size, exp_result', [
+    (10, ((0, 10), )),
-        (
+    (1000, ((0, 1000), )),
-            10,
+    (1000000, ((0, 131072), (131072, 262144), (393216, 393216),
-            (
+               (786432, 213568))),
-                (0, 10),
+    (10000000, ((0, 131072), (131072, 262144), (393216, 393216),
-            )
-        ),
-        (
-            1000,
-            (
-                (0, 1000),
-            )
-        ),
-        (
-            1000000,
-            (
-                (0, 131072), (131072, 262144), (393216, 393216),
-                (786432, 213568)
-            )
-        ),
-        (
-            10000000,
-            (
-                (0, 131072), (131072, 262144), (393216, 393216),
                 (786432, 524288), (1310720, 655360), (1966080, 786432),
                 (2752512, 917504), (3670016, 1048576), (4718592, 1048576),
                 (5767168, 1048576), (6815744, 1048576), (7864320, 1048576),
-                (8912896, 1048576), (9961472, 38528)
+                (8912896, 1048576), (9961472, 38528))),
-            )
+])
-        ),
-    ]
-)
 def test_get_chunks(file_size, exp_result):
     result = tuple(get_chunks(file_size))
 

src/tests/test_errors.py

@@ -3,12 +3,9 @@ import pytest
 from mega.errors import RequestError, _CODE_TO_DESCRIPTIONS
 
 
-@pytest.mark.parametrize(
+@pytest.mark.parametrize('code, exp_message',
-    'code, exp_message', [
+                         [(code, f'{desc[0]}, {desc[1]}')
-        (code, f'{desc[0]}, {desc[1]}')
+                          for code, desc in _CODE_TO_DESCRIPTIONS.items()])
-        for code, desc in _CODE_TO_DESCRIPTIONS.items()
-    ]
-)
 def test_request_error(code, exp_message):
     exc = RequestError(code)
 

src/tests/test_mega.py

@@ -2,15 +2,16 @@ import random
 from pathlib import Path
 import os
 
+import requests_mock
 import pytest
 
 from mega import Mega
 
 TEST_CONTACT = 'test@mega.co.nz'
 TEST_PUBLIC_URL = (
-    'https://mega.nz/#!hYVmXKqL!r0d0-WRnFwulR_shhuEDwrY1Vo103-am1MyUy8oV6Ps'
+    'https://mega.nz/#!hYVmXKqL!r0d0-WRnFwulR_shhuEDwrY1Vo103-am1MyUy8oV6Ps')
-)
 TEST_FILE = os.path.basename(__file__)
+MODULE = 'mega.mega'
 
 
 @pytest.fixture
@@ -32,9 +33,7 @@ def mega(folder_name):
 def uploaded_file(mega, folder_name):
     folder = mega.find(folder_name)
     dest_node_id = folder[1]['h']
-    mega.upload(
+    mega.upload(__file__, dest=dest_node_id, dest_filename='test.py')
-        __file__, dest=dest_node_id, dest_filename='test.py'
-    )
     path = f'{folder_name}/test.py'
     return mega.find(path)
 
@@ -72,8 +71,8 @@ def test_get_link(mega, uploaded_file):
     assert isinstance(link, str)
 
 
+@pytest.mark.skip
 class TestExport:
-
     def test_export_folder(self, mega, folder_name):
         public_url = None
         for _ in range(2):
@@ -103,9 +102,7 @@ class TestExport:
         # Upload a single file into a folder
         folder = mega.find(folder_name)
         dest_node_id = folder[1]['h']
-        mega.upload(
+        mega.upload(__file__, dest=dest_node_id, dest_filename='test.py')
-            __file__, dest=dest_node_id, dest_filename='test.py'
-        )
         path = f'{folder_name}/test.py'
         assert mega.find(path)
 
@@ -131,8 +128,7 @@ class TestCreateFolder:
 
     def test_create_folder_with_sub_folders(self, mega, folder_name, mocker):
         folder_names_and_node_ids = mega.create_folder(
-            name=(Path(folder_name) / 'subdir' / 'anothersubdir')
+            name=(Path(folder_name) / 'subdir' / 'anothersubdir'))
-        )
 
         assert len(folder_names_and_node_ids) == 3
         assert folder_names_and_node_ids == {
@@ -143,16 +139,21 @@ class TestCreateFolder:
 
 
 class TestFind:
-
     def test_find_file(self, mega, folder_name):
         folder = mega.find(folder_name)
+        assert folder
         dest_node_id = folder[1]['h']
-        mega.upload(
+        mega.upload(__file__, dest=dest_node_id, dest_filename='test.py')
-            __file__, dest=dest_node_id, dest_filename='test.py'
+        file1 = mega.find(f'{folder_name}/test.py')
-        )
+        assert file1
-        path = f'{folder_name}/test.py'
 
-        assert mega.find(path)
+        dest_node_id2 = mega.create_folder('new_folder')['new_folder']
+        mega.upload(__file__, dest=dest_node_id2, dest_filename='test.py')
+
+        file2 = mega.find('new_folder/test.py')
+        assert file2
+        # Check that the correct test.py was found
+        assert file1 != file2
 
     def test_path_not_found_returns_none(self, mega):
         assert mega.find('not_found') is None
@@ -194,15 +195,13 @@ def test_download(mega, tmpdir, folder_name):
     # Upload a single file into a folder
     folder = mega.find(folder_name)
     dest_node_id = folder[1]['h']
-    mega.upload(
+    mega.upload(__file__, dest=dest_node_id, dest_filename='test.py')
-        __file__, dest=dest_node_id, dest_filename='test.py'
-    )
     path = f'{folder_name}/test.py'
     file = mega.find(path)
 
-    output_path = mega.download(
+    output_path = mega.download(file=file,
-        file=file, dest_path=tmpdir, dest_filename='test.py'
+                                dest_path=tmpdir,
-    )
+                                dest_filename='test.py')
 
     assert output_path.exists()
 
@@ -222,3 +221,29 @@ def test_add_contact(mega):
 def test_remove_contact(mega):
     resp = mega.remove_contact(TEST_CONTACT)
     assert isinstance(resp, int)
+
+
+@pytest.mark.parametrize('url, expected_file_id_and_key', [
+    ('https://mega.nz/#!Ue5VRSIQ!kC2E4a4JwfWWCWYNJovGFHlbz8F'
+     'N-ISsBAGPzvTjT6k',
+     'Ue5VRSIQ!kC2E4a4JwfWWCWYNJovGFHlbz8FN-ISsBAGPzvTjT6k'),
+    ('https://mega.nz/file/cH51DYDR#qH7QOfRcM-7N9riZWdSjsRq'
+     '5VDTLfIhThx1capgVA30',
+     'cH51DYDR!qH7QOfRcM-7N9riZWdSjsRq5VDTLfIhThx1capgVA30'),
+])
+def test_parse_url(url, expected_file_id_and_key, mega):
+    assert mega._parse_url(url) == expected_file_id_and_key
+
+
+@pytest.mark.skip
+class TestAPIRequest:
+    @pytest.mark.parametrize('response_text', ['-3', '-9'])
+    def test_when_api_returns_int_raises_exception(
+        self,
+        mega,
+        response_text,
+    ):
+        with requests_mock.Mocker() as m:
+            m.post(f'{mega.schema}://g.api.{mega.domain}/cs',
+                   text=response_text)
+            mega._api_request(data={})

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py{36,37,38}-normal,lint
+envlist = py{38}-normal,lint
 
 [testenv]
 commands =