Formatting changes with black

tabcmd/commands/datasources_and_workbooks/datasources_and_workbooks_command.py

@@ -163,4 +163,4 @@ def get_custom_view_by_id(logger, server, custom_view_id) -> TSC.CustomViewItem:
             Errors.exit_with_error(logger, exception=e)
         if matching_custom_view is None:
             Errors.exit_with_error(logger, message=_("errors.xmlapi.not_found"))
-        return matching_custom_view
+        return matching_custom_view

tabcmd/commands/datasources_and_workbooks/export_command.py

@@ -78,8 +78,12 @@ def run_command(args):
         logger.debug(_("tabcmd.launching"))
         session = Session()
         server = session.create_session(args, logger)
-        view_content_url, wb_content_url, custom_view_id, custom_view_name = (
-            ExportCommand.parse_export_url_to_workbook_view_and_custom_view(logger, args.url))
+        (
+            view_content_url,
+            wb_content_url,
+            custom_view_id,
+            custom_view_name,
+        ) = ExportCommand.parse_export_url_to_workbook_view_and_custom_view(logger, args.url)
         logger.debug(["view_url:", view_content_url, "workbook:", wb_content_url])
         if not view_content_url and not wb_content_url:
             view_example = "/workbook_name/view_name"
@@ -97,7 +101,8 @@ def run_command(args):
 
             elif args.pdf or args.png or args.csv:  # it's a view or custom_view
                 export_item, server_content_type = ExportCommand.get_export_item_and_server_content_type(
-                    view_content_url, logger, server, custom_view_id)
+                    view_content_url, logger, server, custom_view_id
+                )
 
                 if args.pdf:
                     output = ExportCommand.download_view_pdf(server_content_type, export_item, args, logger)
@@ -222,4 +227,4 @@ def verify_valid_custom_view_id(logger, custom_view_id):
         try:
             UUID(custom_view_id)
         except ValueError:
-            Errors.exit_with_error(logger, _("export.errors.requires_valid_custom_view_uuid"))
+            Errors.exit_with_error(logger, _("export.errors.requires_valid_custom_view_uuid"))

tabcmd/commands/datasources_and_workbooks/get_url_command.py

@@ -73,8 +73,9 @@ def explain_expected_url(logger, url: str, command: str):
         ds_example = "/datasources/<datasourcename[.ext]"
         message = _("export.errors.requires_workbook_view_param").format(
             command
-        ) + "Given: {0}. Accepted values: {1}, {2}, {3}, {4}".format(url, view_example, custom_view_example,
-                                                                     wb_example, ds_example)
+        ) + "Given: {0}. Accepted values: {1}, {2}, {3}, {4}".format(
+            url, view_example, custom_view_example, wb_example, ds_example
+        )
         Errors.exit_with_error(logger, message)
 
     @staticmethod
@@ -152,8 +153,11 @@ def get_url_parts_from_custom_view_url(url, logger):
         custom_view_name = name_parts[::-1][0]
         custom_view_name = GetUrl.strip_query_params(custom_view_name)
         custom_view_name = GetUrl.get_name_without_possible_extension(custom_view_name)
-        return (DatasourcesAndWorkbooks.get_view_url_from_names(workbook_name, view_name), custom_view_id,
-                custom_view_name)
+        return (
+            DatasourcesAndWorkbooks.get_view_url_from_names(workbook_name, view_name),
+            custom_view_id,
+            custom_view_name,
+        )
 
     @staticmethod
     def filename_from_args(file_argument, item_name, filetype):
@@ -281,7 +285,8 @@ def parse_get_view_url_to_view_and_custom_view_parts(logger, url):
     @staticmethod
     def get_url_item_and_item_type_from_view_url(logger, url, server):
         view_url, custom_view_id, custom_view_name = GetUrl.parse_get_view_url_to_view_and_custom_view_parts(
-            logger, url)
+            logger, url
+        )
 
         get_url_item = GetUrl.get_view_by_content_url(logger, server, view_url)
         get_url_item_type = server.views
@@ -293,4 +298,4 @@ def get_url_item_and_item_type_from_view_url(logger, url, server):
             get_url_item = custom_view_item
             get_url_item_type = server.custom_views
 
-        return get_url_item, get_url_item_type
+        return get_url_item, get_url_item_type

tests/commands/test_datasources_and_workbooks_command.py

@@ -97,4 +97,4 @@ def test_get_custom_view_by_id(self, mock_server):
         mock_server.custom_views = getter
         custom_view_id = "cv-id"
         DatasourcesAndWorkbooks.get_custom_view_by_id(mock_logger, mock_server, custom_view_id)
-        getter.get_by_id.assert_called()
+        getter.get_by_id.assert_called()

tests/commands/test_geturl_utils.py

@@ -97,8 +97,7 @@ def test_view_name_with_url_params(self):
     def test_get_url_parts_from_custom_view_url(self):
         cv_uuid = str(uuid.uuid4())
         custom_view_url = "views/wb-name/view-name/" + cv_uuid + "/custom-view-name"
