Specify exceptions

fofix/core/Config.py

@@ -148,7 +148,7 @@ def _convertValue(value, type, default=False):
     else:
         try:
             return type(value)
-        except:
+        except Exception:
             return None
 
 class Config(object):

fofix/core/GameEngine.py

@@ -264,7 +264,7 @@ def __init__(self, config = None):
         #            GNU/Linux) as the Viewport was not set yet.
         try:
             viewport = glGetIntegerv(GL_VIEWPORT)
-        except:
+        except Exception:
             viewport = [0, 0, width, height]
         h = viewport[3] - viewport[1]
         w = viewport[2] - viewport[0]

fofix/core/Player.py

@@ -53,7 +53,7 @@ def __cmp__(self, other):
                 return 0
             else:
                 return -1
-        except:
+        except Exception:
             return -1
 
 def sortOptionsByKey(dict):
@@ -248,7 +248,7 @@ def _makePlayerIniName(name):
     v = _playerDB.execute("SELECT `value` FROM `config` WHERE `key` = 'version'").fetchone()[0]
     if int(v) != _SCHEMA_VERSION:
         _updateTables = 2 #an old version. We don't want to just burn old tables.
-except:
+except Exception:
     _updateTables = 1 #no good table
 if _updateTables > 0: #needs to handle old versions eventually.
     for tbl in _playerDB.execute("SELECT `name` FROM `sqlite_master` WHERE `type` = 'table'").fetchall():
@@ -325,7 +325,7 @@ def savePlayers():
             c.set("player","controller",int(pref[11]))
             del c
             _playerDB.execute('UPDATE `players` SET `changed` = 0 WHERE `name` = ?', [pref[0]])
-        except:
+        except Exception:
             c = VFS.open(_makePlayerIniName(str(pref[0])), "w")
             c.close()
             c = Config.load(VFS.resolveWrite(_makePlayerIniName(str(pref[0]))), type = 2)
@@ -349,7 +349,7 @@ def updatePlayer(player, pref):
     a = _playerDB.execute('SELECT * FROM `players` WHERE `name` = ?', [player]).fetchone()
     try:
         a = a[0]
