add yapf

 - call ./run_yapf.sh before commits

.style.yapf

@@ -0,0 +1,5 @@
+[style]
+based_on_style = pep8
+DEDENT_CLOSING_BRACKETS = True
+SPLIT_BEFORE_NAMED_ASSIGNS = True
+COLUMN_LIMIT = 120

api/drf_permissions.py

@@ -3,36 +3,42 @@
 
 class CanSeeGroups(permissions.BasePermission):
     """Check if a user should see Groups."""
+
     def has_permission(self, request, view):
         return request.user.profile.can_see_groups
 
 
 class CanSeeContactNames(permissions.BasePermission):
     """Check if a user should see names of Contacts."""
+
     def has_permission(self, request, view):
         return request.user.profile.can_see_contact_names
 
 
 class CanSeeKeywords(permissions.BasePermission):
     """Check if a user should have access to keywords."""
+
     def has_permission(self, request, view):
         return request.user.profile.can_see_keywords
 
 
 class CanSeeOutgoing(permissions.BasePermission):
     """Check if a user should have access to outgoing log."""
+
     def has_permission(self, request, view):
         return request.user.profile.can_see_outgoing
 
 
 class CanSeeIncoming(permissions.BasePermission):
     """Check if a user should have access to incoming log."""
+
     def has_permission(self, request, view):
         return request.user.profile.can_see_incoming
 
 
 class CanSeeKeyword(permissions.BasePermission):
     """Check if a user should have access to a single keyword."""
+
     def has_object_permission(self, request, view, obj):
         if not obj.is_locked:
             return True

api/serializers.py

@@ -11,12 +11,7 @@ class RecipientSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Recipient
-        fields = ('first_name', 'last_name',
-                  'pk',
-                  'url',
-                  'full_name',
-                  'is_archived', 'is_blocking'
-                  )
+        fields = ('first_name', 'last_name', 'pk', 'url', 'full_name', 'is_archived', 'is_blocking')
 
 
 class RecipientGroupSerializer(serializers.ModelSerializer):
@@ -27,12 +22,7 @@ class RecipientGroupSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = RecipientGroup
-        fields = ('name',
-                  'pk',
-                  'description',
-                  'members',
-                  'cost',
-                  'url')
+        fields = ('name', 'pk', 'description', 'members', 'cost', 'url')
 
 
 class ElvantoGroupSerializer(serializers.ModelSerializer):
@@ -41,12 +31,7 @@ class ElvantoGroupSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = ElvantoGroup
-        fields = (
-            'name',
-            'pk',
-            'sync',
-            'last_synced',
-        )
+        fields = ('name', 'pk', 'sync', 'last_synced', )
 
 
 class KeywordSerializer(serializers.ModelSerializer):
@@ -59,13 +44,10 @@ class KeywordSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Keyword
-        fields = ('keyword',
-                  'pk',
-                  'description',
-                  'custom_response',
-                  'is_live',
-                  'url', 'responses_url',
-                  'num_replies', 'num_archived_replies')
+        fields = (
+            'keyword', 'pk', 'description', 'custom_response', 'is_live', 'url', 'responses_url', 'num_replies',
+            'num_archived_replies'
+        )
 
 
 class SmsInboundSerializer(serializers.ModelSerializer):
@@ -74,14 +56,21 @@ class SmsInboundSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = SmsInbound
-        fields = ('sid', 'pk',
-                  'sender_name', 'sender_num',
-                  'content',
-                  'time_received',
-                  'dealt_with', 'is_archived', 'display_on_wall',
-                  'matched_keyword', 'matched_colour', 'matched_link',
-                  'sender_url',
-                  )
+        fields = (
+            'sid',
+            'pk',
+            'sender_name',
+            'sender_num',
+            'content',
+            'time_received',
+            'dealt_with',
+            'is_archived',
+            'display_on_wall',
+            'matched_keyword',
+            'matched_colour',
+            'matched_link',
+            'sender_url',
+        )
 
 
 class SmsInboundSimpleSerializer(serializers.ModelSerializer):
