PEP8 cleanup

Author: kevinastone

.pep8

@@ -2,9 +2,6 @@
 
 # List of PEP8 Errors and Warnings to Ignore
 # E501	line too long (82 > 79 characters)
-# W191	indentation contains tabs
-# W293	blank line contains whitespace
-# E302	expected 2 blank lines, found 0
 
 # Most of the Indentation continuation rules are ignored (short of the mixed spaces and tabs)
 
@@ -20,17 +17,14 @@
 # Whitespace
 # E261	at least two spaces before inline comment
 
-ignore = E501,W191,W293,E302,E12,E261
+ignore = E501,E12,E261
 
 exclude = migrations
 
 [flake8]
 
 # List of PEP8 Errors and Warnings to Ignore
 # E501	line too long (82 > 79 characters)
-# W191	indentation contains tabs
-# W293	blank line contains whitespace
-# E302	expected 2 blank lines, found 0
 
 # Most of the Indentation continuation rules are ignored (short of the mixed spaces and tabs)
 
@@ -50,6 +44,6 @@ exclude = migrations
 # PyFlakes
 # F403	unable to detect undefined names (from whatever import *)
 
-ignore = E501,W191,W293,E302,E12,E261,F403
+ignore = E501,E12,E261,F403
 
 exclude = migrations

example/api/api.py

@@ -26,7 +26,7 @@ class PostMixin(object):
     permission_classes = [
         PostAuthorCanEditPermission
     ]
-    
+
     def pre_save(self, obj):
         """Force author to the current user on save"""
         obj.author = self.request.user
@@ -44,7 +44,7 @@ class PostDetail(PostMixin, generics.RetrieveUpdateDestroyAPIView):
 class UserPostList(generics.ListAPIView):
     model = Post
     serializer_class = PostSerializer
-    
+
     def get_queryset(self):
         queryset = super(UserPostList, self).get_queryset()
         return queryset.filter(author__username=self.kwargs.get('username'))
@@ -69,7 +69,7 @@ class PhotoDetail(generics.RetrieveUpdateDestroyAPIView):
 class PostPhotoList(generics.ListAPIView):
     model = Photo
     serializer_class = PhotoSerializer
-    
+
     def get_queryset(self):
         queryset = super(PostPhotoList, self).get_queryset()
         return queryset.filter(post__pk=self.kwargs.get('pk'))

example/api/auth.py

@@ -5,6 +5,6 @@ class AlwaysRootBackend(object):
     def authenticate(self, *args, **kwargs):
         """Always returns the `root` user.  DO NOT USE THIS IN PRODUCTION!"""
         return User.objects.get(username='root')
-    
+
     def get_user(self, user_id):
         return User.objects.get(username='root')

example/api/management/commands/create_photos.py

@@ -1,19 +1,19 @@
 import os
 import os.path
 
-from django.core.management.base import BaseCommand, CommandError
+from django.core.management.base import BaseCommand
 from django.conf import settings
 
 from example.api.models import Photo, Post
 
 
 class Command(BaseCommand):
-	sample_dir = 'samples'
+    sample_dir = 'samples'
 
-	def handle(self, *args, **options):
-		sample_images = [os.path.join(self.sample_dir, fn) for fn in os.listdir(os.path.join(settings.MEDIA_ROOT, self.sample_dir))]
+    def handle(self, *args, **options):
+        sample_images = [os.path.join(self.sample_dir, fn) for fn in os.listdir(os.path.join(settings.MEDIA_ROOT, self.sample_dir))]
 
-		posts = Post.objects.all()
+        posts = Post.objects.all()
 
-		for i, image in enumerate(sample_images):
-			Photo.objects.create(post=posts[i % posts.count()], image=image)
+        for i, image in enumerate(sample_images):
+            Photo.objects.create(post=posts[i % posts.count()], image=image)

example/api/management/commands/create_posts.py

@@ -1,5 +1,4 @@
-from django.core.management.base import BaseCommand, CommandError
-from django.conf import settings
+from django.core.management.base import BaseCommand
 
 from example.api.models import Post, User
 

example/api/management/commands/create_users.py

@@ -1,5 +1,4 @@
-from django.core.management.base import BaseCommand, CommandError
-from django.conf import settings
+from django.core.management.base import BaseCommand
 
 from example.api.models import User
 

example/api/models.py

@@ -4,15 +4,15 @@
 
 
 class User(AbstractUser):
-	followers = models.ManyToManyField('self', related_name='followees', symmetrical=False)
+    followers = models.ManyToManyField('self', related_name='followees', symmetrical=False)
 
 
 class Post(models.Model):
-	author = models.ForeignKey(User, related_name='posts')
-	title = models.CharField(max_length=255)
-	body = models.TextField(blank=True, null=True)
+    author = models.ForeignKey(User, related_name='posts')
+    title = models.CharField(max_length=255)
+    body = models.TextField(blank=True, null=True)
 
 
 class Photo(models.Model):
-	post = models.ForeignKey(Post, related_name='photos')
-	image = models.ImageField(upload_to="%Y/%m/%d")
+    post = models.ForeignKey(Post, related_name='photos')
+    image = models.ImageField(upload_to="%Y/%m/%d")

