Added fix-encoding-pragma and reorder-python-imports pre-commit hooks

macisamuele · macisamuele · commit e98d29d3a126 · 2017-02-21T19:14:56.000+01:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -7,10 +7,15 @@
         - --ignore=E309,E501
     -   id: check-json
     -   id: check-yaml
+    -   id: fix-encoding-pragma
     -   id: debug-statements
     -   id: end-of-file-fixer
     -   id: flake8
     -   id: name-tests-test
     -   id: trailing-whitespace
     -   id: requirements-txt-fixer
         files: requirements-dev.txt
+-   repo: git://github.com/asottile/reorder_python_imports
+    sha: v0.3.1
+    hooks:
+    -   id: reorder-python-imports
diff --git a/bravado/__init__.py b/bravado/__init__.py
@@ -1 +1,2 @@
+# -*- coding: utf-8 -*-
 version = '8.4.0'
diff --git a/bravado/client.py b/bravado/client.py
@@ -50,7 +50,8 @@
 from bravado_core.formatter import SwaggerFormat  # noqa
 from bravado_core.param import marshal_param
 from bravado_core.spec import Spec
-from six import iteritems, itervalues
+from six import iteritems
+from six import itervalues
 
 from bravado.docstring_property import docstring_property
 from bravado.requests_client import RequestsClient
diff --git a/bravado/compat.py b/bravado/compat.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 
 try:
     import simplejson as json
diff --git a/bravado/docstring_property.py b/bravado/docstring_property.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """Property decorator for the `__doc__` attribute.
 Useful for when you want a custom docstring for class instances
 while still showing a generic docstring for the class itself.
diff --git a/bravado/fido_client.py b/bravado/fido_client.py
@@ -2,11 +2,11 @@
 import logging
 
 import crochet
-import requests
 import fido
+import requests
+from bravado_core.response import IncomingResponse
 from yelp_bytes import to_bytes
 
-from bravado_core.response import IncomingResponse
 from bravado.http_client import HttpClient
 from bravado.http_future import FutureAdapter
 from bravado.http_future import HttpFuture
diff --git a/bravado/http_future.py b/bravado/http_future.py
@@ -2,8 +2,8 @@
 import sys
 
 import bravado_core
-from bravado_core.exception import MatchingResponseNotFound
 import six
+from bravado_core.exception import MatchingResponseNotFound
 
 from bravado.exception import make_http_exception
 
diff --git a/bravado/requests_client.py b/bravado/requests_client.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 import logging
 
-from bravado_core.response import IncomingResponse
 import requests
 import requests.auth
+from bravado_core.response import IncomingResponse
 from six.moves.urllib import parse as urlparse
 
 from bravado.http_client import HttpClient
diff --git a/bravado/swagger_model.py b/bravado/swagger_model.py
@@ -3,8 +3,8 @@
 import logging
 import os
 import os.path
-import yaml
 
+import yaml
 from bravado_core.spec import is_yaml
 from six.moves import urllib
 from six.moves.urllib import parse as urlparse
diff --git a/bravado/warning.py b/bravado/warning.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import warnings
 
 
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import sphinx_rtd_theme
 
 # -- General configuration -----------------------------------------------
diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 # Copyright (c) 2013, Digium, Inc.
 # Copyright (c) 2014-2016, Yelp, Inc.
-
 import os
 
 from setuptools import setup
diff --git a/tests/client/CallableOperation/docstring_test.py b/tests/client/CallableOperation/docstring_test.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from bravado_core.operation import Operation
 
 from bravado.client import CallableOperation
diff --git a/tests/client/ResourceDecorator/dir_test.py b/tests/client/ResourceDecorator/dir_test.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 def test_forwarded_to_delegate(petstore_client):
     expected = ['addPet', 'deletePet', 'findPetsByStatus', 'findPetsByTags',
                 'getPetById', 'updatePet', 'updatePetWithForm', 'uploadFile']
diff --git a/tests/client/SwaggerClient/getattr_test.py b/tests/client/SwaggerClient/getattr_test.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import pytest
 
 from bravado.client import ResourceDecorator
diff --git a/tests/client/conftest.py b/tests/client/conftest.py
@@ -1,10 +1,11 @@
+# -*- coding: utf-8 -*-
 import os
 
-from bravado.compat import json
 import pytest
 
 from bravado.client import Spec
 from bravado.client import SwaggerClient
+from bravado.compat import json
 
 
 @pytest.fixture
diff --git a/tests/client/construct_params_test.py b/tests/client/construct_params_test.py
@@ -1,8 +1,8 @@
-from mock import patch
+# -*- coding: utf-8 -*-
 import pytest
-
 from bravado_core.exception import SwaggerMappingError
 from bravado_core.operation import Operation
+from mock import patch
 
 from bravado.client import CallableOperation
 from bravado.client import construct_params
diff --git a/tests/client/construct_request_test.py b/tests/client/construct_request_test.py
@@ -1,8 +1,10 @@
+# -*- coding: utf-8 -*-
+import pytest
 from bravado_core.operation import Operation
 from mock import patch
-import pytest
 
-from bravado.client import CallableOperation, construct_request
+from bravado.client import CallableOperation
+from bravado.client import construct_request
 
 
 @pytest.mark.parametrize('timeout_kv', [
diff --git a/tests/client/inject_headers_for_remote_refs_test.py b/tests/client/inject_headers_for_remote_refs_test.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from bravado_core.operation import Operation
 from mock import Mock
 
diff --git a/tests/client_test.py b/tests/client_test.py
@@ -4,8 +4,8 @@
 import unittest
 
 import httpretty
-import requests
 import pytest
+import requests
 
 from bravado.client import SwaggerClient
 
diff --git a/tests/exception_test.py b/tests/exception_test.py
@@ -3,9 +3,9 @@
 from requests.models import Response
 
 from bravado.exception import HTTPError
-from bravado.exception import make_http_exception
 from bravado.exception import HTTPInternalServerError
 from bravado.exception import HTTPServerError
+from bravado.exception import make_http_exception
 from bravado.requests_client import RequestsResponseAdapter
 
 
diff --git a/tests/fido_client/FidoClient/prepare_request_for_twisted_test.py b/tests/fido_client/FidoClient/prepare_request_for_twisted_test.py
@@ -4,7 +4,6 @@
 1) Callbacks triggered by twisted and crochet
 2) Timeouts by crochet's wait()
 """
