cli2 4.3.3__tar.gz → 5.0.0rc2__tar.gz

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

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

{cli2-4.3.3 → cli2-5.0.0rc2}/cli2/__init__.py

@@ -13,31 +13,6 @@ from .asyncio import async_resolve, async_run
 from .colors import colors as c
 
 from .configuration import Configuration, cfg
-try:
-    from .client import (
-        ClientError,
-        ResponseError,
-        TokenGetError,
-        RefusedResponseError,
-        RetriesExceededError,
-        FieldError,
-        FieldValueError,
-        FieldExternalizeError,
-        Client,
-        ClientCommand,
-        DateTimeField,
-        Field,
-        Handler,
-        JSONStringField,
-        Model,
-        ModelCommand,
-        Paginator,
-        Related,
-    )
-except ImportError:
-    raise
-    # httpx not installed
-    pass
 from .display import diff, diff_data, render, print, highlight, yaml_highlight
 from .lock import Lock
 from .log import configure, log

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

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

{cli2-4.3.3 → cli2-5.0.0rc2}/cli2.egg-info/SOURCES.txt

@@ -6,7 +6,6 @@ cli2/__init__.py
 cli2/asyncio.py
 cli2/cli.py
 cli2/cli2.py
-cli2/client.py
 cli2/colors.py
 cli2/configuration.py
 cli2/decorators.py
@@ -24,12 +23,7 @@ cli2.egg-info/dependency_links.txt
 cli2.egg-info/entry_points.txt
 cli2.egg-info/requires.txt
 cli2.egg-info/top_level.txt
-cli2/ansible/__init__.py
-cli2/ansible/action.py
-cli2/ansible/playbook.py
-cli2/ansible/variables.py
 cli2/examples/__init__.py
-cli2/examples/client.py
 cli2/examples/conf.py
 cli2/examples/example.py
 cli2/examples/example_obj.py

{cli2-4.3.3 → cli2-5.0.0rc2}/setup.py

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

{cli2-4.3.3 → cli2-5.0.0rc2}/tests/test_ansible.py

@@ -1,14 +1,15 @@
 import cli2
+import cclient
 import httpx
 import mock
 import pytest
 import textwrap
 import yaml
 
-from cli2 import ansible
+import cansible
 
 
-class ActionModule(ansible.ActionBase):
+class ActionModule(cansible.ActionBase):
     mask_keys = ['a']
 
     async def run_async(self):
@@ -31,10 +32,10 @@ async def test_mask(monkeypatch):
 
 @pytest.mark.asyncio
 async def test_response_error(httpx_mock):
-    class Client(cli2.Client):
+    class Client(cclient.Client):
         mask_keys = ['secret']
 
-    class Action(ansible.ActionBase):
+    class Action(cansible.ActionBase):
         async def client_factory(self):
             return Client(base_url='http://foo')
 
@@ -59,9 +60,9 @@ async def test_response_error(httpx_mock):
 
 @pytest.mark.asyncio
 async def test_option():
-    class Action(ansible.ActionBase):
-        fact = ansible.Option(fact='fact', default='default fact')
-        arg = ansible.Option(arg='arg', fact='arg_fact')
+    class Action(cansible.ActionBase):
+        fact = cansible.Option(fact='fact', default='default fact')
+        arg = cansible.Option(arg='arg', fact='arg_fact')
 
         async def run_async(self):
             self.result['arg'] = self.arg
@@ -90,8 +91,8 @@ async def test_option():
         error="Missing arg `arg` or fact `arg_fact`",
     )
 
-    class Action(ansible.ActionBase):
-        name = ansible.Option('name')
+    class Action(cansible.ActionBase):
+        name = cansible.Option('name')
 
         async def run_async(self):
             self.result['name'] = self.name
@@ -108,8 +109,8 @@ async def test_diff(monkeypatch):
     _print = mock.Mock()
     monkeypatch.setattr(cli2.display, '_print', _print)
 
-    class Action(ansible.ActionBase):
-        name = ansible.Option('name', 'object_name', 'Test object')
+    class Action(cansible.ActionBase):
+        name = cansible.Option('name', 'object_name', 'Test object')
 
         async def run_async(self):
             self.before_set(dict(foo=1))

