apply reorder-python-imports

Author: davidism

examples/hello/hello.py

@@ -1,6 +1,11 @@
 from datetime import datetime
-from flask import Flask, request, flash, url_for, redirect, \
-     render_template
+
+from flask import flash
+from flask import Flask
+from flask import redirect
+from flask import render_template
+from flask import request
+from flask import url_for
 from flask_sqlalchemy import SQLAlchemy
 
 

src/flask_sqlalchemy/__init__.py

@@ -7,16 +7,22 @@
 from time import perf_counter
 
 import sqlalchemy
-from flask import _app_ctx_stack, abort, current_app, request
+from flask import _app_ctx_stack
+from flask import abort
+from flask import current_app
+from flask import request
 from flask.signals import Namespace
-from sqlalchemy import event, inspect, orm
+from sqlalchemy import event
+from sqlalchemy import inspect
+from sqlalchemy import orm
 from sqlalchemy.engine.url import make_url
-from sqlalchemy.ext.declarative import DeclarativeMeta, declarative_base
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.ext.declarative import DeclarativeMeta
 from sqlalchemy.orm.exc import UnmappedClassError
 from sqlalchemy.orm.session import Session as SessionBase
 
-from flask_sqlalchemy.model import Model
 from .model import DefaultMeta
+from .model import Model
 
 __version__ = "3.0.0.dev"
 

src/flask_sqlalchemy/model.py

@@ -2,7 +2,8 @@
 
 import sqlalchemy as sa
 from sqlalchemy import inspect
-from sqlalchemy.ext.declarative import DeclarativeMeta, declared_attr
+from sqlalchemy.ext.declarative import DeclarativeMeta
+from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.schema import _get_table_key
 
 

tests/conftest.py

@@ -3,7 +3,7 @@
 import flask
 import pytest
 
-import flask_sqlalchemy as fsa
+from flask_sqlalchemy import SQLAlchemy
 
 
 @pytest.fixture
@@ -16,7 +16,7 @@ def app(request):
 
 @pytest.fixture
 def db(app):
-    return fsa.SQLAlchemy(app)
+    return SQLAlchemy(app)
 
 
 @pytest.fixture

tests/test_basic_app.py

@@ -1,6 +1,6 @@
 import flask
 
-import flask_sqlalchemy as fsa
+from flask_sqlalchemy import get_debug_queries
 
 
 def test_basic_insert(app, db, Todo):
@@ -31,7 +31,7 @@ def test_query_recording(app, db, Todo):
         todo.done = True
         db.session.commit()
 
-        queries = fsa.get_debug_queries()
+        queries = get_debug_queries()
         assert len(queries) == 2
 
         query = queries[0]

tests/test_binds.py

