projects
/
zzz-pokedex.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed exception syntax to work with Python 2.5.
[zzz-pokedex.git]
/
pokedex
/
__init__.py
diff --git
a/pokedex/__init__.py
b/pokedex/__init__.py
index
6954149
..
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:
@@
-142,7
+142,8
@@
def command_csvexport(engine_uri, directory='.'):
columns = [col.name for col in table.columns]
writer.writerow(columns)
columns = [col.name for col in table.columns]
writer.writerow(columns)
- for row in session.query(table).all():
+ primary_key = table.primary_key
+ for row in session.query(table).order_by(*primary_key).all():
csvs = []
for col in columns:
# Convert Pythony values to something more universal
csvs = []
for col in columns:
# Convert Pythony values to something more universal