Merge branch 'blender-v4.2-release'
This commit is contained in:
@@ -182,6 +182,7 @@ def print_debug(*args, **kw):
|
||||
|
||||
def repos_to_notify():
|
||||
import os
|
||||
from . import bl_extension_ops
|
||||
from .bl_extension_utils import (
|
||||
repo_index_outdated,
|
||||
scandir_with_demoted_errors,
|
||||
|
||||
@@ -1456,7 +1456,7 @@ class EXTENSIONS_OT_package_upgrade_all(Operator, _ExtCmdMixIn):
|
||||
assert False, "unreachable" # Poll prevents this.
|
||||
return None
|
||||
|
||||
prefs = context.preferences
|
||||
prefs = bpy.context.preferences
|
||||
|
||||
network_connection_limit = prefs.system.network_connection_limit
|
||||
|
||||
@@ -1509,7 +1509,7 @@ class EXTENSIONS_OT_package_upgrade_all(Operator, _ExtCmdMixIn):
|
||||
continue
|
||||
|
||||
repo_item = repos_all[repo_index]
|
||||
for pkg_id_sequence in sequence_split_with_job_limit(pkg_id_sequence, network_connection_limit):
|
||||
for pkg_id_sequence in _sequence_split_with_job_limit(pkg_id_sequence, network_connection_limit):
|
||||
cmd_batch.append(partial(
|
||||
bl_extension_utils.pkg_install,
|
||||
directory=repo_item.directory,
|
||||
|
||||
@@ -190,6 +190,7 @@ def force_exit_ok_enable() -> None:
|
||||
|
||||
def read_with_timeout(fh: IO[bytes], size: int, *, timeout_in_seconds: float) -> Optional[bytes]:
|
||||
# TODO: implement timeout (TimeoutError).
|
||||
_ = timeout_in_seconds
|
||||
return fh.read(size)
|
||||
|
||||
|
||||
@@ -999,7 +1000,6 @@ def url_retrieve_to_data_iter(
|
||||
"""
|
||||
from urllib.error import ContentTooShortError
|
||||
from urllib.request import urlopen
|
||||
import socket
|
||||
|
||||
request = urllib.request.Request(
|
||||
url,
|
||||
|
||||
Reference in New Issue
Block a user