re-introduce relative imports to unbork python 3.

Browse Source
This commit is contained in:
Friedrich Lindenberg 2015-06-08 10:54:46 +02:00
parent 085817b844
commit 0c04f647b2
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dataset/__init__.py
View File

@ -16,8 +16,7 @@ __all__ = ['Database', 'Table', 'freeze', 'connect']
def connect(url=None, schema=None, reflect_metadata=True, engine_kwargs=None, def connect(url=None, schema=None, reflect_metadata=True, engine_kwargs=None,
reflect_views=True, row_type=row_type): reflect_views=True, row_type=row_type):
""" """ Opens a new connection to a database.
Opens a new connection to a database.
*url* can be any valid `SQLAlchemy engine URL`_. If *url* is not defined *url* can be any valid `SQLAlchemy engine URL`_. If *url* is not defined
it will try to use *DATABASE_URL* from environment variable. Returns an it will try to use *DATABASE_URL* from environment variable. Returns an
@ -28,8 +27,8 @@ def connect(url=None, schema=None, reflect_metadata=True, engine_kwargs=None,
loaded. Additionally, *engine_kwargs* will be directly passed to loaded. Additionally, *engine_kwargs* will be directly passed to
SQLAlchemy, e.g. set *engine_kwargs={'pool_recycle': 3600}* will avoid `DB SQLAlchemy, e.g. set *engine_kwargs={'pool_recycle': 3600}* will avoid `DB
connection timeout`_. Set *row_type* to an alternate dict-like class to connection timeout`_. Set *row_type* to an alternate dict-like class to
change the type of container rows are stored in. change the type of container rows are stored in.::
::
db = dataset.connect('sqlite:///factbook.db') db = dataset.connect('sqlite:///factbook.db')
.. _SQLAlchemy Engine URL: http://docs.sqlalchemy.org/en/latest/core/engines.html#sqlalchemy.create_engine .. _SQLAlchemy Engine URL: http://docs.sqlalchemy.org/en/latest/core/engines.html#sqlalchemy.create_engine

2
test/test_freeze.py
View File

@ -12,7 +12,7 @@ from dataset import connect
from dataset.freeze.app import freeze from dataset.freeze.app import freeze
from dataset.freeze.format.fcsv import value_to_str from dataset.freeze.format.fcsv import value_to_str
from sample_data import TEST_DATA from .sample_data import TEST_DATA
class FreezeTestCase(unittest.TestCase): class FreezeTestCase(unittest.TestCase):

2
test/test_freeze_app.py
View File

@ -14,7 +14,7 @@ from dataset import connect
from dataset.util import FreezeException from dataset.util import FreezeException
from dataset.freeze.config import Configuration, Export from dataset.freeze.config import Configuration, Export
from dataset.freeze.app import create_parser, freeze_with_config, freeze_export from dataset.freeze.app import create_parser, freeze_with_config, freeze_export
from sample_data import TEST_DATA from .sample_data import TEST_DATA
class FreezeAppTestCase(unittest.TestCase): class FreezeAppTestCase(unittest.TestCase):

2
test/test_persistence.py
View File

@ -12,7 +12,7 @@ from sqlalchemy.exc import IntegrityError, SQLAlchemyError
from dataset import connect from dataset import connect
from dataset.util import DatasetException from dataset.util import DatasetException
from sample_data import TEST_DATA, TEST_CITY_1 from .sample_data import TEST_DATA, TEST_CITY_1
class DatabaseTestCase(unittest.TestCase): class DatabaseTestCase(unittest.TestCase):