cli2 4.3.1__tar.gz → 4.3.3__tar.gz

{cli2-4.3.1/cli2.egg-info → cli2-4.3.3}/PKG-INFO

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

{cli2-4.3.1 → cli2-4.3.3}/cli2/client.py

@@ -155,6 +155,8 @@ class Paginator:
             return
 
         self.pagination_initialize(data)
+        if not self.per_page:
+            self.per_page = len(self.data_items(data))
         self.initialized = True
 
     def pagination_initialize(self, data):
@@ -248,10 +250,10 @@ class Paginator:
         :param page_number: Page number to get the items from
         """
         params = self.params.copy()
-        try:
-            self.pagination_parameters(params, page_number)
-        except NotImplementedError:
-            if page_number > 1:
+        if page_number > 1:
+            try:
+                self.pagination_parameters(params, page_number)
+            except NotImplementedError:
                 raise
         for expression in self.expressions:
             if expression.parameterable:
@@ -1295,7 +1297,8 @@ class ClientCommand(Command):
 
     async def post_call(self):
         """ Call :py:meth:`Client.post_call`. """
-        await self.client.post_call(self)
+        if self.client:
+            await self.client.post_call(self)
 
 
 class Client(metaclass=ClientMetaclass):

{cli2-4.3.1 → cli2-4.3.3/cli2.egg-info}/PKG-INFO

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

{cli2-4.3.1 → cli2-4.3.3}/setup.py

@@ -44,7 +44,7 @@ from setuptools import setup
 
 setup(
     name='cli2',
-    version='4.3.1',
+    version='4.3.3',
     setup_requires='setupmeta',
     packages=['cli2'],
     install_requires=[

{cli2-4.3.1 → cli2-4.3.3}/tests/test_client.py

@@ -514,12 +514,11 @@ async def test_pagination_patterns(httpx_mock, client_class):
                 self.total_items = data['total']
 
             def pagination_parameters(self, params, page_number):
-                self.per_page = 1
                 params['offset'] = (page_number - 1) * self.per_page
                 params['limit'] = self.per_page
 
     httpx_mock.add_response(
-        url='http://lol/off?offset=0&limit=1',
+        url='http://lol/off',
         json=dict(total=2, items=[dict(a=1)]),
     )
 
@@ -1200,3 +1199,7 @@ def test_client_command(client_class, httpx_mock):
     cmd = Client.cli['model']['get']
     cmd()
     assert not Client.post_call_called
+
+    cmd = Client.cli['request']
+    cmd()
+    assert not Client.post_call_called