0x2620/python-ox
2
1
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix ox.file

Browse source
This commit is contained in:
j 2014-09-30 21:30:25 +02:00
parent ec252440d9
commit 46278349e3
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ox/file.py
View file

@ -49,7 +49,6 @@ def _get_file_cache():
def cache(filename, type='oshash'): def cache(filename, type='oshash'):
conn = sqlite3.connect(_get_file_cache(), timeout=10) conn = sqlite3.connect(_get_file_cache(), timeout=10)
conn.text_factory = str
conn.row_factory = sqlite3.Row conn.row_factory = sqlite3.Row
if not cache.init: if not cache.init:
@ -92,7 +91,6 @@ cache.init = None
def cleanup_cache(): def cleanup_cache():
conn = sqlite3.connect(_get_file_cache(), timeout=10) conn = sqlite3.connect(_get_file_cache(), timeout=10)
conn.text_factory = str
conn.row_factory = sqlite3.Row conn.row_factory = sqlite3.Row
c = conn.cursor() c = conn.cursor()
c.execute('SELECT path FROM cache') c.execute('SELECT path FROM cache')
@ -108,8 +106,8 @@ def sha1sum(filename, cached=False):
if cached: if cached:
return cache(filename, 'sha1') return cache(filename, 'sha1')
sha1 = hashlib.sha1() sha1 = hashlib.sha1()
with open(filename) as f: with open(filename, 'rb') as f:
for chunk in iter(lambda: f.read(128*sha1.block_size), ''): for chunk in iter(lambda: f.read(128*sha1.block_size), b''):
sha1.update(chunk) sha1.update(chunk)
return sha1.hexdigest() return sha1.hexdigest()