feat(*): use latest python (3.5 right now) for API

from __future__ import unicode_literals is not needed anymore, see http://python-future.org/unicode_literals.html

xrange is now range in python 3 and exception needs as instead of comma as a separator

print needs parentheses

basestring is replaced with str

Author: helgi

.travis.yml

@@ -24,7 +24,7 @@ before_install:
   - wget "http://ftp.debian.org/debian/pool/main/s/shellcheck/shellcheck_0.3.7-5_amd64.deb"
   - sudo dpkg -i shellcheck_0.3.7-5_amd64.deb
   - sudo pip install virtualenv
-  - virtualenv $HOME/venv
+  - virtualenv -p python3.5 $HOME/venv
   - source $HOME/venv/bin/activate
   - createdb -U postgres deis
 install:

rootfs/api/admin.py

@@ -4,7 +4,6 @@
 Django admin app configuration for Deis API models.
 """
 
-from __future__ import unicode_literals
 
 from django.contrib import admin
 from guardian.admin import GuardedModelAdmin

rootfs/api/fields.py

@@ -2,7 +2,6 @@
 Deis API custom fields for representing data in Django forms.
 """
 
-from __future__ import unicode_literals
 from django.db import models
 
 

rootfs/api/management/commands/load_db_state_to_etcd.py

@@ -9,8 +9,8 @@ class Command(BaseCommand):
     """
     def handle(self, *args, **options):
         """Publishes Deis platform state from the database to etcd."""
-        print "Publishing DB state to etcd..."
+        print("Publishing DB state to etcd...")
         for model in (Key, App, Domain, Certificate, Config):
             for obj in model.objects.all():
                 obj.save()
-        print "Done Publishing DB state to etcd."
+        print("Done Publishing DB state to etcd.")

rootfs/api/migrations/0001_initial.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
 
 from django.db import models, migrations
 import jsonfield.fields

rootfs/api/migrations/0002_auto_20151215_0352.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
 
 from django.db import migrations, models
 import api.models

rootfs/api/models.py

@@ -4,7 +4,6 @@
 Data models for the Deis API.
 """
 
-from __future__ import unicode_literals
 import base64
 from datetime import datetime
 import etcd
@@ -18,19 +17,16 @@
 from django.conf import settings
 from django.core.exceptions import ValidationError, SuspiciousOperation
 from django.db import models
-from django.db.models import Count
-from django.db.models import Max
+from django.db.models import Count, Max
 from django.db.models.signals import post_delete, post_save
 from django.dispatch import receiver
-from django.utils.encoding import python_2_unicode_compatible
 from jsonfield import JSONField
 from OpenSSL import crypto
 import requests
 from rest_framework.authtoken.models import Token
 
-from api import utils
 from registry import publish_release
-from utils import dict_diff, dict_merge, fingerprint
+from api.utils import dict_diff, dict_merge, fingerprint, generate_app_name
 
 
 User = settings.AUTH_USER_MODEL
@@ -82,9 +78,9 @@ def validate_id_is_docker_compatible(value):
 def validate_app_structure(value):
     """Error if the dict values aren't ints >= 0."""
     try:
-        if any(int(v) < 0 for v in value.viewvalues()):
+        if any(int(v) < 0 for v in value.values()):
             raise ValueError("Must be greater than or equal to zero")
-    except ValueError, err:
+    except ValueError as err:
         raise ValidationError(err)
 
 
@@ -141,7 +137,6 @@ class Meta:
         abstract = True
 
 
-@python_2_unicode_compatible
 class App(UuidAuditedModel):
     """
     Application used to service requests on behalf of end-users
@@ -159,9 +154,9 @@ class Meta:
     @property
     def select_app_name(self):
         """Select a unique randomly generated app name"""
-        name = utils.generate_app_name()
+        name = generate_app_name()
         while App.objects.filter(id=name).exists():
-            name = utils.generate_app_name()
+            name = generate_app_name()
 
         return name
 
@@ -174,9 +169,9 @@ def _scheduler(self):
 
     def save(self, **kwargs):
         if not self.id:
-            self.id = utils.generate_app_name()
+            self.id = generate_app_name()
             while App.objects.filter(id=self.id).exists():
-                self.id = utils.generate_app_name()
+                self.id = generate_app_name()
 
         return super(App, self).save(**kwargs)
 
@@ -265,15 +260,15 @@ def scale(self, user, structure):  # noqa
                 raise EnvironmentError(
                     'Container type {} does not exist in application'.format(container_type))
         msg = '{} scaled containers '.format(user.username) + ' '.join(
-            "{}={}".format(k, v) for k, v in requested_structure.items())
+            "{}={}".format(k, v) for k, v in list(requested_structure.items()))
         log_event(self, msg)
         # iterate and scale by container type (web, worker, etc)
         changed = False
         to_add, to_remove = [], []
         scale_types = {}
 
         # iterate on a copy of the container_type keys
-        for container_type in requested_structure.keys():
+        for container_type in list(requested_structure.keys()):
             containers = list(self.container_set.filter(type=container_type).order_by('created'))
             # increment new container nums off the most recent container
             results = self.container_set.filter(type=container_type).aggregate(Max('num'))
@@ -518,7 +513,6 @@ def run(self, user, command):
         return c.run(escaped_command)
 
 
-@python_2_unicode_compatible
 class Container(UuidAuditedModel):
     """
     Docker container used to securely host an application process.
@@ -649,7 +643,6 @@ def run(self, command):
             raise
 
 
-@python_2_unicode_compatible
 class Push(UuidAuditedModel):
     """
     Instance of a push used to trigger an application build
@@ -674,7 +667,6 @@ def __str__(self):
         return "{0}-{1}".format(self.app.id, self.sha[:7])
 
 
-@python_2_unicode_compatible
 class Build(UuidAuditedModel):
     """
     Instance of a software build used by runtime nodes
@@ -728,7 +720,6 @@ def __str__(self):
         return "{0}-{1}".format(self.app.id, str(self.uuid)[:7])
 
 
-@python_2_unicode_compatible
 class Config(UuidAuditedModel):
     """
     Set of configuration values applied as environment variables
@@ -778,15 +769,14 @@ def save(self, **kwargs):
 
                 data.update(new_data)
                 # remove config keys if we provided a null value
-                [data.pop(k) for k, v in new_data.viewitems() if v is None]
+                [data.pop(k) for k, v in new_data.items() if v is None]
                 setattr(self, attr, data)
         except Config.DoesNotExist:
             pass
 
         return super(Config, self).save(**kwargs)
 
 
-@python_2_unicode_compatible
 class Release(UuidAuditedModel):
     """
     Software release deployed by the application platform
@@ -953,7 +943,6 @@ def save(self, *args, **kwargs):  # noqa
         super(Release, self).save(*args, **kwargs)
 
 
-@python_2_unicode_compatible
 class Domain(AuditedModel):
     owner = models.ForeignKey(settings.AUTH_USER_MODEL)
     app = models.ForeignKey('App')
@@ -997,7 +986,7 @@ def _save_service_config(self, app, component, data):
         component = "%s.deis.io/" % component
 
         # add component to data and flatten
-        data = {"%s%s" % (component, key): value for key, value in data.items()}
+        data = {"%s%s" % (component, key): value for key, value in list(data.items())}
         svc['metadata']['annotations'].update(morph.flatten(data))
 
         # Update the k8s service for the application with new domain information
@@ -1015,7 +1004,7 @@ def save(self, *args, **kwargs):
             config['domains'] = ''
 
         # convert from string to list to work with and filter out empty strings
-        domains = filter(None, config['domains'].split(','))
+        domains = [_f for _f in config['domains'].split(',') if _f]
         if domain not in domains:
             domains.append(domain)
         config['domains'] = ','.join(domains)
@@ -1037,7 +1026,7 @@ def delete(self, *args, **kwargs):
             config['domains'] = ''
 
         # convert from string to list to work with and filter out empty strings
-        domains = filter(None, config['domains'].split(','))
+        domains = [_f for _f in config['domains'].split(',') if _f]
         if domain in domains:
             domains.remove(domain)
         config['domains'] = ','.join(domains)
@@ -1051,7 +1040,6 @@ def __str__(self):
         return self.domain
 
 
-@python_2_unicode_compatible
 class Certificate(AuditedModel):
     """
     Public and private key pair used to secure application traffic at the router.
@@ -1077,13 +1065,17 @@ def save(self, *args, **kwargs):
         certificate = self._get_certificate()
         if not self.common_name:
             self.common_name = certificate.get_subject().CN
+
         if not self.expires:
+            # https://pyopenssl.readthedocs.org/en/latest/api/crypto.html#OpenSSL.crypto.X509.get_notAfter
+            # Convert bytes to string
+            timestamp = certificate.get_notAfter().decode(encoding='UTF-8')
             # convert openssl's expiry date format to Django's DateTimeField format
-            self.expires = datetime.strptime(certificate.get_notAfter(), '%Y%m%d%H%M%SZ')
+            self.expires = datetime.strptime(timestamp, '%Y%m%d%H%M%SZ')
+
         return super(Certificate, self).save(*args, **kwargs)
 
 
-@python_2_unicode_compatible
 class Key(UuidAuditedModel):
     """An SSH public key."""
 

rootfs/api/routers.py

@@ -2,7 +2,6 @@
 REST framework URL routing classes.
 """
 
-from __future__ import unicode_literals
 
 from rest_framework.routers import DefaultRouter
 from rest_framework.routers import Route

rootfs/api/serializers.py

@@ -2,7 +2,6 @@
 Classes to serialize the RESTful representation of Deis API models.
 """
 
-from __future__ import unicode_literals
 import json
 import re
 
@@ -35,7 +34,7 @@ def to_internal_value(self, data):
 
     def to_representation(self, obj):
         """Serialize the field's JSON data, for read operations."""
-        for k, v in obj.viewitems():
+        for k, v in obj.items():
             if v is None:  # NoneType is used to unset a value
                 continue
 
@@ -143,64 +142,64 @@ class Meta:
         """Metadata options for a :class:`ConfigSerializer`."""
         model = models.Config
 
-    def validate_values(self, value):
-        for k, v in value.viewitems():
-            if not re.match(CONFIGKEY_MATCH, k):
+    def validate_values(self, data):
+        for key, value in data.items():
+            if not re.match(CONFIGKEY_MATCH, key):
                 raise serializers.ValidationError(
                     "Config keys must start with a letter or underscore and "
                     "only contain [A-z0-9_]")
 
-        return value
+        return data
 
-    def validate_memory(self, value):
-        for k, v in value.viewitems():
-            if v is None:  # use NoneType to unset a value
+    def validate_memory(self, data):
+        for key, value in data.items():
+            if value is None:  # use NoneType to unset an item
                 continue
 
-            if not re.match(PROCTYPE_MATCH, k):
+            if not re.match(PROCTYPE_MATCH, key):
                 raise serializers.ValidationError("Process types can only contain [a-z]")
 
-            if not re.match(MEMLIMIT_MATCH, str(v)):
+            if not re.match(MEMLIMIT_MATCH, str(value)):
                 raise serializers.ValidationError(
                     "Limit format: <number><unit>, where unit = B, K, M or G")
 
-        return value
+        return data
 
-    def validate_cpu(self, value):
-        for k, v in value.viewitems():
-            if v is None:  # use NoneType to unset a value
+    def validate_cpu(self, data):
+        for key, value in data.items():
+            if value is None:  # use NoneType to unset an item
                 continue
 
-            if not re.match(PROCTYPE_MATCH, k):
+            if not re.match(PROCTYPE_MATCH, key):
                 raise serializers.ValidationError("Process types can only contain [a-z]")
 
-            shares = re.match(CPUSHARE_MATCH, str(v))
+            shares = re.match(CPUSHARE_MATCH, str(value))
             if not shares:
                 raise serializers.ValidationError("CPU shares must be an integer")
 
-            for v in shares.groupdict().viewvalues():
+            for share in shares.groupdict().values():
                 try:
-                    i = int(v)
+                    i = int(share)
                 except ValueError:
                     raise serializers.ValidationError("CPU shares must be an integer")
 
                 if i > 1024 or i < 0:
                     raise serializers.ValidationError("CPU shares must be between 0 and 1024")
 
-        return value
+        return data
 
-    def validate_tags(self, value):
-        for k, v in value.viewitems():
-            if v is None:  # use NoneType to unset a value
+    def validate_tags(self, data):
+        for key, value in data.items():
+            if value is None:  # use NoneType to unset an item
                 continue
 
-            if not re.match(TAGKEY_MATCH, k):
+            if not re.match(TAGKEY_MATCH, key):
                 raise serializers.ValidationError("Tag keys can only contain [a-z]")
 
-            if not re.match(TAGVAL_MATCH, str(v)):
-                raise serializers.ValidationError("Invalid tag value")
+            if not re.match(TAGVAL_MATCH, str(value)):
+                raise serializers.ValidationError("Invalid tag data")
 
-        return value
+        return data
 
 
 class ReleaseSerializer(serializers.ModelSerializer):

rootfs/api/tests/__init__.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 import logging
 
 from django.test.runner import DiscoverRunner