Merge pull request #3 from akopkesheshyan/issue2

fixed TypeError on calling tasks API #2

Author: Akop Kesheshyan

bitrix24/__init__.py

@@ -21,7 +21,7 @@
 Copyright (c) 2019 by Akop Kesheshyan.
 """
 
-__version__ = '1.1.0'
+__version__ = '1.1.1'
 __author__ = 'Akop Kesheshyan <akop.kesheshyan@icloud.com>'
 __license__ = 'MIT'
 __copyright__ = 'Copyright 2019 Akop Kesheshyan'

bitrix24/bitrix24.py

@@ -101,5 +101,11 @@ def callMethod(self, method, **params):
             params['start'] = 0
         if 'next' in r and r['total'] > params['start']:
             params['start'] += 50
-            return r['result'] + self.callMethod(method, **params)
+            data = self.callMethod(method, **params)
+            if isinstance(r['result'], dict):
+                result = r['result'].copy()
+                result.update(data)
+            else:
+                result = r['result'] + data
+            return result
         return r['result']

setup.py

@@ -25,7 +25,7 @@
 
 setup(
     name='bitrix24-rest',
-    version='1.1.0',
+    version='1.1.1',
     install_requires=['requests'],
     packages=find_packages(),
     url='https://github.com/akopkesheshyan/bitrix24-python-rest',