From 34028b99e77da105c3e0e9675d6258b76317a91e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adolfo=20G=C3=B3mez=20Garc=C3=ADa?= Date: Tue, 31 Jul 2018 23:59:59 +0200 Subject: [PATCH] Fixes from merge --- server/src/uds/models/ServicesPool.py | 2 +- server/src/uds/models/TicketStore.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/uds/models/ServicesPool.py b/server/src/uds/models/ServicesPool.py index f9971a29..820a1d0a 100644 --- a/server/src/uds/models/ServicesPool.py +++ b/server/src/uds/models/ServicesPool.py @@ -72,7 +72,7 @@ logger = logging.getLogger(__name__) class DeployedService(UUIDModel, TaggingMixin): """ A deployed service is the Service produced element that is assigned finally to an user (i.e. a Virtual Machine, etc..) - ''' + """ # pylint: disable=model-missing-unicode name = models.CharField(max_length=128, default='') short_name = models.CharField(max_length=32, default='') diff --git a/server/src/uds/models/TicketStore.py b/server/src/uds/models/TicketStore.py index c64845cd..7008372a 100644 --- a/server/src/uds/models/TicketStore.py +++ b/server/src/uds/models/TicketStore.py @@ -164,7 +164,7 @@ class TicketStore(UUIDModel): for v in TicketStore.objects.all(): if now > v.stamp + timedelta(seconds=v.validity): v.delete() - cleanSince = now - datetime.timedelta(seconds=TicketStore.MAX_VALIDITY) + cleanSince = now - datetime.timedelta(seconds=TicketStore.MAX_VALIDITY) number = TicketStore.objects.filter(stamp__lt=cleanSince).delete() def __unicode__(self):