diff --git a/happydomain/api.py b/happydomain/api.py index c506ebb..cff195e 100644 --- a/happydomain/api.py +++ b/happydomain/api.py @@ -51,7 +51,7 @@ class HappyDomain: if val is not None: for au in val: - ret.append(Domain(self, zone_history_are_ids=True, **au)) + ret.append(Domain(self, **au)) return ret diff --git a/happydomain/domain.py b/happydomain/domain.py index 5302178..f146712 100644 --- a/happydomain/domain.py +++ b/happydomain/domain.py @@ -2,11 +2,11 @@ import json from urllib.parse import quote from .error import HappyError -from .zone import UncompleteZoneMeta, ZoneMeta, Zone +from .zone import ZoneMeta, Zone class Domain: - def __init__(self, _session, id, id_owner, id_provider, domain, zone_history, zone_history_are_ids=False, group=""): + def __init__(self, _session, id, id_owner, id_provider, domain, zone_history, group=""): self._session = _session self.id = id @@ -14,10 +14,7 @@ class Domain: self.id_provider = id_provider self.domain = domain self.group = group - if zone_history_are_ids: - self.zone_history = [UncompleteZoneMeta(self, zid) for zid in zone_history] - else: - self.zone_history = zone_history if zone_history is not None else [] + self.zone_history = zone_history if zone_history is not None else [] def _dumps(self): return json.dumps({ diff --git a/happydomain/zone.py b/happydomain/zone.py index ca3ff77..bd8757c 100644 --- a/happydomain/zone.py +++ b/happydomain/zone.py @@ -31,54 +31,6 @@ class ZoneMeta: }) -class UncompleteZoneMeta(ZoneMeta): - - def __init__(self, _domain, id): - self._complete = None - self._domain = _domain - self.id = id - - def resolve(self): - if self._complete is None: - self._complete = self._domain.get_zone(self.id) - - @property - def id_author(self): - self.resolve() - return self._complete.id_author - - @property - def default_ttl(self): - self.resolve() - return self._complete.default_ttl - - @property - def last_modified(self): - self.resolve() - return self._complete.last_modified - - @property - def last_modified(self): - self.resolve() - return self._complete.last_modified - - @property - def commit_message(self): - self.resolve() - return self._complete.commit_message - - @property - def commit_date(self): - self.resolve() - return self._complete.commit_date - - @property - def published(self): - self.resolve() - return self._complete.published - - - class Zone(ZoneMeta): def __init__(self, _session, _domainid, **kwargs): diff --git a/pyproject.toml b/pyproject.toml index c6b4980..e7ae932 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "happydomain" -version = "0.1.0" +version = "0.0.7" authors = [ { name="happyDomain's team", email="contact+pypi@happydomain.org" }, ] diff --git a/setup.py b/setup.py index 365f2c9..f9a6b9e 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ try: except ImportError: from distutils.core import setup -version = "0.1.0" +version = "0.0.7" setup( name = "happydomain",