Skip to content

Commit

Permalink
massive isort
Browse files Browse the repository at this point in the history
  • Loading branch information
darius BERNARD committed Nov 23, 2016
1 parent f868e6e commit ff1c8a6
Show file tree
Hide file tree
Showing 16 changed files with 28 additions and 41 deletions.
3 changes: 1 addition & 2 deletions rest_models/backend/auth.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals, absolute_import, print_function
from __future__ import absolute_import, print_function, unicode_literals

import logging

from requests.auth import AuthBase, HTTPBasicAuth

from rest_models.backend.exceptions import FakeDatabaseDbAPI2

logger = logging.getLogger(__name__)
Expand Down
4 changes: 2 additions & 2 deletions rest_models/backend/base.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals, absolute_import, print_function
from __future__ import absolute_import, print_function, unicode_literals

import logging
from importlib import import_module
Expand All @@ -8,8 +8,8 @@
from django.db.backends.base.base import BaseDatabaseWrapper
from django.db.backends.base.validation import BaseDatabaseValidation
from rest_models.backend.connexion import ApiConnexion

from rest_models.backend.exceptions import FakeDatabaseDbAPI2

from .client import DatabaseClient
from .creation import DatabaseCreation
from .features import DatabaseFeatures
Expand Down
10 changes: 4 additions & 6 deletions rest_models/backend/compiler.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals, absolute_import, print_function
from __future__ import absolute_import, print_function, unicode_literals

import logging
from collections import namedtuple

from django.db.models.sql.constants import MULTI, NO_RESULTS, SINGLE
from django.db.models.sql.compiler import SQLCompiler as BaseSQLCompiler
from django.db.models.sql.where import WhereNode, SubqueryConstraint
from django.db.models.lookups import Lookup
from django.db.models.sql.compiler import SQLCompiler as BaseSQLCompiler
from django.db.models.sql.constants import MULTI, NO_RESULTS, SINGLE
from django.db.models.sql.where import SubqueryConstraint, WhereNode
from django.db.utils import ProgrammingError


from rest_models.backend.exceptions import FakeDatabaseDbAPI2

logger = logging.getLogger(__name__)
Expand Down
5 changes: 2 additions & 3 deletions rest_models/backend/connexion.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals, absolute_import, print_function
from __future__ import absolute_import, print_function, unicode_literals

import logging

Expand All @@ -9,11 +9,10 @@
from django.test.client import RequestFactory
from requests.adapters import BaseAdapter
from requests.cookies import extract_cookies_to_jar
from requests.exceptions import Timeout, ConnectionError
from requests.exceptions import ConnectionError, Timeout
from requests.models import Response
from requests.structures import CaseInsensitiveDict
from requests.utils import get_encoding_from_headers

from rest_models.backend.exceptions import FakeDatabaseDbAPI2

logger = logging.getLogger(__name__)
Expand Down
2 changes: 1 addition & 1 deletion rest_models/backend/creation.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals, absolute_import, print_function
from __future__ import absolute_import, print_function, unicode_literals

import logging
import re
Expand Down
4 changes: 2 additions & 2 deletions rest_models/backend/exceptions.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-

from django.db.utils import (DatabaseError, Error, IntegrityError,
from django.db.utils import (DatabaseError, Error, IntegrityError, # noqa
InterfaceError, InternalError, NotSupportedError,
OperationalError, ProgrammingError) # noqa
OperationalError, ProgrammingError)

__ALL__ = ['ProgrammingError', 'OperationalError', 'IntegrityError', 'InternalError',
'NotSupportedError', 'DatabaseError', 'InterfaceError', 'Error']
Expand Down
4 changes: 2 additions & 2 deletions rest_models/backend/introspection.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals, absolute_import, print_function
from __future__ import absolute_import, print_function, unicode_literals

import logging

Expand All @@ -22,4 +22,4 @@ def get_constraints(self, cursor, table_name):
return []

def django_table_names(self, only_existing=False, include_views=True):
return []
return []
2 changes: 1 addition & 1 deletion rest_models/backend/operations.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals, absolute_import, print_function
from __future__ import absolute_import, print_function, unicode_literals

import logging

