diff options
Diffstat (limited to 'release/scripts/modules/bpy')
| -rw-r--r-- | release/scripts/modules/bpy/path.py | 5 | ||||
| -rw-r--r-- | release/scripts/modules/bpy/utils.py | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/release/scripts/modules/bpy/path.py b/release/scripts/modules/bpy/path.py index ccc9df93b0d..874efc2e131 100644 --- a/release/scripts/modules/bpy/path.py +++ b/release/scripts/modules/bpy/path.py @@ -219,7 +219,10 @@ def resolve_ncase(path): # we are expecting 'dirpath' to be a directory, but it could be a file if _os.path.isdir(dirpath): - files = _os.listdir(dirpath) + try: + files = _os.listdir(dirpath) + except PermissionError: # We might not have the permission to list dirpath... + return path, False else: return path, False diff --git a/release/scripts/modules/bpy/utils.py b/release/scripts/modules/bpy/utils.py index 5621af29bc3..b3a7a13e331 100644 --- a/release/scripts/modules/bpy/utils.py +++ b/release/scripts/modules/bpy/utils.py @@ -429,7 +429,7 @@ def time_from_frame(frame, fps=None, fps_base=None): :arg frame: number. :type frame: the frame number :return: the time in seconds. - :rtype: timedate.timedelta + :rtype: datetime.timedelta """ if fps is None: @@ -440,18 +440,18 @@ def time_from_frame(frame, fps=None, fps_base=None): from datetime import timedelta - return timedelta((frame * fps_base) / fps) + return timedelta(0, (frame * fps_base) / fps) def time_to_frame(time, fps=None, fps_base=None): """ Returns a float frame number from a time given in seconds or - as a timedate.timedelta object. + as a datetime.timedelta object. If *fps* and *fps_base* are not given the current scene is used. :arg time: time in seconds. - :type time: number or a timedate.timedelta object + :type time: number or a datetime.timedelta object :return: the frame. :rtype: float """ |