Compatibilisation avec django

This commit is contained in:
Pierre-Elliott Bécue 2015-09-26 03:01:59 +02:00
parent c18de85fd2
commit 8213b919ee

View file

@ -637,27 +637,27 @@ class generalizedTimeFormat(Attr):
une donnée de temps suivant la RFC 4517 une donnée de temps suivant la RFC 4517
""" """
__slots__ = ("_stamp", "_datetime",) __slots__ = ("stamp", "datetime",)
default = "19700101000000Z" default = "19700101000000Z"
def __float__(self): def __float__(self):
return self._stamp return self.stamp
def __int__(self): def __int__(self):
return int(self._stamp) return int(self.stamp)
def __eq__(self, othertime): def __eq__(self, othertime):
if isinstance(othertime, generalizedTimeFormat): if isinstance(othertime, generalizedTimeFormat):
return self._stamp == othertime._stamp return self.stamp == othertime.stamp
elif isinstance(othertime, float): elif isinstance(othertime, float):
return self._stamp == othertime return self.stamp == othertime
elif isinstance(othertime, int): elif isinstance(othertime, int):
return self._stamp == othertime return self.stamp == othertime
elif isinstance(othertime, unicode) or isinstance(othertime, str): elif isinstance(othertime, unicode) or isinstance(othertime, str):
resource = generalizedTimeFormat(othertime, conn=None, Parent=None) resource = generalizedTimeFormat(othertime, conn=None, Parent=None)
return self._stamp == resource._stamp return self.stamp == resource.stamp
elif isinstance(othertime, datetime.datetime): elif isinstance(othertime, datetime.datetime):
return self._datetime == othertime return self.datetime == othertime
else: else:
return False return False
@ -666,16 +666,16 @@ class generalizedTimeFormat(Attr):
def __lt__(self, othertime): def __lt__(self, othertime):
if isinstance(othertime, generalizedTimeFormat): if isinstance(othertime, generalizedTimeFormat):
return self._stamp < othertime._stamp return self.stamp < othertime.stamp
elif isinstance(othertime, float): elif isinstance(othertime, float):
return self._stamp < othertime return self.stamp < othertime
elif isinstance(othertime, int): elif isinstance(othertime, int):
return self._stamp < othertime return self.stamp < othertime
elif isinstance(othertime, unicode) or isinstance(othertime, str): elif isinstance(othertime, unicode) or isinstance(othertime, str):
resource = generalizedTimeFormat(othertime, conn=None, Parent=None) resource = generalizedTimeFormat(othertime, conn=None, Parent=None)
return self._stamp < resource._stamp return self.stamp < resource.stamp
elif isinstance(othertime, datetime.datetime): elif isinstance(othertime, datetime.datetime):
return self._datetime < othertime return self.datetime < othertime
else: else:
return False return False
@ -691,21 +691,21 @@ class generalizedTimeFormat(Attr):
def parse_value(self, gtf): def parse_value(self, gtf):
if isinstance(gtf, str) or isinstance(gtf, unicode): if isinstance(gtf, str) or isinstance(gtf, unicode):
if not ('Z' in gtf or '+' in gtf or '-' in gtf): if not ('Z' in gtf or '+' in gtf or '-' in gtf):
self._stamp = gtf self.stamp = gtf
self.value = to_generalized_time_format(float(gtf)) self.value = to_generalized_time_format(float(gtf))
self._datetime = datetime_from_generalized_time_format(self.value) self.datetime = datetime_from_generalized_time_format(self.value)
else: else:
self._stamp = from_generalized_time_format(gtf) self.stamp = from_generalized_time_format(gtf)
self._datetime = datetime_from_generalized_time_format(gtf) self.datetime = datetime_from_generalized_time_format(gtf)
self.value = gtf self.value = gtf
elif isinstance(gtf, float): elif isinstance(gtf, float):
self._stamp = gtf self.stamp = gtf
self.value = to_generalized_time_format(gtf) self.value = to_generalized_time_format(gtf)
self._datetime = datetime_from_generalized_time_format(self.value) self.datetime = datetime_from_generalized_time_format(self.value)
elif isinstance(gtf, datetime.datetime): elif isinstance(gtf, datetime.datetime):
self._datetime = gtf self.datetime = gtf
self.value = datetime_to_generalized_time_format(gtf) self.value = datetime_to_generalized_time_format(gtf)
self._stamp = from_generalized_time_format(self.value) self.stamp = from_generalized_time_format(self.value)
@crans_attribute @crans_attribute
class debutAdhesion(generalizedTimeFormat): class debutAdhesion(generalizedTimeFormat):