Remove ISODateTimeDescriptor and supported_fields in favor of direct domain fields. (#75)

Author: LKaemmerling

CHANGELOG.rst

@@ -6,6 +6,7 @@ master (XXXX-XX-XX)
 --------------------
 
 * Feature: Add 'created' property to SSH Key domain
+* Fix: Remove ISODatetime Descriptor because it leads to wrong dates
 
 1.6.2 (2019-10-15)
 -------------------

hcloud/actions/domain.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
-from hcloud.core.domain import BaseDomain
+from dateutil.parser import isoparse
 
-from hcloud.helpers.descriptors import ISODateTime
+from hcloud.core.domain import BaseDomain
 
 
 class Action(BaseDomain):
@@ -23,20 +23,17 @@ class Action(BaseDomain):
     STATUS_ERROR = "error"
     """Action Status error"""
 
-    started = ISODateTime()
-    finished = ISODateTime()
-
     __slots__ = (
         "id",
         "command",
         "status",
         "progress",
         "resources",
         "error",
+        "started",
+        "finished"
     )
 
-    supported_fields = ("started", "finished")
-
     def __init__(
             self,
             id,
@@ -53,8 +50,8 @@ def __init__(
 
         self.status = status
         self.progress = progress
-        self.started = started
-        self.finished = finished
+        self.started = isoparse(started) if started else None
+        self.finished = isoparse(finished) if finished else None
         self.resources = resources
         self.error = error
 

hcloud/core/domain.py

@@ -5,16 +5,9 @@
 class BaseDomain(object):
     __slots__ = ()
 
-    supported_fields = ()
-
-    @classmethod
-    def get_supported_fields(cls):
-        return set(cls.__slots__ + cls.supported_fields)
-
     @classmethod
     def from_dict(cls, data):
-        supported_fields = cls.get_supported_fields()
-        supported_data = {k: v for k, v in data.items() if k in supported_fields}
+        supported_data = {k: v for k, v in data.items() if k in cls.__slots__}
         return cls(**supported_data)
 
 

hcloud/floating_ips/domain.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
-from hcloud.core.domain import BaseDomain
+from dateutil.parser import isoparse
 
-from hcloud.helpers.descriptors import ISODateTime
+from hcloud.core.domain import BaseDomain
 
 
 class FloatingIP(BaseDomain):
@@ -43,10 +43,9 @@ class FloatingIP(BaseDomain):
         "blocked",
         "protection",
         "labels",
-        "name"
+        "name",
+        "created"
     )
-    created = ISODateTime()
-    supported_fields = ("created",)
 
     def __init__(
         self,
@@ -73,7 +72,7 @@ def __init__(
         self.blocked = blocked
         self.protection = protection
         self.labels = labels
-        self.created = created
+        self.created = isoparse(created) if created else None
         self.name = name
 
 

hcloud/helpers/descriptors.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
+from dateutil.parser import isoparse
+
 from hcloud.core.domain import BaseDomain, DomainIdentityMixin
-from hcloud.helpers.descriptors import ISODateTime
 
 
 class Image(BaseDomain, DomainIdentityMixin):
@@ -39,8 +40,6 @@ class Image(BaseDomain, DomainIdentityMixin):
     :param labels: Dict
             User-defined labels (key-value pairs)
     """
-    created = ISODateTime()
-    deprecated = ISODateTime()
 
     __slots__ = (
         "id",
@@ -56,11 +55,11 @@ class Image(BaseDomain, DomainIdentityMixin):
         "created_from",
         "status",
         "protection",
-        "labels"
+        "labels",
+        "created",
+        "deprecated"
     )
 
-    supported_fields = ("created", "deprecated")
-
     def __init__(
             self,
             id=None,
@@ -84,11 +83,11 @@ def __init__(
         self.id = id
         self.name = name
         self.type = type
-        self.created = created
+        self.created = isoparse(created) if created else None
         self.description = description
         self.image_size = image_size
         self.disk_size = disk_size
-        self.deprecated = deprecated
+        self.deprecated = isoparse(deprecated) if deprecated else None
         self.bound_to = bound_to
         self.os_flavor = os_flavor
         self.os_version = os_version

hcloud/images/domain.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
+from dateutil.parser import isoparse
+
 from hcloud.core.domain import BaseDomain, DomainIdentityMixin
-from hcloud.helpers.descriptors import ISODateTime
 
 
 class Iso(BaseDomain, DomainIdentityMixin):
@@ -17,17 +18,15 @@ class Iso(BaseDomain, DomainIdentityMixin):
     :param deprecated: datetime, None
            ISO 8601 timestamp of deprecation, None if ISO is still available. After the deprecation time it will no longer be possible to attach the ISO to servers.
     """
-    deprecated = ISODateTime()
 
     __slots__ = (
         "id",
         "name",
         "type",
-        "description"
+        "description",
+        "deprecated"
     )
 
-    supported_fields = ("deprecated", )
-
     def __init__(
         self,
         id=None,
@@ -40,4 +39,4 @@ def __init__(
         self.name = name
         self.type = type
         self.description = description
-        self.deprecated = deprecated
+        self.deprecated = isoparse(deprecated) if deprecated else None

hcloud/isos/domain.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
+from dateutil.parser import isoparse
+
 from hcloud.core.domain import BaseDomain
-from hcloud.helpers.descriptors import ISODateTime
 
 
 class Network(BaseDomain):
@@ -32,12 +33,10 @@ class Network(BaseDomain):
         "routes",
         "servers",
         "protection",
-        "labels"
+        "labels",
+        "created"
     )
 
-    created = ISODateTime()
-    supported_fields = ("created",)
-
     def __init__(
             self,
             id,
@@ -52,7 +51,7 @@ def __init__(
     ):
         self.id = id
         self.name = name
-        self.created = created
+        self.created = isoparse(created) if created else None
         self.ip_range = ip_range
         self.subnets = subnets
         self.routes = routes

hcloud/networks/domain.py

@@ -23,6 +23,8 @@ class ServerType(BaseDomain, DomainIdentityMixin):
            Type of server boot drive. Local has higher speed. Network has better availability. Choices: `local`, `network`
     :param cpu_type: string
            Type of cpu. Choices: `shared`, `dedicated`
+    :param deprecated: bool
+           True if server type is deprecated
     """
     __slots__ = (
         "id",
@@ -33,7 +35,8 @@ class ServerType(BaseDomain, DomainIdentityMixin):
         "disk",
         "prices",
         "storage_type",
-        "cpu_type"
+        "cpu_type",
+        "deprecated"
     )
 
     def __init__(
@@ -46,8 +49,8 @@ def __init__(
         disk=None,
         prices=None,
         storage_type=None,
-        cpu_type=None
-
+        cpu_type=None,
+        deprecated=None
     ):
         self.id = id
         self.name = name
@@ -58,3 +61,4 @@ def __init__(
         self.prices = prices
         self.storage_type = storage_type
         self.cpu_type = cpu_type
+        self.deprecated = deprecated

hcloud/server_types/domain.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
-from hcloud.core.domain import BaseDomain
+from dateutil.parser import isoparse
 
-from hcloud.helpers.descriptors import ISODateTime
+from hcloud.core.domain import BaseDomain
 
 
 class Server(BaseDomain):
@@ -78,13 +78,10 @@ class Server(BaseDomain):
         "protection",
         "labels",
         "volumes",
-        "private_net"
+        "private_net",
+        "created"
     )
 
-    created = ISODateTime()
-
-    supported_fields = ("created",)
-
     def __init__(
             self,
             id,
@@ -110,7 +107,7 @@ def __init__(
         self.id = id
         self.name = name
         self.status = status
-        self.created = created
+        self.created = isoparse(created) if created else None
         self.public_net = public_net
         self.server_type = server_type
         self.datacenter = datacenter