refactoring and updating models for python 3.7 -- UUIDModel

server/src/uds/models/Image.py

@@ -39,7 +39,7 @@ from django.http import HttpResponse
 
 from PIL import Image as PILImage
 
-from uds.models.UUIDModel import UUIDModel
+from uds.models.uuid_model import UUIDModel
 from uds.models.util import getSqlDatetime
 
 from uds.core.util import encoders

server/src/uds/models/ManagedObjectModel.py

@@ -36,7 +36,7 @@ import typing
 from django.db import models
 from uds.core.environment import Environment
 from uds.core import Module
-from uds.models.UUIDModel import UUIDModel
+from uds.models.uuid_model import UUIDModel
 
 
 logger = logging.getLogger(__name__)

server/src/uds/models/MetaPool.py

@@ -39,7 +39,7 @@ from django.utils.translation import ugettext_noop as _
 
 from uds.core.util import log
 from uds.core.util import states
-from uds.models.UUIDModel import UUIDModel
+from uds.models.uuid_model import UUIDModel
 from uds.models.Tag import TaggingMixin
 from uds.models.util import getSqlDatetime
 from uds.core.util.calendar import CalendarChecker

server/src/uds/models/Network.py

@@ -38,7 +38,7 @@ from django.db.models import signals
 
 from uds.models.Transport import Transport
 from uds.core.util import net
-from uds.models.UUIDModel import UUIDModel
+from uds.models.uuid_model import UUIDModel
 from uds.models.Tag import TaggingMixin
 
 

server/src/uds/models/Permissions.py

@@ -36,7 +36,7 @@ from django.utils.translation import ugettext as _
 from django.db import models
 from django.db.models import Q
 
-from uds.models.UUIDModel import UUIDModel
+from uds.models.uuid_model import UUIDModel
 from uds.models.user import User
 from uds.models.group import Group
 from uds.models.util import getSqlDatetime

server/src/uds/models/Proxy.py

@@ -36,7 +36,7 @@ import requests
 
 from django.db import models
 
-from uds.models.UUIDModel import UUIDModel
+from uds.models.uuid_model import UUIDModel
 from uds.models.Tag import TaggingMixin
 
 

server/src/uds/models/ServicesPool.py

@@ -42,7 +42,7 @@ from uds.core.environment import Environment
 from uds.core.util import log
 from uds.core.util import states
 from uds.core.services.Exceptions import InvalidServiceException
-from uds.models.UUIDModel import UUIDModel
+from uds.models.uuid_model import UUIDModel
 from uds.models.Tag import TaggingMixin
 
 from uds.models.OSManager import OSManager

server/src/uds/models/ServicesPoolGroup.py

@@ -35,7 +35,7 @@ import logging
 from django.db import models
 from django.utils.translation import ugettext as _
 
-from uds.models.UUIDModel import UUIDModel
+from uds.models.uuid_model import UUIDModel
 from uds.models.Image import Image
 from uds.core.ui.images import DEFAULT_THUMB_BASE64
 

server/src/uds/models/ServicesPoolPublication.py

@@ -42,7 +42,7 @@ from uds.core.util import log
 
 from uds.models.ServicesPool import DeployedService
 from uds.models.util import getSqlDatetime
-from uds.models.UUIDModel import UUIDModel
+from uds.models.uuid_model import UUIDModel
 
 logger = logging.getLogger(__name__)
 

server/src/uds/models/Tag.py

@@ -34,7 +34,7 @@ import logging
 
 
 from django.db import models
-from uds.models.UUIDModel import UUIDModel
+from uds.models.uuid_model import UUIDModel
 
 logger = logging.getLogger(__name__)
 

server/src/uds/models/TicketStore.py

@@ -34,7 +34,7 @@ import logging
 
 from django.db import models
 
-from uds.models.UUIDModel import UUIDModel
+from uds.models.uuid_model import UUIDModel
 from uds.models.util import getSqlDatetime
 from uds.core.managers import cryptoManager
 

server/src/uds/models/account.py

@@ -33,7 +33,7 @@ import typing
 
 from django.db import models
 
