diff options
author | Siddharth Ravikumar <sravik@bgsu.edu> | 2015-02-26 02:38:52 -0500 |
---|---|---|
committer | Siddharth Ravikumar <sravik@bgsu.edu> | 2015-02-26 02:38:52 -0500 |
commit | 6eb0555742dc1b7290c55a17b02ff108ae03591d (patch) | |
tree | 03999491d0b10723f2962833c935c9d45a815ef0 /combox/file.py | |
parent | ec1b156cd7926e5845c8b6b16762e5fc57ea3a8b (diff) |
modded combox.file.hash_file function -- added new arg `file_content'
- `file_content' is set to None by default
- If `file_content' is not None, hash of this is returned.
Updated the test for hash_file function.
modified: combox/file.py
modified: tests/file_test.py
Diffstat (limited to 'combox/file.py')
-rw-r--r-- | combox/file.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/combox/file.py b/combox/file.py index 959954a..d7602e9 100644 --- a/combox/file.py +++ b/combox/file.py @@ -301,14 +301,17 @@ def read_file(filename): return file_.read() -def hash_file(filename): +def hash_file(filename, file_content=None): """Does a SHA512 hash on the contents of file. Returns the hexdigest of the file content's hash. filename: Absolute pathname of the file. + file_content: If not None, hash of file_content is returned. """ - file_content = read_file(filename) + + if not file_content: + file_content = read_file(filename) return sha512(file_content).hexdigest() |