@@ -90,12 +79,7 @@ class SmsInboundSimpleSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = SmsInbound
-        fields = ('pk',
-                  'content',
-                  'time_received',
-                  'is_archived', 'display_on_wall',
-                  'matched_keyword',
-                  )
+        fields = ('pk', 'content', 'time_received', 'is_archived', 'display_on_wall', 'matched_keyword', )
 
 
 class SmsOutboundSerializer(serializers.ModelSerializer):
@@ -105,10 +89,4 @@ class SmsOutboundSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = SmsOutbound
-        fields = ('content',
-                  'pk',
-                  'time_sent',
-                  'sent_by',
-                  'recipient',
-                  'recipient_url',
-                  )
+        fields = ('content', 'pk', 'time_sent', 'sent_by', 'recipient', 'recipient_url', )

api/urls.py

@@ -16,119 +16,161 @@
 # api
 urlpatterns = [
     # sms views
-    url(r'^v1/sms/in/$',
+    url(
+        r'^v1/sms/in/$',
         ApiCollection.as_view(
             model_class=SmsInbound,
             serializer_class=SmsInboundSerializer,
             permission_classes=(IsAuthenticated, CanSeeIncoming)
         ),
-        name='in_log'),
-    url(r'^v1/sms/out/$',
+        name='in_log'
+    ),
+    url(
+        r'^v1/sms/out/$',
         ApiCollection.as_view(
             model_class=SmsOutbound,
             serializer_class=SmsOutboundSerializer,
             permission_classes=(IsAuthenticated, CanSeeOutgoing),
             related_field='recipient',
         ),
-        name='out_log'),
-    url(r'^v1/sms/live_wall/in/$',
+        name='out_log'
+    ),
+    url(
+        r'^v1/sms/live_wall/in/$',
         ApiCollectionAllWall.as_view(
             permission_classes=(IsAuthenticated, CanSeeIncoming)
         ),
-        name='live_wall'),
-    url(r'^v1/sms/in/recpient/(?P<pk>\d+)/$',
+        name='live_wall'
+    ),
+    url(
+        r'^v1/sms/in/recpient/(?P<pk>\d+)/$',
         ApiCollectionRecentSms.as_view(
-            permission_classes=(IsAuthenticated, CanSeeContactNames, CanSeeIncoming)),
-        name='contact_recent_sms'),
-    url(r'^v1/sms/in/keyword/(?P<pk>\d+)/$',
+            permission_classes=(
+                IsAuthenticated, CanSeeContactNames, CanSeeIncoming
+            )
+        ),
+        name='contact_recent_sms'
+    ),
+    url(
+        r'^v1/sms/in/keyword/(?P<pk>\d+)/$',
         ApiCollectionKeywordSms.as_view(
-            permission_classes=(IsAuthenticated, CanSeeKeywords, CanSeeKeyword, CanSeeIncoming),
+            permission_classes=(
+                IsAuthenticated, CanSeeKeywords, CanSeeKeyword, CanSeeIncoming
+            ),
             archive=False
         ),
-        name='keyword_sms'),
-    url(r'^v1/sms/in/keyword/(?P<pk>\d+)/archive/$',
+        name='keyword_sms'
+    ),
+    url(
+        r'^v1/sms/in/keyword/(?P<pk>\d+)/archive/$',
         ApiCollectionKeywordSms.as_view(
-            permission_classes=(IsAuthenticated, CanSeeKeywords, CanSeeKeyword, CanSeeIncoming),
-            archive=True),
-        name='keyword_sms_archive'),
-    url(r'^v1/sms/in/(?P<pk>[0-9]+)$',
+            permission_classes=(
+                IsAuthenticated, CanSeeKeywords, CanSeeKeyword, CanSeeIncoming
+            ),
+            archive=True
+        ),
+        name='keyword_sms_archive'
+    ),
+    url(
+        r'^v1/sms/in/(?P<pk>[0-9]+)$',
         ApiMember.as_view(
             model_class=SmsInbound,
             serializer_class=SmsInboundSerializer,
             permission_classes=(IsAuthenticated, CanSeeIncoming),
         ),
-        name='sms_in_member'),
+        name='sms_in_member'
+    ),
     # recipient views
