Clean up imports with pycharm

tony · tony · commit 475ed94f2fd8 · 2015-12-23T23:59:49.000-06:00
diff --git a/tmuxp/__init__.py b/tmuxp/__init__.py
@@ -13,10 +13,10 @@
 
 from .__about__ import __title__, __package_name__, __version__, \
     __description__, __email__, __author__, __license__, __copyright__
-
-from .session import Session
+from .pane import Pane
 from .server import Server
+from .session import Session
 from .window import Window
-from .pane import Pane
 from .workspacebuilder import WorkspaceBuilder
-from . import config, util, cli
+
+from . import config, util, cli
diff --git a/tmuxp/__main__.py b/tmuxp/__main__.py
@@ -8,8 +8,8 @@
 from __future__ import absolute_import, division, print_function, \
     with_statement, unicode_literals
 
-import sys
 import os
+import sys
 
 
 def run():
diff --git a/tmuxp/cli.py b/tmuxp/cli.py
@@ -8,20 +8,17 @@
 from __future__ import absolute_import, division, print_function, \
     with_statement, unicode_literals
 
-import os
-import sys
 import argparse
-import re
 import logging
-
-from distutils.util import strtobool
+import os
+import sys
 
 import argcomplete
 import kaptan
 
-from .__about__ import __version__
 from . import log, util, exc, WorkspaceBuilder, Server, config
-from ._compat import ascii_lowercase, input, string_types
+from .__about__ import __version__
+from ._compat import input, string_types
 from .workspacebuilder import freeze
 
 
diff --git a/tmuxp/config.py b/tmuxp/config.py
@@ -8,9 +8,9 @@
 from __future__ import absolute_import, division, print_function, \
     with_statement, unicode_literals
 
-import os
 import copy
 import logging
+import os
 
 from . import exc
 from ._compat import string_types
diff --git a/tmuxp/exc.py b/tmuxp/exc.py
@@ -9,8 +9,6 @@
 from __future__ import absolute_import, division, print_function, \
     with_statement, unicode_literals
 
-import subprocess
-
 from ._compat import implements_to_string
 
 
diff --git a/tmuxp/log.py b/tmuxp/log.py
@@ -12,8 +12,7 @@
 import logging
 import time
 
