From: Eevee <git@veekun.com>
Date: Sun, 15 Aug 2010 04:16:08 +0000 (-0700)
Subject: If the parse of an uploaded Pokémon fails, don't catch the crash.
X-Git-Tag: veekun-promotions/2010082201~2
X-Git-Url: http://git.veekun.com/zzz-spline-gts.git/commitdiff_plain/2cbec70983d2d2c20b239877562d682ffd7d5fe5?ds=sidebyside

If the parse of an uploaded Pokémon fails, don't catch the crash.
---

diff --git a/splinext/gts/controllers/gts.py b/splinext/gts/controllers/gts.py
index 15b3457..1349c16 100644
--- a/splinext/gts/controllers/gts.py
+++ b/splinext/gts/controllers/gts.py
@@ -19,6 +19,7 @@ from sqlalchemy import and_, or_, not_
 from sqlalchemy.orm import aliased, contains_eager, eagerload, eagerload_all, join
 from sqlalchemy.orm.exc import NoResultFound
 from sqlalchemy.sql import func
+from sqlalchemy.exc import IntegrityError
 
 from spline.model import meta
 from spline.lib.base import BaseController, render
@@ -196,9 +197,9 @@ class GTSController(BaseController):
             meta.Session.add(stored_pokemon)
             meta.Session.commit()
             return '\x01\x00'
-        except:
-            # If that failed (presumably due to unique key collision), we're
-            # already storing something.  Reject!
+        except IntegrityError:
+            # If that failed due to unique key collision, we're already storing
+            # something.  Reject!
             return '\x0c\x00'
 
     def page_post_finish(self, pid, data):