jumbo merge

modules/processing.py

@@ -471,7 +471,7 @@ def create_infotext(p: StableDiffusionProcessing, all_prompts, all_seeds, all_su
 def print_profile(profile, msg: str):
     try:
         from rich import print # pylint: disable=redefined-builtin
-    except:
+    except Exception:
         pass
     lines = profile.key_averages().table(sort_by="cuda_time_total", row_limit=20)
     lines = lines.split('\n')
@@ -485,7 +485,7 @@ def print_profile(profile, msg: str):
     import pstats
     try:
         from rich import print # pylint: disable=redefined-builtin
-    except:
+    except Exception:
         pass
     profile.disable()
     stream = io.StringIO()
@@ -645,7 +645,7 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed:
             if not shared.opts.dont_fix_second_order_samplers_schedule:
                 try:
                     step_multiplier = 2 if sd_samplers.all_samplers_map.get(p.sampler_name).aliases[0] in ['k_dpmpp_2s_a', 'k_dpmpp_2s_a_ka', 'k_dpmpp_sde', 'k_dpmpp_sde_ka', 'k_dpm_2', 'k_dpm_2_a', 'k_heun'] else 1
-                except:
+                except Exception:
                     pass
             if p.n_iter > 1:
                 shared.state.job = f"Batch {n+1} out of {p.n_iter}"