Confluence: cleaner bugfix

Author: Gonchik Tsymzhitov

atlassian/confluence.py

@@ -227,16 +227,28 @@ def remove_page_from_trash(self, page_id):
         :param page_id:
         :return:
         """
-        url = 'rest/api/content/{page_id}?status=trashed'.format(page_id=page_id)
-        return self.delete(url)
+        return self.remove_page(page_id=page_id, status='trashed')
 
-    def remove_page(self, page_id):
+    def remove_page_as_draft(self, page_id):
+        """
+        This method removed page from trash
+        :param page_id:
+        :return:
+        """
+        return self.remove_page(page_id=page_id, status='draft')
+
+    def remove_page(self, page_id, status=None):
         """
         This method removed page
         :param page_id:
+        :param status: OPTIONAL: type of page
         :return:
         """
-        url = 'rest/api/content/{page_id}'.format(page_id=page_id)
+        if status is None:
+            url = 'rest/api/content/{page_id}'.format(page_id=page_id)
+        else:
+            url = 'rest/api/content/{page_id}?status={status}'.format(page_id=page_id, status=status)
+
         return self.delete(url)
 
     def create_page(self, space, title, body, parent_id=None, type='page'):

atlassian/rest_client.py

@@ -31,7 +31,7 @@ def log_curl_debug(self, method, path, data=None, headers=None, level=logging.DE
             password=self.password,
             headers=' -H '.join(["'{0}: {1}'".format(key, value) for key, value in headers.items()]),
             data='' if not data else "--data '{0}'".format(json.dumps(data)),
-            url='{0}{1}'.format(self.url, path))
+            url='{0}'.format(urljoin(self.url, path)))
         log.log(level=level, msg=message)
 
     def resource_url(self, resource):