Datetime changes for 2.7 and different way to call api with params

Author: Faustasm

requirements.txt

@@ -1,3 +1,4 @@
 urllib3==1.25.9
 requests==2.24.0
 six==1.15.0
+python-dateutil==2.8.1

tox.ini

@@ -2,7 +2,6 @@
 
 import json
 import requests
-import urllib.parse
 
 from upcloud_api import UpCloudAPIError, __version__
 
@@ -29,8 +28,6 @@ def request(self, method, endpoint, body=None, params=None, timeout=-1, request_
             raise Exception('Invalid/Forbidden HTTP method')
 
         url = 'https://api.upcloud.com/' + self.api_v + endpoint if request_to_api else endpoint
-        if params:
-            url += urllib.parse.urlencode(params, doseq=True)
         headers = {
             'Authorization': self.token,
             'User-Agent': 'upcloud-python-api/{}'.format(__version__)
@@ -50,6 +47,7 @@ def request(self, method, endpoint, body=None, params=None, timeout=-1, request_
         APIcall = getattr(requests, method.lower())
         res = APIcall(url,
                       data=data,
+                      params=params,
                       headers=headers,
                       timeout=call_timeout)
 

upcloud_api/cloud_manager/base.py

@@ -1,6 +1,7 @@
 import itertools
 from time import sleep
-from datetime import datetime, timezone
+from datetime import datetime
+from dateutil import tz
 
 from upcloud_api import UpCloudClientError, UpCloudAPIError
 
@@ -48,5 +49,6 @@ def convert_datetime_string_to_object(datetime_string):
     """
     Helper function to convert datetime string to object with local timezone
     """
+    local_tz = tz.tzlocal()
     datetime_object = datetime.strptime(datetime_string, '%Y-%m-%d %H:%M:%S')
-    return datetime_object.astimezone().replace(microsecond=0).isoformat()
+    return datetime_object.replace(tzinfo=local_tz, microsecond=0).isoformat()