cli2 4.3.2__tar.gz → 4.3.4__tar.gz

{cli2-4.3.2/cli2.egg-info → cli2-4.3.4}/PKG-INFO

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

{cli2-4.3.2 → cli2-4.3.4}/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:
@@ -1285,13 +1287,15 @@ class ClientCommand(Command):
         :py:meth:`Client.setargs`.
         """
         super().setargs()
-        self['self'].factory = self.client_class.factory
+        if 'self' in self:
+            self['self'].factory = self.client_class.factory
         self.client_class.setargs(self)
 
     async def factories_resolve(self):
         """ Set :py:attr:`client` after resolving factories. """
         await super().factories_resolve()
-        self.client = self['self'].value
+        if 'self' in self:
+            self.client = self['self'].value
 
     async def post_call(self):
         """ Call :py:meth:`Client.post_call`. """

{cli2-4.3.2 → cli2-4.3.4/cli2.egg-info}/PKG-INFO

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

{cli2-4.3.2 → cli2-4.3.4}/setup.py

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

{cli2-4.3.2 → cli2-4.3.4}/tests/test_client.py

@@ -76,6 +76,14 @@ async def test_client_cli(client_class, httpx_mock):
     assert list(client_class.cli['testmodel3'].keys()) == ['help', 'find']
 
 
+def test_client_cli_func(client_class):
+    # test adding a normal function
+    @client_class.cli.cmd
+    def foo(test):
+        pass
+    client_class.cli['foo']('bar')
+
+
 @pytest.mark.asyncio
 async def test_client_cli_override(client_class, httpx_mock):
     class Client(client_class):
@@ -514,12 +522,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)]),
     )