-
 from bravado.fido_client import FidoClient
 
 
diff --git a/tests/fido_client/FidoClient/request_test.py b/tests/fido_client/FidoClient/request_test.py
@@ -1,7 +1,7 @@
+# -*- coding: utf-8 -*-
 import mock
 from mock import patch
 
-
 from bravado.fido_client import FidoClient
 
 
diff --git a/tests/fido_client/FidoFutureAdapter/result_test.py b/tests/fido_client/FidoFutureAdapter/result_test.py
@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
-from mock import Mock
-import pytest
-
 import crochet
+import pytest
+from mock import Mock
 
 from bravado.fido_client import FidoFutureAdapter
 
diff --git a/tests/functional/conftest.py b/tests/functional/conftest.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import functools
 import json
 
diff --git a/tests/functional/model_func_test.py b/tests/functional/model_func_test.py
@@ -1,14 +1,16 @@
+# -*- coding: utf-8 -*-
 """
 Functional tests related to passing models in req/response
 """
 import httpretty
 import pytest
-
 from jsonschema.exceptions import ValidationError
 
 from bravado.client import SwaggerClient
 from bravado.compat import json
-from tests.functional.conftest import register_spec, register_get, API_DOCS_URL
+from tests.functional.conftest import API_DOCS_URL
+from tests.functional.conftest import register_get
+from tests.functional.conftest import register_spec
 
 
 @pytest.fixture
diff --git a/tests/functional/request_func_test.py b/tests/functional/request_func_test.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """
 Request related functional tests
 """
@@ -6,7 +7,9 @@
 from six.moves.urllib import parse as urlparse
 
 from bravado.client import SwaggerClient
