pep8 fixes

lms/djangoapps/django_comment_client/base/views.py

@@ -119,7 +119,7 @@ def create_thread(request, course_id, commentable_id):
     #patch for backward compatibility to comments service
     if not 'pinned' in thread.attributes:
         thread['pinned'] = False
-    
+
     if post.get('auto_subscribe', 'false').lower() == 'true':
         user = cc.User.from_django_user(request.user)
         user.follow(thread)
@@ -174,7 +174,7 @@ def _create_comment(request, course_id, thread_id=None, parent_id=None):
         user = cc.User.from_django_user(request.user)
         user.follow(comment.thread)
     if request.is_ajax():
-        return ajax_content_response(request, course_id,comment.to_dict(), 'discussion/ajax_create_comment.html')
+        return ajax_content_response(request, course_id, comment.to_dict(), 'discussion/ajax_create_comment.html')
     else:
         return JsonResponse(utils.safe_content(comment.to_dict()))
 
@@ -290,29 +290,32 @@ def vote_for_thread(request, course_id, thread_id, value):
 def flag_abuse_for_thread(request, course_id, thread_id):
     user = cc.User.from_django_user(request.user)
     thread = cc.Thread.find(thread_id)
-    thread.flagAbuse(user,thread)
+    thread.flagAbuse(user, thread)
     return JsonResponse(utils.safe_content(thread.to_dict()))
 
+
 @require_POST
 @login_required
 @permitted
 def un_flag_abuse_for_thread(request, course_id, thread_id):
     user = cc.User.from_django_user(request.user)
-    
+
     thread = cc.Thread.find(thread_id)
     removeAll = cached_has_permission(request.user, 'openclose_thread', course_id)
-    thread.unFlagAbuse(user,thread,removeAll)
+    thread.unFlagAbuse(user, thread, removeAll)
     return JsonResponse(utils.safe_content(thread.to_dict()))
 
+
 @require_POST
 @login_required
 @permitted
 def flag_abuse_for_comment(request, course_id, comment_id):
     user = cc.User.from_django_user(request.user)
     comment = cc.Comment.find(comment_id)
-    comment.flagAbuse(user,comment)
+    comment.flagAbuse(user, comment)
     return JsonResponse(utils.safe_content(comment.to_dict()))
 
+
 @require_POST
 @login_required
 @permitted
@@ -320,9 +323,10 @@ def un_flag_abuse_for_comment(request, course_id, comment_id):
     user = cc.User.from_django_user(request.user)
     removeAll = cached_has_permission(request.user, 'openclose_thread', course_id)
     comment = cc.Comment.find(comment_id)
-    comment.unFlagAbuse(user,comment, removeAll)
+    comment.unFlagAbuse(user, comment, removeAll)
     return JsonResponse(utils.safe_content(comment.to_dict()))
 
+
 @require_POST
 @login_required
 @permitted
@@ -332,19 +336,21 @@ def undo_vote_for_thread(request, course_id, thread_id):
     user.unvote(thread)
     return JsonResponse(utils.safe_content(thread.to_dict()))
 
+
 @require_POST
 @login_required
 @permitted
 def pin_thread(request, course_id, thread_id):
     user = cc.User.from_django_user(request.user)
     thread = cc.Thread.find(thread_id)
-    thread.pin(user,thread_id)
+    thread.pin(user, thread_id)
     return JsonResponse(utils.safe_content(thread.to_dict()))
 
+
 def un_pin_thread(request, course_id, thread_id):
     user = cc.User.from_django_user(request.user)
     thread = cc.Thread.find(thread_id)
-    thread.un_pin(user,thread_id)
+    thread.un_pin(user, thread_id)
     return JsonResponse(utils.safe_content(thread.to_dict()))
 
 
@@ -491,16 +497,11 @@ def upload(request, course_id):  # ajax upload file to a question or answer
         if not file_extension in cc_settings.ALLOWED_UPLOAD_FILE_TYPES:
             file_types = "', '".join(cc_settings.ALLOWED_UPLOAD_FILE_TYPES)
             msg = _("allowed file types are '%(file_types)s'") % \
-                    {'file_types': file_types}
+                {'file_types': file_types}
             raise exceptions.PermissionDenied(msg)
 
         # generate new file name
-        new_file_name = str(
-                            time.time()
-                        ).replace(
-                            '.',
-                            str(random.randint(0, 100000))
-                        ) + file_extension
+        new_file_name = str(time.time()).replace('.', str(random.randint(0, 100000))) + file_extension
 
         file_storage = get_storage_class()()
         # use default storage to store file
@@ -511,7 +512,7 @@ def upload(request, course_id):  # ajax upload file to a question or answer
         if size > cc_settings.MAX_UPLOAD_FILE_SIZE:
             file_storage.delete(new_file_name)
             msg = _("maximum upload file size is %(file_size)sK") % \
-                    {'file_size': cc_settings.MAX_UPLOAD_FILE_SIZE}
+                {'file_size': cc_settings.MAX_UPLOAD_FILE_SIZE}
             raise exceptions.PermissionDenied(msg)
 
     except exceptions.PermissionDenied, e:

lms/djangoapps/django_comment_client/forum/views.py

@@ -9,7 +9,7 @@ from django.contrib.auth.models import User
 
 from mitxmako.shortcuts import render_to_response, render_to_string
 from courseware.courses import get_course_with_access
-from course_groups.cohorts import (is_course_cohorted, get_cohort_id, is_commentable_cohorted, 
+from course_groups.cohorts import (is_course_cohorted, get_cohort_id, is_commentable_cohorted,
                                    get_cohorted_commentables, get_course_cohorts, get_cohort_by_id)
 from courseware.access import has_access
 from django_comment_client.models import Role
@@ -43,7 +43,7 @@ def get_threads(request, course_id, discussion_id=None, per_page=THREADS_PER_PAG
         'course_id': course_id,
         'user_id': request.user.id,
     }
-    
+
     if not request.GET.get('sort_key'):
         # If the user did not select a sort key, use their last used sort key
         cc_user = cc.User.from_django_user(request.user)
@@ -93,11 +93,11 @@ def get_threads(request, course_id, discussion_id=None, per_page=THREADS_PER_PAG
         else:
             thread['group_name'] = ""
             thread['group_string'] = "This post visible to everyone."
-    
+
         #patch for backward compatibility to comments service
         if not 'pinned' in thread:
             thread['pinned'] = False
-        
+
     query_params['page'] = page
     query_params['num_pages'] = num_pages
 
@@ -242,10 +242,10 @@ def single_thread(request, course_id, discussion_id, thread_id):
     user_info = cc_user.to_dict()
 
     try:
-      thread = cc.Thread.find(thread_id).retrieve(recursive=True, user_id=request.user.id)
+        thread = cc.Thread.find(thread_id).retrieve(recursive=True, user_id=request.user.id)
     except (cc.utils.CommentClientError, cc.utils.CommentClientUnknownError) as err:
-      log.error("Error loading single thread.")
-      raise Http404
+        log.error("Error loading single thread.")
+        raise Http404
 
     if request.is_ajax():
         courseware_context = get_courseware_context(thread, course)
@@ -302,9 +302,6 @@ def single_thread(request, course_id, discussion_id, thread_id):
         cohorts = get_course_cohorts(course_id)
         cohorted_commentables = get_cohorted_commentables(course_id)
         user_cohort = get_cohort_id(request.user, course_id)
-        
-        
-       
 
         context = {
             'discussion_id': discussion_id,
@@ -411,7 +408,7 @@ def followed_threads(request, course_id, user_id):
                 'user_info': saxutils.escape(json.dumps(user_info), escapedict),
                 'annotated_content_info': saxutils.escape(json.dumps(annotated_content_info), escapedict),
                 #                'content': content,
-            }
+                }
 
             return render_to_response('discussion/user_profile.html', context)
     except (cc.utils.CommentClientError, cc.utils.CommentClientUnknownError):

lms/djangoapps/django_comment_client/management/commands/reload_forum_users.py

@@ -6,10 +6,11 @@ from django.core.management.base import BaseCommand, CommandError
 from django.contrib.auth.models import User
 import comment_client as cc
 
+
 class Command(BaseCommand):
     help = 'Reload forum (comment client) users from existing users'
 
-    def adduser(self,user):
+    def adduser(self, user):
         print user
         try:
             cc_user = cc.User.from_django_user(user)
@@ -22,8 +23,7 @@ class Command(BaseCommand):
             uset = [User.objects.get(username=x) for x in args]
         else:
             uset = User.objects.all()
-            
+
         for user in uset:
             self.adduser(user)
-        
-                
+
\ No newline at end of file

lms/djangoapps/django_comment_client/tests/test_mustache_helpers.py

@@ -39,4 +39,3 @@ class CloseThreadTextTest(TestCase):
         self.assertEqual(mustache_helpers.close_thread_text(self.contentOpen), 'Close thread')
 
 #########################################################################################
-

lms/djangoapps/django_comment_client/utils.py

@@ -105,12 +105,12 @@ def filter_unstarted_categories(category_map):
     result_map = {}
 
     unfiltered_queue = [category_map]
-    filtered_queue   = [result_map]
+    filtered_queue = [result_map]
 
     while len(unfiltered_queue) > 0:
 
         unfiltered_map = unfiltered_queue.pop()
-        filtered_map   = filtered_queue.pop()
+        filtered_map = filtered_queue.pop()
 
         filtered_map["children"] = []
         filtered_map["entries"] = {}
@@ -187,8 +187,7 @@ def initialize_discussion_info(course):
         category = " / ".join([x.strip() for x in category.split("/")])
         last_category = category.split("/")[-1]
         discussion_id_map[id] = {"location": module.location, "title": last_category + " / " + title}
-        unexpanded_category_map[category].append({"title": title, "id": id,
-            "sort_key": sort_key, "start_date": module.lms.start})
+        unexpanded_category_map[category].append({"title": title, "id": id, "sort_key": sort_key, "start_date": module.lms.start})
 
     category_map = {"entries": defaultdict(dict), "subcategories": defaultdict(dict)}
     for category_path, entries in unexpanded_category_map.items():
@@ -215,9 +214,9 @@ def initialize_discussion_info(course):
         level = path[-1]
         if level not in node:
             node[level] = {"subcategories": defaultdict(dict),
-                            "entries": defaultdict(dict),
-                            "sort_key": level,
-                            "start_date": category_start_date}
+                           "entries": defaultdict(dict),
+                           "sort_key": level,
+                           "start_date": category_start_date}
         else:
             if node[level]["start_date"] > category_start_date:
                 node[level]["start_date"] = category_start_date
