X-Git-Url: http://git.veekun.com/zzz-pokedex.git/blobdiff_plain/638bc0eb815f3cb8bff0bfc027d4d0d931ab7273..be88bf79e1b92fc58370bfc8375e2803fb726420:/pokedex/db/__init__.py

diff --git a/pokedex/db/__init__.py b/pokedex/db/__init__.py
index ced519b..99e058b 100644
--- a/pokedex/db/__init__.py
+++ b/pokedex/db/__init__.py
@@ -1,13 +1,24 @@
+import pkg_resources
+
 from sqlalchemy import MetaData, Table, create_engine, orm
 
 from .tables import metadata
 
-def connect(uri, **kwargs):
+def connect(uri=None, **kwargs):
     """Connects to the requested URI.  Returns a session object.
 
+    With the URI omitted, attempts to connect to a default SQLite database
+    contained within the package directory.
+
     Calling this function also binds the metadata object to the created engine.
     """
 
+    # Default to a URI within the package, which was hopefully created at some point
+    if not uri:
+        sqlite_path = pkg_resources.resource_filename('pokedex',
+                                                      'data/pokedex.sqlite')
+        uri = 'sqlite:///' + sqlite_path
+
     ### Do some fixery for MySQL
     if uri[0:5] == 'mysql':
         # MySQL uses latin1 for connections by default even if the server is