-    url(r'^v1/recipients/$',
+    url(
+        r'^v1/recipients/$',
         ApiCollection.as_view(
             model_class=Recipient,
             serializer_class=RecipientSerializer,
             filter_list=True,
             filters={'is_archived': False},
             permission_classes=(IsAuthenticated, CanSeeContactNames)
         ),
-        name='recipients'),
-    url(r'^v1/recipients/(?P<pk>[0-9]+)$',
+        name='recipients'
+    ),
+    url(
+        r'^v1/recipients/(?P<pk>[0-9]+)$',
         ApiMember.as_view(
             model_class=Recipient,
             serializer_class=RecipientSerializer,
             permission_classes=(IsAuthenticated, CanSeeContactNames)
         ),
-        name='recipient'),
+        name='recipient'
+    ),
     # group views
-    url(r'^v1/groups/$',
+    url(
+        r'^v1/groups/$',
         ApiCollection.as_view(
             model_class=RecipientGroup,
             serializer_class=RecipientGroupSerializer,
             filter_list=True,
             filters={'is_archived': False},
             permission_classes=(IsAuthenticated, CanSeeGroups)
         ),
-        name='recipient_groups'),
-    url(r'^v1/groups/(?P<pk>[0-9]+)$',
+        name='recipient_groups'
+    ),
+    url(
+        r'^v1/groups/(?P<pk>[0-9]+)$',
         ApiMember.as_view(
             model_class=RecipientGroup,
             serializer_class=RecipientGroupSerializer,
             permission_classes=(IsAuthenticated, CanSeeGroups)
         ),
-        name='group'),
+        name='group'
+    ),
     # Elvanto groups
-    url(r'^v1/elvanto/groups/$',
+    url(
+        r'^v1/elvanto/groups/$',
         ApiCollection.as_view(
             model_class=ElvantoGroup,
             serializer_class=ElvantoGroupSerializer,
             permission_classes=(IsAuthenticated, CanSeeGroups)
         ),
-        name='elvanto_groups'),
-    url(r'^v1/elvanto/group/(?P<pk>[0-9]+)$',
+        name='elvanto_groups'
+    ),
+    url(
+        r'^v1/elvanto/group/(?P<pk>[0-9]+)$',
         ApiMember.as_view(
             model_class=ElvantoGroup,
             serializer_class=ElvantoGroupSerializer,
             permission_classes=(IsAuthenticated, CanSeeGroups)
         ),
-        name='elvanto_group'),
+        name='elvanto_group'
+    ),
     # Elvanto group buttons
-    url(r'^v1/elvanto/group_fetch/$',
+    url(
+        r'^v1/elvanto/group_fetch/$',
         ElvantoFetchButton.as_view(),
-        name='fetch_elvanto_groups'),
-    url(r'^v1/elvanto/group_pull/$',
+        name='fetch_elvanto_groups'
+    ),
+    url(
+        r'^v1/elvanto/group_pull/$',
         ElvantoPullButton.as_view(),
-        name='pull_elvanto_groups'),
+        name='pull_elvanto_groups'
+    ),
     # keyword views
-    url(r'^v1/keywords/$',
+    url(
+        r'^v1/keywords/$',
         ApiCollection.as_view(
             model_class=Keyword,
             serializer_class=KeywordSerializer,
             filter_list=True,
             filters={'is_archived': False},
             permission_classes=(IsAuthenticated, CanSeeKeywords)
         ),
-        name='keywords'),
-    url(r'^v1/keywords/(?P<pk>[0-9]+)$',
+        name='keywords'
+    ),
+    url(
+        r'^v1/keywords/(?P<pk>[0-9]+)$',
         ApiMember.as_view(
             model_class=Keyword,
             serializer_class=KeywordSerializer,
             permission_classes=(IsAuthenticated, CanSeeKeyword)
         ),
-        name='keyword'),
+        name='keyword'
+    ),
 ]