fix issue leonidessaguisagjr#10: Evaluate file paths from checksum di…

…r II

filehash/filehash.py

@@ -203,11 +203,9 @@ def hash_dir(self, path, pattern='*'):
         :returns: List of tuples where each tuple contains a filename and the
                   calculated hash for each file.
         """
-        saved_dir = os.getcwd()
-        os.chdir(os.path.abspath(path))  # pushd
-        filenames = [filename for filename in glob.glob(pattern) if os.path.isfile(filename)]
-        result = self.hash_files(filenames)
-        os.chdir(saved_dir)  # popd
+        with _chdir(os.path.abspath(path)):
+            filenames = [filename for filename in glob.glob(pattern) if os.path.isfile(filename)]
+            result = self.hash_files(filenames)
         return result
 
     def cathash_files(self, filenames):
@@ -237,11 +235,9 @@ def cathash_dir(self, path, pattern='*'):
                         Defaults to '*' i.e. all files in the directory.
         :returns: Digest of the files, in hex.
         """
-        saved_dir = os.getcwd()
-        os.chdir(os.path.abspath(path))  # pushd
-        filenames = [filename for filename in glob.glob(pattern) if os.path.isfile(filename)]
-        result = self.cathash_files(filenames)
-        os.chdir(saved_dir)  # popd
+        with _chdir(os.path.abspath(path)):
+            filenames = [filename for filename in glob.glob(pattern) if os.path.isfile(filename)]
+            result = self.cathash_files(filenames)
         return result
 
     def verify_checksums(self, checksum_filename):