Cleanup: comments for is_path_builtin

Also reduce scope of import.
This commit is contained in:
2019-10-31 18:01:58 +11:00
parent 3252ef4aca
commit 2e2fd12a55
3 changed files with 17 additions and 7 deletions

View File

@@ -456,12 +456,19 @@ def preset_paths(subdir):
return dirs return dirs
def is_path_builtin(path): def is_path_builtin(path):
""" """
Returns True if the path in question in one of the built in paths used by blender. Returns True if the path is one of the built-in paths used by Blender.
:arg path: Path you want to check if it is in the built in settings directory :arg path: Path you want to check if it is in the built-in settings directory
:type path: str
:rtype: bool
""" """
# Note that this function is is not optimized for speed,
# it's intended to be used to check if it's OK to remove presets.
#
# If this is used in a draw-loop for example, we could cache some of the values.
search_path = _os.path.abspath(path) search_path = _os.path.abspath(path)
user_path = resource_path('USER') user_path = resource_path('USER')
@@ -469,15 +476,19 @@ def is_path_builtin(path):
parent_path = resource_path(res) parent_path = resource_path(res)
if not parent_path or parent_path == user_path: if not parent_path or parent_path == user_path:
# Make sure that the current path is not empty string and that it is # Make sure that the current path is not empty string and that it is
# not the same as the user config path. IE "~/.config/blender" on linux # not the same as the user config path. IE "~/.config/blender" on Linux
# This can happen on portable installs. # This can happen on portable installs.
continue continue
if _os.path.samefile(_os.path.commonpath([parent_path]), _os.path.commonpath([parent_path, path])): if _os.path.samefile(
_os.path.commonpath([parent_path]),
_os.path.commonpath([parent_path, path])
):
return True return True
return False return False
def smpte_from_seconds(time, fps=None, fps_base=None): def smpte_from_seconds(time, fps=None, fps_base=None):
""" """
Returns an SMPTE formatted string from the *time*: Returns an SMPTE formatted string from the *time*:

View File

@@ -29,8 +29,6 @@ from bpy.props import (
StringProperty, StringProperty,
) )
from bpy.utils import is_path_builtin
# For preset popover menu # For preset popover menu
WindowManager.preset_name = StringProperty( WindowManager.preset_name = StringProperty(
name="Preset Name", name="Preset Name",
@@ -86,6 +84,7 @@ class AddPresetBase:
def execute(self, context): def execute(self, context):
import os import os
from bpy.utils import is_path_builtin
if hasattr(self, "pre_cb"): if hasattr(self, "pre_cb"):
self.pre_cb(context) self.pre_cb(context)

View File

@@ -432,7 +432,7 @@ class FILEBROWSER_MT_view(Menu):
class FILEBROWSER_MT_select(Menu): class FILEBROWSER_MT_select(Menu):
bl_label = "Select" bl_label = "Select"
def draw(self, context): def draw(self, _context):
layout = self.layout layout = self.layout
layout.operator("file.select_all", text="All").action = 'SELECT' layout.operator("file.select_all", text="All").action = 'SELECT'