From cc9e6efbca482445f2a2540211798873fb63de0d Mon Sep 17 00:00:00 2001 From: drigato Date: Thu, 19 Feb 2015 10:38:30 -0500 Subject: [PATCH] SAAS-596: Store file size and hash in database Removed try/except while getting file size and hash --- .../airtime_analyzer/metadata_analyzer.py | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/python_apps/airtime_analyzer/airtime_analyzer/metadata_analyzer.py b/python_apps/airtime_analyzer/airtime_analyzer/metadata_analyzer.py index a127c3197..d273112df 100644 --- a/python_apps/airtime_analyzer/airtime_analyzer/metadata_analyzer.py +++ b/python_apps/airtime_analyzer/airtime_analyzer/metadata_analyzer.py @@ -99,19 +99,16 @@ class MetadataAnalyzer(Analyzer): pass # Get file size and md5 hash of the file - try: - metadata["filesize"] = os.path.getsize(filename) + metadata["filesize"] = os.path.getsize(filename) - with open(filename, 'rb') as fh: - m = hashlib.md5() - while True: - data = fh.read(8192) - if not data: - break - m.update(data) - metadata["md5_hash"] = m.hexdigest() - except (OSError, IOError) as e: - raise e + with open(filename, 'rb') as fh: + m = hashlib.md5() + while True: + data = fh.read(8192) + if not data: + break + m.update(data) + metadata["md5_hash"] = m.hexdigest()