@@ -434,17 +434,17 @@ def __init__( # pylint: disable=too-many-statements
434
434
):
435
435
_validate .check_obsolete (obsolete )
436
436
437
- caller_name = None if name else get_caller_name ()
437
+ caller_name : str = name if name is not None else get_caller_name ()
438
438
439
439
# We have 3 cases: server is either True (we create the server), False
440
440
# (defer server creation) or a Flask app instance (we use their server)
441
441
if isinstance (server , flask .Flask ):
442
442
self .server = server
443
443
if name is None :
444
- name = getattr (server , "name" , caller_name )
444
+ caller_name = getattr (server , "name" , caller_name )
445
445
elif isinstance (server , bool ):
446
446
name = name if name else caller_name
447
- self .server = flask .Flask (name ) if server else None # type: ignore
447
+ self .server = flask .Flask (caller_name ) if server else None # type: ignore
448
448
else :
449
449
raise ValueError ("server must be a Flask app or a boolean" )
450
450
@@ -454,16 +454,16 @@ def __init__( # pylint: disable=too-many-statements
454
454
455
455
name = cast (str , name ) # to satisfy type checking
456
456
self .config = AttributeDict (
457
- name = name ,
457
+ name = caller_name ,
458
458
assets_folder = os .path .join (
459
- flask .helpers .get_root_path (name ), assets_folder
459
+ flask .helpers .get_root_path (caller_name ), assets_folder
460
460
), # type: ignore
461
461
assets_url_path = assets_url_path ,
462
462
assets_ignore = assets_ignore ,
463
463
assets_external_path = get_combined_config (
464
464
"assets_external_path" , assets_external_path , ""
465
465
),
466
- pages_folder = pages_folder_config (name , pages_folder , use_pages ),
466
+ pages_folder = pages_folder_config (caller_name , pages_folder , use_pages ),
467
467
eager_loading = eager_loading ,
468
468
include_assets_files = get_combined_config (
469
469
"include_assets_files" , include_assets_files , True
0 commit comments