# HG changeset patch # User Simon Cross # Date 1673719234 -3600 # Node ID 16c690a7dc27926c95bae962a071f2c71aaa7ad4 # Parent 55e9c1b8e94c1971a8ed2dd6fd7eddce695ee4ef Fix bare except clauses. diff -r 55e9c1b8e94c -r 16c690a7dc27 mamba/habitats/editor.py --- a/mamba/habitats/editor.py Sat Jan 14 18:45:33 2023 +0100 +++ b/mamba/habitats/editor.py Sat Jan 14 19:00:34 2023 +0100 @@ -349,7 +349,7 @@ try: result = request.urlopen(url, args) mtxt = result.read() - except: + except Exception: mtxt = "Failed to upload level. :(" else: mtxt = "Success! %s\n%s" % (mtxt, @@ -532,7 +532,7 @@ def commit_line(self, sprite): try: self.level.validate_sprite(sprite) - except: + except Exception: # We don't know what errors thwe constructor may show, so # we catch everything # We use sys.exc_info to get slight neater info diff -r 55e9c1b8e94c -r 16c690a7dc27 mamba/habitats/userlevelmenu.py --- a/mamba/habitats/userlevelmenu.py Sat Jan 14 18:45:33 2023 +0100 +++ b/mamba/habitats/userlevelmenu.py Sat Jan 14 19:00:34 2023 +0100 @@ -29,7 +29,7 @@ try: source = self._url_data("level/%s" % name) level = Level(name, self.level_namespace, source) - except: + except Exception: print("Failed to download online level %r" % name) return self.cache[name] = level @@ -37,7 +37,7 @@ def _populate_cache(self): try: data = self._url_data("index") - except: + except Exception: print("Failed to download online level index.") return levels = [x.strip() for x in data.splitlines()] @@ -48,7 +48,7 @@ def _populate_cache_from_zip(self): try: data = self._url_data("levels.zip") - except: + except Exception: print("Failed to download online level zip.") return level_zip = zipfile.ZipFile(BytesIO(data), "r") @@ -113,7 +113,7 @@ try: self.get_level(name) self._level_list.append(name) - except: + except Exception: print("Invalid user level:", name) return self._level_list[:] diff -r 55e9c1b8e94c -r 16c690a7dc27 mamba/sound.py --- a/mamba/sound.py Sat Jan 14 18:45:33 2023 +0100 +++ b/mamba/sound.py Sat Jan 14 19:00:34 2023 +0100 @@ -73,7 +73,7 @@ mixer.music.load(data.filepath('music/%s' % track_name)) mixer.music.play(-1) # Loop sound mixer.music.set_volume(volume) - except: + except Exception: print('Unable to load track %s. Skipping' % track_name) def stop_music(self): @@ -100,7 +100,7 @@ self._sounds[key] = pygame.mixer.Sound(track_name) if volume is not None: self._sounds[key].set_volume(volume) - except: + except Exception: print('Unable to load sound %s. Skipping' % track_name) self._sounds[key] = None