diff --git a/messages/_config.py b/messages/_config.py index c45fb8f..0f323cd 100644 --- a/messages/_config.py +++ b/messages/_config.py @@ -127,10 +127,7 @@ def retrieve_pwd_from_config(msg, cfg): msg_type = msg.__class__.__name__.lower() key_fmt = msg.profile + "_" + msg_type pwd = cfg.pwd[key_fmt].split(" :: ") - if len(pwd) == 1: - msg.auth = pwd[0] - else: - msg.auth = tuple(pwd) + msg.auth = pwd[0] if len(pwd) == 1 else tuple(pwd) def update_config_data(msg, cfg): @@ -227,9 +224,7 @@ def get_data_from_user(msg_type): def get_auth_from_user(msg_type): """Get the required 'auth' from the user and return as a dict.""" - auth = [] - for k, v in CONFIG[msg_type]["auth"].items(): - auth.append((k, getpass(v + ": "))) + auth = [(k, getpass(v + ": ")) for k, v in CONFIG[msg_type]["auth"].items()] return OrderedDict(auth) @@ -277,11 +272,5 @@ def write_auth(msg_type, profile_name, auth, cfg): :cfg: (jsonconfig.Config) config instance. """ key_fmt = profile_name + "_" + msg_type - pwd = [] - for k, v in CONFIG[msg_type]["auth"].items(): - pwd.append(auth[k]) - - if len(pwd) > 1: - cfg.pwd[key_fmt] = " :: ".join(pwd) - else: - cfg.pwd[key_fmt] = pwd[0] + pwd = [auth[k] for k, v in CONFIG[msg_type]["auth"].items()] + cfg.pwd[key_fmt] = " :: ".join(pwd) if len(pwd) > 1 else pwd[0] diff --git a/messages/telegram.py b/messages/telegram.py index 3294e24..dcfb643 100644 --- a/messages/telegram.py +++ b/messages/telegram.py @@ -154,10 +154,10 @@ def _send_content(self, method="/sendMessage"): raise MessageSendError(e) if self.verbose: - if method == "/sendMessage": - content_type = "Message body" - elif method == "/sendDocument": + if method == "/sendDocument": content_type = "Attachment: " + self.message["document"] + elif method == "/sendMessage": + content_type = "Message body" print(timestamp(), content_type, "sent.") def send(self): diff --git a/tests/integration_tests/int_setup.py b/tests/integration_tests/int_setup.py index fb80767..8706f2a 100644 --- a/tests/integration_tests/int_setup.py +++ b/tests/integration_tests/int_setup.py @@ -9,5 +9,7 @@ def integration_test_configured(msgtype): """ with jsonconfig.Config('messages') as cfg: data = cfg.data - return ('integration_tester' in cfg.data.keys() - and msgtype in data['integration_tester']) + return ( + 'integration_tester' in data.keys() + and msgtype in data['integration_tester'] + ) diff --git a/tests/test_api.py b/tests/test_api.py index bb31aa9..a24dc46 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -87,10 +87,10 @@ def test_send_raisesMessSendErr(mocker): WHEN a message encounters a send() error THEN assert SystemExit is raised """ - kwargs = email_kwargs fact_mock = mocker.patch.object(messages.api, 'message_factory') fact_mock.return_value.send.side_effect = MessageSendError('login fail') with pytest.raises(SystemExit): + kwargs = email_kwargs send('email', **kwargs) @@ -123,8 +123,8 @@ def test_message_factory_keyerror(cfg_mock): WHEN message_factory is called with an unsupported message type THEN assert UnsupportedMessageTypeError is raised """ - kwargs = email_kwargs with pytest.raises(UnsupportedMessageTypeError): + kwargs = email_kwargs msg = message_factory('bad', **kwargs) diff --git a/tests/test_cli.py b/tests/test_cli.py index 5f32008..50f22b9 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -79,7 +79,7 @@ def test_get_body_from_file_travis(mocker): kwds = {'file': 'file.txt'} get_body_from_file(kwds) assert kwds['file'] is None - assert 'body' in kwds.keys() + assert 'body' in kwds ############################################################################## diff --git a/tests/test_exceptions.py b/tests/test_exceptions.py index 793e021..5441a9f 100644 --- a/tests/test_exceptions.py +++ b/tests/test_exceptions.py @@ -16,12 +16,6 @@ def test_InvalidMessageInputError(capsys): """ with pytest.raises(InvalidMessageInputError): raise InvalidMessageInputError('Email', 'from_', 'some_value', 'email address') - out, err = capsys.readouterr() - assert 'Invalid input for specified message class: Email' in out - assert '* argument: "from_"' in out - assert '* value given: some_value' - assert '* input type must be: email address' in out - assert err == '' def test_UnsupportedMessageTypeError_default(capsys): @@ -32,9 +26,6 @@ def test_UnsupportedMessageTypeError_default(capsys): """ with pytest.raises(UnsupportedMessageTypeError): raise UnsupportedMessageTypeError('BadType') - out, err = capsys.readouterr() - assert 'Invalid input for specified message class: BadType' in out - assert err == '' def test_UnsupportedMessageTypeError_listarg(capsys): @@ -45,11 +36,6 @@ def test_UnsupportedMessageTypeError_listarg(capsys): """ with pytest.raises(UnsupportedMessageTypeError): raise UnsupportedMessageTypeError('BadType', {'m1', 'm2'}) - out, err = capsys.readouterr() - assert 'Invalid input for specified message class: BadType' in out - assert '* Supported message types:' in out - assert "{'m1', 'm2'}" in out - assert err == '' def test_UnknownProfileError(capsys): @@ -60,9 +46,6 @@ def test_UnknownProfileError(capsys): """ with pytest.raises(UnknownProfileError): raise UnknownProfileError('unknown_user') - out, err = capsys.readouterr() - assert 'Unknown Profile name: unknown_user' in out - assert err == '' def test_MessageSendError(capsys): @@ -73,6 +56,3 @@ def test_MessageSendError(capsys): """ with pytest.raises(MessageSendError): raise MessageSendError('login failed') - out, err = capsys.readouterr() - assert 'login failed' in out - assert err == '' diff --git a/tests/test_utils.py b/tests/test_utils.py index 566f2d4..6f8107d 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -41,9 +41,7 @@ def get_test_class(): def val_test_func(item): """Test func for check_valid.""" - if item == 'BAD': - return False - return True + return item != 'BAD' ##############################################################################