From a66b73e0f8047133fc383d31167af88a0bc6bd86 Mon Sep 17 00:00:00 2001
From: Langenfeld <langenfv@tf.uni-freiburg.de>
Date: Fri, 9 Aug 2019 10:34:38 +0200
Subject: [PATCH] small changes for 1.9.0

---
 gitea/gitea.py | 57 +++++++++-----------------------------------------
 test_api.py    |  2 +-
 2 files changed, 11 insertions(+), 48 deletions(-)

diff --git a/gitea/gitea.py b/gitea/gitea.py
index 7c42512..9a9251e 100644
--- a/gitea/gitea.py
+++ b/gitea/gitea.py
@@ -360,67 +360,30 @@ class Gitea:
         return {}
 
     def requests_get(self, endpoint, params={}):
-        """ Get parsed result from API-endpoint.
-
-        Args:
-            endpoint (str): Endpoint to request from.
-
-        Returns: (dict)
-            Parsed JSON-answer from the API.
-
-        Throws:
-            Exception, if answer status code is not ok.
-        """
-        request = self.requests.get(
-            self.__get_url(endpoint), headers=self.headers, params=params
-        )
+        request = self.requests.get(self.__get_url(endpoint), headers=self.headers, params=params)
         if request.status_code not in [200, 201]:
-            logging.error("Received status code: %s (%s)" % (request.status_code, request.url))
+            message = "Received status code: %s (%s)" % (request.status_code, request.url)
+            logging.error(message)
             if request.status_code in [404]:
                 raise NotFoundException()
             if request.status_code in [403]:
                 raise Exception("Unauthorized: %s - Check your permissions and try again!"% request.url)
-            raise Exception("Received status code: %s (%s)" % (request.status_code, request.url))
+            raise Exception(message)
         return self.parse_result(request)
 
     def requests_put(self, endpoint):
-        """ Get parsed result from API-endpoint.
-
-        Args:
-            endpoint (str): Endpoint to request from.
-
-        Throws:
-            Exception, if answer status code is not ok.
-        """
         request = self.requests.put(self.__get_url(endpoint), headers=self.headers)
         if request.status_code not in [204]:
-            logging.error(
-                "Received status code: %s (%s) %s"
-                % (request.status_code, request.url, request.text)
-            )
-            raise Exception(
-                "Received status code: %s (%s) %s"
-                % (request.status_code, request.url, request.text)
-            )
+            message = "Received status code: %s (%s) %s"%(request.status_code, request.url, request.text)
+            logging.error(message)
+            raise Exception(message)
 
     def requests_delete(self, endpoint):
-        """ Get parsed result from API-endpoint.
-
-        Args:
-            endpoint (str): Endpoint to request from.
-
-        Throws:
-            Exception, if answer status code is not ok.
-        """
         request = self.requests.delete(self.__get_url(endpoint), headers=self.headers)
         if request.status_code not in [204]:
-            logging.error(
-                "Received status code: %s (%s)" % (request.status_code, request.url)
-            )
-            raise Exception(
-                "Received status code: %s (%s) %s"
-                % (request.status_code, request.url, vars(request))
-            )
+            message = "Received status code: %s (%s)" % (request.status_code, request.url)
+            logging.error(message)
+            raise Exception(message)
 
     def requests_post(self, endpoint, data):
         """ Post data to API-endpoint.
diff --git a/test_api.py b/test_api.py
index 48b41f2..cf64946 100644
--- a/test_api.py
+++ b/test_api.py
@@ -34,7 +34,7 @@ def test_token_owner():
     assert user.is_admin, "Testuser is not Admin - Tests may fail"
 
 def test_gitea_version():
-    assert gitea.get_version() == "1.8.2", "Version changed. Updated?"
+    assert gitea.get_version() == "1.9.0", "Version changed. Updated?"
 
 def test_fail_get_non_existent_user():
     with pytest.raises(NotFoundException) as e: