Fix Markdown references to Gen V stuff.

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

diff --git a/pokedex/__init__.py b/pokedex/__init__.py
index 393979c..45b4d7a 100644 (file)
--- a/pokedex/__init__.py
+++ b/pokedex/__init__.py
@@ -3,6 +3,7 @@ from optparse import OptionParser
 import os
 import sys
 
+# XXX importing pokedex.whatever should not import all these
 import pokedex.db
 import pokedex.db.load
 import pokedex.db.tables
@@ -55,8 +56,8 @@ def get_session(options):
     session = pokedex.db.connect(engine_uri)
 
     if options.verbose:
-        print "Connected to database {engine} (from {got_from})" \
-            .format(engine=session.bind.url, got_from=got_from)
+        print "Connected to database %(engine)s (from %(got_from)s)" \
+            % dict(engine=session.bind.url, got_from=got_from)
 
     return session
 
@@ -75,8 +76,8 @@ def get_lookup(options, session=None, recreate=False):
         index_dir, got_from = defaults.get_default_index_dir_with_origin()
 
     if options.verbose:
-        print "Opened lookup index {index_dir} (from {got_from})" \
-            .format(index_dir=index_dir, got_from=got_from)
+        print "Opened lookup index %(index_dir)s (from %(got_from)s)" \
+            % dict(index_dir=index_dir, got_from=got_from)
 
     lookup = pokedex.lookup.PokedexLookup(index_dir, session=session)
 
@@ -97,8 +98,8 @@ def get_csv_directory(options):
     if csvdir is None:
         csvdir, got_from = defaults.get_default_csv_dir_with_origin()
 
-    print "Using CSV directory {csvdir} (from {got_from})" \
-        .format(csvdir=csvdir, got_from=got_from)
+    print "Using CSV directory %(csvdir)s (from %(got_from)s)" \
+        % dict(csvdir=csvdir, got_from=got_from)
 
     return csvdir
 
@@ -136,7 +137,8 @@ def command_load(*args):
     pokedex.db.load.load(session, directory=options.directory,
                                   drop_tables=options.drop_tables,
                                   tables=tables,
-                                  verbose=options.verbose)
+                                  verbose=options.verbose,
+                                  safe=False)
 
 def command_reindex(*args):
     parser = get_parser(verbose=True)
@@ -157,7 +159,8 @@ def command_setup(*args):
     session = get_session(options)
     get_csv_directory(options)
     pokedex.db.load.load(session, directory=None, drop_tables=True,
-                                  verbose=options.verbose)
+                                  verbose=options.verbose,
+                                  safe=False)
 
     lookup = get_lookup(options, session=session, recreate=True)