-from tests.functional.conftest import register_spec, API_DOCS_URL, register_get
+from tests.functional.conftest import API_DOCS_URL
+from tests.functional.conftest import register_get
+from tests.functional.conftest import register_spec
 
 
 def test_form_params_in_request(httprettified, swagger_dict):
diff --git a/tests/functional/response_func_test.py b/tests/functional/response_func_test.py
@@ -1,16 +1,19 @@
+# -*- coding: utf-8 -*-
 """
 Response related functional tests
 """
 import datetime
 import functools
 
-from jsonschema.exceptions import ValidationError
 import pytest
+from jsonschema.exceptions import ValidationError
 
 from bravado.client import SwaggerClient
 from bravado.compat import json
 from bravado.exception import HTTPError
-from tests.functional.conftest import register_spec, register_get, API_DOCS_URL
+from tests.functional.conftest import API_DOCS_URL
+from tests.functional.conftest import register_get
+from tests.functional.conftest import register_spec
 
 
 register_test_http = functools.partial(
diff --git a/tests/functional/spec_func_test.py b/tests/functional/spec_func_test.py
@@ -1,12 +1,16 @@
+# -*- coding: utf-8 -*-
 """
 Swagger Specification related functional tests
 """
 import httpretty
 import pytest
 from swagger_spec_validator.common import SwaggerValidationError
 
-from bravado.client import SwaggerClient, ResourceDecorator
-from tests.functional.conftest import register_get, register_spec, API_DOCS_URL
+from bravado.client import ResourceDecorator
+from bravado.client import SwaggerClient
+from tests.functional.conftest import API_DOCS_URL
+from tests.functional.conftest import register_get
+from tests.functional.conftest import register_spec
 
 
 def test_invalid_spec_raises_SwaggerValidationError(
diff --git a/tests/http_future/HttpFuture/result_test.py b/tests/http_future/HttpFuture/result_test.py
@@ -1,11 +1,13 @@
+# -*- coding: utf-8 -*-
+import pytest
 from bravado_core.operation import Operation
 from bravado_core.response import IncomingResponse
-from bravado.http_future import FutureAdapter
-from mock import patch, Mock
-import pytest
+from mock import Mock
+from mock import patch
 
-from bravado.http_future import HttpFuture
 from bravado.exception import HTTPError
+from bravado.http_future import FutureAdapter
+from bravado.http_future import HttpFuture
 
 
 def test_200_get_swagger_spec():
diff --git a/tests/http_future/raise_on_expected_test.py b/tests/http_future/raise_on_expected_test.py
@@ -1,6 +1,7 @@
+# -*- coding: utf-8 -*-
+import pytest
 from bravado_core.response import IncomingResponse
 from mock import Mock
-import pytest
 
 from bravado.exception import HTTPError
 from bravado.http_future import raise_on_expected
diff --git a/tests/http_future/raise_on_unexpected_test.py b/tests/http_future/raise_on_unexpected_test.py
@@ -1,6 +1,7 @@
+# -*- coding: utf-8 -*-
+import pytest
 from bravado_core.response import IncomingResponse
 from mock import Mock
-import pytest
 
 from bravado.exception import HTTPError
 from bravado.http_future import raise_on_unexpected
diff --git a/tests/http_future/unmarshall_response_test.py b/tests/http_future/unmarshall_response_test.py
@@ -1,8 +1,10 @@
+# -*- coding: utf-8 -*-
 import pytest
-from mock import Mock, patch
 from bravado_core.exception import MatchingResponseNotFound
 from bravado_core.operation import Operation
 from bravado_core.response import IncomingResponse
+from mock import Mock
+from mock import patch
 
 from bravado.exception import HTTPError
 from bravado.http_future import unmarshal_response
diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
@@ -1,15 +1,11 @@
 # -*- coding: utf-8 -*-
-
 import threading
 import time
 
-from six.moves import urllib
-
-
-import ephemeral_port_reserve
 import bottle
-
+import ephemeral_port_reserve
 import pytest
+from six.moves import urllib
 
 ROUTE_1_RESPONSE = b"HEY BUDDY"
 ROUTE_2_RESPONSE = b"BYE BUDDY"
diff --git a/tests/petstore/conftest.py b/tests/petstore/conftest.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import pytest
 
 from bravado.client import SwaggerClient
diff --git a/tests/petstore/pet/__init__.py b/tests/petstore/pet/__init__.py
@@ -1 +1,2 @@
+# -*- coding: utf-8 -*-
 __author__ = 'analogue'
diff --git a/tests/petstore/pet/addPet_test.py b/tests/petstore/pet/addPet_test.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from __future__ import print_function
 
 
diff --git a/tests/petstore/pet/deletePet_test.py b/tests/petstore/pet/deletePet_test.py
@@ -1,4 +1,6 @@
+# -*- coding: utf-8 -*-
 from __future__ import print_function
+
 import pytest
 
 
diff --git a/tests/petstore/pet/findPetsByStatus_test.py b/tests/petstore/pet/findPetsByStatus_test.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 def test_uses_default_of_available(petstore):
     status_code, pets = petstore.pet.findPetsByStatus().result()
     assert pets
diff --git a/tests/petstore/pet/findPetsByTags_test.py b/tests/petstore/pet/findPetsByTags_test.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import pytest
 
 
diff --git a/tests/petstore/pet/getPetById_test.py b/tests/petstore/pet/getPetById_test.py
@@ -1,5 +1,8 @@
+# -*- coding: utf-8 -*-
 from __future__ import print_function
+
 from pprint import pprint
+
 import pytest
 
 
diff --git a/tests/petstore/pet/updatePetWithForm_test.py b/tests/petstore/pet/updatePetWithForm_test.py
diff --git a/tests/petstore/pet/updatePet_test.py b/tests/petstore/pet/updatePet_test.py
diff --git a/tests/petstore/pet/uploadFile_test.py b/tests/petstore/pet/uploadFile_test.py
diff --git a/tests/petstore/store/__init__.py b/tests/petstore/store/__init__.py
diff --git a/tests/petstore/store/getInventory_test.py b/tests/petstore/store/getInventory_test.py
diff --git a/tests/petstore/store/getOrderById_test.py b/tests/petstore/store/getOrderById_test.py
diff --git a/tests/petstore/store/placeOrder_test.py b/tests/petstore/store/placeOrder_test.py
diff --git a/tests/petstore/user/creatUser_test.py b/tests/petstore/user/creatUser_test.py
diff --git a/tests/petstore/user/createUsersWithArrayInput_test.py b/tests/petstore/user/createUsersWithArrayInput_test.py
diff --git a/tests/petstore/user/deleteUser_test.py b/tests/petstore/user/deleteUser_test.py
diff --git a/tests/petstore/user/getUserByName_test.py b/tests/petstore/user/getUserByName_test.py
diff --git a/tests/petstore/user/loginUser_test.py b/tests/petstore/user/loginUser_test.py
diff --git a/tests/petstore/user/logoutUser_test.py b/tests/petstore/user/logoutUser_test.py
diff --git a/tests/petstore/user/updateUser_test.py b/tests/petstore/user/updateUser_test.py
diff --git a/tests/requests_client/RequestsClient/separate_params_test.py b/tests/requests_client/RequestsClient/separate_params_test.py
diff --git a/tests/requests_client/RequestsFutureAdapter/build_timeout_test.py b/tests/requests_client/RequestsFutureAdapter/build_timeout_test.py
diff --git a/tests/swagger_model/__init__.py b/tests/swagger_model/__init__.py
diff --git a/tests/swagger_model/load_file_test.py b/tests/swagger_model/load_file_test.py
diff --git a/tests/swagger_model/loader_test.py b/tests/swagger_model/loader_test.py
diff --git a/tests/warning/warn_for_deprecated_op_test.py b/tests/warning/warn_for_deprecated_op_test.py

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
	`1`	`+# -- coding: utf-8 --`
`1`	`2`	`version = '8.4.0'`