Removed need to close file system object log2timeline#306 (log2timeli…

…ne#533)

dfvfs/helpers/source_scanner.py

@@ -722,9 +722,8 @@ def ScanForFileSystem(self, source_path_spec):
       # Check if the file system can be opened since the file system by
       # signature detection results in false positives.
       try:
-        file_system = resolver.Resolver.OpenFileSystem(
+        resolver.Resolver.OpenFileSystem(
             file_system_path_spec, resolver_context=self._resolver_context)
-        file_system.Close()
       except errors.BackEndError:
         file_system_path_spec = None
 
@@ -767,8 +766,6 @@ def ScanForStorageMediaImage(self, source_path_spec):
       except errors.PathSpecError:
         glob_results = None
 
-      file_system.Close()
-
       if not glob_results:
         return None
 

dfvfs/helpers/volume_scanner.py

@@ -665,19 +665,13 @@ def _ScanFileSystem(self, scan_node, base_path_specs):
       raise errors.ScannerError('Invalid or missing file system scan node.')
 
     file_system = resolver.Resolver.OpenFileSystem(scan_node.path_spec)
-    if not file_system:
-      return
-
-    try:
+    if file_system:
       path_resolver = windows_path_resolver.WindowsPathResolver(
           file_system, scan_node.path_spec.parent)
 
       if self._ScanFileSystemForWindowsDirectory(path_resolver):
         base_path_specs.append(scan_node.path_spec)
 
-    finally:
-      file_system.Close()
-
   def _ScanFileSystemForWindowsDirectory(self, path_resolver):
     """Scans a file system for a known Windows directory.
 

dfvfs/vfs/file_system.py

@@ -3,6 +3,8 @@
 
 import abc
 
+from dfvfs.lib import decorators
+
 
 class FileSystem(object):
   """Virtual file system interface."""
@@ -81,19 +83,15 @@ def BasenamePath(self, path):
     _, _, basename = path.rpartition(self.PATH_SEPARATOR)
     return basename
 
+  @decorators.deprecated
   def Close(self):
     """Closes the file system.
 
     Raises:
       IOError: if the file system object was not opened or the close failed.
       OSError: if the file system object was not opened or the close failed.
     """
-    if not self._is_open:
-      raise IOError('Not opened.')
-
-    self._Close()
-    self._is_open = False
-    self._path_spec = None
+    return
 
   def DirnamePath(self, path):
     """Determines the directory name of the path.

tests/vfs/apfs_container_file_entry.py

@@ -35,7 +35,6 @@ def setUp(self):
 
   def tearDown(self):
     """Cleans up the needed objects used throughout the test."""
-    self._file_system.Close()
     self._resolver_context.Empty()
 
   def testInitialize(self):
@@ -77,7 +76,6 @@ def setUp(self):
 
   def tearDown(self):
     """Cleans up the needed objects used throughout the test."""
-    self._file_system.Close()
     self._resolver_context.Empty()
 
   def testInitialize(self):

tests/vfs/apfs_container_file_system.py

@@ -40,8 +40,6 @@ def testOpenAndClose(self):
 
     file_system.Open()
 
-    file_system.Close()
-
   def testFileEntryExistsByPathSpec(self):
     """Test the file entry exists by path specification functionality."""
     file_system = apfs_container_file_system.APFSContainerFileSystem(
@@ -74,8 +72,6 @@ def testFileEntryExistsByPathSpec(self):
         location='/apfs9', parent=self._raw_path_spec)
     self.assertFalse(file_system.FileEntryExistsByPathSpec(path_spec))
 
-    file_system.Close()
-
   def testGetFileEntryByPathSpec(self):
     """Tests the GetFileEntryByPathSpec function."""
     file_system = apfs_container_file_system.APFSContainerFileSystem(
@@ -123,8 +119,6 @@ def testGetFileEntryByPathSpec(self):
 
     self.assertIsNone(file_entry)
 
-    file_system.Close()
-
   def testGetRootFileEntry(self):
     """Test the get root file entry functionality."""
     file_system = apfs_container_file_system.APFSContainerFileSystem(
@@ -138,8 +132,6 @@ def testGetRootFileEntry(self):
     self.assertIsNotNone(file_entry)
     self.assertEqual(file_entry.name, '')
 
-    file_system.Close()
-
   # TODO: add tests for GetAPFSVolumeByPathSpec function.
 
 

tests/vfs/apfs_file_entry.py

@@ -40,7 +40,6 @@ def setUp(self):
 
   def tearDown(self):
     """Cleans up the needed objects used throughout the test."""
-    self._file_system.Close()
     self._resolver_context.Empty()
 
   def testInitialize(self):
@@ -89,7 +88,6 @@ def setUp(self):
 
   def tearDown(self):
     """Cleans up the needed objects used throughout the test."""
-    self._file_system.Close()
     self._resolver_context.Empty()
 
   def testInitialize(self):
@@ -430,7 +428,6 @@ def setUp(self):
 
   def tearDown(self):
     """Cleans up the needed objects used throughout the test."""
-    self._file_system.Close()
     self._resolver_context.Empty()
 
   def testInitialize(self):

tests/vfs/apfs_file_system.py

@@ -46,8 +46,6 @@ def testOpenAndClose(self):
 
     file_system.Open()
 
-    file_system.Close()
-
   def testFileEntryExistsByPathSpec(self):
     """Test the file entry exists by path specification functionality."""
     file_system = apfs_file_system.APFSFileSystem(
@@ -67,8 +65,6 @@ def testFileEntryExistsByPathSpec(self):
         parent=self._apfs_container_path_spec)
     self.assertFalse(file_system.FileEntryExistsByPathSpec(path_spec))
 
-    file_system.Close()
-
   def testGetFileEntryByPathSpec(self):
     """Tests the GetFileEntryByPathSpec function."""
     file_system = apfs_file_system.APFSFileSystem(
@@ -104,8 +100,6 @@ def testGetFileEntryByPathSpec(self):
 
     self.assertIsNone(file_entry)
 
-    file_system.Close()
-
   # TODO: add tests for GetAPFSFileEntryByPathSpec function.
 
   def testGetRootFileEntry(self):
@@ -121,8 +115,6 @@ def testGetRootFileEntry(self):
     self.assertIsNotNone(file_entry)
     self.assertEqual(file_entry.name, '')
 
-    file_system.Close()
-
 
 if __name__ == '__main__':
   unittest.main()

tests/vfs/bde_file_entry.py

@@ -36,7 +36,6 @@ def setUp(self):
 
   def tearDown(self):
     """Cleans up the needed objects used throughout the test."""
-    self._file_system.Close()
     self._resolver_context.Empty()
 
   def testIntialize(self):

tests/vfs/bde_file_system.py

@@ -43,8 +43,6 @@ def testOpenAndClose(self):
 
     file_system.Open()
 
-    file_system.Close()
-
   def testFileEntryExistsByPathSpec(self):
     """Test the file entry exists by path specification functionality."""
     file_system = bde_file_system.BDEFileSystem(
@@ -56,8 +54,6 @@ def testFileEntryExistsByPathSpec(self):
     result = file_system.FileEntryExistsByPathSpec(self._bde_path_spec)
     self.assertTrue(result)
 
-    file_system.Close()
-
   def testGetFileEntryByPathSpec(self):
     """Tests the GetFileEntryByPathSpec function."""
     file_system = bde_file_system.BDEFileSystem(
@@ -70,8 +66,6 @@ def testGetFileEntryByPathSpec(self):
     self.assertIsNotNone(file_entry)
     self.assertEqual(file_entry.name, '')
 
-    file_system.Close()
-
   def testGetRootFileEntry(self):
     """Test the get root file entry functionality."""
     file_system = bde_file_system.BDEFileSystem(
@@ -84,8 +78,6 @@ def testGetRootFileEntry(self):
     self.assertIsNotNone(file_entry)
     self.assertEqual(file_entry.name, '')
 
-    file_system.Close()
-
 
 if __name__ == '__main__':
   unittest.main()

tests/vfs/compressed_stream_file_entry.py

@@ -36,7 +36,6 @@ def setUp(self):
 
   def tearDown(self):
     """Cleans up the needed objects used throughout the test."""
-    self._file_system.Close()
     self._resolver_context.Empty()
 
   def testInitialize(self):

tests/vfs/compressed_stream_file_system.py

@@ -40,8 +40,6 @@ def testOpenAndClose(self):
 
     file_system.Open()
 
-    file_system.Close()
-
   def testFileEntryExistsByPathSpec(self):
     """Test the file entry exists by path specification functionality."""
     file_system = compressed_stream_file_system.CompressedStreamFileSystem(
@@ -53,8 +51,6 @@ def testFileEntryExistsByPathSpec(self):
     self.assertTrue(file_system.FileEntryExistsByPathSpec(
         self._compressed_stream_path_spec))
 
-    file_system.Close()
-
   def testGetFileEntryByPathSpec(self):
     """Tests the GetFileEntryByPathSpec function."""
     file_system = compressed_stream_file_system.CompressedStreamFileSystem(
@@ -69,8 +65,6 @@ def testGetFileEntryByPathSpec(self):
     self.assertIsNotNone(file_entry)
     self.assertEqual(file_entry.name, '')
 
-    file_system.Close()
-
   def testGetRootFileEntry(self):
     """Test the get root file entry functionality."""
     file_system = compressed_stream_file_system.CompressedStreamFileSystem(
@@ -84,8 +78,6 @@ def testGetRootFileEntry(self):
     self.assertIsNotNone(file_entry)
     self.assertEqual(file_entry.name, '')
 
-    file_system.Close()
-
 
 if __name__ == '__main__':
   unittest.main()

tests/vfs/cpio_file_entry.py

@@ -32,7 +32,6 @@ def setUp(self):
 
   def tearDown(self):
     """Cleans up the needed objects used throughout the test."""
-    self._file_system.Close()
     self._resolver_context.Empty()
 
   def testInitialize(self):
@@ -72,7 +71,6 @@ def setUp(self):
 
   def tearDown(self):
     """Cleans up the needed objects used throughout the test."""
-    self._file_system.Close()
     self._resolver_context.Empty()
 
   def testIntialize(self):

tests/vfs/cpio_file_system.py

@@ -39,8 +39,6 @@ def testOpenAndClose(self):
 
     file_system.Open()
 
-    file_system.Close()
-
   def testFileEntryExistsByPathSpec(self):
     """Test the file entry exists by path specification functionality."""
     file_system = cpio_file_system.CPIOFileSystem(
@@ -59,8 +57,6 @@ def testFileEntryExistsByPathSpec(self):
         parent=self._os_path_spec)
     self.assertFalse(file_system.FileEntryExistsByPathSpec(path_spec))
 
-    file_system.Close()
-
   def testGetFileEntryByPathSpec(self):
     """Tests the GetFileEntryByPathSpec function."""
     file_system = cpio_file_system.CPIOFileSystem(
@@ -84,8 +80,6 @@ def testGetFileEntryByPathSpec(self):
 
     self.assertIsNone(file_entry)
 
-    file_system.Close()
-
   def testGetRootFileEntry(self):
     """Test the get root file entry functionality."""
     file_system = cpio_file_system.CPIOFileSystem(
@@ -99,8 +93,6 @@ def testGetRootFileEntry(self):
     self.assertIsNotNone(file_entry)
     self.assertEqual(file_entry.name, '')
 
-    file_system.Close()
-
   # TODO: add tests for GetCPIOArchiveFileEntryByPathSpec function.
 
 

tests/vfs/data_range_file_entry.py

@@ -32,7 +32,6 @@ def setUp(self):
 
   def tearDown(self):
     """Cleans up the needed objects used throughout the test."""
-    self._file_system.Close()
     self._resolver_context.Empty()
 
   def testInitialize(self):

tests/vfs/data_range_file_system.py

@@ -38,8 +38,6 @@ def testOpenAndClose(self):
 
     file_system.Open()
 
-    file_system.Close()
-
   def testFileEntryExistsByPathSpec(self):
     """Test the file entry exists by path specification functionality."""
     file_system = data_range_file_system.DataRangeFileSystem(
@@ -51,8 +49,6 @@ def testFileEntryExistsByPathSpec(self):
     self.assertTrue(file_system.FileEntryExistsByPathSpec(
         self._data_range_path_spec))
 
-    file_system.Close()
-
   def testGetFileEntryByPathSpec(self):
     """Tests the GetFileEntryByPathSpec function."""
     file_system = data_range_file_system.DataRangeFileSystem(
@@ -67,8 +63,6 @@ def testGetFileEntryByPathSpec(self):
     self.assertIsNotNone(file_entry)
     self.assertEqual(file_entry.name, '')
 
-    file_system.Close()
-
   def testGetRootFileEntry(self):
     """Test the get root file entry functionality."""
     file_system = data_range_file_system.DataRangeFileSystem(
@@ -82,8 +76,6 @@ def testGetRootFileEntry(self):
     self.assertIsNotNone(file_entry)
     self.assertEqual(file_entry.name, '')
 
-    file_system.Close()
-
 
 if __name__ == '__main__':
   unittest.main()

tests/vfs/encoded_stream_file_entry.py

@@ -35,7 +35,6 @@ def setUp(self):
 
   def tearDown(self):
     """Cleans up the needed objects used throughout the test."""
-    self._file_system.Close()
     self._resolver_context.Empty()
 
   def testInitialize(self):