From ba4bf75c9b5c350cc3441f2360cd229d4a3d4adf Mon Sep 17 00:00:00 2001
From: Jan Range <range.jan@web.de>
Date: Wed, 24 Apr 2024 22:37:08 +0200
Subject: [PATCH] fix merge conflict

---
 src/pyDataverse/api.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pyDataverse/api.py b/src/pyDataverse/api.py
index 8ebd777..4272c0b 100644
--- a/src/pyDataverse/api.py
+++ b/src/pyDataverse/api.py
@@ -287,7 +287,7 @@ def _sync_request(
         kwargs = self._filter_kwargs(kwargs)
 
         try:
-            resp = method(**kwargs)
+            resp = method(**kwargs, follow_redirects=True)
 
             if resp.status_code == 401:
                 error_msg = resp.json()["message"]
@@ -462,13 +462,13 @@ def get_datafile(
         """
         is_first_param = True
         if is_pid:
-            url = "{0}/datafile/{1}".format(self.base_url_api_data_access, identifier)
-            if data_format or no_var_header or image_thumb:
-                url += "?"
-        else:
             url = "{0}/datafile/:persistentId/?persistentId={1}".format(
                 self.base_url_api_data_access, identifier
             )
+        else:
+            url = "{0}/datafile/{1}".format(self.base_url_api_data_access, identifier)
+            if data_format or no_var_header or image_thumb:
+                url += "?"
         if data_format:
             url += "format={0}".format(data_format)
             is_first_param = False