Take the hostname for the PythonAnywhere site from $PYTHONANYWHERE_SITE if its available -- otherwise fail back to www.$PYTHONANYWHERE_DOMAIN and then to www.pythonanywhere.com. by: Giles

Author: gpjt

pythonanywhere/api.py

@@ -21,8 +21,14 @@ class NoTokenError(Exception):
 
 
 def get_api_endpoint():
-    domain = os.environ.get("PYTHONANYWHERE_DOMAIN", "pythonanywhere.com")
-    return "https://www.{domain}/api/v0/user/{{username}}/{{flavor}}/".format(domain=domain)
+    hostname = os.environ.get(
+        "PYTHONANYWHERE_SITE",
+        "www." + os.environ.get(
+            "PYTHONANYWHERE_DOMAIN",
+            "pythonanywhere.com"
+        )
+    )
+    return "https://{hostname}/api/v0/user/{{username}}/{{flavor}}/".format(hostname=hostname)
 
 
 def call_api(url, method, **kwargs):

tests/test_api.py

@@ -11,8 +11,16 @@
 
 
 class TestGetAPIEndpoint:
-    def test_gets_domain_from_env_if_set(self, monkeypatch):
+
+    def test_defaults_to_pythonanywhere_dot_com_if_no_environment_variables(self):
         assert get_api_endpoint() == "https://www.pythonanywhere.com/api/v0/user/{username}/{flavor}/"
+
+    def test_gets_domain_from_pythonanywhere_site_and_ignores_pythonanywhere_domain_if_both_set(self, monkeypatch):
+        monkeypatch.setenv("PYTHONANYWHERE_SITE", "www.foo.com")
+        monkeypatch.setenv("PYTHONANYWHERE_DOMAIN", "wibble.com")
+        assert get_api_endpoint() == "https://www.foo.com/api/v0/user/{username}/{flavor}/"
+
+    def test_gets_domain_from_pythonanywhere_domain_and_adds_on_www_if_set_but_no_pythonanywhere_site(self, monkeypatch):
         monkeypatch.setenv("PYTHONANYWHERE_DOMAIN", "foo.com")
         assert get_api_endpoint() == "https://www.foo.com/api/v0/user/{username}/{flavor}/"