From 10d1b7e770045b95ff5cb0cc3b4adfcc583049e2 Mon Sep 17 00:00:00 2001 From: Jesse Jarzynka Date: Thu, 2 Jun 2016 16:04:18 -0700 Subject: [PATCH] style(pep8): Add flake8-import-order plugin with import order changes (#808) Fixes #798 --- falcon/api.py | 7 +++---- falcon/errors.py | 2 +- falcon/request.py | 13 ++++++------- falcon/response.py | 2 +- falcon/testing/base.py | 2 +- falcon/testing/helpers.py | 4 ++-- falcon/testing/test_case.py | 4 ++-- falcon/util/__init__.py | 2 +- setup.py | 3 ++- tests/test_before_hooks.py | 2 +- tests/test_cookies.py | 4 ++-- tests/test_example.py | 3 ++- tests/test_hello.py | 6 +++--- tests/test_httperror.py | 4 ++-- tests/test_httpstatus.py | 2 +- tests/test_middleware.py | 2 +- tests/test_query_params.py | 2 +- tests/test_redirects.py | 2 +- tests/test_req_vars.py | 4 ++-- tests/test_request_context.py | 3 +-- tests/test_uri_templates.py | 3 ++- tests/test_utils.py | 2 +- tests/test_wsgi_errors.py | 3 ++- tox.ini | 3 +++ 24 files changed, 44 insertions(+), 40 deletions(-) diff --git a/falcon/api.py b/falcon/api.py index 7957ca0..3b5539b 100644 --- a/falcon/api.py +++ b/falcon/api.py @@ -14,16 +14,15 @@ import inspect import re + import six -from falcon import api_helpers as helpers -from falcon import DEFAULT_MEDIA_TYPE +from falcon import api_helpers as helpers, DEFAULT_MEDIA_TYPE, routing from falcon.http_error import HTTPError from falcon.http_status import HTTPStatus from falcon.request import Request, RequestOptions -from falcon.response import Response import falcon.responders -from falcon import routing +from falcon.response import Response import falcon.status_codes as status diff --git a/falcon/errors.py b/falcon/errors.py index 6c67be5..5818033 100644 --- a/falcon/errors.py +++ b/falcon/errors.py @@ -14,10 +14,10 @@ from datetime import datetime +from falcon import util from falcon.http_error import HTTPError, NoRepresentation, \ OptionalRepresentation import falcon.status_codes as status -from falcon import util class HTTPBadRequest(HTTPError): diff --git a/falcon/request.py b/falcon/request.py index 156f9a2..c0217c5 100644 --- a/falcon/request.py +++ b/falcon/request.py @@ -24,22 +24,21 @@ except AttributeError: import io NativeStream = io.BufferedReader -import mimeparse -import six from wsgiref.validate import InputWrapper +import mimeparse +import six +from six.moves import http_cookies + from falcon.errors import * # NOQA -from falcon import util -from falcon.util.uri import parse_query_string, parse_host, unquote_string -from falcon import request_helpers as helpers +from falcon import request_helpers as helpers, util +from falcon.util.uri import parse_host, parse_query_string, unquote_string # NOTE(tbug): In some cases, http_cookies is not a module # but a dict-like structure. This fixes that issue. # See issue https://github.com/falconry/falcon/issues/556 -from six.moves import http_cookies SimpleCookie = http_cookies.SimpleCookie - DEFAULT_ERROR_LOG_FORMAT = (u'{0:%Y-%m-%d %H:%M:%S} [FALCON] [ERROR]' u' {1} {2}{3} => ') diff --git a/falcon/response.py b/falcon/response.py index ddeeebb..f3e2c9b 100644 --- a/falcon/response.py +++ b/falcon/response.py @@ -20,7 +20,7 @@ from six import string_types as STRING_TYPES # See issue https://github.com/falconry/falcon/issues/556 from six.moves import http_cookies -from falcon.response_helpers import header_property, format_range +from falcon.response_helpers import format_range, header_property from falcon.response_helpers import is_ascii_encodable from falcon.util import dt_to_http, TimezoneGMT from falcon.util.uri import encode as uri_encode diff --git a/falcon/testing/base.py b/falcon/testing/base.py index 5fd92b3..374986c 100644 --- a/falcon/testing/base.py +++ b/falcon/testing/base.py @@ -21,8 +21,8 @@ except ImportError: # pragma: nocover import falcon import falcon.request -from falcon.testing.srmock import StartResponseMock from falcon.testing.helpers import create_environ +from falcon.testing.srmock import StartResponseMock class TestBase(unittest.TestCase): diff --git a/falcon/testing/helpers.py b/falcon/testing/helpers.py index 38d340e..14eab47 100644 --- a/falcon/testing/helpers.py +++ b/falcon/testing/helpers.py @@ -13,13 +13,13 @@ # limitations under the License. import cgi -import random import io +import random import sys import six -from falcon.util import uri, http_now +from falcon.util import http_now, uri # Constants DEFAULT_HOST = 'falconframework.org' diff --git a/falcon/testing/test_case.py b/falcon/testing/test_case.py index 93cf369..e9448a3 100644 --- a/falcon/testing/test_case.py +++ b/falcon/testing/test_case.py @@ -22,9 +22,9 @@ except ImportError: # pragma: nocover import falcon import falcon.request -from falcon.util import CaseInsensitiveDict -from falcon.testing.srmock import StartResponseMock from falcon.testing.helpers import create_environ, get_encoding_from_headers +from falcon.testing.srmock import StartResponseMock +from falcon.util import CaseInsensitiveDict class Result(object): diff --git a/falcon/util/__init__.py b/falcon/util/__init__.py index 219db47..d4dd724 100644 --- a/falcon/util/__init__.py +++ b/falcon/util/__init__.py @@ -1,6 +1,6 @@ # Hoist misc. utils +from falcon.util import structures from falcon.util.misc import * # NOQA from falcon.util.time import * -from falcon.util import structures CaseInsensitiveDict = structures.CaseInsensitiveDict diff --git a/setup.py b/setup.py index 112d578..da08665 100644 --- a/setup.py +++ b/setup.py @@ -3,9 +3,10 @@ import imp import io import os from os import path -from setuptools import setup, find_packages, Extension import sys +from setuptools import Extension, find_packages, setup + MYDIR = path.abspath(os.path.dirname(__file__)) VERSION = imp.load_source('version', path.join('.', 'falcon', 'version.py')) diff --git a/tests/test_before_hooks.py b/tests/test_before_hooks.py index 93ba484..bfdb14a 100644 --- a/tests/test_before_hooks.py +++ b/tests/test_before_hooks.py @@ -1,6 +1,6 @@ import functools -import json import io +import json import falcon import falcon.testing as testing diff --git a/tests/test_cookies.py b/tests/test_cookies.py index 8bc487d..d714216 100644 --- a/tests/test_cookies.py +++ b/tests/test_cookies.py @@ -1,6 +1,6 @@ +from datetime import datetime, timedelta, tzinfo import re import sys -from datetime import datetime, timedelta, tzinfo import ddt from six.moves.http_cookies import Morsel @@ -8,7 +8,7 @@ from testtools.matchers import LessThan import falcon import falcon.testing as testing -from falcon.util import TimezoneGMT, http_date_to_dt +from falcon.util import http_date_to_dt, TimezoneGMT UNICODE_TEST_STRING = u'Unicode_\xc3\xa6\xc3\xb8' diff --git a/tests/test_example.py b/tests/test_example.py index b267292..1ef986b 100644 --- a/tests/test_example.py +++ b/tests/test_example.py @@ -3,9 +3,10 @@ import logging import uuid from wsgiref import simple_server -import falcon import requests +import falcon + class StorageEngine(object): diff --git a/tests/test_hello.py b/tests/test_hello.py index a30ac4e..2229dfc 100644 --- a/tests/test_hello.py +++ b/tests/test_hello.py @@ -1,11 +1,11 @@ +import io + import ddt +import six import falcon -import io import falcon.testing as testing -import six - # NOTE(kgriffs): Concept from Gunicorn's source (wsgi.py) class FileWrapper(object): diff --git a/tests/test_httperror.py b/tests/test_httperror.py index 09e6bd2..9cb39b4 100644 --- a/tests/test_httperror.py +++ b/tests/test_httperror.py @@ -5,11 +5,11 @@ import json import xml.etree.ElementTree as et import ddt -from testtools.matchers import raises, Not +from testtools.matchers import Not, raises import yaml -import falcon.testing as testing import falcon +import falcon.testing as testing class FaultyResource: diff --git a/tests/test_httpstatus.py b/tests/test_httpstatus.py index cb3d013..453bc01 100644 --- a/tests/test_httpstatus.py +++ b/tests/test_httpstatus.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -import falcon.testing as testing import falcon from falcon.http_status import HTTPStatus +import falcon.testing as testing def before_hook(req, resp, params): diff --git a/tests/test_middleware.py b/tests/test_middleware.py index 274751e..b3cee39 100644 --- a/tests/test_middleware.py +++ b/tests/test_middleware.py @@ -1,8 +1,8 @@ +from datetime import datetime import json import falcon import falcon.testing as testing -from datetime import datetime _EXPECTED_BODY = {u'status': u'ok'} diff --git a/tests/test_query_params.py b/tests/test_query_params.py index a9b44e0..bb01847 100644 --- a/tests/test_query_params.py +++ b/tests/test_query_params.py @@ -3,8 +3,8 @@ from datetime import date import ddt import falcon -import falcon.testing as testing from falcon.errors import HTTPInvalidParam +import falcon.testing as testing @ddt.ddt diff --git a/tests/test_redirects.py b/tests/test_redirects.py index 13291ec..950cd93 100644 --- a/tests/test_redirects.py +++ b/tests/test_redirects.py @@ -1,7 +1,7 @@ import ddt -import falcon.testing as testing import falcon +import falcon.testing as testing class RedirectingResource(object): diff --git a/tests/test_req_vars.py b/tests/test_req_vars.py index ae6bf09..985a3a2 100644 --- a/tests/test_req_vars.py +++ b/tests/test_req_vars.py @@ -1,8 +1,8 @@ import datetime -import six -import testtools import ddt +import six +import testtools import falcon from falcon.request import Request diff --git a/tests/test_request_context.py b/tests/test_request_context.py index d9013dd..3bb829d 100644 --- a/tests/test_request_context.py +++ b/tests/test_request_context.py @@ -1,6 +1,5 @@ -import falcon.testing as testing - from falcon.request import Request +import falcon.testing as testing class TestRequestContext(testing.TestBase): diff --git a/tests/test_uri_templates.py b/tests/test_uri_templates.py index b7dbe86..d63a585 100644 --- a/tests/test_uri_templates.py +++ b/tests/test_uri_templates.py @@ -1,6 +1,7 @@ +import six + import falcon import falcon.testing as testing -import six class IDResource(object): diff --git a/tests/test_utils.py b/tests/test_utils.py index 8dcc253..fef8bec 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -7,8 +7,8 @@ import json import random import sys -import testtools import six +import testtools import falcon from falcon import testing diff --git a/tests/test_wsgi_errors.py b/tests/test_wsgi_errors.py index 0554211..5d51862 100644 --- a/tests/test_wsgi_errors.py +++ b/tests/test_wsgi_errors.py @@ -1,8 +1,9 @@ import io -import falcon.testing as testing import six +import falcon.testing as testing + unicode_message = u'Unicode: \x80' diff --git a/tox.ini b/tox.ini index a473973..13a7b9d 100644 --- a/tox.ini +++ b/tox.ini @@ -119,6 +119,7 @@ commands = py3kwarn falcon [testenv:pep8] deps = flake8 flake8-quotes + flake8-import-order # NOTE(kgriffs): Run with py27 since some code branches assume the # unicode type is defined, and pep8 complains in those cases when @@ -130,6 +131,8 @@ commands = flake8 \ --exclude=./build,.venv,.tox,dist,doc,./falcon/bench/nuts \ --ignore=F403 \ --max-line-length=99 \ + --import-order-style=google \ + --application-import-names=falcon \ [] # --------------------------------------------------------------------