Merge branch 'devel' into devel

awx/api/serializers.py

@@ -949,7 +949,6 @@ class UserSerializer(BaseSerializer):
             tokens                 = self.reverse('api:o_auth2_token_list',         kwargs={'pk': obj.pk}),
             authorized_tokens      = self.reverse('api:user_authorized_token_list', kwargs={'pk': obj.pk}),
             personal_tokens        = self.reverse('api:o_auth2_personal_token_list',   kwargs={'pk': obj.pk}),
-
         ))
         return res
 

awx/main/management/commands/create_oauth2_token.py

@@ -1,5 +1,4 @@
 # Django
-
 from django.core.management.base import BaseCommand, CommandError
 from django.contrib.auth.models import User
 from django.core.exceptions import ObjectDoesNotExist
@@ -17,6 +16,7 @@ class Command(BaseCommand):
 
     def handle(self, *args, **options):
         if not options['user']:
+
             raise CommandError('Username not supplied. Usage: awx-manage create_oauth2_token --user=username.')
         try:
             user = User.objects.get(username=options['user'])

awx/main/tests/functional/commands/test_oauth2_token_create.py

@@ -1,12 +1,18 @@
+# Python
 import pytest
 import string
 import random
 import StringIO
+
+# Django
 from django.contrib.auth.models import User
 from django.core.management import call_command
-from awx.main.models.oauth import OAuth2AccessToken
 from django.core.management.base import CommandError
 
+# AWX
+from awx.main.models.oauth import OAuth2AccessToken
+
+
 
 @pytest.mark.django_db
 @pytest.mark.inventory_import