_compat module for py2/py3. Transition. Reorganize imports on some modules.

Author: tony

tmuxp/__init__.py

@@ -20,5 +20,3 @@
 from .pane import Pane
 from .workspacebuilder import WorkspaceBuilder
 from . import config, util, cli
-
-import logging

tmuxp/_compat.py

@@ -0,0 +1,59 @@
+import sys
+
+PY2 = sys.version_info[0] == 2
+
+_identity = lambda x: x
+
+
+if not PY2:
+    text_type = str
+    string_types = (str,)
+    integer_types = (int, )
+    unichr = chr
+
+    text_to_native = lambda s, enc: s
+
+    iterkeys = lambda d: iter(d.keys())
+    itervalues = lambda d: iter(d.values())
+    iteritems = lambda d: iter(d.items())
+
+    from io import StringIO, BytesIO
+    import pickle
+
+    izip = zip
+    imap = map
+    range_type = range
+
+    cmp = lambda a, b: (a > b) - (a < b)
+
+    input = input
+    from string import ascii_lowercase
+    import urllib.parse as urllib
+    import urllib.parse as urlparse
+else:
+    text_type = unicode
+    string_types = (str, unicode)
+    integer_types = (int, long)
+
+    text_to_native = lambda s, enc: s.encode(enc)
+    unichr = unichr
+
+    iterkeys = lambda d: d.iterkeys()
+    itervalues = lambda d: d.itervalues()
+    iteritems = lambda d: d.iteritems()
+
+    from cStringIO import StringIO as BytesIO
+    from StringIO import StringIO
+    import cPickle as pickle
+
+    from itertools import izip, imap
+    range_type = xrange
+
+    cmp = cmp
+
+    input = raw_input
+    from string import lower as ascii_lowercase
+    import urlparse
+
+
+number_types = integer_types + (float,)

tmuxp/cli.py

@@ -12,16 +12,19 @@
 import os
 import sys
 import argparse
-import argcomplete
+import re
 import logging
+
+from distutils.util import strtobool
+
+import argcomplete
 import kaptan
+
 from . import log, util, exc, WorkspaceBuilder, Server, config
-from .util import ascii_lowercase, input
+from ._compat import ascii_lowercase, input
 from .workspacebuilder import freeze
-from distutils.util import strtobool
 
 
-import re
 VERSIONFILE = os.path.join(
     os.path.abspath(os.path.dirname(__file__)), '__init__.py'
 )

tmuxp/config.py

@@ -10,11 +10,13 @@
 """
 
 from __future__ import absolute_import, division, print_function, with_statement
+
 import os
 import copy
 import logging
+
 from . import exc
-from .util import basestring
+from ._compat import string_types
 
 logger = logging.getLogger(__name__)
 
@@ -60,7 +62,7 @@ def is_config_file(filename, extensions=['.yml', '.yaml', '.json']):
     """
 
     extensions = [extensions] if isinstance(
-        extensions, basestring) else extensions
+        extensions, string_types) else extensions
     return any(filename.endswith(e) for e in extensions)
 
 
@@ -174,18 +176,17 @@ def expand(sconf, cwd=None):
         start_path = sconf['start_directory']
         if any(start_path.startswith(a) for a in ['.', './']):
             start_path = os.path.normpath(os.path.join(cwd, start_path))
-
             sconf['start_directory'] = start_path
 
     if (
         'shell_command' in sconf and
-        isinstance(sconf['shell_command'], basestring)
+        isinstance(sconf['shell_command'], string_types)
     ):
         sconf['shell_command'] = [sconf['shell_command']]
 
     if (
         'shell_command_before' in sconf and
-        isinstance(sconf['shell_command_before'], basestring)
+        isinstance(sconf['shell_command_before'], string_types)
     ):
         sconf['shell_command_before'] = [sconf['shell_command_before']]
 
@@ -201,7 +202,7 @@ def expand(sconf, cwd=None):
             p = copy.deepcopy(pconf)
             pconf = sconf['panes'][p_index] = {}
 
-            if isinstance(p, basestring):
+            if isinstance(p, string_types):
                 p = {
                     'shell_command': [p]
                 }
@@ -215,7 +216,7 @@ def expand(sconf, cwd=None):
             if 'shell_command' in p:
                 cmd = p['shell_command']
 
-                if isinstance(p['shell_command'], basestring):
+                if isinstance(p['shell_command'], string_types):
                     cmd = [cmd]
 
                 if not cmd or any(a == cmd for a in [None, 'blank', 'pane']):
@@ -343,12 +344,12 @@ def import_tmuxinator(sconf):
     if 'pre' in sconf and 'pre_window' in sconf:
         tmuxp_config['shell_command'] = sconf['pre']
 
-        if isinstance(sconf['pre'], basestring):
+        if isinstance(sconf['pre'], string_types):
             tmuxp_config['shell_command_before'] = [sconf['pre_window']]
         else:
             tmuxp_config['shell_command_before'] = sconf['pre_window']
     elif 'pre' in sconf:
-        if isinstance(sconf['pre'], basestring):
+        if isinstance(sconf['pre'], string_types):
             tmuxp_config['shell_command_before'] = [sconf['pre']]
         else:
             tmuxp_config['shell_command_before'] = sconf['pre']
@@ -367,7 +368,7 @@ def import_tmuxinator(sconf):
 
             windowdict['window_name'] = k
 
-            if isinstance(v, basestring) or v is None:
+            if isinstance(v, string_types) or v is None:
                 windowdict['panes'] = [v]
                 tmuxp_config['windows'].append(windowdict)
                 continue

tmuxp/log.py

@@ -10,8 +10,10 @@
 """
 
 from __future__ import absolute_import, division, print_function, with_statement
+
 import logging
 import time
+
 from ._vendor.colorama import init
 from ._vendor.colorama import Fore, Back, Style
 

tmuxp/pane.py

@@ -11,9 +11,12 @@
 
 """
 from __future__ import absolute_import, division, print_function, with_statement
-from . import util, formats, exc
+
 import logging
 
+from . import util, formats, exc
+
+
 logger = logging.getLogger(__name__)
 
 

tmuxp/server.py

@@ -13,10 +13,11 @@
 from __future__ import absolute_import, division, print_function, with_statement
 
 import os
+import logging
+
 from .util import tmux, TmuxRelationalObject
 from .session import Session
 from . import formats, exc
-import logging
 
 logger = logging.getLogger(__name__)
 

tmuxp/session.py

@@ -13,9 +13,11 @@
 from __future__ import absolute_import, division, print_function, with_statement
 
 import pipes
+import logging
+
 from .window import Window
 from . import util, formats, exc
-import logging
+
 logger = logging.getLogger(__name__)
 
 

tmuxp/testsuite/helpers.py

@@ -12,14 +12,15 @@
 
 import time
 from random import randint
-
+import logging
 try:
     import unittest2 as unittest
 except ImportError:  # Python 2.7
     import unittest
+
 from . import t
 from .. import Server, log, exc
-import logging
+
 logger = logging.getLogger(__name__)
 
 TEST_SESSION_PREFIX = 'tmuxp_'

tmuxp/testsuite/test_cli.py

@@ -12,14 +12,15 @@
 
 import os
 import shutil
-import kaptan
 import tempfile
+import logging
+
+import kaptan
+
 from .. import config, cli
 from ..util import tmux
 from .helpers import TestCase
 
-import logging
-
 logger = logging.getLogger(__name__)
 TMUXP_DIR = os.path.join(os.path.dirname(__file__), '.tmuxp')