diff -r eaf146e811a4 -r 2a35296a6304 hgext/largefiles/lfutil.py
--- a/hgext/largefiles/lfutil.py	Mon Apr 15 23:35:43 2013 +0200
+++ b/hgext/largefiles/lfutil.py	Mon Apr 15 23:43:44 2013 +0200
@@ -311,7 +311,7 @@
         return ''
     hasher = util.sha1('')
     fd = open(file, 'rb')
-    for data in blockstream(fd):
+    for data in util.filechunkiter(fd, 128 * 1024):
         hasher.update(data)
     fd.close()
     return hasher.hexdigest()
@@ -331,16 +331,6 @@
     def close(self):
         pass
 
-def blockstream(infile, blocksize=128 * 1024):
-    """Generator that yields blocks of data from infile and closes infile."""
-    while True:
-        data = infile.read(blocksize)
-        if not data:
-            break
-        yield data
-    # same blecch as copyandhash() above
-    infile.close()
-
 def writehash(hash, filename, executable):
     util.makedirs(os.path.dirname(filename))
     util.writefile(filename, hash + '\n')