-from colorama import init
-from colorama import Fore, Back, Style
+from colorama import Fore, Style
 
 LEVEL_COLORS = {
     'DEBUG': Fore.BLUE,  # Blue
diff --git a/tmuxp/pane.py b/tmuxp/pane.py
@@ -10,7 +10,7 @@
 
 import logging
 
-from . import util, formats, exc
+from . import util, exc
 
 
 logger = logging.getLogger(__name__)
diff --git a/tmuxp/server.py b/tmuxp/server.py
@@ -8,12 +8,12 @@
 from __future__ import absolute_import, division, print_function, \
     with_statement, unicode_literals
 
-import os
 import logging
+import os
 
-from .util import tmux_cmd, TmuxRelationalObject
-from .session import Session
 from . import formats, exc
+from .session import Session
+from .util import tmux_cmd, TmuxRelationalObject
 
 logger = logging.getLogger(__name__)
 
diff --git a/tmuxp/session.py b/tmuxp/session.py
@@ -8,11 +8,11 @@
 from __future__ import absolute_import, division, print_function, \
     with_statement, unicode_literals
 
-import os
 import logging
+import os
 
-from .window import Window
 from . import util, formats, exc
+from .window import Window
 
 logger = logging.getLogger(__name__)
 
diff --git a/tmuxp/testsuite/__init__.py b/tmuxp/testsuite/__init__.py
@@ -9,8 +9,8 @@
     with_statement, unicode_literals
 
 import logging
-import sys
 import pkgutil
+import sys
 
 try:
     import unittest2 as unittest
diff --git a/tmuxp/testsuite/cli.py b/tmuxp/testsuite/cli.py
@@ -9,16 +9,14 @@
 from __future__ import absolute_import, division, print_function, \
     with_statement, unicode_literals
 
+import logging
 import os
 import shutil
 import tempfile
-import logging
 import unittest
 
-import kaptan
-
-from .. import config, cli
 from .helpers import TestCase
+from .. import config, cli
 
 logger = logging.getLogger(__name__)
 
diff --git a/tmuxp/testsuite/config.py b/tmuxp/testsuite/config.py
@@ -9,17 +9,17 @@
 from __future__ import absolute_import, division, print_function, \
     with_statement, unicode_literals
 
+import logging
 import os
 import shutil
 import tempfile
-import logging
 import unittest
 
 import kaptan
 
+from .helpers import TestCase
 from .. import config, exc
 from .._compat import support
-from .helpers import TestCase
 
 
 
diff --git a/tmuxp/testsuite/config_teamocil.py b/tmuxp/testsuite/config_teamocil.py
@@ -9,14 +9,14 @@
 from __future__ import absolute_import, division, print_function, \
     with_statement, unicode_literals
 
-import os
 import logging
+import os
 import unittest
 
 import kaptan
 
-from .. import config, exc
 from .helpers import TestCase
+from .. import config
 
 logger = logging.getLogger(__name__)
 TMUXP_DIR = os.path.join(os.path.dirname(__file__), '.tmuxp')
diff --git a/tmuxp/testsuite/config_tmuxinator.py b/tmuxp/testsuite/config_tmuxinator.py
@@ -9,17 +9,14 @@
 from __future__ import absolute_import, division, print_function, \
     with_statement, unicode_literals
 
-import os
 import logging
+import os
 import unittest
 
 import kaptan
 
-from .. import config, exc
-from .._compat import string_types
 from .helpers import TestCase
-
-import logging
+from .. import config
 
 logger = logging.getLogger(__name__)
 TMUXP_DIR = os.path.join(os.path.dirname(__file__), '.tmuxp')
diff --git a/tmuxp/testsuite/helpers.py b/tmuxp/testsuite/helpers.py
@@ -4,9 +4,8 @@
 from __future__ import absolute_import, division, print_function, \
     with_statement, unicode_literals
 
-import time
-import logging
 import contextlib
+import logging
 
 try:
     import unittest2 as unittest
@@ -16,7 +15,7 @@
 from random import randint
 
 from . import t
-from .. import Server, log, exc
+from .. import exc
 
 logger = logging.getLogger(__name__)
 
diff --git a/tmuxp/testsuite/pane.py b/tmuxp/testsuite/pane.py
@@ -9,10 +9,9 @@
 from __future__ import absolute_import, division, print_function, \
     with_statement, unicode_literals
 
-import unittest
 import logging
+import unittest
 
-from . import t
 from .helpers import TmuxTestCase
 
 logger = logging.getLogger(__name__)
diff --git a/tmuxp/testsuite/server.py b/tmuxp/testsuite/server.py
@@ -9,14 +9,12 @@
 from __future__ import absolute_import, division, print_function, \
     with_statement, unicode_literals
 
-from random import randint
-
-import unittest
 import logging
+import unittest
 
-from .. import Server
-from .helpers import TmuxTestCase
 from . import t
+from .helpers import TmuxTestCase
+from .. import Server
 
 logger = logging.getLogger(__name__)
 
diff --git a/tmuxp/testsuite/session.py b/tmuxp/testsuite/session.py
@@ -9,14 +9,13 @@
 from __future__ import absolute_import, division, print_function, \
     with_statement, unicode_literals
 
-from random import randint
-
-import unittest
 import logging
+import unittest
+from random import randint
 
-from .. import Session, Window, Pane
-from .helpers import TmuxTestCase, TEST_SESSION_PREFIX
 from . import t
+from .helpers import TmuxTestCase, TEST_SESSION_PREFIX
+from .. import Session, Window, Pane
 
 logger = logging.getLogger(__name__)
 
diff --git a/tmuxp/testsuite/test_utils.py b/tmuxp/testsuite/test_utils.py
@@ -4,8 +4,7 @@
 from __future__ import absolute_import, division, print_function, \
     with_statement, unicode_literals
 
-from .helpers import get_test_session_name, temp_session, TestCase, \
-    TmuxTestCase, unittest  # , temp_window, temp_pane
+from .helpers import get_test_session_name, temp_session, TmuxTestCase, unittest
 
 
 class TempSession(TmuxTestCase):
diff --git a/tmuxp/testsuite/tmuxobject.py b/tmuxp/testsuite/tmuxobject.py
@@ -9,14 +9,13 @@
 from __future__ import absolute_import, division, print_function, \
     with_statement, unicode_literals
 
-import random
 import logging
+import random
 import unittest
 
-from .. import Pane, Window, Session
 from . import t
-
 from .helpers import TmuxTestCase, TEST_SESSION_PREFIX
+from .. import Pane, Window, Session
 
 logger = logging.getLogger(__name__)
 
diff --git a/tmuxp/testsuite/util.py b/tmuxp/testsuite/util.py
@@ -9,18 +9,14 @@
 from __future__ import absolute_import, division, print_function, \
     with_statement, unicode_literals
 
-import random
 import logging
-import unittest
-import subprocess
 import os
+import unittest
 
+from .helpers import TmuxTestCase, TestCase
 from .. import exc
-from ..util import has_required_tmux_version, run_before_script
 from ..exc import BeforeLoadScriptNotExists, BeforeLoadScriptError
-
-
-from .helpers import TmuxTestCase, TestCase
+from ..util import has_required_tmux_version, run_before_script
 
 logger = logging.getLogger(__name__)
 
diff --git a/tmuxp/testsuite/window.py b/tmuxp/testsuite/window.py
@@ -12,9 +12,8 @@
 import logging
 import unittest
 
-from .. import Pane, Window, Server
-from . import t
 from .helpers import TmuxTestCase
+from .. import Pane, Window, Server
 
 
 logger = logging.getLogger(__name__)
diff --git a/tmuxp/testsuite/workspacebuilder.py b/tmuxp/testsuite/workspacebuilder.py
@@ -9,19 +9,18 @@
 from __future__ import absolute_import, division, print_function, \
     with_statement, unicode_literals
 
-import os
-import platform
 import logging
-import unittest
+import os
 import tempfile
 import time
+import unittest
 
 import kaptan
 
+from .helpers import TmuxTestCase
 from .. import Window, config, exc
 from .._compat import text_type
 from ..workspacebuilder import WorkspaceBuilder
-from .helpers import TestCase, TmuxTestCase, temp_session
 
 logger = logging.getLogger(__name__)
 
diff --git a/tmuxp/testsuite/workspacefreezer.py b/tmuxp/testsuite/workspacefreezer.py
@@ -9,16 +9,16 @@
 from __future__ import absolute_import, division, print_function, \
     with_statement, unicode_literals
 
-import os
 import logging
-import unittest
+import os
 import time
+import unittest
 
 import kaptan
 
-from .. import Window, config, exc
-from ..workspacebuilder import WorkspaceBuilder, freeze
 from .helpers import TmuxTestCase
+from .. import config
+from ..workspacebuilder import WorkspaceBuilder, freeze
 
 logger = logging.getLogger(__name__)
 
diff --git a/tmuxp/util.py b/tmuxp/util.py
diff --git a/tmuxp/window.py b/tmuxp/window.py
