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

Khroki · Mar 21, 2012 · 343a9e4 · 343a9e4
2 parents b366a33 + 8a87e19
commit 343a9e4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/leveleditor.py b/leveleditor.py
@@ -453,7 +453,7 @@ def _blockUnderCursor(self, center=False):
                 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 @@ def drawToolbar(self):
                                  ), 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)