@@ -1,5 +1,6 @@
-import flask_sqlalchemy as fsa
-from sqlalchemy.ext.declarative import declared_attr
+from flask_sqlalchemy import get_state
+from flask_sqlalchemy import SQLAlchemy
+
 
 def test_basic_binds(app, db):
     app.config['SQLALCHEMY_BINDS'] = {
@@ -83,13 +84,13 @@ class FooBoundModel(AbstractFooBoundModel):
 
 
 def test_connector_cache(app):
-    db = fsa.SQLAlchemy()
+    db = SQLAlchemy()
     db.init_app(app)
 
     with app.app_context():
         db.get_engine()
 
-    connector = fsa.get_state(app).connectors[None]
+    connector = get_state(app).connectors[None]
     assert connector._app is app
 
 

tests/test_config.py

@@ -1,8 +1,10 @@
 from unittest import mock
+
 import pytest
+import sqlalchemy
 from sqlalchemy.pool import NullPool
 
-import flask_sqlalchemy as fsa
+from flask_sqlalchemy import SQLAlchemy
 
 
 @pytest.fixture
@@ -23,15 +25,15 @@ def test_default_error_without_uri_or_binds(self, app, recwarn):
         SQLALCHEMY_DATABASE_URI and SQLALCHEMY_BINDS are unset
         """
 
-        fsa.SQLAlchemy(app)
+        SQLAlchemy(app)
 
         # Our pytest fixture for creating the app sets
         # SQLALCHEMY_DATABASE_URI, so undo that here so that we
         # can inspect what FSA does below:
         del app.config['SQLALCHEMY_DATABASE_URI']
 
         with pytest.raises(RuntimeError) as exc_info:
-            fsa.SQLAlchemy(app)
+            SQLAlchemy(app)
 
         expected = 'Either SQLALCHEMY_DATABASE_URI ' \
                    'or SQLALCHEMY_BINDS needs to be set.'
@@ -45,7 +47,7 @@ def test_defaults_with_uri(self, app, recwarn):
         Our pytest fixture for creating the app sets SQLALCHEMY_DATABASE_URI
         """
 
-        fsa.SQLAlchemy(app)
+        SQLAlchemy(app)
 
         # Expecting no warnings for default config with URI
         assert len(recwarn) == 0
@@ -60,51 +62,51 @@ def test_engine_creation_ok(self, app):
         """ create_engine() isn't called until needed.  Let's make sure we can do that without
             errors or warnings.
         """
-        assert fsa.SQLAlchemy(app).get_engine()
+        assert SQLAlchemy(app).get_engine()
 
 
-@mock.patch.object(fsa.sqlalchemy, 'create_engine', autospec=True, spec_set=True)
+@mock.patch.object(sqlalchemy, 'create_engine', autospec=True, spec_set=True)
 class TestCreateEngine:
     """
         Tests for _EngineConnector and SQLAlchemy methods inolved in setting up
         the SQLAlchemy engine.
     """
 
     def test_engine_echo_default(self, m_create_engine, app_nr):
-        fsa.SQLAlchemy(app_nr).get_engine()
+        SQLAlchemy(app_nr).get_engine()
 
         args, options = m_create_engine.call_args
         assert 'echo' not in options
 
     def test_engine_echo_true(self, m_create_engine, app_nr):
         app_nr.config['SQLALCHEMY_ECHO'] = True
-        fsa.SQLAlchemy(app_nr).get_engine()
+        SQLAlchemy(app_nr).get_engine()
 
         args, options = m_create_engine.call_args
         assert options['echo'] is True
 
     def test_config_from_engine_options(self, m_create_engine, app_nr):
         app_nr.config['SQLALCHEMY_ENGINE_OPTIONS'] = {'foo': 'bar'}
-        fsa.SQLAlchemy(app_nr).get_engine()
+        SQLAlchemy(app_nr).get_engine()
 
         args, options = m_create_engine.call_args
         assert options['foo'] == 'bar'
 
     def test_config_from_init(self, m_create_engine, app_nr):
-        fsa.SQLAlchemy(app_nr, engine_options={'bar': 'baz'}).get_engine()
+        SQLAlchemy(app_nr, engine_options={'bar': 'baz'}).get_engine()
 
         args, options = m_create_engine.call_args
         assert options['bar'] == 'baz'
 
     def test_pool_class_default(self, m_create_engine, app_nr):
-        fsa.SQLAlchemy(app_nr).get_engine()
+        SQLAlchemy(app_nr).get_engine()
 
         args, options = m_create_engine.call_args
         assert options['poolclass'].__name__ == 'StaticPool'
 
     def test_pool_class_nullpool(self, m_create_engine, app_nr):
         engine_options = {'poolclass': NullPool}
-        fsa.SQLAlchemy(app_nr, engine_options=engine_options).get_engine()
+        SQLAlchemy(app_nr, engine_options=engine_options).get_engine()
 
         args, options = m_create_engine.call_args
         assert options['poolclass'].__name__ == 'NullPool'

tests/test_meta_data.py

@@ -1,10 +1,10 @@
 import sqlalchemy as sa
 
-import flask_sqlalchemy as fsa
+from flask_sqlalchemy import SQLAlchemy
 
 
 def test_default_metadata(app):
-    db = fsa.SQLAlchemy(app, metadata=None)
+    db = SQLAlchemy(app, metadata=None)
 
     class One(db.Model):
         id = db.Column(db.Integer, primary_key=True)
@@ -27,7 +27,7 @@ class CustomMetaData(sa.MetaData):
         pass
 
     custom_metadata = CustomMetaData(schema="test_schema")
-    db = fsa.SQLAlchemy(app, metadata=custom_metadata)
+    db = SQLAlchemy(app, metadata=custom_metadata)
 
     class One(db.Model):
         id = db.Column(db.Integer, primary_key=True)

tests/test_model_class.py

@@ -1,16 +1,18 @@
 import pytest
 from sqlalchemy.exc import InvalidRequestError
-from sqlalchemy.ext.declarative import DeclarativeMeta, declarative_base
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.ext.declarative import DeclarativeMeta
 
-import flask_sqlalchemy as fsa
+from flask_sqlalchemy import SQLAlchemy
 from flask_sqlalchemy.model import BindMetaMixin
+from flask_sqlalchemy.model import Model
 
 
 def test_custom_model_class():
-    class CustomModelClass(fsa.Model):
+    class CustomModelClass(Model):
         pass
 
-    db = fsa.SQLAlchemy(model_class=CustomModelClass)
+    db = SQLAlchemy(model_class=CustomModelClass)
 
     class SomeModel(db.Model):
         id = db.Column(db.Integer, primary_key=True)
@@ -22,8 +24,8 @@ def test_no_table_name():
     class NoNameMeta(BindMetaMixin, DeclarativeMeta):
         pass
 
-    db = fsa.SQLAlchemy(model_class=declarative_base(
-        cls=fsa.Model, metaclass=NoNameMeta, name='Model'))
+    db = SQLAlchemy(model_class=declarative_base(
+        cls=Model, metaclass=NoNameMeta, name='Model'))
 
     with pytest.raises(InvalidRequestError):
         class User(db.Model):

tests/test_pagination.py

@@ -1,11 +1,11 @@
 import pytest
 from werkzeug.exceptions import NotFound
 
-import flask_sqlalchemy as fsa
+from flask_sqlalchemy import Pagination
 
 
 def test_basic_pagination():
-    p = fsa.Pagination(None, 1, 20, 500, [])
+    p = Pagination(None, 1, 20, 500, [])
     assert p.page == 1
     assert not p.has_prev
     assert p.has_next
@@ -18,12 +18,12 @@ def test_basic_pagination():
 
 
 def test_pagination_pages_when_0_items_per_page():
-    p = fsa.Pagination(None, 1, 0, 500, [])
+    p = Pagination(None, 1, 0, 500, [])
     assert p.pages == 0
 
 
 def test_pagination_pages_when_total_is_none():
-    p = fsa.Pagination(None, 1, 100, None, [])
+    p = Pagination(None, 1, 100, None, [])
     assert p.pages == 0
 
 

tests/test_query_class.py

@@ -1,4 +1,5 @@
-import flask_sqlalchemy as fsa
+from flask_sqlalchemy import BaseQuery
+from flask_sqlalchemy import SQLAlchemy
 
 
 def test_default_query_class(db):
@@ -14,17 +15,17 @@ class Child(db.Model):
     c = Child()
     c.parent = p
 
-    assert type(Parent.query) == fsa.BaseQuery
-    assert type(Child.query) == fsa.BaseQuery
-    assert isinstance(p.children, fsa.BaseQuery)
-    assert isinstance(db.session.query(Parent), fsa.BaseQuery)
+    assert type(Parent.query) == BaseQuery
+    assert type(Child.query) == BaseQuery
+    assert isinstance(p.children, BaseQuery)
+    assert isinstance(db.session.query(Parent), BaseQuery)
 
 
 def test_custom_query_class(app):
-    class CustomQueryClass(fsa.BaseQuery):
+    class CustomQueryClass(BaseQuery):
         pass
 
-    db = fsa.SQLAlchemy(app, query_class=CustomQueryClass)
+    db = SQLAlchemy(app, query_class=CustomQueryClass)
 
     class Parent(db.Model):
         id = db.Column(db.Integer, primary_key=True)
@@ -47,13 +48,13 @@ class Child(db.Model):
 
 
 def test_dont_override_model_default(app):
-    class CustomQueryClass(fsa.BaseQuery):
+    class CustomQueryClass(BaseQuery):
         pass
 
-    db = fsa.SQLAlchemy(app, query_class=CustomQueryClass)
+    db = SQLAlchemy(app, query_class=CustomQueryClass)
 
     class SomeModel(db.Model):
         id = db.Column(db.Integer, primary_key=True)
-        query_class = fsa.BaseQuery
+        query_class = BaseQuery
 
-    assert type(SomeModel.query) == fsa.BaseQuery
+    assert type(SomeModel.query) == BaseQuery

tests/test_query_property.py

@@ -1,11 +1,11 @@
 import pytest
 from werkzeug.exceptions import NotFound
 
-import flask_sqlalchemy as fsa
+from flask_sqlalchemy import SQLAlchemy
 
 
 def test_no_app_bound(app):
-    db = fsa.SQLAlchemy()
+    db = SQLAlchemy()
     db.init_app(app)
 
     class Foo(db.Model):

tests/test_sessions.py

@@ -1,7 +1,7 @@
 import sqlalchemy as sa
 from sqlalchemy.orm import sessionmaker
 
-import flask_sqlalchemy as fsa
+from flask_sqlalchemy import SQLAlchemy
 
 
 def test_default_session_scoping(app, db):
@@ -20,7 +20,7 @@ def test_session_scoping_changing(app):
     def scopefunc():
         return id(dict())
 
-    db = fsa.SQLAlchemy(app, session_options=dict(scopefunc=scopefunc))
+    db = SQLAlchemy(app, session_options=dict(scopefunc=scopefunc))
 
     class FOOBar(db.Model):
         id = db.Column(db.Integer, primary_key=True)