Merge with git@github.com:zothar/mcedit.git 'master'

2012-03-21 17:41:57 -05:00 · 2012-03-21 17:41:57 -05:00 · 343a9e4c70
commit 343a9e4c70
parent b366a331bd 8a87e19e21
1 changed files with 2 additions and 2 deletions
--- a/leveleditor.py
+++ b/leveleditor.py
@ -453,7 +453,7 @@ class CameraViewport(GLViewport):
                GL.glReadBuffer(GL.GL_BACK)
            else:
                GL.glReadBuffer(GL.GL_FRONT)
-        except Exception, e:
+        except Exception:
            logging.exception('Exception during glReadBuffer')
        ws = self.get_root().size
        if center:
@ -3675,7 +3675,7 @@ class EditorToolbar(GLOrtho):
                                 ), dtype="f4"))

                GL.glDrawArrays(GL.GL_QUADS, 0, 4)
-            except Exception, e:
+            except Exception:
                logging.exception('Error while drawing toolbar.')
        GL.glDisableClientState(GL.GL_TEXTURE_COORD_ARRAY)