pokemon_moves table no longer tries to have an autoinc column.

[zzz-pokedex.git] / pokedex / __init__.py

diff --git a/pokedex/__init__.py b/pokedex/__init__.py
index 8437ce4..4a731d1 100644 (file)
--- a/pokedex/__init__.py
+++ b/pokedex/__init__.py
@@ -104,7 +104,7 @@ def command_csvimport(engine_uri, directory='.'):
             try:
                 session.add(row)
                 session.flush()
             try:
                 session.add(row)
                 session.flush()

-            except IntegrityError as e:
+            except IntegrityError, e:

                 failed_rows.append(row)
 
         # Loop over the failed rows and keep trying to insert them.  If a loop
                 failed_rows.append(row)
 
         # Loop over the failed rows and keep trying to insert them.  If a loop


@@ -121,7 +121,7 @@ def command_csvimport(engine_uri, directory='.'):
                     # Success!
                     del failed_rows[i]
                     do_another_loop = True
                     # Success!
                     del failed_rows[i]
                     do_another_loop = True

-                except IntegrityError as e:
+                except IntegrityError, e:

                     pass
 
         if failed_rows:
                     pass
 
         if failed_rows: