chore: python 3.x syntax migration (#314)

Author: tony

docs/conf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import inspect
 import os
 import sys
@@ -109,8 +108,8 @@ def setup(app):
 latex_documents = [
     (
         'index',
-        '{0}.tex'.format(about['__package_name__']),
-        '{0} Documentation'.format(about['__title__']),
+        '{}.tex'.format(about['__package_name__']),
+        '{} Documentation'.format(about['__title__']),
         about['__author__'],
         'manual',
     )
@@ -120,7 +119,7 @@ def setup(app):
     (
         'index',
         about['__package_name__'],
-        '{0} Documentation'.format(about['__title__']),
+        '{} Documentation'.format(about['__title__']),
         about['__author__'],
         1,
     )
@@ -129,8 +128,8 @@ def setup(app):
 texinfo_documents = [
     (
         'index',
-        '{0}'.format(about['__package_name__']),
-        '{0} Documentation'.format(about['__title__']),
+        '{}'.format(about['__package_name__']),
+        '{} Documentation'.format(about['__title__']),
         about['__author__'],
         about['__package_name__'],
         about['__description__'],

libtmux/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # flake8: NOQA
 from .__about__ import (
     __author__,

libtmux/_compat.py

@@ -1,98 +1,54 @@
 # -*- coding: utf8 -*-
 # flake8: NOQA
+import configparser
+import pickle
 import sys
+import urllib.parse as urlparse
+from collections.abc import MutableMapping
+from io import BytesIO, StringIO
+from string import ascii_lowercase
+from urllib.request import urlretrieve
 
 PY2 = sys.version_info[0] == 2
 
 _identity = lambda x: x
 
 
-if PY2:
-    unichr = unichr
-    text_type = unicode
-    string_types = (str, unicode)
-    integer_types = (int, long)
-    from urllib import urlretrieve
+unichr = chr
+text_type = str
+string_types = (str,)
+integer_types = (int,)
 
-    text_to_native = lambda s, enc: s.encode(enc)
+text_to_native = lambda s, enc: s
 
-    iterkeys = lambda d: d.iterkeys()
-    itervalues = lambda d: d.itervalues()
-    iteritems = lambda d: d.iteritems()
+iterkeys = lambda d: iter(d.keys())
+itervalues = lambda d: iter(d.values())
+iteritems = lambda d: iter(d.items())
 
-    from itertools import imap, izip
 
-    import ConfigParser as configparser
-    import cPickle as pickle
-    from cStringIO import StringIO as BytesIO
-    from StringIO import StringIO
+izip = zip
+imap = map
+range_type = range
 
-    range_type = xrange
+cmp = lambda a, b: (a > b) - (a < b)
 
-    cmp = cmp
+console_encoding = sys.__stdout__.encoding
 
-    input = raw_input
-    from collections import MutableMapping
-    from string import lower as ascii_lowercase
+implements_to_string = _identity
 
-    import urlparse
 
-    exec('def reraise(tp, value, tb=None):\n raise tp, value, tb')
-
-    def implements_to_string(cls):
-        cls.__unicode__ = cls.__str__
-        cls.__str__ = lambda x: x.__unicode__().encode('utf-8')
-        return cls
-
-    def console_to_str(s):
+def console_to_str(s):
+    """ From pypa/pip project, pip.backwardwardcompat. License MIT. """
+    try:
+        return s.decode(console_encoding, 'ignore')
+    except UnicodeDecodeError:
         return s.decode('utf_8', 'ignore')
 
 
-else:
-    unichr = chr
-    text_type = str
-    string_types = (str,)
-    integer_types = (int,)
-
-    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())
-
-    import configparser
-    import pickle
-    from io import BytesIO, StringIO
-
-    izip = zip
-    imap = map
-    range_type = range
-
-    cmp = lambda a, b: (a > b) - (a < b)
-
-    input = input
-    import urllib.parse as urllib
-    import urllib.parse as urlparse
-    from string import ascii_lowercase
-    from urllib.request import urlretrieve
-
-    console_encoding = sys.__stdout__.encoding
-
-    implements_to_string = _identity
-
-    from collections.abc import MutableMapping
-
-    def console_to_str(s):
-        """ From pypa/pip project, pip.backwardwardcompat. License MIT. """
-        try:
-            return s.decode(console_encoding, 'ignore')
-        except UnicodeDecodeError:
-            return s.decode('utf_8', 'ignore')
-
-    def reraise(tp, value, tb=None):
-        if value.__traceback__ is not tb:
-            raise (value.with_traceback(tb))
-        raise value
+def reraise(tp, value, tb=None):
+    if value.__traceback__ is not tb:
+        raise (value.with_traceback(tb))
+    raise value
 
 
 number_types = integer_types + (float,)

libtmux/common.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # flake8: NOQA W605
 """Helper methods and mixins.
 

libtmux/exc.py

@@ -1,11 +1,9 @@
-# -*- coding: utf-8 -*-
 """libtmux exceptions.
 
 libtmux.exc
 ~~~~~~~~~~~
 
 """
-from __future__ import absolute_import, unicode_literals, with_statement
 
 
 class LibTmuxException(Exception):

libtmux/formats.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """Format variables for tmux objects.
 
 libtmux.formats
@@ -8,8 +7,6 @@
 
 """
 
-from __future__ import absolute_import, unicode_literals, with_statement
-
 SESSION_FORMATS = [
     'session_name',
     'session_windows',

libtmux/pane.py

@@ -1,13 +1,10 @@
-# -*- coding: utf-8 -*-
 # flake8: NOQA W605
 """Pythonization of the :ref:`tmux(1)` pane.
 
 libtmux.pane
 ~~~~~~~~~~~~
 
 """
-from __future__ import absolute_import, unicode_literals, with_statement
-
 import logging
 
 from . import exc

libtmux/server.py

@@ -1,12 +1,9 @@
-# -*- coding: utf-8 -*-
 """Pythonization of the :term:`tmux(1)` server.
 
 libtmux.server
 ~~~~~~~~~~~~~~
 
 """
-from __future__ import absolute_import, unicode_literals, with_statement
-
 import logging
 import os
 
@@ -113,11 +110,11 @@ def cmd(self, *args, **kwargs):
 
         args = list(args)
         if self.socket_name:
-            args.insert(0, '-L{0}'.format(self.socket_name))
+            args.insert(0, '-L{}'.format(self.socket_name))
         if self.socket_path:
-            args.insert(0, '-S{0}'.format(self.socket_path))
+            args.insert(0, '-S{}'.format(self.socket_path))
         if self.config_file:
-            args.insert(0, '-f{0}'.format(self.config_file))
+            args.insert(0, '-f{}'.format(self.config_file))
         if self.colors:
             if self.colors == 256:
                 args.insert(0, '-2')

libtmux/session.py

@@ -1,12 +1,9 @@
-# -*- coding: utf-8 -*-
 """Pythonization of the :term:`tmux(1)` session.
 
 libtmux.session
 ~~~~~~~~~~~~~~~
 
 """
-from __future__ import absolute_import, unicode_literals, with_statement
-
 import logging
 import os
 

libtmux/test.py

@@ -1,8 +1,4 @@
-# -*- coding: utf-8 -*-
 """Helper methods for libtmux and downstream libtmux libraries."""
-
-from __future__ import absolute_import, unicode_literals, with_statement
-
 import contextlib
 import logging
 import os

libtmux/window.py

@@ -1,12 +1,9 @@
-# -*- coding: utf-8 -*-
 """Pythonization of the :term:`tmux(1)` window.
 
 libtmux.window
 ~~~~~~~~~~~~~~
 
 """
-from __future__ import absolute_import, unicode_literals, with_statement
-
 import logging
 import os
 import shlex

tests/conftest.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import logging
 import os
 

tests/test_common.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """Tests for utility functions in tmux."""
 
 import re

tests/test_pane.py

@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
 """Test for tmuxp Pane object."""
-from __future__ import absolute_import, unicode_literals, with_statement
-
 import logging
 
 logger = logging.getLogger(__name__)

tests/test_server.py

@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
 """Test for tmuxp Server object."""
-from __future__ import absolute_import, unicode_literals, with_statement
-
 import logging
 
 from libtmux import Server

tests/test_session.py

@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
 """Test for tmuxp Session object."""
-from __future__ import absolute_import, unicode_literals, with_statement
-
 import logging
 
 import pytest

tests/test_tmuxobject.py

@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
 """Test for tmuxp TmuxRelationalObject and TmuxMappingObject."""
-from __future__ import absolute_import, unicode_literals, with_statement
-
 import logging
 
 from libtmux import Pane, Session, Window

tests/test_window.py

@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
 """Test for tmuxp Window object."""
-from __future__ import absolute_import, unicode_literals, with_statement
-
 import logging
 
 import pytest