-from uds.models.UUIDModel import UUIDModel
+from uds.models.uuid_model import UUIDModel
 from uds.models.Tag import TaggingMixin
 from uds.models.util import getSqlDatetime
 from uds.models.util import NEVER

server/src/uds/models/account_usage.py

@@ -34,7 +34,7 @@ from django.db import models
 
 from uds.core.util.tools import secondsToTimeString
 
-from .UUIDModel import UUIDModel
+from .uuid_model import UUIDModel
 from .account import Account
 from .user_service import UserService
 from .util import NEVER

server/src/uds/models/calendar.py

@@ -32,7 +32,7 @@
 import logging
 
 from django.db import models
-from uds.models.UUIDModel import UUIDModel
+from uds.models.uuid_model import UUIDModel
 from uds.models.Tag import TaggingMixin
 
 

server/src/uds/models/calendar_access.py

@@ -37,7 +37,7 @@ from django.db import models
 
 from uds.core.util import states
 
-from .UUIDModel import UUIDModel
+from .uuid_model import UUIDModel
 from .calendar import Calendar
 from .ServicesPool import ServicePool
 from .MetaPool import MetaPool

server/src/uds/models/calendar_action.py

@@ -43,7 +43,7 @@ from django.db import models
 from uds.core.util import (calendar, log)
 
 from .calendar import Calendar
-from .UUIDModel import UUIDModel
+from .uuid_model import UUIDModel
 from .util import getSqlDatetime
 from .ServicesPool import ServicePool
 from .Transport import Transport

server/src/uds/models/calendar_rule.py

@@ -39,7 +39,7 @@ from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from dateutil import rrule as rules
 
-from .UUIDModel import UUIDModel
+from .uuid_model import UUIDModel
 from .calendar import Calendar
 from .util import getSqlDatetime
 

server/src/uds/models/dbfile.py

@@ -35,7 +35,7 @@ import logging
 import typing
 
 from django.db import models
-from uds.models.UUIDModel import UUIDModel
+from uds.models.uuid_model import UUIDModel
 from uds.core.util import encoders
 
 

server/src/uds/models/group.py

@@ -39,7 +39,7 @@ from django.db.models import signals
 from uds.core.util.State import State
 from uds.core.util import log
 
-from .UUIDModel import UUIDModel
+from .uuid_model import UUIDModel
 from .authenticator import Authenticator
 from .user import User
 from .util import UnsavedForeignKey, getSqlDatetime

server/src/uds/models/user.py

@@ -41,7 +41,7 @@ from uds.models.util import UnsavedForeignKey
 from uds.models.util import NEVER
 from uds.models.util import getSqlDatetime
 from uds.core.util import log
-from uds.models.UUIDModel import UUIDModel
+from uds.models.uuid_model import UUIDModel
 
 # Not imported in runtime, just for type checking
 if typing.TYPE_CHECKING:

server/src/uds/models/user_service.py

@@ -40,7 +40,7 @@ from uds.core.environment import Environment
 from uds.core.util import log
 from uds.core.util import unique
 from uds.core.util.State import State
-from uds.models.UUIDModel import UUIDModel
+from uds.models.uuid_model import UUIDModel
 
 from uds.models.ServicesPool import DeployedService
 from uds.models.ServicesPoolPublication import DeployedServicePublication

server/src/uds/models/uuid_model.py

@@ -33,26 +33,22 @@
 import logging
 
 from django.db import models
-from django.utils.encoding import python_2_unicode_compatible
 
 from uds.core.util.model import generateUuid
 
 
 logger = logging.getLogger(__name__)
 
-
-@python_2_unicode_compatible
 class UUIDModel(models.Model):
     """
     Base abstract model for models that require an uuid
     """
-    # pylint: disable=model-missing-unicode
     uuid = models.CharField(max_length=50, default=None, null=True, unique=True)
 
     class Meta:
         abstract = True
 
-    def genUuid(self):
+    def genUuid(self) -> str:
         return generateUuid()
 
     # Override default save to add uuid