Fix flake8-import-order warnings

16 files changed, 27 insertions, 22 deletions

diff --git a/calm/calm.py b/calm/calm.py
index 04db081..196d29b 100755
--- a/calm/calm.py
+++ b/calm/calm.py
@@ -63,9 +63,6 @@ import sys
 import tempfile
 import time
 
-from .abeyance_handler import AbeyanceHandler
-from .buffering_smtp_handler import BufferingSMTPHandler
-from .movelist import MoveList
 from . import common_constants
 from . import db
 from . import irk
@@ -78,6 +75,9 @@ from . import reports
 from . import setup_exe
 from . import uploads
 from . import utils
+from .abeyance_handler import AbeyanceHandler
+from .buffering_smtp_handler import BufferingSMTPHandler
+from .movelist import MoveList
 
 
 #
diff --git a/calm/find-duplicates.py b/calm/find-duplicates.py
index 9e1aabb..59d8012 100644
--- a/calm/find-duplicates.py
+++ b/calm/find-duplicates.py
@@ -23,10 +23,11 @@
 
 import argparse
 import hashlib
-import re
 import os
+import re
 import sys
 import tarfile
+
 import xtarfile
 
 from . import common_constants
diff --git a/calm/fix-annotate-perl-hint.py b/calm/fix-annotate-perl-hint.py
index 6959535..ea21bea 100644
--- a/calm/fix-annotate-perl-hint.py
+++ b/calm/fix-annotate-perl-hint.py
@@ -28,6 +28,7 @@ import re
 import shutil
 import sys
 import tarfile
+
 import xtarfile
 
 from . import common_constants
diff --git a/calm/fixes.py b/calm/fixes.py
index e7f8146..f147be2 100644
--- a/calm/fixes.py
+++ b/calm/fixes.py
@@ -28,8 +28,9 @@ import re
 import shutil
 import socket
 import tarfile
-import urllib.request
 import urllib.error
+import urllib.request
+
 import xtarfile
 
 from . import hint
diff --git a/calm/hint-migrate.py b/calm/hint-migrate.py
index e06edc6..43c5ae9 100644
--- a/calm/hint-migrate.py
+++ b/calm/hint-migrate.py
@@ -22,8 +22,8 @@
 #
 
 import argparse
-import re
 import os
+import re
 import shutil
 import sys
 
diff --git a/calm/hint.py b/calm/hint.py
index 9ae25aa..8a640e5 100755
--- a/calm/hint.py
+++ b/calm/hint.py
@@ -25,9 +25,9 @@
 # parser for .hint files
 #
 
-from collections import OrderedDict
 import argparse
 import re
+from collections import OrderedDict
 
 try:
     import license_expression
diff --git a/calm/maintainers.py b/calm/maintainers.py
index deac250..0a8225a 100644
--- a/calm/maintainers.py
+++ b/calm/maintainers.py
@@ -40,11 +40,11 @@
 # list (and it's inversion) and accessors, and invalidate that stored list when
 # cygwin-pkg-maint changes...
 
-from collections import defaultdict
 import itertools
 import logging
 import os
 import re
+from collections import defaultdict
 
 from . import utils
 
diff --git a/calm/mkgitoliteconf.py b/calm/mkgitoliteconf.py
index 1655134..7b52dea 100755
--- a/calm/mkgitoliteconf.py
+++ b/calm/mkgitoliteconf.py
@@ -25,9 +25,9 @@
 # mkgitoliteconf - creates a gitolite conf file fragment from cygwin-pkg-maint
 #
 
-from collections import defaultdict
 import argparse
 import sys
+from collections import defaultdict
 
 from . import common_constants
 from . import maintainers
diff --git a/calm/movelist.py b/calm/movelist.py
index 6101271..e4cb2e9 100644
--- a/calm/movelist.py
+++ b/calm/movelist.py
@@ -23,8 +23,8 @@
 
 import logging
 import os
-
 from collections import defaultdict
+
 from . import logfilters
 from . import utils
 
diff --git a/calm/package.py b/calm/package.py
index 14295af..7d68856 100755
--- a/calm/package.py
+++ b/calm/package.py
@@ -25,8 +25,6 @@
 # utilities for working with a package database
 #
 
-from collections import defaultdict
-from enum import Enum, IntEnum, unique
 import copy
 import difflib
 import hashlib
@@ -37,14 +35,17 @@ import pprint
 import re
 import textwrap
 import time
+from collections import defaultdict
+from enum import Enum, IntEnum, unique
+
 import xtarfile
 
-from .version import SetupVersion
-from .movelist import MoveList
 from . import common_constants
 from . import hint
 from . import maintainers
 from . import past_mistakes
+from .movelist import MoveList
+from .version import SetupVersion
 
 
 # kinds of packages
diff --git a/calm/pkg2html.py b/calm/pkg2html.py
index 04e0836..f6a2ada 100755
--- a/calm/pkg2html.py
+++ b/calm/pkg2html.py
@@ -50,13 +50,14 @@ import string
 import sys
 import textwrap
 import time
+
 import xtarfile
 
-from .version import SetupVersion
 from . import common_constants
 from . import maintainers
 from . import package
 from . import utils
+from .version import SetupVersion
 
 
 #
diff --git a/calm/repology.py b/calm/repology.py
index 16d285b..45a0da6 100644
--- a/calm/repology.py
+++ b/calm/repology.py
@@ -26,12 +26,11 @@
 # may not exist for some packages, e.g. where upstream doesn't do releases)
 #
 
-from collections import namedtuple
-
 import json
 import logging
 import time
 import urllib.request
+from collections import namedtuple
 
 from .version import SetupVersion
 
diff --git a/calm/spelling.py b/calm/spelling.py
index 505c1fb..77464d7 100644
--- a/calm/spelling.py
+++ b/calm/spelling.py
@@ -22,6 +22,7 @@
 #
 
 import re
+
 from enchant import DictWithPWL
 from enchant.checker import SpellChecker
 from enchant.tokenize import Filter
diff --git a/calm/uploads.py b/calm/uploads.py
index 3bb8faa..db26f80 100644
--- a/calm/uploads.py
+++ b/calm/uploads.py
@@ -25,19 +25,20 @@
 # upload directory processing
 #
 
-from collections import defaultdict, namedtuple
 import filecmp
-import os
 import logging
+import os
 import re
 import shutil
 import time
+from collections import defaultdict, namedtuple
+
 import xtarfile
 
-from .movelist import MoveList
 from . import common_constants
 from . import fixes
 from . import package
+from .movelist import MoveList
 
 # reminders will be issued weekly
 REMINDER_INTERVAL = 60 * 60 * 24 * 7
diff --git a/calm/utils.py b/calm/utils.py
index bafc5ff..fb95cc6 100644
--- a/calm/utils.py
+++ b/calm/utils.py
@@ -29,7 +29,6 @@ import filecmp
 import logging
 import os
 import subprocess
-
 from contextlib import contextmanager
 
 
diff --git a/test/test_calm.py b/test/test_calm.py
index e34ac99..ded5f27 100755
--- a/test/test_calm.py
+++ b/test/test_calm.py
@@ -39,7 +39,6 @@ import tempfile
 import types
 import unittest
 
-from calm.version import SetupVersion
 import calm.calm
 import calm.common_constants as common_constants
 import calm.hint as hint
@@ -47,6 +46,7 @@ import calm.maintainers as maintainers
 import calm.package as package
 import calm.pkg2html as pkg2html
 import calm.uploads as uploads
+from calm.version import SetupVersion
 
 ARGDIRS = ['rel_area', 'homedir', 'htdocs', 'stagingdir', 'vault']