-        view_url, custom_view_id, custom_view_name = GetUrl.get_url_parts_from_custom_view_url(custom_view_url,
-                                                                                            None)
+        view_url, custom_view_id, custom_view_name = GetUrl.get_url_parts_from_custom_view_url(custom_view_url, None)
         assert view_url == "wb-name/sheets/view-name"
         assert custom_view_id == cv_uuid
         assert custom_view_name == "custom-view-name"
@@ -116,17 +115,15 @@ def test_get_url_parts_from_custom_view_url_bad_url(self):
     def test_get_url_parts_from_custom_view_url_with_url_params(self):
         cv_uuid = str(uuid.uuid4())
         custom_view_url = "views/wb-name/view-name/" + cv_uuid + "/custom-view-name?:refresh=yes"
-        view_url, custom_view_id, custom_view_name = GetUrl.get_url_parts_from_custom_view_url(custom_view_url,
-                                                                                            None)
+        view_url, custom_view_id, custom_view_name = GetUrl.get_url_parts_from_custom_view_url(custom_view_url, None)
         assert view_url == "wb-name/sheets/view-name"
         assert custom_view_id == cv_uuid
         assert custom_view_name == "custom-view-name"
 
     def test_get_url_parts_from_custom_view_url_with_file_extension(self):
         cv_uuid = str(uuid.uuid4())
         custom_view_url = "views/wb-name/view-name/" + cv_uuid + "/custom-view-name.png"
-        view_url, custom_view_id, custom_view_name = GetUrl.get_url_parts_from_custom_view_url(custom_view_url,
-                                                                                            None)
+        view_url, custom_view_id, custom_view_name = GetUrl.get_url_parts_from_custom_view_url(custom_view_url, None)
         assert view_url == "wb-name/sheets/view-name"
         assert custom_view_id == cv_uuid
         assert custom_view_name == "custom-view-name"
@@ -159,7 +156,8 @@ def test_parse_get_url_to_custom_view_parts(self):
         cv_uuid = str(uuid.uuid4())
         custom_view_url = "views/wb-name/view-name/" + cv_uuid + "/custom-view-name"
         view_url, custom_view_id, custom_view_name = GetUrl.parse_get_view_url_to_view_and_custom_view_parts(
-            mock_logger, custom_view_url)
+            mock_logger, custom_view_url
+        )
         assert view_url == "wb-name/sheets/view-name"
         assert custom_view_id == cv_uuid
         assert custom_view_name == "custom-view-name"
@@ -168,7 +166,8 @@ def test_parse_get_url_to_custom_view_parts_with_file_extension(self):
         cv_uuid = str(uuid.uuid4())
         custom_view_url = "views/wb-name/view-name/" + cv_uuid + "/custom-view-name.png"
         view_url, custom_view_id, custom_view_name = GetUrl.parse_get_view_url_to_view_and_custom_view_parts(
-            mock_logger, custom_view_url)
+            mock_logger, custom_view_url
+        )
         assert view_url == "wb-name/sheets/view-name"
         assert custom_view_id == cv_uuid
         assert custom_view_name == "custom-view-name"
@@ -179,7 +178,8 @@ def test_get_url_item_and_item_type_from_view_url(self, mock_server):
         mock_server.views = mock.MagicMock()
         mock_server.views.get = mock.MagicMock("get", return_value=([fake_item], 1))
         view_item, server_content_type = GetUrl.get_url_item_and_item_type_from_view_url(
-            mock_logger, view_url, mock_server)
+            mock_logger, view_url, mock_server
+        )
         assert view_item == fake_item
         assert server_content_type == mock_server.views
 
@@ -191,7 +191,8 @@ def test_get_url_item_and_item_type_from_custom_view_url(self, mock_server):
         mock_server.custom_views = mock.MagicMock()
         mock_server.custom_views.get_by_id = mock.MagicMock("get_by_id", return_value=fake_cv_item)
         cv_item, server_content_type = GetUrl.get_url_item_and_item_type_from_view_url(
-            mock_logger, view_url, mock_server)
+            mock_logger, view_url, mock_server
+        )
         assert cv_item == fake_cv_item
         assert server_content_type == mock_server.custom_views
 
@@ -272,7 +273,8 @@ def test_get_export_item_and_item_type_for_view(self, mock_server):
         mock_server.views = mock.MagicMock()
         mock_server.views.get = mock.MagicMock("get", return_value=([fake_item], 1))
         view_item, server_content_type = ExportCommand.get_export_item_and_server_content_type(
-            view_url, mock_logger, mock_server, None)
+            view_url, mock_logger, mock_server, None
+        )
         assert view_item == fake_item
         assert server_content_type == mock_server.views
 
@@ -284,7 +286,8 @@ def test_get_export_item_and_item_type_for_custom_view(self, mock_server):
         mock_server.custom_views = mock.MagicMock()
         mock_server.custom_views.get_by_id = mock.MagicMock("get_by_id", return_value=fake_cv_item)
         cv_item, server_content_type = ExportCommand.get_export_item_and_server_content_type(
-            view_url, mock_logger, mock_server, fake_cv_id)
+            view_url, mock_logger, mock_server, fake_cv_id
+        )
         assert cv_item == fake_cv_item
         assert server_content_type == mock_server.custom_views