use pythonanywhere core 0.1.9 for file sharing. by Giles and Filip

Author: filiplajszczak

pythonanywhere/files.py

@@ -4,7 +4,6 @@
 
 import getpass
 import logging
-from urllib.parse import urljoin
 
 from snakesay import snakesay
 
@@ -45,9 +44,6 @@ def __init__(self, path):
     def __repr__(self):
         return self.url
 
-    def _make_sharing_url(self, path):
-        return urljoin(self.api.base_url.split("api")[0], path)
-
     @staticmethod
     def _standarize_path(path):
         return path.replace("~", f"/home/{getpass.getuser()}") if path.startswith("~") else path
@@ -141,10 +137,9 @@ def get_sharing_url(self, quiet=False):
 
         url = self.api.sharing_get(self.path)
         if url:
-            sharing_url = self._make_sharing_url(url)
             if not quiet:
-                logger.info(snakesay(f"{self.path} is shared at {sharing_url}"))
-            return sharing_url
+                logger.info(snakesay(f"{self.path} is shared at {url}"))
+            return url
 
         logger.info(snakesay(f"{self.path} has not been shared"))
 
@@ -155,15 +150,13 @@ def share(self):
         empty string when share not successful."""
 
         try:
-            code, url = self.api.sharing_post(self.path)
+            msg, url = self.api.sharing_post(self.path)
         except Exception as e:
             logger.warning(snakesay(str(e)))
             return ""
 
-        msg = {200: "was already", 201: "successfully"}[code]
-        sharing_url = self._make_sharing_url(url)
-        logger.info(snakesay(f"{self.path} {msg} shared at {sharing_url}"))
-        return sharing_url
+        logger.info(snakesay(f"{self.path} {msg} at {url}"))
+        return url
 
     def unshare(self):
         """Returns `True` when file unshared or has not been shared,

requirements.txt

@@ -8,7 +8,7 @@ pytest==8.2.1
 pytest-cov==5.0.0
 pytest-mock==3.14.0
 pytest-mypy==0.10.3
-pythonanywhere_core==0.1.8
+pythonanywhere_core==0.1.9
 requests==2.32.3
 responses==0.25.0
 schema==0.7.2

tests/test_files.py

@@ -49,14 +49,6 @@ def test_repr_returns_url_property_value(self, mocker):
 
         assert PAPath("path").__repr__() == mock_url
 
-    def test_make_sharing_url_contains_pa_site_address(self, mocker):
-        mock_urljoin = mocker.patch("pythonanywhere.files.urljoin")
-        pa_path = PAPath("path")
-
-        pa_path._make_sharing_url("rest")
-
-        assert mock_urljoin.call_args == call(pa_path.api.base_url.split("api")[0], "rest")
-
     def test_sanitizes_path(self):
         pa_path = PAPath("~")
 
@@ -205,15 +197,14 @@ class TestPAPathShare():
     def test_returns_full_url_for_shared_file(self, mocker):
         mock_sharing_get = mocker.patch("pythonanywhere_core.files.Files.sharing_get")
         mock_sharing_get.return_value = "url"
-        mock_make_url = mocker.patch("pythonanywhere.files.PAPath._make_sharing_url")
         mock_snake = mocker.patch("pythonanywhere.files.snakesay")
         mock_info = mocker.patch("pythonanywhere.files.logger.info")
         query_path = "/pa/path/to/a/file"
 
         result = PAPath(query_path).get_sharing_url()
 
         assert mock_sharing_get.call_args == call(query_path)
-        assert mock_snake.call_args == call(f"{query_path} is shared at {mock_make_url.return_value}")
+        assert mock_snake.call_args == call(f"{query_path} is shared at {mock_sharing_get.return_value}")
         assert mock_info.call_args == call(mock_snake.return_value)
         assert result.endswith("url")
 
@@ -233,35 +224,29 @@ def test_returns_empty_string_when_file_not_shared(self, mocker):
 
     def test_path_already_shared(self, mocker):
         mock_sharing_post = mocker.patch("pythonanywhere_core.files.Files.sharing_post")
-        mock_sharing_post.return_value = (200, "url")
-        mock_make_url = mocker.patch("pythonanywhere.files.PAPath._make_sharing_url")
+        mock_sharing_post.return_value = ("was already shared", "url")
         mock_snake = mocker.patch("pythonanywhere.files.snakesay")
         mock_info = mocker.patch("pythonanywhere.files.logger.info")
         path_to_share = "/pa/path/to/a/file"
 
         result = PAPath(path_to_share).share()
 
         assert mock_sharing_post.call_args == call(path_to_share)
-        assert mock_snake.call_args == call(f"{path_to_share} was already shared at {mock_make_url.return_value}")
+        assert mock_snake.call_args == call(f"{path_to_share} was already shared at {mock_sharing_post.return_value[1]}")
         assert mock_info.call_args == call(mock_snake.return_value)
-        assert mock_make_url.call_args == call("url")
-        assert result == mock_make_url.return_value
 
     def test_path_successfully_shared(self, mocker):
         mock_sharing_post = mocker.patch("pythonanywhere_core.files.Files.sharing_post")
-        mock_sharing_post.return_value = (201, "url")
-        mock_make_url = mocker.patch("pythonanywhere.files.PAPath._make_sharing_url")
+        mock_sharing_post.return_value = ("successfully shared", "url")
         mock_snake = mocker.patch("pythonanywhere.files.snakesay")
         mock_info = mocker.patch("pythonanywhere.files.logger.info")
         path_to_share = "/pa/path/to/a/file"
 
         result = PAPath(path_to_share).share()
 
         assert mock_sharing_post.call_args == call(path_to_share)
-        assert mock_snake.call_args == call(f"{path_to_share} successfully shared at {mock_make_url.return_value}")
+        assert mock_snake.call_args == call(f"{path_to_share} successfully shared at {mock_sharing_post.return_value[1]}")
         assert mock_info.call_args == call(mock_snake.return_value)
-        assert mock_make_url.call_args == call("url")
-        assert result == mock_make_url.return_value
 
     def test_warns_if_share_fails(self, mocker):
         mock_sharing_post = mocker.patch("pythonanywhere_core.files.Files.sharing_post")