{cli2-4.3.3 → cli2-5.0.0rc2}/tests/test_ansible_variables.py

@@ -1,10 +1,10 @@
-from cli2 import ansible
+import cansible
 import pytest
 import os
 
 
 def test_story():
-    variables = ansible.Variables(
+    variables = cansible.Variables(
         root_path=os.path.dirname(__file__),
         pass_path=os.path.dirname(__file__) + '/vault_pass',
     )
@@ -14,7 +14,7 @@ def test_story():
 
 
 def test_exceptions():
-    variables = ansible.Variables()
+    variables = cansible.Variables()
     with pytest.raises(Exception) as exc:
         variables['variables.yml']
     assert exc.value.args == (
@@ -25,12 +25,12 @@ def test_exceptions():
         variables['/variables_vault.yml']
     assert exc.value.args == ('/variables_vault.yml does not exist',)
 
-    variables = ansible.Variables(root_path=os.path.dirname(__file__))
+    variables = cansible.Variables(root_path=os.path.dirname(__file__))
     with pytest.raises(Exception) as exc:
         variables['variables_vault.yml']
     assert exc.value.args == ('Vault password required in pass_path',)
 
-    variables = ansible.Variables(
+    variables = cansible.Variables(
         root_path=os.path.dirname(__file__),
         pass_path='/does/not/exist',
     )

{cli2-4.3.3 → cli2-5.0.0rc2}/tests/test_cli.py

@@ -47,7 +47,7 @@ def test_cli(name, command):
 
 
 def test_hide():
-    autotest('tests/test_hide.txt', 'cli2-example-client object find --help')
+    autotest('tests/test_hide.txt', 'cli2-client-example object find --help')
 
 
 def test_load_module():

{cli2-4.3.3 → cli2-5.0.0rc2}/tests/test_client.py

@@ -1,6 +1,6 @@
 from datetime import datetime
 import cli2
-import cli2.client
+import cclient
 import httpx
 import inspect
 import mock
@@ -11,7 +11,7 @@ async def _response(**kwargs):
     return httpx.Response(**kwargs)
 
 
-class HandlerSentinel(cli2.Handler):
+class HandlerSentinel(cclient.Handler):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.calls = []
@@ -23,9 +23,9 @@ class HandlerSentinel(cli2.Handler):
 
 @pytest.fixture
 def client_class():
-    class TestClient(cli2.Client):
+    class TestClient(cclient.Client):
         """ doc """
-        class Paginator(cli2.Paginator):
+        class Paginator(cclient.Paginator):
             def pagination_parameters(self, params, page_number):
                 if page_number > 1:
                     params['page'] = page_number
@@ -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):
@@ -110,7 +118,7 @@ async def test_client_cli_override(client_class, httpx_mock):
 
 
 def test_client_model(client_class):
-    assert issubclass(client_class.Model, cli2.Model)
+    assert issubclass(client_class.Model, cclient.Model)
     assert client_class.Model._client_class == client_class
 
     class TestModel(client_class.Model):
@@ -144,27 +152,27 @@ async def test_async_factory(httpx_mock, client_class):
 
 @pytest.mark.asyncio
 async def test_client_cli_side_effect(client_class, httpx_mock):
-    from cli2.examples import client as example_client
+    from cclient import example
 
     # test that this didn't spill over client_class
     test_client_cli(client_class, httpx_mock)
 
     # Test that Client's __init_subclass__ did setup a factory for self
     assert isinstance(
-        await example_client.APIClient.cli['get']['self'].factory_value(),
-        example_client.APIClient,
+        await example.APIClient.cli['get']['self'].factory_value(),
+        example.APIClient,
     )
 
     # Test that Model's __init_subclass__ did setup a factory for cls
     httpx_mock.add_response(url='http://localhost:8000/1', json=[1])
-    result = await example_client.cli['get'].async_call('/1')
+    result = await example.cli['get'].async_call('/1')
     assert result.json() == [1]
 
     httpx_mock.add_response(
         url='http://localhost:8000/objects/1/',
         json=dict(id=1, a=2),
     )
-    result = await example_client.cli['object']['get'].async_call('id=1')
+    result = await example.cli['object']['get'].async_call('id=1')
     assert result.id == 1
     assert result.data['a'] == 2
 
@@ -253,7 +261,7 @@ async def test_handler(client_class):
     client = client_class()
     client.client_reset = mock.AsyncMock()
     client.token_reset = mock.AsyncMock()
-    handler = cli2.Handler(accepts=[201], refuses=[218], retokens=[418])
+    handler = cclient.Handler(accepts=[201], refuses=[218], retokens=[418])
 
     response = httpx.Response(status_code=201)
     result = await handler(client, response, 0, log)
@@ -268,7 +276,7 @@ async def test_handler(client_class):
 
     response = httpx.Response(status_code=200, content='[2]')
     response.request = httpx.Request('POST', '/', json=[1])
-    with pytest.raises(cli2.RetriesExceededError) as exc:
+    with pytest.raises(cclient.RetriesExceededError) as exc:
         await handler(client, response, handler.tries + 1, log)
     log.info.assert_called_once_with(
         'retry', status_code=200, tries=0, sleep=.0
@@ -279,7 +287,7 @@ async def test_handler(client_class):
 
     response = httpx.Response(status_code=200)
     response.request = httpx.Request('GET', '/')
-    with pytest.raises(cli2.RetriesExceededError) as exc:
+    with pytest.raises(cclient.RetriesExceededError) as exc:
         await handler(client, response, handler.tries + 1, log)
 
     msg = 'Unacceptable response <Response [200 OK]> after 31 tries\n\x1b[0m\x1b[1mGET /\x1b[0m\n\x1b[1mHTTP 200\x1b[0m'  # noqa
@@ -287,7 +295,7 @@ async def test_handler(client_class):
 
     response = httpx.Response(status_code=218)
     response.request = httpx.Request('POST', '/')
-    with pytest.raises(cli2.RefusedResponseError) as exc:
+    with pytest.raises(cclient.RefusedResponseError) as exc:
         await handler(client, response, 1, log)
 
     assert exc.value.response
@@ -298,7 +306,7 @@ async def test_handler(client_class):
 
     response = httpx.Response(status_code=418)
     response.request = httpx.Request('POST', '/')
-    with pytest.raises(cli2.TokenGetError):
+    with pytest.raises(cclient.TokenGetError):
         await handler(client, response, 1, log)
 
     assert not client.client_reset.await_count
@@ -329,7 +337,7 @@ async def test_handler(client_class):
     assert not result
     assert client.token_reset.await_count == 1
 
-    handler = cli2.Handler(accepts=[], refuses=[222])
+    handler = cclient.Handler(accepts=[], refuses=[222])
 
     response = httpx.Response(status_code=123)
     result = await handler(client, response, 0, log)
@@ -468,7 +476,7 @@ async def test_pagination_model(httpx_mock, client_class):
 
 
 def test_paginator_fields(client_class):
-    paginator = cli2.Paginator(client_class(), '/')
+    paginator = cclient.Paginator(client_class(), '/')
     paginator.total_items = 95
     paginator.per_page = 10
     assert paginator.total_pages == 10
@@ -509,7 +517,7 @@ async def test_pagination_patterns(httpx_mock, client_class):
     class Offset(client_class.Model):
         url_list = '/off'
 
-        class Paginator(cli2.Paginator):
+        class Paginator(cclient.Paginator):
             def pagination_initialize(self, data):
                 self.total_items = data['total']
 
@@ -576,9 +584,9 @@ async def test_pagination_reverse(httpx_mock, client_class):
 
 def test_descriptor(client_class):
     class Model(client_class.Model):
-        id = cli2.Field()
-        bar = cli2.Field('nested/bar')
-        foo = cli2.Field('undeclared/foo')
+        id = cclient.Field()
+        bar = cclient.Field('nested/bar')
+        foo = cclient.Field('undeclared/foo')
 
     model = Model(data=dict(id=1, nested=dict(bar=2)))
     assert model.data['id'] == 1
@@ -613,7 +621,7 @@ def test_descriptor(client_class):
 
 def test_jsonstring(client_class):
     class Model(client_class.Model):
-        json = cli2.JSONStringField()
+        json = cclient.JSONStringField()
 
     client = client_class()
     model = client.Model(data=dict(json='{"foo": 1}'))
@@ -633,7 +641,7 @@ def test_jsonstring(client_class):
 
 def test_datetime(client_class):
     class Model(client_class.Model):
-        dt = cli2.DateTimeField()
+        dt = cclient.DateTimeField()
 
     model = Model(dict(dt='2020-11-12T01:02:03'))
     assert model.dt == datetime(2020, 11, 12, 1, 2, 3)
@@ -643,10 +651,10 @@ def test_datetime(client_class):
 
 def test_model_inheritance(client_class):
     class Model(client_class.Model):
-        foo = cli2.Field()
+        foo = cclient.Field()
 
     class Model2(Model):
-        bar = cli2.Field()
+        bar = cclient.Field()
 
     client = client_class()
     assert [*client.Model._fields.keys()] == ['foo']
@@ -655,10 +663,10 @@ def test_model_inheritance(client_class):
 
 def test_relation_simple(client_class):
     class Child(client_class.Model):
-        foo = cli2.Field()
+        foo = cclient.Field()
 
     class Father(client_class.Model):
-        child = cli2.Related('Child')
+        child = cclient.Related('Child')
 
     client = client_class()
     model = client.Father(dict(child=dict(foo=1)))
@@ -677,10 +685,10 @@ def test_relation_simple(client_class):
 
 def test_relation_many(client_class):
     class Child(client_class.Model):
-        foo = cli2.Field()
+        foo = cclient.Field()
 
     class Father(client_class.Model):
-        children = cli2.Related('Child', many=True)
+        children = cclient.Related('Child', many=True)
 
     client = client_class()
     model = client.Father(dict(children=[dict(foo=1)]))
@@ -706,8 +714,8 @@ async def test_python_expression(httpx_mock, client_class):
 
     class Model(client_class.Model):
         url_list = '/foo'
-        a = cli2.Field()
-        b = cli2.Field()
+        a = cclient.Field()
+        b = cclient.Field()
         paginator = Paginator
 
     def mock():
@@ -758,8 +766,8 @@ async def test_python_expression(httpx_mock, client_class):
 async def test_expression_parameter(httpx_mock, client_class):
     class Model(client_class.Model):
         url_list = '/foo'
-        a = cli2.Field()
-        b = cli2.Field(parameter='b')
+        a = cclient.Field()
+        b = cclient.Field(parameter='b')
 
     httpx_mock.add_response(url='http://lol/foo?b=1', json=dict(
         items=[dict(a=1, b=1), dict(a=3, b=1)],
@@ -788,7 +796,7 @@ async def test_model_crud(httpx_mock, client_class):
 @pytest.mark.asyncio
 async def test_client_cli2(httpx_mock, client_class):
     class Foo(client_class.Model):
-        id = cli2.Field()
+        id = cclient.Field()
         url_list = '/foo'
 
     assert client_class.cli.name == 'test'
@@ -829,14 +837,14 @@ async def test_object_command(httpx_mock, client_class):
 ))
 def test_datetime_fmts(intern, extern, client_class):
     class DtModel(client_class.Model):
-        dt = cli2.DateTimeField()
+        dt = cclient.DateTimeField()
     model = client_class().DtModel(dict(dt=intern))
     assert model.dt == extern
 
 
 def test_datetime_fmt(client_class):
     class DtModel(client_class.Model):
-        dt = cli2.DateTimeField(fmt='%d/%m/%Y %H:%M:%S')
+        dt = cclient.DateTimeField(fmt='%d/%m/%Y %H:%M:%S')
     model = client_class().DtModel(dict(dt='13/02/2025 12:34:56'))
     assert model.dt == datetime(2025, 2, 13, 12, 34, 56)
 
@@ -846,15 +854,15 @@ def test_datetime_fmt(client_class):
 
 def test_datetime_error(client_class):
     class DtModel(client_class.Model):
-        dt = cli2.DateTimeField()
+        dt = cclient.DateTimeField()
     model = client_class().DtModel(dict(dt='13/024:56'))
-    with pytest.raises(cli2.client.FieldExternalizeError):
+    with pytest.raises(cclient.FieldExternalizeError):
         model.dt
 
 
 def test_datetime_default_fmt(client_class):
     class DtModel(client_class.Model):
-        dt = cli2.DateTimeField()
+        dt = cclient.DateTimeField()
     model = client_class().DtModel()
     model.dt = datetime(2025, 2, 13, 16, 9, 30)
     assert model.data['dt'] == '2025-02-13T16:09:30.000000'
@@ -866,11 +874,11 @@ def test_datetime_default_fmt(client_class):
 
 @pytest.mark.asyncio
 async def test_mask_recursive(client_class, monkeypatch):
-    client = client_class(mask=cli2.Mask(['scrt', 'password']))
+    client = client_class(mask=cclient.Mask(['scrt', 'password']))
     client.client.send = mock.AsyncMock()
 
     log = mock.Mock()
-    monkeypatch.setattr(cli2.client, 'log', log)
+    monkeypatch.setattr(cclient, 'log', log)
     response = httpx.Response(
         status_code=200,
         content='{"pub": 1, "foo": [{"scrt": "pass"}]}',
@@ -900,11 +908,11 @@ async def test_mask_recursive(client_class, monkeypatch):
     'key', ('json', 'data'),
 )
 async def test_mask_logs(client_class, key, monkeypatch):
-    client = client_class(mask=cli2.Mask(['scrt', 'password']))
+    client = client_class(mask=cclient.Mask(['scrt', 'password']))
     client.client.send = mock.AsyncMock()
 
     log = mock.Mock()
-    monkeypatch.setattr(cli2.client, 'log', log)
+    monkeypatch.setattr(cclient, 'log', log)
     response = httpx.Response(
         status_code=200,
         content='{"pub": 1, "scrt": "pass"}',
@@ -940,26 +948,26 @@ async def test_mask_exceptions(client_class):
     response.request = httpx.Request('POST', '/', json=dict(a=1, b=2))
     client.mask.keys.add('a')
     client.mask.keys.add('c')
-    error = cli2.ResponseError(client, response, 1)
+    error = cclient.ResponseError(client, response, 1)
     expected = "\n\x1b[0m\x1b[1mPOST /\x1b[0m\n\x1b[94ma\x1b[39;49;00m:\x1b[37m \x1b[39;49;00m\x1b[33m'\x1b[39;49;00m\x1b[33m***MASKED***\x1b[39;49;00m\x1b[33m'\x1b[39;49;00m\x1b[37m\x1b[39;49;00m\n\x1b[94mb\x1b[39;49;00m:\x1b[37m \x1b[39;49;00m2\x1b[37m\x1b[39;49;00m\n\n\x1b[1mHTTP 218\x1b[0m\n\x1b[94mc\x1b[39;49;00m:\x1b[37m \x1b[39;49;00m\x1b[33m'\x1b[39;49;00m\x1b[33m***MASKED***\x1b[39;49;00m\x1b[33m'\x1b[39;49;00m\x1b[37m\x1b[39;49;00m\n\x1b[94md\x1b[39;49;00m:\x1b[37m \x1b[39;49;00m4\x1b[37m\x1b[39;49;00m\n"  # noqa
     assert str(error) == expected
 
     # this needs to work with form data too
     response = httpx.Response(status_code=218, content='{"c": 3, "d": 4}')
     response.request = httpx.Request('POST', '/', data=dict(a=1, b=2))
-    client.mask = cli2.Mask(['a', 'c'])
-    error = cli2.ResponseError(client, response, 1)
+    client.mask = cclient.Mask(['a', 'c'])
+    error = cclient.ResponseError(client, response, 1)
     expected = "\n\x1b[0m\x1b[1mPOST /\x1b[0m\n\x1b[94ma\x1b[39;49;00m:\x1b[37m \x1b[39;49;00m\x1b[33m'\x1b[39;49;00m\x1b[33m***MASKED***\x1b[39;49;00m\x1b[33m'\x1b[39;49;00m\x1b[37m\x1b[39;49;00m\n\x1b[94mb\x1b[39;49;00m:\x1b[37m \x1b[39;49;00m\x1b[33m'\x1b[39;49;00m\x1b[33m2\x1b[39;49;00m\x1b[33m'\x1b[39;49;00m\x1b[37m\x1b[39;49;00m\n\n\x1b[1mHTTP 218\x1b[0m\n\x1b[94mc\x1b[39;49;00m:\x1b[37m \x1b[39;49;00m\x1b[33m'\x1b[39;49;00m\x1b[33m***MASKED***\x1b[39;49;00m\x1b[33m'\x1b[39;49;00m\x1b[37m\x1b[39;49;00m\n\x1b[94md\x1b[39;49;00m:\x1b[37m \x1b[39;49;00m4\x1b[37m\x1b[39;49;00m\n"  # noqa
     assert str(error) == expected
 
 
 @pytest.mark.asyncio
 async def test_request_mask(client_class, monkeypatch):
-    client = client_class(mask=cli2.Mask(['password']))
+    client = client_class(mask=cclient.Mask(['password']))
     client.client.send = mock.AsyncMock()
 
     log = mock.Mock()
-    monkeypatch.setattr(cli2.client, 'log', log)
+    monkeypatch.setattr(cclient, 'log', log)
     response = httpx.Response(
         status_code=200,
         content='{"pub": 1, "scrt": "pass"}',
@@ -990,7 +998,7 @@ async def test_log_content(client_class, monkeypatch):
     client = client_class()
     client.client.send = mock.AsyncMock()
     log = mock.Mock()
-    monkeypatch.setattr(cli2.client, 'log', log)
+    monkeypatch.setattr(cclient, 'log', log)
     response = httpx.Response(status_code=200, content='lol:]bar')
     response.request = httpx.Request('POST', '/')
     client.client.send.return_value = response
@@ -1011,7 +1019,7 @@ async def test_log_quiet(client_class, monkeypatch):
     client = client_class()
     client.client.send = mock.AsyncMock()
     log = mock.Mock()
-    monkeypatch.setattr(cli2.client, 'log', log)
+    monkeypatch.setattr(cclient, 'log', log)
     response = httpx.Response(status_code=200, content='[1]')
     response.request = httpx.Request('GET', '/')
     client.client.send.return_value = response
@@ -1039,8 +1047,8 @@ def test_class_override(client_class):
 @pytest.mark.asyncio
 async def test_save(client_class, httpx_mock):
     class TestModel(client_class.Model):
-        id = cli2.Field()
-        foo = cli2.Field()
+        id = cclient.Field()
+        foo = cclient.Field()
 
     client = client_class()
     model = client.TestModel(id=1, foo='bar')
@@ -1073,22 +1081,22 @@ async def test_save(client_class, httpx_mock):
 
 def test_id_value(client_class):
     class TestModel(client_class.Model):
-        id = cli2.Field()
+        id = cclient.Field()
     assert client_class().TestModel(id=1).id_value == 1
 
     class TestModel2(client_class.Model):
-        bar = cli2.Field()
+        bar = cclient.Field()
         id_field = 'bar'
     assert client_class().TestModel2(bar=1).id_value == 1
 
 
 @pytest.mark.asyncio
 async def test_debug(client_class, monkeypatch):
-    client = client_class(mask=cli2.Mask(['scrt', 'password']), debug=True)
+    client = client_class(mask=cclient.Mask(['scrt', 'password']), debug=True)
     client.client.send = mock.AsyncMock()
 
     log = mock.Mock()
-    monkeypatch.setattr(cli2.client, 'log', log)
+    monkeypatch.setattr(cclient, 'log', log)
 
     response = httpx.Response(
         status_code=200,

cli2-4.3.3/cli2/ansible/__init__.py

@@ -1,16 +0,0 @@
-# flake8: noqa
-"""
-Wrapping all imports in a try/except because pytest always tries to import
-this even when we're using cli2 without ansible
-"""
-try:
-    from .action import (
-        ansi_escape,
-        Option,
-        AnsibleError,
-        AnsibleOptionError,
-        ActionBase,
-    )
-    from .variables import Variables
-except ImportError:
-    pass