From 5ee4ec84aab02ceb455453f6e3e6b662fb96053f Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Thu, 24 Feb 2022 11:10:14 +0000
Subject: [PATCH] Tidying

---
 happening.py |  3 ++-
 session.py   | 12 +++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/happening.py b/happening.py
index 9c70092da..e484ff110 100644
--- a/happening.py
+++ b/happening.py
@@ -1302,5 +1302,6 @@ def dav_month_via_server(session, http_prefix: str,
         '    </c:comp-filter>\n' + \
         '  </c:filter>\n' + \
         '</c:calendar-query>'
-    result = get_method("REPORT", xml_str, session, url, params, debug)
+    result = \
+        get_method("REPORT", xml_str, session, url, params, headers, debug)
     return result
diff --git a/session.py b/session.py
index 9d951d0d1..27b653ac7 100644
--- a/session.py
+++ b/session.py
@@ -667,7 +667,7 @@ def download_image_any_mime_type(session, url: str,
 
 
 def get_method(method_name: str, xml_str: str,
-               session, url: str, params: {}, debug: bool,
+               session, url: str, params: {}, headers: {}, debug: bool,
                version: str = '1.3.0', http_prefix: str = 'https',
                domain: str = 'testdomain',
                timeout_sec: int = 20, quiet: bool = False) -> {}:
@@ -679,9 +679,10 @@ def get_method(method_name: str, xml_str: str,
             print('url: ' + str(url))
             print('ERROR: get_method failed, url should be a string')
         return None
-    headers = {
-        'Accept': 'application/xml'
-    }
+    if not headers:
+        headers = {
+            'Accept': 'application/xml'
+        }
     session_params = {}
     session_headers = {}
     if headers:
@@ -694,7 +695,8 @@ def get_method(method_name: str, xml_str: str,
             '; +' + http_prefix + '://' + domain + '/'
     if not session:
         if not quiet:
-            print('WARN: get_method failed, no session specified for get_vcard')
+            print('WARN: get_method failed, ' +
+                  'no session specified for get_vcard')
         return None
 
     if debug: