# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1347987180 -32400
# Node ID dfc0cb4355f4c62d62f9183809436c4510798011
# Parent  f094e31cd30b419d2fbb376521b0a2ca308fbeec
small correction to avoid warnings

diff -r f094e31cd30b -r dfc0cb4355f4 src/ldt/ldt/ldt_utils/views/content.py
--- a/src/ldt/ldt/ldt_utils/views/content.py	Tue Sep 18 16:22:11 2012 +0200
+++ b/src/ldt/ldt/ldt_utils/views/content.py	Wed Sep 19 01:53:00 2012 +0900
@@ -15,7 +15,6 @@
 from ldt.security.cache import cached_assign
 from ldt.user.forms import PictureForm
 from tagging.models import Tag, TaggedItem
-from urllib2 import urlparse
 import ldt.utils.path as ldt_utils_path
 import logging
 import mimetypes
@@ -56,14 +55,11 @@
             media_instance_val = {}
         #add prefix
         
-        def add_prefix(dict, prefix):
-            for key, value in dict.items():
-                dict['%s-%s' % (prefix, key)] = value
-                del(dict[key])
+        def add_prefix(_dict, prefix):
+            return dict([('%s-%s' % (prefix, key), value) for key,value in _dict.items()])
         
-        add_prefix(content_instance_val, "content")
-        add_prefix(media_instance_val, "media")     
-        src_video=request.POST.get('media-src')
+        content_instance_val = add_prefix(content_instance_val, "content")
+        media_instance_val= add_prefix(media_instance_val, "media")     
    
         for k in request.POST.keys():
             value = request.POST.get(k)
@@ -395,9 +391,9 @@
 
     
 @login_required
-def contents_filter(request, filter): 
-    if filter and len(filter) > 0 and filter[0] == '_':
-        filter = filter[1:]
+def contents_filter(request, _filter): 
+    if _filter and len(_filter) > 0 and _filter[0] == '_':
+        _filter = _filter[1:]
     
     num_page = 0
     if request.GET.has_key('num_page'):
@@ -406,17 +402,17 @@
     if request.GET.has_key('tag_filter'):
         tag_filter = request.GET["tag_filter"]
     
-    # We paginate the content list, in case of filter or not
-    if filter and not tag_filter :
-        content_nb = Content.safe_objects.filter(title__icontains=filter).count()
+    # We paginate the content list, in case of _filter or not
+    if _filter and not tag_filter :
+        content_nb = Content.safe_objects.filter(title__icontains=_filter).count()
         nb_ct_pages = int(math.ceil(content_nb / settings.LDT_MAX_CONTENTS_PER_PAGE)) + 1
-        content_list = Content.safe_objects.filter(title__icontains=filter)[(num_page*settings.LDT_MAX_CONTENTS_PER_PAGE):((num_page+1)*settings.LDT_MAX_CONTENTS_PER_PAGE)] #@UndefinedVariable
-    elif filter and tag_filter :
+        content_list = Content.safe_objects.filter(title__icontains=_filter)[(num_page*settings.LDT_MAX_CONTENTS_PER_PAGE):((num_page+1)*settings.LDT_MAX_CONTENTS_PER_PAGE)] #@UndefinedVariable
+    elif _filter and tag_filter :
         #TaggedItem.objects.get_by_model(Content.objects.all(), '"'+tag_filter+'"')
-        content_nb = TaggedItem.objects.get_by_model(Content.safe_objects.filter(title__icontains=filter), '"'+tag_filter+'"').count()
+        content_nb = TaggedItem.objects.get_by_model(Content.safe_objects.filter(title__icontains=_filter), '"'+tag_filter+'"').count()
         nb_ct_pages = int(math.ceil(content_nb / settings.LDT_MAX_CONTENTS_PER_PAGE)) + 1
-        content_list = TaggedItem.objects.get_by_model(Content.safe_objects.filter(title__icontains=filter), '"'+tag_filter+'"')[(num_page*settings.LDT_MAX_CONTENTS_PER_PAGE):((num_page+1)*settings.LDT_MAX_CONTENTS_PER_PAGE)] #@UndefinedVariable
-    elif tag_filter and not filter:
+        content_list = TaggedItem.objects.get_by_model(Content.safe_objects.filter(title__icontains=_filter), '"'+tag_filter+'"')[(num_page*settings.LDT_MAX_CONTENTS_PER_PAGE):((num_page+1)*settings.LDT_MAX_CONTENTS_PER_PAGE)] #@UndefinedVariable
+    elif tag_filter and not _filter:
         content_nb = TaggedItem.objects.get_by_model(Content.safe_objects.all(), '"'+tag_filter+'"').count()
         nb_ct_pages = int(math.ceil(content_nb / settings.LDT_MAX_CONTENTS_PER_PAGE)) +1
         content_list = TaggedItem.objects.get_by_model(Content.safe_objects.all(), '"'+tag_filter+'"')[(num_page*settings.LDT_MAX_CONTENTS_PER_PAGE):((num_page+1)*settings.LDT_MAX_CONTENTS_PER_PAGE)] #@UndefinedVariable
@@ -486,4 +482,3 @@
     else:
         title=data['title']
     return title
-  
\ No newline at end of file