Syntax modernization

Author: tony

Makefile

@@ -38,3 +38,15 @@ flake8:
 
 watch_flake8:
 	if command -v entr > /dev/null; then ${PY_FILES} | entr -c $(MAKE) flake8; else $(MAKE) flake8 entr_warn; fi
+
+futurize:
+	futurize --write --nobackups `${PY_FILES}`
+
+pyupgrade:
+	pyupgrade `${PY_FILES}` --py37-plus 
+
+autoflake:
+	autoflake `${PY_FILES}` -i
+
+2to3-fixer:
+	2to3-3.8 -w -n -f $(fixer) `${PY_FILES}`

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__'],
@@ -196,14 +195,14 @@ def linkcode_resolve(domain, info):  # NOQA: C901
     fn = relpath(fn, start=dirname(libtmux.__file__))
 
     if 'dev' in about['__version__']:
-        return "%s/blob/master/%s/%s%s" % (
+        return "{}/blob/master/{}/{}{}".format(
             about['__github__'],
             about['__package_name__'],
             fn,
             linespec,
         )
     else:
-        return "%s/blob/v%s/%s/%s%s" % (
+        return "{}/blob/v{}/{}/{}{}".format(
             about['__github__'],
             about['__version__'],
             about['__package_name__'],

libtmux/__init__.py

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

libtmux/_compat.py

@@ -1,5 +1,6 @@
-# -*- coding: utf8 -*-
 # flake8: NOQA
+from future import standard_library
+standard_library.install_aliases()
 import sys
 
 PY2 = sys.version_info[0] == 2
@@ -8,34 +9,26 @@
 
 
 if PY2:
-    unichr = unichr
-    text_type = unicode
-    string_types = (str, unicode)
-    integer_types = (int, long)
-    from urllib import urlretrieve
+    chr = chr
+    text_type = str
+    string_types = (str, str)
+    integer_types = (int, int)
 
     text_to_native = lambda s, enc: s.encode(enc)
 
-    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
 
     range_type = xrange
 
     cmp = cmp
 
     input = raw_input
-    from collections import MutableMapping
-    from string import lower as ascii_lowercase
 
-    import urlparse
 
     exec('def reraise(tp, value, tb=None):\n raise tp, value, tb')
 
@@ -49,20 +42,17 @@ def console_to_str(s):
 
 
 else:
-    unichr = chr
+    chr = 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())
+    iterkeys = lambda d: iter(list(d.keys()))
+    itervalues = lambda d: iter(list(d.values()))
+    iteritems = lambda d: iter(list(d.items()))
 
-    import configparser
-    import pickle
-    from io import BytesIO, StringIO
 
     izip = zip
     imap = map
@@ -71,16 +61,11 @@ def console_to_str(s):
     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. """
@@ -91,7 +76,7 @@ def console_to_str(s):
 
     def reraise(tp, value, tb=None):
         if value.__traceback__ is not tb:
-            raise (value.with_traceback(tb))
+            raise value
         raise value
 
 

libtmux/common.py

@@ -1,12 +1,10 @@
-# -*- coding: utf-8 -*-
 # flake8: NOQA W605
 """Helper methods and mixins.
 
 libtmux.common
 ~~~~~~~~~~~~~~
 
 """
-import collections
 import logging
 import os
 import re
@@ -27,7 +25,7 @@
 TMUX_MAX_VERSION = '2.4'
 
 
-class EnvironmentMixin(object):
+class EnvironmentMixin:
 
     """
     Mixin class for managing session and server level environment variables in
@@ -143,7 +141,7 @@ def show_environment(self, name=None):
         return vars_dict
 
 
-class tmux_cmd(object):
+class tmux_cmd:
 
     """
     :term:`tmux(1)` command via :py:mod:`subprocess`.
@@ -193,7 +191,7 @@ def __init__(self, *args, **kwargs):
             append_env_path=kwargs.get('append_env_path', True),
         )
         if not tmux_bin:
-            raise (exc.TmuxCommandNotFound)
+            raise exc
 
         cmd = [tmux_bin]
         cmd += args  # add the command arguments to cmd
@@ -208,23 +206,23 @@ def __init__(self, *args, **kwargs):
             stdout, stderr = self.process.communicate()
             returncode = self.process.returncode
         except Exception as e:
-            logger.error('Exception for %s: \n%s' % (subprocess.list2cmdline(cmd), e))
+            logger.error(f'Exception for {subprocess.list2cmdline(cmd)}: \n{e}')
 
         self.returncode = returncode
 
         self.stdout = console_to_str(stdout)
         self.stdout = self.stdout.split('\n')
-        self.stdout = list(filter(None, self.stdout))  # filter empty values
+        self.stdout = list(_f for _f in self.stdout if _f)  # filter empty values
 
         self.stderr = console_to_str(stderr)
         self.stderr = self.stderr.split('\n')
-        self.stderr = list(filter(None, self.stderr))  # filter empty values
+        self.stderr = list(_f for _f in self.stderr if _f)  # filter empty values
 
         if 'has-session' in cmd and len(self.stderr):
             if not self.stdout:
                 self.stdout = self.stderr[0]
 
-        logger.debug('self.stdout for %s: \n%s' % (' '.join(cmd), self.stdout))
+        logger.debug('self.stdout for {}: \n{}'.format(' '.join(cmd), self.stdout))
 
 
 class TmuxMappingObject(MutableMapping):
@@ -261,22 +259,22 @@ def __delitem__(self, key):
 
     def keys(self):
         """Return list of keys."""
-        return self._info.keys()
+        return list(self._info.keys())
 
     def __iter__(self):
         return self._info.__iter__()
 
     def __len__(self):
-        return len(self._info.keys())
+        return len(list(self._info.keys()))
 
     def __getattr__(self, key):
         try:
             return self._info[self.formatter_prefix + key]
         except KeyError:
-            raise AttributeError('%s has no property %s' % (self.__class__, key))
+            raise AttributeError(f'{self.__class__} has no property {key}')
 
 
-class TmuxRelationalObject(object):
+class TmuxRelationalObject:
 
     """Base Class for managing tmux object child entities.  .. # NOQA
 
@@ -334,7 +332,7 @@ def where(self, attrs, first=False):
 
         # from https://github.com/serkanyersen/underscore.py
         def by(val, *args):
-            for key, value in attrs.items():
+            for key, value in list(attrs.items()):
                 try:
                     if attrs[key] != val[key]:
                         return False
@@ -429,8 +427,8 @@ def _is_executable_file_or_link(exe):
         if _is_executable_file_or_link(full_path):
             return full_path
     logger.info(
-        '\'{0}\' could not be found in the following search path: '
-        '\'{1}\''.format(exe, search_path)
+        '\'{}\' could not be found in the following search path: '
+        '\'{}\''.format(exe, search_path)
     )
 
     return None

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):
@@ -17,53 +15,45 @@ class TmuxSessionExists(LibTmuxException):
 
     """Session does not exist in the server."""
 
-    pass
 
 
 class TmuxCommandNotFound(LibTmuxException):
 
     """Application binary for tmux not found."""
 
-    pass
 
 
 class VersionTooLow(LibTmuxException):
 
     """Raised if tmux below the minimum version to use libtmux."""
 
-    pass
 
 
 class BadSessionName(LibTmuxException):
 
     """Disallowed session name for tmux (empty, contains periods or colons)."""
 
-    pass
 
 
 class OptionError(LibTmuxException):
 
     """Root error for any error involving invalid, ambiguous or bad options."""
 
-    pass
 
 
 class UnknownOption(OptionError):
 
     """Option unknown to tmux show-option(s) or show-window-option(s)."""
 
-    pass
 
 
 class InvalidOption(OptionError):
 
     """Option invalid to tmux, introduced in tmux v2.4."""
 
-    pass
 
 
 class AmbiguousOption(OptionError):
 
     """Option that could potentially match more than one."""
 
-    pass

libtmux/formats.py

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

libtmux/pane.py

@@ -1,12 +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
 
@@ -67,7 +65,7 @@ def _info(self, *args):
 
         # from https://github.com/serkanyersen/underscore.py
         def by(val, *args):
-            for key, value in attrs.items():
+            for key, value in list(attrs.items()):
                 try:
                     if attrs[key] != val[key]:
                         return False
@@ -279,4 +277,4 @@ def select_pane(self):
         return self.window.select_pane(self.get('pane_id'))
 
     def __repr__(self):
-        return "%s(%s %s)" % (self.__class__.__name__, self.get('pane_id'), self.window)
+        return "{}({} {})".format(self.__class__.__name__, self.get('pane_id'), self.window)