-    except:
+    except Exception:
         a = None
     if a is not None:
         _playerDB.execute('UPDATE `players` SET `name` = ?, `lefty` = ?, `drumflip` = ?, `autokick` = ?, `assist` = ?, `twochord` = ?, `necktype` = ?, `neck` = ?, \
@@ -556,7 +556,7 @@ def keycode(name, config):
                 return "None"
             try:
                 return int(k)
-            except:
+            except Exception:
                 return getattr(pygame, k)
 
         self.controlMapping = {}
@@ -806,7 +806,7 @@ def keycode(name, config):
             return None
         try:
             return int(k)
-        except:
+        except Exception:
             return getattr(pygame, k)
 
     # list of keys to look for

fofix/core/Resource.py

@@ -113,7 +113,7 @@ def load(self):
             start = time.time()
             self.result = self.function()
             self.time = time.time() - start
-        except:
+        except Exception:
             self.exception = sys.exc_info()
 
     def finish(self):
@@ -204,7 +204,7 @@ def fileName(self, *name, **args):
                     # If the original file does not exist, see if we can write to its directory
                     if not os.path.isfile(readOnlyPath) and os.access(os.path.dirname(readOnlyPath), os.W_OK):
                         pass
-                except:
+                except Exception:
                     raise
                 # If the resource exists in the read-only path, make a copy to the
                 # read-write path.
@@ -213,7 +213,7 @@ def fileName(self, *name, **args):
                     log.info("Copying '%s' to writable data directory." % "/".join(name))
                     try:
                         os.makedirs(os.path.dirname(readWritePath))
-                    except:
+                    except Exception:
                         pass
                     shutil.copy(readOnlyPath, readWritePath)
                     self.makeWritable(readWritePath)

fofix/core/Settings.py

@@ -178,7 +178,7 @@ def __init__(self, engine, config, section, option, noneOK = False, shift = None
         def keycode(k):
             try:
                 return int(k)
-            except:
+            except Exception:
                 return getattr(pygame, k)
 
         if self.shift:
@@ -198,7 +198,7 @@ def getText(self, selected):
         def keycode(k):
             try:
                 return int(k)
-            except:
+            except Exception:
                 return getattr(pygame, k)
         o = self.config.prototype[self.section][self.option]
         v = self.config.get(self.section, self.option)

fofix/core/Shader.py

@@ -135,8 +135,10 @@ def getVars(self, fname, program, sArray):
                 break
             if aline[0] == "uniform":
                 value = None
-                try:    n = int(aline[1][-1])
-                except: n = 4
+                try:
+                    n = int(aline[1][-1])
+                except Exception:
+                    n = 4
                 if   aline[1] == "bool": value = False
                 elif aline[1] == "int": value = 0
                 elif aline[1] == "float": value = 0.0
@@ -499,7 +501,7 @@ def checkIfEnabled(self):
                     continue
             return True
         return False
-        
+
     def defineConfig(self):
         for name in self.shaders.keys():
             for key in self[name].keys():
@@ -534,7 +536,7 @@ def set(self, dir):
         try:
             self.noise3D = self.loadTex3D("noise3d.dds")
             self.outline = self.loadTex2D("outline.tga")
-        except:
+        except Exception:
             log.error('Could not load shader textures - shaders disabled: ')
             return
 
@@ -546,7 +548,7 @@ def set(self, dir):
         # Also set uniform shader variables to default values.
         try:
             self.make("lightning","stage")
-        except:
+        except Exception:
             log.error("Error compiling lightning shader: ")
         else:
             self.enable("stage")
@@ -566,7 +568,7 @@ def set(self, dir):
 
         try:
             self.make("lightning","sololight")
-        except:
+        except Exception:
             log.error("Error compiling lightning shader: ")
         else:
             self.enable("sololight")
@@ -588,7 +590,7 @@ def set(self, dir):
 
         try:
             self.make("lightning","tail")
-        except:
+        except Exception:
             log.error("Error compiling lightning shader: ")
         else:
             self.enable("tail")
@@ -611,7 +613,7 @@ def set(self, dir):
 
         try:
             self.make("rockbandtail","tail2")
-        except:
+        except Exception:
             log.error("Error compiling rockbandtail shader: ")
         else:
             self.enable("tail2")
@@ -624,20 +626,20 @@ def set(self, dir):
 
         try:
             self.make("metal","notes")
-        except:
+        except Exception:
             log.error("Error compiling metal shader: ")
         else:
             self.enable("notes")
             self.disable()
 
         try:
             self.make("neck","neck")
-        except:
+        except Exception:
             log.error("Error compiling neck shader: ")
 
         try:
             self.make("cd","cd")
-        except:
+        except Exception:
             log.error("Error compiling cd shader: ")
 
 def mixColors(c1,c2,blend=0.5):

fofix/core/Texture.py

@@ -88,7 +88,7 @@ def loadImage(self, image):
                 log.warn("Unsupported image mode '%s' converted to 'RGB'. May have unexpected results." % image.mode)
                 string = image.tobytes('raw', 'RGB', 0, -1)
                 self.loadRaw(image.size, string, GL_RGB, 3)
-            except:
+            except Exception:
                 raise TextureException("Unsupported image mode '%s'" % image.mode)
 
     def nextPowerOfTwo(self, n):

fofix/core/Video.py

@@ -54,7 +54,7 @@ def setMode(self, resolution, fullscreen = False, flags = pygame.OPENGL | pygame
 
         try:
             pygame.display.quit()
-        except:
+        except Exception:
             pass
 
         pygame.display.init()
@@ -140,7 +140,7 @@ def setMode(self, resolution, fullscreen = False, flags = pygame.OPENGL | pygame
         if multisamples:
             try:
                 glEnable(GL_MULTISAMPLE_ARB)
-            except:
+            except Exception:
                 pass
 
         return bool(self.screen)

fofix/game/Dialogs.py

@@ -1142,7 +1142,7 @@ def render(self, visibility, topMost):
 
             try:
                 font = self.engine.data.fontDict[self.engine.theme.avatarSelectFont]
-            except:
+            except Exception:
                 font = self.engine.data.font
             if self.avText:
                 drawImage(self.avText, scale = (self.engine.theme.avatarSelectTextScale, -self.engine.theme.avatarSelectTextScale), coord = (self.engine.theme.avatarSelectTextX, self.engine.theme.avatarSelectTextY - v))