Subliminal update

libs/guessit/hash_mpc.py

@@ -18,8 +18,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from guessit import Guess
-import struct, os
+import struct
+import os
+
 
 def hash_file(filename):
     """This function is taken from:
@@ -32,25 +33,24 @@ def hash_file(filename):
     f = open(filename, "rb")
 
     filesize = os.path.getsize(filename)
-    hash = filesize
+    hash_value = filesize
 
     if filesize < 65536 * 2:
-        raise Exception, "SizeError: size is %d, should be > 132K..." % filesize
+        raise Exception("SizeError: size is %d, should be > 132K..." % filesize)
 
-    for x in range(65536/bytesize):
-        buffer = f.read(bytesize)
-        (l_value,)= struct.unpack(longlongformat, buffer)
-        hash += l_value
-        hash = hash & 0xFFFFFFFFFFFFFFFF #to remain as 64bit number
+    for x in range(65536 / bytesize):
+        buf = f.read(bytesize)
+        (l_value,) = struct.unpack(longlongformat, buf)
+        hash_value += l_value
+        hash_value = hash_value & 0xFFFFFFFFFFFFFFFF #to remain as 64bit number
 
-
-    f.seek(max(0,filesize-65536),0)
-    for x in range(65536/bytesize):
-        buffer = f.read(bytesize)
-        (l_value,)= struct.unpack(longlongformat, buffer)
-        hash += l_value
-        hash = hash & 0xFFFFFFFFFFFFFFFF
+    f.seek(max(0, filesize - 65536), 0)
+    for x in range(65536 / bytesize):
+        buf = f.read(bytesize)
+        (l_value,) = struct.unpack(longlongformat, buf)
+        hash_value += l_value
+        hash_value = hash_value & 0xFFFFFFFFFFFFFFFF
 
     f.close()
-    returnedhash =  "%016x" % hash
-    return returnedhash
+
+    return "%016x" % hash_value