Flask 8 errors

8828 · Nov 17, 2016 · 60e190f · 60e190f
1 parent bdeeccc
commit 60e190f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/conda/core/install.py b/conda/core/install.py
@@ -103,7 +103,7 @@ def make_link_operation(source_path_info):
                 prefix_placehoder = source_path_info.prefix_placeholder
                 file_mode = source_path_info.file_mode
             elif (getattr(source_path_info, "no_link", None) is not None or
-                          source_path_info.node_type == NodeType.softlink):
+                    source_path_info.node_type == NodeType.softlink):
                 link_type = LinkType.copy
                 prefix_placehoder, file_mode = '', None
             else:
@@ -198,7 +198,7 @@ def make_link_operation(source_path_info):
                 prefix_placehoder = source_path_info.prefix_placeholder
                 file_mode = source_path_info.file_mode
             elif (getattr(source_path_info, "no_link", None) is not None or
-                          source_path_info.node_type == NodeType.softlink):
+                    source_path_info.node_type == NodeType.softlink):
                 link_type = LinkType.copy
                 prefix_placehoder, file_mode = '', None
             else:

diff --git a/conda/exports.py b/conda/exports.py
@@ -80,9 +80,11 @@
 from conda.base.context import get_prefix as context_get_prefix, non_x86_linux_machines  # NOQA
 non_x86_linux_machines = non_x86_linux_machines
 
-from conda.base.constants import DEFAULT_CHANNELS, FileMode  # NOQA
-from conda.models.package_info import NodeType
-from conda._vendor.auxlib.entity import EntityEncoder
+from conda.base.constants import DEFAULT_CHANNELS       # NOQA
+from conda.models.package_info import NodeType          # NOQA
+from conda._vendor.auxlib.entity import EntityEncoder   # NOQA
+NodeType = NodeType
+EntityEncoder = EntityEncoder
 get_prefix = partial(context_get_prefix, conda.base.context.context)
 get_default_urls = lambda: DEFAULT_CHANNELS
 

diff --git a/conda/gateways/disk/read.py b/conda/gateways/disk/read.py
@@ -63,7 +63,6 @@ def collect_all_info_for_package(extracted_package_directory):
 
         has_prefix_files = read_has_prefix(join(info_dir, 'has_prefix'))
         no_link = read_no_link(info_dir)
-        soft_links = read_soft_links(extracted_package_directory, files)
 
         path_info_files = []
         for f in files: