non working code

non working code.
usathyan · Oct 23, 2023 · 76481d0 · 76481d0
1 parent 0d63be2
commit 76481d0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 57 deletions.
diff --git a/confluence_dumper.py b/confluence_dumper.py
@@ -200,7 +200,7 @@ def download_file(clean_url, download_folder, downloaded_file_name, depth=0, err
         print('%sDOWNLOAD: %s' % ('\t'*(depth+1), downloaded_file_name))
         try:
             utils.http_download_binary_file(absolute_download_url, downloaded_file_path,
-                                            auth=settings.HTTP_AUTHENTICATION, headers=settings.HTTP_CUSTOM_HEADERS,
+                                            headers=settings.HTTP_CUSTOM_HEADERS,
                                             verify_peer_certificate=settings.VERIFY_PEER_CERTIFICATE,
                                             proxies=settings.HTTP_PROXIES)
 
@@ -299,7 +299,7 @@ def fetch_page_recursively(page_id, folder_path, download_folder, html_template,
     page_url = '%s/rest/api/content/%s?expand=children.page,children.attachment,body.view.value' \
                % (settings.CONFLUENCE_BASE_URL, page_id)
     try:
-        response = utils.http_get(page_url, auth=settings.HTTP_AUTHENTICATION, headers=settings.HTTP_CUSTOM_HEADERS,
+        response = utils.http_get(page_url, headers=settings.HTTP_CUSTOM_HEADERS,
                                   verify_peer_certificate=settings.VERIFY_PEER_CERTIFICATE,
                                   proxies=settings.HTTP_PROXIES)
         page_content = response['body']['view']['value']
@@ -319,7 +319,7 @@ def fetch_page_recursively(page_id, folder_path, download_folder, html_template,
         page_url = '%s/rest/api/content/%s/child/attachment?limit=25' % (settings.CONFLUENCE_BASE_URL, page_id)
         counter = 0
         while page_url:
-            response = utils.http_get(page_url, auth=settings.HTTP_AUTHENTICATION, headers=settings.HTTP_CUSTOM_HEADERS,
+            response = utils.http_get(page_url, headers=settings.HTTP_CUSTOM_HEADERS,
                                       verify_peer_certificate=settings.VERIFY_PEER_CERTIFICATE,
                                       proxies=settings.HTTP_PROXIES)
             counter += len(response['results'])
@@ -357,7 +357,7 @@ def fetch_page_recursively(page_id, folder_path, download_folder, html_template,
         page_url = '%s/rest/api/content/%s/child/page?limit=25' % (settings.CONFLUENCE_BASE_URL, page_id)
         counter = 0
         while page_url:
-            response = utils.http_get(page_url, auth=settings.HTTP_AUTHENTICATION, headers=settings.HTTP_CUSTOM_HEADERS,
+            response = utils.http_get(page_url, headers=settings.HTTP_CUSTOM_HEADERS,
                                       verify_peer_certificate=settings.VERIFY_PEER_CERTIFICATE,
                                       proxies=settings.HTTP_PROXIES)
             counter += len(response['results'])
@@ -443,7 +443,7 @@ def main():
         spaces_to_export = []
         page_url = '%s/rest/api/space?limit=25' % settings.CONFLUENCE_BASE_URL
         while page_url:
-            response = utils.http_get(page_url, auth=settings.HTTP_AUTHENTICATION, headers=settings.HTTP_CUSTOM_HEADERS,
+            response = utils.http_get(page_url, headers=settings.HTTP_CUSTOM_HEADERS,
                                       verify_peer_certificate=settings.VERIFY_PEER_CERTIFICATE,
                                       proxies=settings.HTTP_PROXIES)
             for space in response['results']:
@@ -473,7 +473,7 @@ def main():
             os.makedirs(download_folder)
 
             space_url = '%s/rest/api/space/%s?expand=homepage' % (settings.CONFLUENCE_BASE_URL, space)
-            response = utils.http_get(space_url, auth=settings.HTTP_AUTHENTICATION,
+            response = utils.http_get(space_url,
                                       headers=settings.HTTP_CUSTOM_HEADERS,
                                       verify_peer_certificate=settings.VERIFY_PEER_CERTIFICATE,
                                       proxies=settings.HTTP_PROXIES)

diff --git a/settings.sample.py b/settings.sample.py
diff --git a/utils.py b/utils.py
@@ -13,7 +13,7 @@
 import requests
 import shutil
 import re
-import urllib
+import urllib.parse
 
 
 class ConfluenceException(Exception):
@@ -33,7 +33,7 @@ def http_get(request_url, auth=None, headers=None, verify_peer_certificate=True,
     :returns: JSON response.
     :raises: ConfluenceException in the case of the server does not answer HTTP code 200.
     """
-    response = requests.get(request_url, auth=auth, headers=headers, verify=verify_peer_certificate, proxies=proxies)
+    response = requests.get(request_url, headers=headers, verify=verify_peer_certificate, proxies=proxies)
     if 200 == response.status_code:
         return response.json()
     else:
@@ -53,7 +53,7 @@ def http_download_binary_file(request_url, file_path, auth=None, headers=None, v
     :param proxies: (optional) Dictionary mapping protocol to the URL of the proxy.
     :raises: ConfluenceException in the case of the server does not answer with HTTP code 200.
     """
-    response = requests.get(request_url, stream=True, auth=auth, headers=headers, verify=verify_peer_certificate,
+    response = requests.get(request_url, stream=True, headers=headers, verify=verify_peer_certificate,
                             proxies=proxies)
     if 200 == response.status_code:
         with open(file_path, 'wb') as downloaded_file:
@@ -124,7 +124,7 @@ def decode_url(encoded_url):
     :param encoded_url: Encoded URL.
     :returns: Decoded URL.
     """
-    return urllib.unquote(encoded_url.encode('utf8')).decode('utf8')
+    return urllib.parse.unquote(encoded_url.encode('utf8')).encode('utf-8')
 
 
 def encode_url(decoded_url):
@@ -133,7 +133,7 @@ def encode_url(decoded_url):
     :param decoded_url: Decoded URL.
     :returns: Encoded URL.
     """
-    return urllib.quote(decoded_url.encode('utf8')).encode('utf8')
+    return urllib.parse.quote(decoded_url.encode('utf8')).encode('utf-8')
 
 
 def is_file_format(file_name, file_extensions):