example/api/permissions.py

@@ -5,7 +5,7 @@ class SafeMethodsOnlyPermission(permissions.BasePermission):
     """Only can access non-destructive methods (like GET and HEAD)"""
     def has_permission(self, request, view):
         return self.has_object_permission(request, view)
-    
+
     def has_object_permission(self, request, view, obj=None):
         return request.method in permissions.SAFE_METHODS
 

example/api/serializers.py

@@ -5,7 +5,7 @@
 
 class UserSerializer(serializers.ModelSerializer):
     posts = serializers.HyperlinkedIdentityField('posts', view_name='userpost-list', lookup_field='username')
-    
+
     class Meta:
         model = User
         fields = ('id', 'username', 'first_name', 'last_name', 'posts', )
@@ -15,18 +15,18 @@ class PostSerializer(serializers.ModelSerializer):
     author = UserSerializer(required=False)
     photos = serializers.HyperlinkedIdentityField('photos', view_name='postphoto-list')
     # author = serializers.HyperlinkedRelatedField(view_name='user-detail', lookup_field='username')
-    
+
     def get_validation_exclusions(self, *args, **kwargs):
         # Need to exclude `user` since we'll add that later based off the request
         exclusions = super(PostSerializer, self).get_validation_exclusions(*args, **kwargs)
         return exclusions + ['author']
-    
+
     class Meta:
         model = Post
 
 
 class PhotoSerializer(serializers.ModelSerializer):
     image = serializers.Field('image.url')
-    
+
     class Meta:
         model = Photo

example/urls.py

@@ -11,7 +11,7 @@
 class SimpleStaticView(TemplateView):
     def get_template_names(self):
         return [self.kwargs.get('template_name') + ".html"]
-    
+
     def get(self, request, *args, **kwargs):
         from django.contrib.auth import authenticate, login
         if request.user.is_anonymous():

setup.py

@@ -5,53 +5,53 @@
 
 # Shamelessly stolen (then modified) from https://github.com/cburgmer/pdfserver/blob/master/setup.py
 def parse_requirements(file_name):
-	import re
-	requirements = []
-	for line in open(file_name, 'r').read().split('\n'):
-		if re.match(r'(\s*#)|(\s*$)', line):
-			continue
-		# if re.match(r'\s*-e\s+', line):
-		m = re.search(r"(git(?:\+\w{3})?|https?|svn)://.+#egg=(.*)$", line)
-		if m:
-			# FIXME: Can't install packages from source repos right now
-			if 'http' in m.group(1):
-				# Distutils can install Http served packages right now
-				# FIXME: Skip this now
-				# requirements.append(m.group(2))
-				pass
-			pass
-		elif re.match(r'\s*-f\s+', line):
-			pass
-		elif re.match(r'\s*-i\s+', line):
-			pass
-		else:
-			requirements.append(line)
-
-	return requirements
+    import re
+    requirements = []
+    for line in open(file_name, 'r').read().split('\n'):
+        if re.match(r'(\s*#)|(\s*$)', line):
+            continue
+        # if re.match(r'\s*-e\s+', line):
+        m = re.search(r"(git(?:\+\w{3})?|https?|svn)://.+#egg=(.*)$", line)
+        if m:
+            # FIXME: Can't install packages from source repos right now
+            if 'http' in m.group(1):
+                # Distutils can install Http served packages right now
+                # FIXME: Skip this now
+                # requirements.append(m.group(2))
+                pass
+            pass
+        elif re.match(r'\s*-f\s+', line):
+            pass
+        elif re.match(r'\s*-i\s+', line):
+            pass
+        else:
+            requirements.append(line)
+
+    return requirements
 
 
 def parse_dependency_links(file_name):
-	import re
-	dependency_links = []
-	for line in open(file_name, 'r').read().split('\n'):
-		if re.match(r'\s*-[ef]\s+', line):
-			dependency_links.append(re.sub(r'\s*-[ef]\s+', '', line))
-			continue
-		m = re.search(r"((?:git(?:\+ssh)|http|svn)://.+#egg=.*)$", line)
-		if m:
-			dependency_links.append(m.group(1))
-
-	return dependency_links
+    import re
+    dependency_links = []
+    for line in open(file_name, 'r').read().split('\n'):
+        if re.match(r'\s*-[ef]\s+', line):
+            dependency_links.append(re.sub(r'\s*-[ef]\s+', '', line))
+            continue
+        m = re.search(r"((?:git(?:\+ssh)|http|svn)://.+#egg=.*)$", line)
+        if m:
+            dependency_links.append(m.group(1))
+
+    return dependency_links
 
 params = dict(
-	name='API Example',
-	packages=find_packages(),
-	install_requires=parse_requirements('requirements.txt'),
-	dependency_links=parse_dependency_links('requirements.txt'),
-	entry_points={
-		'console_scripts': [
-		]
-	},
+    name='API Example',
+    packages=find_packages(),
+    install_requires=parse_requirements('requirements.txt'),
+    dependency_links=parse_dependency_links('requirements.txt'),
+    entry_points={
+        'console_scripts': [
+        ]
+    },
 )
 
 setup(**params)