# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1352285402 -3600
# Node ID 03a00e8f2e3bfe83182a97f9e56fbfaee60f17ab
# Parent  8fd1b95f04efcae4084415d8a1d08dd37a48b5fd
Remove warnings

diff -r 8fd1b95f04ef -r 03a00e8f2e3b src/ldt/ldt/ldt_utils/models.py
--- a/src/ldt/ldt/ldt_utils/models.py	Tue Nov 06 18:45:13 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/models.py	Wed Nov 07 11:50:02 2012 +0100
@@ -14,7 +14,7 @@
     generate_uuid)
 from ldt.utils import generate_hash 
 import datetime
-import lxml.etree
+import lxml.etree #@UnresolvedImport
 import mimetypes
 import os.path
 import re
@@ -54,7 +54,6 @@
     description = models.TextField(null=True, blank=True, verbose_name=_('description'))
     title = models.CharField(max_length=1024, null=True, blank=True, verbose_name=_('title'))
     src = models.CharField(max_length=1024, verbose_name=_('media.src'))
-    #TODO: use a fixed length char field
     src_hash = models.CharField(max_length=128, unique=True, verbose_name=_('media.src_hash'), blank=True)
     mimetype_field = models.CharField(max_length=512, null=True, blank=True, verbose_name=_('media.mimetype'))
     
@@ -178,10 +177,10 @@
         iri_file_path = self.iri_file_path()
         thumbnail = os.path.join(settings.MEDIA_ROOT, unicode(self.image))
         if os.path.exists(iri_file_path):
-            dir = os.path.dirname(iri_file_path)
-            temp = os.path.join(os.path.join(os.path.dirname(dir), "temp"), self.iri_id)             
+            iri_dir = os.path.dirname(iri_file_path)
+            temp = os.path.join(os.path.join(os.path.dirname(iri_dir), "temp"), self.iri_id)             
             try:
-                move(dir, temp)
+                move(iri_dir, temp)
             except Exception, e:
                 raise e
         if os.path.exists(thumbnail):
@@ -197,8 +196,8 @@
     #del .iri, and .png from temp directory
     def commit(self):
         iri_file_path=self.iri_file_path()
-        dir = os.path.dirname(iri_file_path)
-        temp = os.path.join(os.path.join(os.path.dirname(dir), "temp"), self.iri_id)
+        iri_dir = os.path.dirname(iri_file_path)
+        temp = os.path.join(os.path.join(os.path.dirname(iri_dir), "temp"), self.iri_id)
         thumbnail = os.path.join(settings.MEDIA_ROOT, unicode(self.image))
         temp_thumbnail = os.path.join(os.path.dirname(thumbnail), "temp")
         if os.path.exists(temp):
@@ -211,12 +210,12 @@
     #move .iri, and .png to there original directory
     def rollback(self):
         iri_file_path=self.iri_file_path()
-        dir = os.path.dirname(iri_file_path)
-        temp = os.path.join(os.path.join(os.path.dirname(dir), "temp"), self.iri_id)
+        iri_dir = os.path.dirname(iri_file_path)
+        temp = os.path.join(os.path.join(os.path.dirname(iri_dir), "temp"), self.iri_id)
         thumbnail = os.path.join(settings.MEDIA_ROOT, unicode(self.image))
         temp_thumbnail = os.path.join(os.path.dirname(thumbnail), "temp")
         if os.path.exists(temp):
-            move(temp, dir)
+            move(temp, iri_dir)
             os.rmdir(os.path.dirname(temp))
         if os.path.exists(temp_thumbnail):
             move(os.path.join(temp_thumbnail, os.path.basename(thumbnail)), os.path.dirname(thumbnail))
@@ -260,12 +259,12 @@
         try:
             iri_file_path = self.iri_file_path()
             if not os.path.exists(iri_file_path):
-                dir = os.path.dirname(iri_file_path)
-                if not os.path.exists(dir):
-                    os.makedirs(dir)
+                iri_dir = os.path.dirname(iri_file_path)
+                if not os.path.exists(iri_dir):
+                    os.makedirs(iri_dir)
                 created = True
-                file = open(iri_file_path, "w")
-                create_empty_iri(file, self, "IRI")
+                iri_file = open(iri_file_path, "w")
+                create_empty_iri(iri_file, self, "IRI")
             else:
                 created = False
                 update_iri(iri_file_path, self, "IRI")
diff -r 8fd1b95f04ef -r 03a00e8f2e3b src/ldt/ldt/ldt_utils/searchutils.py
--- a/src/ldt/ldt/ldt_utils/searchutils.py	Tue Nov 06 18:45:13 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/searchutils.py	Wed Nov 07 11:50:02 2012 +0100
@@ -1,4 +1,3 @@
-from django.conf import settings
 from ldt.indexation import SimpleSearch
 from ldt.ldt_utils.models import Content, Project
 from ldt.ldt_utils.utils import LdtUtils