Expand Down
2 changes: 1 addition & 1 deletion rest_models/backend/schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ class DatabaseSchemaEditor(BaseDatabaseSchemaEditor):
prepare_default = do_nothing
delete_model = do_nothing
quote_name = do_nothing
quote_value = do_nothing
quote_value = do_nothing
3 changes: 1 addition & 2 deletions rest_models/router.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals, absolute_import, print_function
from __future__ import absolute_import, print_function, unicode_literals

import logging
from importlib import import_module

from django.apps import apps
from django.conf import settings
from django.core.exceptions import ImproperlyConfigured

from rest_models.backend.base import DatabaseWrapper

logger = logging.getLogger(__name__)
Expand Down
6 changes: 3 additions & 3 deletions rest_models/tests/tests_build_params.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
from django.db.models.query_utils import Q
from django.db.utils import NotSupportedError, ProgrammingError
from django.test import TestCase
from rest_models.backend.compiler import SQLCompiler, QueryParser, Alias
from rest_models.backend.compiler import Alias, QueryParser, SQLCompiler

from testapp.models import Pizza, Topping, Menu
from testapp.models import Menu, Pizza, Topping


class CompilerTestCase(TestCase):
Expand Down Expand Up @@ -430,4 +430,4 @@ def test_order_related(self):
self.assertQsToOrder(
Pizza.objects.all().order_by('menu__name'),
{'sort[]': ['menu.name']},
)
)
4 changes: 2 additions & 2 deletions rest_models/tests/tests_compilers.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
from django.db.utils import ProgrammingError
from django.test.testcases import TestCase

import testapp.models as client_models
import testapi.models as api_models
import testapp.models as client_models


class TestQueryInsert(TestCase):
Expand Down Expand Up @@ -158,4 +158,4 @@ def test_delete_obj(self):
p = client_models.Pizza(pk=1)
p.delete()
self.assertEqual(api_models.Pizza.objects.count(), 2)
self.assertFalse(api_models.Pizza.objects.filter(pk=1).exists())
self.assertFalse(api_models.Pizza.objects.filter(pk=1).exists())
5 changes: 1 addition & 4 deletions rest_models/tests/tests_connexion.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals, absolute_import, print_function
from __future__ import absolute_import, print_function, unicode_literals

import logging

from django.db.utils import ProgrammingError
from django.test.testcases import LiveServerTestCase, TestCase
from rest_models.backend.connexion import ApiConnexion

from rest_models.backend.exceptions import FakeDatabaseDbAPI2

logger = logging.getLogger(__name__)
Expand Down Expand Up @@ -193,5 +192,3 @@ def test_auth_admin(self):
def test_auth_no_rigth(self):
c = ApiConnexion(self.live_server_url + "/api/v2/", auth=('user1', 'user1'))
self.assertRaises(ProgrammingError, c.patch, 'authpizza/1', json={'pizza': {'price': 0}})


10 changes: 3 additions & 7 deletions rest_models/tests/tests_routers.py
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals, absolute_import, print_function
from __future__ import absolute_import, print_function, unicode_literals

import copy

from django.conf import settings
from django.contrib.auth import get_user_model
from django.core.exceptions import ImproperlyConfigured
from django.test import TestCase

from django.core.management import call_command

from django.test import TestCase
from rest_models.router import RestModelRouter


import testapp.models as client_models
import testapi.models as api_models
import testapp.models as client_models


class TestMigrationRouter(TestCase):
Expand Down Expand Up @@ -73,4 +70,3 @@ def test_allow_migration(self):
self.assertFalse(router.allow_migrate('api', 'testapi', 'Pizza')) # legacy model on api db

self.assertIsNone(router.allow_migrate('default', 'testapi')) # final model not provided : don't know

2 changes: 1 addition & 1 deletion testapp/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-


from __future__ import unicode_literals, print_function, absolute_import
from __future__ import absolute_import, print_function, unicode_literals

from django.conf import settings
from django.db import models
Expand Down
3 changes: 1 addition & 2 deletions testappsimple/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-


from __future__ import unicode_literals, print_function, absolute_import
from __future__ import absolute_import, print_function, unicode_literals

from django.conf import settings
from django.db import models
Expand All @@ -13,4 +13,3 @@ class ModelA(models.Model):

class APIMeta:
pass

0 comments on commit ff1c8a6

Please sign in to comment.