Renamed method to uri_join.

Author: Iljushkin, Alexander

reportportal_client/service.py

@@ -23,16 +23,16 @@ def __init__(self, endpoint, project, token, api_base=None):
             self.api_base = "api/v1"
         self.project = project
         self.token = token
-        self.base_url = self.uri_join_safe(self.endpoint,
-                                           self.api_base,
-                                           self.project)
+        self.base_url = self.uri_join(self.endpoint,
+                                      self.api_base,
+                                      self.project)
         self.headers = {"Content-Type": "application/json",
                         "Authorization": "{0} {1}".format("bearer",
                                                           self.token)}
         self.session = requests.Session()
 
     @staticmethod
-    def uri_join_safe(*uri_parts):
+    def uri_join(*uri_parts):
         """Safe join of uri parts for our case.
 
         Avoiding usage of urlparse.urljoin and os.path.join as it does not clearly join parts.
@@ -47,34 +47,34 @@ def uri_join_safe(*uri_parts):
         return '/'.join(stripped)
 
     def start_launch(self, start_launch_rq):
-        url = self.uri_join_safe(self.base_url, "launch")
+        url = self.uri_join(self.base_url, "launch")
         r = self.session.post(url=url, headers=self.headers,
                               data=start_launch_rq.data)
         return EntryCreatedRS(raw=r.text)
 
     def finish_launch(self, launch_id, finish_execution_rq):
-        url = self.uri_join_safe(self.base_url, "launch", launch_id, "finish")
+        url = self.uri_join(self.base_url, "launch", launch_id, "finish")
         r = self.session.put(url=url, headers=self.headers,
                              data=finish_execution_rq.data)
         return OperationCompletionRS(raw=r.text)
 
     def start_test_item(self, parent_item_id, start_test_item_rq):
         if parent_item_id is not None:
-            url = self.uri_join_safe(self.base_url, "item", parent_item_id)
+            url = self.uri_join(self.base_url, "item", parent_item_id)
         else:
-            url = self.uri_join_safe(self.base_url, "item")
+            url = self.uri_join(self.base_url, "item")
         r = self.session.post(url=url, headers=self.headers,
                               data=start_test_item_rq.data)
         return EntryCreatedRS(raw=r.text)
 
     def finish_test_item(self, item_id, finish_test_item_rq):
-        url = self.uri_join_safe(self.base_url, "item", item_id)
+        url = self.uri_join(self.base_url, "item", item_id)
         r = self.session.put(url=url, headers=self.headers,
                              data=finish_test_item_rq.data)
         return OperationCompletionRS(raw=r.text)
 
     def log(self, save_log_rq):
-        url = self.uri_join_safe(self.base_url, "log")
+        url = self.uri_join(self.base_url, "log")
         r = self.session.post(url=url, headers=self.headers,
                               data=save_log_rq.data)
         return EntryCreatedRS(raw=r.text)