Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(318)

Unified Diff: dfvfs/resolver_helpers/zip_resolver_helper.py

Issue 335570043: [dfvfs] Moved resolver helpers to reduce cyclic imports (Closed)
Patch Set: Moved resolver helpers to reduce cyclic imports Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « dfvfs/resolver_helpers/vshadow_resolver_helper.py ('k') | dfvfs/serializer/json_serializer.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dfvfs/resolver_helpers/zip_resolver_helper.py
diff --git a/dfvfs/resolver/zip_resolver_helper.py b/dfvfs/resolver_helpers/zip_resolver_helper.py
similarity index 65%
rename from dfvfs/resolver/zip_resolver_helper.py
rename to dfvfs/resolver_helpers/zip_resolver_helper.py
index 04556f55ab92c58d2e5c2f8e4fcee93aedf5ef61..8e23ea16c89a458587c2595955fb00c64dc422ab 100644
--- a/dfvfs/resolver/zip_resolver_helper.py
+++ b/dfvfs/resolver_helpers/zip_resolver_helper.py
@@ -3,13 +3,11 @@
from __future__ import unicode_literals
-# This is necessary to prevent a circular import.
-import dfvfs.file_io.zip_file_io
-import dfvfs.vfs.zip_file_system
-
+from dfvfs.file_io import zip_file_io
from dfvfs.lib import definitions
-from dfvfs.resolver import resolver
-from dfvfs.resolver import resolver_helper
+from dfvfs.resolver_helpers import manager
+from dfvfs.resolver_helpers import resolver_helper
+from dfvfs.vfs import zip_file_system
class ZipResolverHelper(resolver_helper.ResolverHelper):
@@ -26,7 +24,7 @@ class ZipResolverHelper(resolver_helper.ResolverHelper):
Returns:
FileIO: file-like object.
"""
- return dfvfs.file_io.zip_file_io.ZipFile(resolver_context)
+ return zip_file_io.ZipFile(resolver_context)
def NewFileSystem(self, resolver_context):
"""Creates a new file system object.
@@ -37,7 +35,7 @@ class ZipResolverHelper(resolver_helper.ResolverHelper):
Returns:
FileSystem: file system.
"""
- return dfvfs.vfs.zip_file_system.ZipFileSystem(resolver_context)
+ return zip_file_system.ZipFileSystem(resolver_context)
-resolver.Resolver.RegisterHelper(ZipResolverHelper())
+manager.ResolverHelperManager.RegisterHelper(ZipResolverHelper())
« no previous file with comments | « dfvfs/resolver_helpers/vshadow_resolver_helper.py ('k') | dfvfs/serializer/json_serializer.py » ('j') | no next file with comments »

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b