cli2 3.3.44__tar.gz → 3.3.46__tar.gz

{cli2-3.3.44/cli2.egg-info → cli2-3.3.46}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cli2
-Version: 3.3.44
+Version: 3.3.46
 Summary: image:: https://yourlabs.io/oss/cli2/badges/master/pipeline.svg
 Home-page: https://yourlabs.io/oss/cli2
 Author: James Pic

{cli2-3.3.44 → cli2-3.3.46}/cli2/client.py

@@ -168,7 +168,7 @@ class Paginator:
         :param data: Data of the first response
         """
 
-    def pagination_parameters(self, page_number):
+    def pagination_parameters(self, params, page_number):
         """
         Return GET parameters for a given page.
 
@@ -180,12 +180,15 @@ class Paginator:
 
         .. code-block:: python
 
-            def pagination_parameters(self, page_number):
+            def pagination_parameters(self, params, page_number):
                 # this is the default implementation
-                return dict(page=page_number)
+                params['page'] = page_number
+
+        :param params: Dict of base GET parameters
+        :param page_number: Page number to get
         """
         if page_number > 1:
-            return dict(page=page_number)
+            params['page'] = page_number
 
     def response_items(self, response):
         """
@@ -228,10 +231,7 @@ class Paginator:
 
         :param page_number: Page number to get the items from
         """
-        try:
-            return self.response_items(await self.page_response(page_number))
-        except NotImplementedError:
-            return []
+        return self.response_items(await self.page_response(page_number))
 
     async def page_response(self, page_number):
         """
@@ -240,13 +240,7 @@ class Paginator:
         :param page_number: Page number to get the items from
         """
         params = self.params.copy()
-        pagination_parameters = self.pagination_parameters(page_number)
-        if pagination_parameters:
-            params.update(pagination_parameters)
-        elif page_number != 1:
-            raise NotImplementedError(
-                'pagination_parameters returned None, cannot paginate',
-            )
+        self.pagination_parameters(params, page_number)
         for expression in self.expressions:
             if expression.parameterable:
                 expression.params(params)
@@ -533,6 +527,8 @@ class JSONStringField(MutableField):
         return json.dumps(data, **self.options)
 
     def externalize(self, obj, value):
+        if value == '':
+            return value
         return json.loads(value)
 
 

{cli2-3.3.44 → cli2-3.3.46}/cli2/test_client.py

@@ -162,9 +162,6 @@ class Client(cli2.Client):
         kwargs.setdefault('base_url', 'http://lol')
         super().__init__(*args, **kwargs)
 
-    def pagination_parameters(self, paginator, page_number):
-        return dict(page=page_number)
-
 
 raised = False
 
@@ -499,12 +496,10 @@ async def test_pagination_patterns(httpx_mock):
         def pagination_initialize(self, data):
             self.total_items = data['total']
 
-        def pagination_parameters(self, page_number):
+        def pagination_parameters(self, params, page_number):
             self.per_page = 1
-            return dict(
-                offset=(page_number - 1) * paginator.per_page,
-                limit=paginator.per_page,
-            )
+            params['offset'] = (page_number - 1) * self.per_page
+            params['limit'] = self.per_page
 
     class Offset(Client.Model):
         url_list = '/off'
@@ -532,7 +527,9 @@ async def test_pagination_patterns(httpx_mock):
     await paginator.initialize()
     assert paginator.total_pages == 2
     assert paginator.per_page == 1
-    assert paginator.pagination_parameters(2) == dict(offset=1, limit=1)
+    params = dict()
+    paginator.pagination_parameters(params, 2)
+    assert params == dict(offset=1, limit=1)
 
 
 @pytest.mark.asyncio
@@ -612,6 +609,9 @@ def test_jsonstring():
     model.json = dict(a=1)
     assert model.data['json'] == '{"a": 1}'
 
+    model = client.Model(data=dict(json=''))
+    assert model.json == ''
+
 
 def test_datetime():
     class Model(Client.Model):

{cli2-3.3.44 → cli2-3.3.46/cli2.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cli2
-Version: 3.3.44
+Version: 3.3.46
 Summary: image:: https://yourlabs.io/oss/cli2/badges/master/pipeline.svg
 Home-page: https://yourlabs.io/oss/cli2
 Author: James Pic

{cli2-3.3.44 → cli2-3.3.46}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup
 
 setup(
     name='cli2',
-    version='3.3.44',
+    version='3.3.46',
     setup_requires='setupmeta',
     install_requires=[
         'docstring_parser',