Fix formatting

Author: Alexey Bogoslovskyi

shellfoundry/utilities/cloudshell_api/client_wrapper.py

@@ -58,7 +58,5 @@ def _create_client(self):
                     msg = e.msg
                 else:
                     msg = "Please verify the credentials in the config"
-                raise FatalError(
-                    "Login to CloudShell failed. {}".format(msg)
-                )
+                raise FatalError("Login to CloudShell failed. {}".format(msg))
             raise FatalError(self.ConnectionFailureMessage)

shellfoundry/utilities/template_retriever.py

@@ -104,8 +104,7 @@ def _get_local_templates(self, template_location):
                             )
                         else:
                             standard_version = templ_data.get(
-                                "version",
-                                templ_data.get("shell_version", "0.0.1")
+                                "version", templ_data.get("shell_version", "0.0.1")
                             )
 
                         templ_info.append(

tests/test_commands/test_extend_command.py

@@ -41,7 +41,7 @@ def test_extend_incorrect_arguments(self):
 
         with patch("shellfoundry.commands.extend_command.TempDirContext"):
             with self.assertRaisesRegex(
-                BadParameter, u"Check correctness of entered attributes"
+                BadParameter, "Check correctness of entered attributes"
             ):
                 self.tested_instance.extend("local:some_path", ("new_attribute",))
 
@@ -105,7 +105,7 @@ def test_extend_from_remote_download_failed(self):
     def test_extend_not_2_gen_shell(self):
         with patch("shellfoundry.commands.extend_command.TempDirContext"):
             with self.assertRaisesRegex(
-                ClickException, u"Invalid second generation Shell."
+                ClickException, "Invalid second generation Shell."
             ):
                 self.tested_instance.extend("some_path", ("new_attribute",))
 

tests/test_commands/test_install_command.py

@@ -111,8 +111,8 @@ def test_install_gen1_shell_cs_connection_failed(self, os_mock, shell_package_mo
         # Assert
         self.mock_installer.install.assert_called_once()
         self.assertTrue(
-            str(context.exception) == u"Connection to CloudShell Server failed. "
-            u"Please make sure it is up and running properly."
+            str(context.exception) == "Connection to CloudShell Server failed. "
+            "Please make sure it is up and running properly."
         )
 
     @patch("shellfoundry.commands.install_command.ShellPackage")
@@ -139,7 +139,7 @@ def test_install_gen1_shell_cs_login_failed(self, os_mock, shell_package_mock):
         self.mock_installer.install.assert_called_once()
         self.assertTrue(
             str(context.exception)
-            == u"Login to CloudShell failed. Please verify the credentials in the config"  # noqa: E501
+            == "Login to CloudShell failed. Please verify the credentials in the config"  # noqa: E501
         )
 
     @patch("shellfoundry.commands.install_command.ShellPackage")
@@ -165,8 +165,8 @@ def test_install_gen1_shell_non_auth_http_error(self, os_mock, shell_package_moc
         # Assert
         self.mock_installer.install.assert_called_once()
         self.assertTrue(
-            str(context.exception) == u"Failed to install shell. "
-            u"CloudShell responded with: 'HTTP Error 404: Non auth error'"
+            str(context.exception) == "Failed to install shell. "
+            "CloudShell responded with: 'HTTP Error 404: Non auth error'"
         )
 
     @patch("shellfoundry.commands.install_command.ShellPackage")
@@ -192,6 +192,6 @@ def test_install_gen1_shell_base_exception(self, os_mock, shell_package_mock):
         # Assert
         self.mock_installer.install.assert_called_once()
         self.assertTrue(
-            str(context.exception) == u"Failed to install shell. "
-            u"CloudShell responded with: 'Some base exception'"
+            str(context.exception) == "Failed to install shell. "
+            "CloudShell responded with: 'Some base exception'"
         )

tests/test_commands/test_list_command.py

@@ -46,7 +46,7 @@ def test_build_package_package_created(self, pip_mock, echo_mock):
 
         # Assert
         assertFileExists(self, "dist/nut_shell.zip")
-        echo_mock.assert_any_call(u"Shell package was successfully created:")
+        echo_mock.assert_any_call("Shell package was successfully created:")
 
     @patch("click.echo")
     @patch("shellfoundry.utilities.python_dependencies_packager.pip_main")
@@ -63,7 +63,7 @@ def test_proper_error_message_displayed_when_shell_yml_is_in_wrong_format(
         command_executor.pack()
 
         # Assert
-        echo_mock.assert_any_call(u"shell.yml format is wrong")
+        echo_mock.assert_any_call("shell.yml format is wrong")
 
     @patch("click.echo")
     @patch("shellfoundry.utilities.python_dependencies_packager.pip_main")
@@ -80,7 +80,7 @@ def test_proper_error_message_displayed_when_shell_yml_missing(
         command_executor.pack()
 
         # Assert
-        echo_mock.assert_any_call(u"shell.yml file is missing")
+        echo_mock.assert_any_call("shell.yml file is missing")
 
     @patch("click.secho")
     @patch("shellfoundry.utilities.python_dependencies_packager.pip_main")

tests/test_commands/test_pack_command.py

@@ -69,7 +69,7 @@ def test_client_wrapper_raises_an_error_when_create_client_fails_after_retries_h
         # Assert
         self.assertEqual(
             context.exception.message,
-            u"Login to CloudShell failed. {}".format(error_msg),
+            "Login to CloudShell failed. {}".format(error_msg),
         )
 
     @patch(

tests/test_utilities/test_cloudshell_api/test_client_wrapper.py

@@ -182,7 +182,7 @@ def test_error_displayed_when_failed_to_connect_to_cloudshell_server(self):
                 self.assertTrue(echo_mock.called, "click should have been called")
                 self.assertEqual(
                     echo_mock.call_args[0][0],
-                    u"Login to CloudShell failed. Please verify the credentials in cloudshell_config.yml",  # noqa: E501
+                    "Login to CloudShell failed. Please verify the credentials in cloudshell_config.yml",  # noqa: E501
                 )
 
         # Assert

tests/test_utilities/test_driver_generator.py

@@ -149,7 +149,7 @@ def test_fail_to_login_into_cs(self):
         # Assert
         self.assertTrue(
             context.exception.message
-            == u"Login to CloudShell failed. Please verify the credentials in the config"  # noqa: E501
+            == "Login to CloudShell failed. Please verify the credentials in the config"  # noqa: E501
         )
 
     @patch(