Merge pull request #7 from Flowerowl/master

format code with pep8

wordpress/admin.py

@@ -1,49 +1,62 @@
 from django.contrib import admin
-from wordpress.models import Option, Comment, Link, Post, PostMeta, Taxonomy, Term, User, UserMeta
+from wordpress.models import (
+    Option, Comment, Link, Post,
+    PostMeta, Taxonomy, Term, User, UserMeta
+)
+
 
 class OptionAdmin(admin.ModelAdmin):
     list_display = ('name', 'value')
 
+
 class CommentAdmin(admin.ModelAdmin):
-    list_display = ('id','post','author_name','post_date')
-    list_filter = ('comment_type','approved')
-    search_fields = ('author_name','author_email','post__title')
+    list_display = ('id', 'post', 'author_name', 'post_date')
+    list_filter = ('comment_type', 'approved')
+    search_fields = ('author_name', 'author_email', 'post__title')
+
 
 class LinkAdmin(admin.ModelAdmin):
-    list_display = ('id','name','url','description')
+    list_display = ('id', 'name', 'url', 'description')
     list_filter = ('visible',)
-    search_fields = ('name','url','description')
+    search_fields = ('name', 'url', 'description')
+
 
 class PostMetaInline(admin.TabularInline):
     model = PostMeta
-
+
+
 class PostAdmin(admin.ModelAdmin):
     inlines = (PostMetaInline,)
-    list_display = ('id','title','author','post_date')
-    list_filter = ('status','post_type','comment_status','ping_status','author')
+    list_display = ('id', 'title', 'author', 'post_date')
+    list_filter = ('status', 'post_type', 'comment_status', 'ping_status', 'author')
     search_fields = ('title',)
-
+
+
 class UserMetaInline(admin.TabularInline):
     model = UserMeta
-
+
+
 class UserAdmin(admin.ModelAdmin):
     inlines = (UserMetaInline,)
-    list_display = ('id','display_name','email','status')
+    list_display = ('id', 'display_name', 'email', 'status')
     list_filter = ('status',)
-    search_fields = ('login','username','display_name','email')
+    search_fields = ('login', 'username', 'display_name', 'email')
+
 
 class TaxonomyAdmin(admin.ModelAdmin):
-    list_display = ('id','name','term')
+    list_display = ('id', 'name', 'term')
     list_filter = ('name',)
-
+
+
 class TermAdmin(admin.ModelAdmin):
-    list_display = ('id','name')
+    list_display = ('id', 'name')
     search_fields = ('name',)
 
+
 admin.site.register(Option, OptionAdmin)
 admin.site.register(Comment, CommentAdmin)
 admin.site.register(Link, LinkAdmin)
 admin.site.register(Post, PostAdmin)
 admin.site.register(Taxonomy, TaxonomyAdmin)
 admin.site.register(Term, TermAdmin)
-admin.site.register(User, UserAdmin)
+admin.site.register(User, UserAdmin)

wordpress/models.py

@@ -5,6 +5,7 @@
 from django.core.exceptions import ObjectDoesNotExist
 from django.db import models
 
+
 STATUS_CHOICES = (
     ('closed', 'closed'),
     ('open', 'open'),
@@ -46,6 +47,7 @@ class WordPressException(Exception):
 #
 # Base managers
 #
+
 class WordPressManager(models.Manager):
     """
     Base manager for wordpress queries.
@@ -198,7 +200,8 @@ class PostManager(WordPressManager):
     """
 
     def _by_status(self, status, post_type='post'):
-        return self.filter(status=status, post_type=post_type).select_related().prefetch_related('meta')
+        return self.filter(status=status, post_type=post_type)\
+            .select_related().prefetch_related('meta')
 
     def drafts(self, post_type='post'):
         return self._by_status('draft', post_type)
@@ -478,7 +481,6 @@ def __unicode__(self):
         return self.name
 
     @models.permalink
-
     def get_absolute_url(self):
         return ('wp_archive_term', (self.slug, ))
 

wordpress/templatetags/wp.py

@@ -5,6 +5,7 @@
 
 register = template.Library()
 
+
 class PostsContextNode(template.Node):
 
     def __init__(self, queryset, var_name):
@@ -15,32 +16,34 @@ def render(self, context):
         context[self.var_name] = self.queryset
         return ''
 
+
 class PostsTemplateNode(template.Node):
-    
+
     def __init__(self, queryset, nodelist):
         self.queryset = queryset
         self.nodelist = nodelist
-        
+
     def render(self, context):
         content = ''
         for post in self.queryset:
             content += self.nodelist.render(Context({'post': post})) + '\n'
         return content
 
+
 def _posts(parser, token, queryset):
 
     m = re.search(r'(?P<tag>\w+)(?: (?P<count>\d{1,4}))?(?: as (?P<var_name>\w+))?', token.contents)
     args = m.groupdict()
-    
+
     if args['count']:
         try:
             queryset = queryset[:int(args['count'])]
         except ValueError:
             raise template.TemplateSyntaxError, "count argument must be an integer"
-    
+
     if args['var_name']:
         return PostsContextNode(queryset, args['var_name'])
-        
+
     else:
         nodelist = parser.parse(('end%s' % args['tag'],))
         parser.delete_first_token()
@@ -66,4 +69,4 @@ def do_recent_posts(parser, token):
 GROUP BY t.name, t.slug
 ORDER BY cnt DESC
 LIMIT 10
-"""
+"""