Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cc-4105: fixed bug: return statement missing

This commit is contained in:
Rudi Grinberg 2012-08-14 15:45:40 -04:00
parent d3e6c57372
commit 9880a8732f
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
python_apps/media-monitor2/media/monitor/pure.py
View File

@ -5,6 +5,7 @@ import shutil
import sys import sys
import hashlib import hashlib
import locale import locale
import operator as op
from os.path import normpath from os.path import normpath
from itertools import takewhile from itertools import takewhile
@ -200,8 +201,7 @@ def parse_int(s):
if s.isdigit(): return s if s.isdigit(): return s
else: else:
try: try:
return reduce(lambda x,y: x + y, return reduce(op.add, takewhile(lambda x: x.isdigit(), s))
takewhile(lambda x: x.isdigit(), s))
except: return 0 except: return 0
def normalized_metadata(md, original_path): def normalized_metadata(md, original_path):
@ -305,8 +305,7 @@ def file_md5(path,max_length=100):
def encode_to(obj, encoding='utf-8'): def encode_to(obj, encoding='utf-8'):
# TODO : add documentation + unit tests for this function # TODO : add documentation + unit tests for this function
if isinstance(obj, unicode): if isinstance(obj, unicode): obj = obj.encode(encoding)
obj = obj.encode(encoding)
return obj return obj
def convert_dict_value_to_utf8(md): def convert_dict_value_to_utf8(md):
@ -354,8 +353,7 @@ def fondle(path,times=None):
touch a file to change the last modified date. Beware of calling this touch a file to change the last modified date. Beware of calling this
function on the same file from multiple threads. function on the same file from multiple threads.
""" """
with file(path, 'a'): with file(path, 'a'): os.utime(path, times)
os.utime(path, times)
def last_modified(path): def last_modified(path):
""" """
@ -364,9 +362,8 @@ def last_modified(path):
the file does not exist we set this time 0 so that any files on the the file does not exist we set this time 0 so that any files on the
filesystem were modified after it filesystem were modified after it
""" """
if os.path.exists(path): if os.path.exists(path): return os.path.getmtime(path)
return os.path.getmtime(path) else: return 0
else: 0
def expand_storage(store): def expand_storage(store):
""" """