@@ -297,12 +296,12 @@ class QueryCountDebugMiddleware(object):
 
 def get_ability(course_id, content, user):
     return {
-            'editable': check_permissions_by_view(user, course_id, content, "update_thread" if content['type'] == 'thread' else "update_comment"),
-            'can_reply': check_permissions_by_view(user, course_id, content, "create_comment" if content['type'] == 'thread' else "create_sub_comment"),
-            'can_endorse': check_permissions_by_view(user, course_id, content, "endorse_comment") if content['type'] == 'comment' else False,
-            'can_delete': check_permissions_by_view(user, course_id, content, "delete_thread" if content['type'] == 'thread' else "delete_comment"),
-            'can_openclose': check_permissions_by_view(user, course_id, content, "openclose_thread") if content['type'] == 'thread' else False,
-            'can_vote': check_permissions_by_view(user, course_id, content, "vote_for_thread" if content['type'] == 'thread' else "vote_for_comment"),
+        'editable': check_permissions_by_view(user, course_id, content, "update_thread" if content['type'] == 'thread' else "update_comment"),
+        'can_reply': check_permissions_by_view(user, course_id, content, "create_comment" if content['type'] == 'thread' else "create_sub_comment"),
+        'can_endorse': check_permissions_by_view(user, course_id, content, "endorse_comment") if content['type'] == 'comment' else False,
+        'can_delete': check_permissions_by_view(user, course_id, content, "delete_thread" if content['type'] == 'thread' else "delete_comment"),
+        'can_openclose': check_permissions_by_view(user, course_id, content, "openclose_thread") if content['type'] == 'thread' else False,
+        'can_vote': check_permissions_by_view(user, course_id, content, "vote_for_thread" if content['type'] == 'thread' else "vote_for_comment"),
     }
 
 #TODO: RENAME
