sorted some imports

Makefile

@@ -1,6 +1,9 @@
 test:
 	coverage run --source=faker --omit=faker/build_docs.py setup.py test
 
+isort:
+	isort -rc --atomic .
+
 release:
 	check-manifest
 	rm -rf build dist

faker/__init__.py

@@ -1,5 +1,5 @@
-from faker.generator import Generator  # noqa F401
 from faker.factory import Factory  # noqa F401
+from faker.generator import Generator  # noqa F401
 
 VERSION = '2.0.0'
 

faker/build_docs.py

@@ -1,15 +1,13 @@
 # coding=utf-8
 
-from __future__ import print_function
-from __future__ import unicode_literals
+from __future__ import print_function, unicode_literals
 
 import os
 import pprint
 import sys
 
 import six
 
-
 DOCS_ROOT = os.path.abspath(os.path.join('..', 'docs'))
 
 

faker/cli.py

@@ -1,22 +1,18 @@
 # coding=utf-8
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals
 
+import argparse
+import logging
 import os
+import random
 import sys
-import argparse
 
-import random
 import six
 
-from faker import Faker, documentor
-from faker import VERSION
+from faker import VERSION, Faker, documentor
 from faker.config import AVAILABLE_LOCALES, DEFAULT_LOCALE, META_PROVIDERS_MODULES
 
-import logging
-
-
 __author__ = 'joke2k'
 
 

faker/config.py

@@ -1,5 +1,6 @@
 # coding=utf-8
 from importlib import import_module
+
 from faker.utils.loading import find_available_locales, find_available_providers
 
 DEFAULT_LOCALE = 'en_US'

faker/documentor.py

@@ -4,10 +4,10 @@
 
 import inspect
 
-from .compat import getargspec
-
 from faker import utils
 
+from .compat import getargspec
+
 
 class Documentor(object):
 

faker/factory.py

@@ -1,19 +1,17 @@
 # coding=utf-8
 
-from __future__ import unicode_literals
-from __future__ import absolute_import
+from __future__ import absolute_import, unicode_literals
 
-from importlib import import_module
 import locale as pylocale
-
 import logging
 import sys
 
+from importlib import import_module
+
 from faker import Generator
-from faker.config import DEFAULT_LOCALE, PROVIDERS, AVAILABLE_LOCALES
+from faker.config import AVAILABLE_LOCALES, DEFAULT_LOCALE, PROVIDERS
 from faker.utils.loading import list_module
 
-
 logger = logging.getLogger(__name__)
 
 # identify if python is being run in interactive mode. If so, disable logging.

faker/generator.py

@@ -2,8 +2,8 @@
 
 from __future__ import unicode_literals
 
-import re
 import random as random_module
+import re
 
 _re_token = re.compile(r'\{\{(\s?)(\w+)(\s?)\}\}')
 random = random_module.Random()

faker/providers/__init__.py

@@ -7,7 +7,6 @@
 
 from faker.utils.distribution import choices_distribution, choices_distribution_unique
 
-
 _re_hash = re.compile(r'#')
 _re_perc = re.compile(r'%')
 _re_excl = re.compile(r'!')

faker/utils/datasets.py

@@ -1,8 +1,9 @@
 # coding=utf-8
 
+import operator
+
 from collections import Counter
 from functools import reduce
-import operator
 
 
 def add_dicts(*args):

faker/utils/datetime_safe.py

@@ -12,11 +12,13 @@
 # '1850/08/02 was a Friday'
 
 from __future__ import unicode_literals
-from datetime import date as real_date
-from datetime import datetime as real_datetime
+
 import re
 import time
 
+from datetime import date as real_date
+from datetime import datetime as real_datetime
+
 
 class date(real_date):
     def strftime(self, fmt):

faker/utils/distribution.py

@@ -1,6 +1,7 @@
 # coding=utf-8
 
 import bisect
+
 from faker.generator import random as mod_random
 
 

faker/utils/loading.py

@@ -1,7 +1,8 @@
 import os
+import pkgutil
 import sys
+
 from importlib import import_module
-import pkgutil
 
 
 def get_path(module):

faker/utils/text.py

@@ -1,10 +1,9 @@
 # coding=utf-8
 
 import re
-
-import six
 import unicodedata
 
+import six
 
 _re_pattern = re.compile(r'[^\w\s-]', flags=re.U)
 _re_pattern_allow_dots = re.compile(r'[^\.\w\s-]', flags=re.U)

setup.py

@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 # coding=utf-8
 
-import os
 import io
+import os
 
-from setuptools import setup, find_packages
+from setuptools import find_packages, setup
 
 here = os.path.abspath(os.path.dirname(__file__))
 with io.open(os.path.join(here, 'README.rst'), encoding='utf-8') as fp:

tests/mymodule/en_US/__init__.py

@@ -1,4 +1,5 @@
 from __future__ import unicode_literals
+
 from faker.providers import BaseProvider
 
 

tests/test_base_provider.py

@@ -1,5 +1,5 @@
-import unittest
 import string
+import unittest
 
 import six
 

tests/test_factory.py

@@ -3,19 +3,19 @@
 from __future__ import unicode_literals
 
 import re
-import unittest
 import string
 import sys
+import unittest
 
 from collections import OrderedDict
 from ipaddress import ip_address, ip_network
 
-import six
 import pytest
+import six
 
-from faker import Generator, Faker
+from faker import Faker, Generator
 from faker.generator import random
-from faker.utils import text, decorators
+from faker.utils import decorators, text
 
 
 class BarProvider(object):

tests/test_generator.py

@@ -1,4 +1,5 @@
 import unittest
+
 from faker import Generator
 
 try:

tests/utils/test_utils.py

@@ -1,14 +1,14 @@
-from faker.utils.loading import find_available_locales
-from faker.utils.distribution import choices_distribution, choices_distribution_unique
-from faker.utils.datasets import add_dicts
-from faker.config import PROVIDERS
-from faker.generator import random
-from faker.utils.loading import find_available_providers
-from faker.config import META_PROVIDERS_MODULES
-from importlib import import_module
-import unittest
 import json
 import os
+import unittest
+
+from importlib import import_module
+
+from faker.config import META_PROVIDERS_MODULES, PROVIDERS
+from faker.generator import random
+from faker.utils.datasets import add_dicts
+from faker.utils.distribution import choices_distribution, choices_distribution_unique
+from faker.utils.loading import find_available_locales, find_available_providers
 
 TEST_DIR = os.path.dirname(__file__)