@@ -331,6 +330,7 @@ def get_annotated_content_infos(course_id, thread, user, user_info):
     Get metadata for a thread and its children
     """
     infos = {}
+
     def annotate(content):
         infos[str(content['id'])] = get_annotated_content_info(course_id, content, user, user_info)
         for child in content.get('children', []):
@@ -395,8 +395,8 @@ def get_courseware_context(content, course):
         location = id_map[id]["location"].url()
         title = id_map[id]["title"]
 
-        url = reverse('jump_to', kwargs={"course_id":course.location.course_id, 
-                                                    "location": location})
+        url = reverse('jump_to', kwargs={"course_id": course.location.course_id,
+                      "location": location})
 
         content_info = {"courseware_url": url, "courseware_title": title}
     return content_info
@@ -410,7 +410,7 @@ def safe_content(content):
         'at_position_list', 'children', 'highlighted_title', 'highlighted_body',
         'courseware_title', 'courseware_url', 'tags', 'unread_comments_count',
         'read', 'group_id', 'group_name', 'group_string', 'pinned', 'abuse_flaggers'
-        
+
     ]
 
     if (content.get('anonymous') is False) and (content.get('anonymous_to_peers') is False):

lms/lib/comment_client/comment.py

@@ -41,7 +41,7 @@ class Comment(models.Model):
             return cls.url_for_comments(params)
         else:
             return super(Comment, cls).url(action, params)
-            
+
     def flagAbuse(self, user, voteable):
         if voteable.type == 'thread':
             url = _url_for_flag_abuse_thread(voteable.id)
@@ -51,8 +51,8 @@ class Comment(models.Model):
             raise CommentClientError("Can only flag/unflag threads or comments")
         params = {'user_id': user.id}
         request = perform_request('put', url, params)
-        voteable.update_attributes(request)    
-        
+        voteable.update_attributes(request)
+
     def unFlagAbuse(self, user, voteable, removeAll):
         if voteable.type == 'thread':
             url = _url_for_unflag_abuse_thread(voteable.id)
@@ -61,12 +61,12 @@ class Comment(models.Model):
         else:
             raise CommentClientError("Can flag/unflag for threads or comments")
         params = {'user_id': user.id}
-        
+
         if removeAll:
             params['all'] = True
-            
+
         request = perform_request('put', url, params)
-        voteable.update_attributes(request)             
+        voteable.update_attributes(request)
 
 
 def _url_for_thread_comments(thread_id):
@@ -75,9 +75,11 @@ def _url_for_thread_comments(thread_id):
 
 def _url_for_comment(comment_id):
     return "{prefix}/comments/{comment_id}".format(prefix=settings.PREFIX, comment_id=comment_id)
-    
+
+
 def _url_for_flag_abuse_comment(comment_id):
-    return "{prefix}/comments/{comment_id}/abuse_flags".format(prefix=settings.PREFIX, comment_id=comment_id)      
-       
+    return "{prefix}/comments/{comment_id}/abuse_flags".format(prefix=settings.PREFIX, comment_id=comment_id)
+
+
 def _url_for_unflag_abuse_comment(comment_id):
-    return "{prefix}/comments/{comment_id}/abuse_unflags".format(prefix=settings.PREFIX, comment_id=comment_id) 
+    return "{prefix}/comments/{comment_id}/abuse_unflags".format(prefix=settings.PREFIX, comment_id=comment_id)

lms/lib/comment_client/thread.py

@@ -11,7 +11,6 @@ class Thread(models.Model):
         'created_at', 'updated_at', 'comments_count', 'unread_comments_count',
         'at_position_list', 'children', 'type', 'highlighted_title',
         'highlighted_body', 'endorsed', 'read', 'group_id', 'group_name', 'pinned', 'abuse_flaggers'
-        
     ]
 
     updatable_fields = [
@@ -33,7 +32,7 @@ class Thread(models.Model):
                           'course_id': query_params['course_id'],
                           'recursive': False}
         params = merge_dict(default_params, strip_blank(strip_none(query_params)))
-        
+
         if query_params.get('text') or query_params.get('tags') or query_params.get('commentable_ids'):
             url = cls.url(action='search')
         else:
@@ -56,7 +55,7 @@ class Thread(models.Model):
 
     @classmethod
     def url(cls, action, params={}):
-        
+
         if action in ['get_all', 'post']:
             return cls.url_for_threads(params)
         elif action == 'search':
@@ -70,11 +69,11 @@ class Thread(models.Model):
     def _retrieve(self, *args, **kwargs):
         url = self.url(action='get', params=self.attributes)
         request_params = {
-                            'recursive': kwargs.get('recursive'),
-                            'user_id': kwargs.get('user_id'),
-                            'mark_as_read': kwargs.get('mark_as_read', True),
-                         }
- 
+            'recursive': kwargs.get('recursive'),
+            'user_id': kwargs.get('user_id'),
+            'mark_as_read': kwargs.get('mark_as_read', True),
+        }
+
         # user_id may be none, in which case it shouldn't be part of the
         # request.
         request_params = strip_none(request_params)
@@ -91,8 +90,8 @@ class Thread(models.Model):
             raise CommentClientError("Can only flag/unflag threads or comments")
         params = {'user_id': user.id}
         request = perform_request('put', url, params)
-        voteable.update_attributes(request)    
-        
+        voteable.update_attributes(request)
+
     def unFlagAbuse(self, user, voteable, removeAll):
         if voteable.type == 'thread':
             url = _url_for_unflag_abuse_thread(voteable.id)
@@ -104,31 +103,34 @@ class Thread(models.Model):
         #if you're an admin, when you unflag, remove ALL flags
         if removeAll:
             params['all'] = True
-         
+
         request = perform_request('put', url, params)
-        voteable.update_attributes(request)    
-    
+        voteable.update_attributes(request)
+
     def pin(self, user, thread_id):
         url = _url_for_pin_thread(thread_id)
         params = {'user_id': user.id}
         request = perform_request('put', url, params)
-        self.update_attributes(request)    
+        self.update_attributes(request)
 
     def un_pin(self, user, thread_id):
         url = _url_for_un_pin_thread(thread_id)
         params = {'user_id': user.id}
         request = perform_request('put', url, params)
-        self.update_attributes(request)   
-        
+        self.update_attributes(request)
+
+
 def _url_for_flag_abuse_thread(thread_id):
-    return "{prefix}/threads/{thread_id}/abuse_flags".format(prefix=settings.PREFIX, thread_id=thread_id)      
-       
+    return "{prefix}/threads/{thread_id}/abuse_flags".format(prefix=settings.PREFIX, thread_id=thread_id)
+
+
 def _url_for_unflag_abuse_thread(thread_id):
-    return "{prefix}/threads/{thread_id}/abuse_unflags".format(prefix=settings.PREFIX, thread_id=thread_id)      
-        
+    return "{prefix}/threads/{thread_id}/abuse_unflags".format(prefix=settings.PREFIX, thread_id=thread_id)
+
+
 def _url_for_pin_thread(thread_id):
-    return "{prefix}/threads/{thread_id}/pin".format(prefix=settings.PREFIX, thread_id=thread_id)      
-       
+    return "{prefix}/threads/{thread_id}/pin".format(prefix=settings.PREFIX, thread_id=thread_id)
+
+
 def _url_for_un_pin_thread(thread_id):
-    return "{prefix}/threads/{thread_id}/unpin".format(prefix=settings.PREFIX, thread_id=thread_id)      
-       
+    return "{prefix}/threads/{thread_id}/unpin".format(prefix=settings.PREFIX, thread_id=thread_id)