flake8

Author: tony

tmuxp/cli.py

@@ -260,7 +260,7 @@ def load_workspace(config_file, args):
         logger.error('%s is empty or parsed no config data' % config_file)
         return
 
-    tmux_bin = util.which('tmux')
+    util.which('tmux')
 
     try:
         logger.info('Loading %s.' % config_file)
@@ -575,11 +575,12 @@ def command_import_tmuxinator(args):
         else:
             sys.exit('Unknown config format.')
 
-        print(newconfig)
-        print(
-            '---------------------------------------------------------------')
         print(
-            'Configuration import does its best to convert tmuxinator files.\n')
+            newconfig,
+            '---------------------------------------------------------------'
+            'Configuration import does its best to convert tmuxinator files.'
+            '\n'
+        )
         if args.answer_yes or prompt_yes_no(
             'The new config *WILL* require adjusting afterwards. Save config?'
         ):
@@ -667,7 +668,6 @@ def command_convert(args):
 
 def command_attach_session(args):
     """Command to attach / switch client to a tmux session."""
-    commands = []
     ctext = ' '.join(args.session_name)
 
     t = Server(
@@ -696,7 +696,6 @@ def command_attach_session(args):
 
 def command_kill_session(args):
     """Command to kill a tmux session."""
-    commands = []
     ctext = ' '.join(args.session_name)
 
     t = Server(
@@ -909,7 +908,9 @@ def get_parser():
         required=True)
     import_tmuxinatorgroup.add_argument(
         '--list', dest='list', action='store_true',
-        help='List yaml configs in ~/.tmuxinator and current working directory.'
+        help=(
+            'List yaml configs in ~/.tmuxinator and current working directory.'
+        )
     )
 
     import_tmuxinatorgroup.add_argument(
@@ -926,7 +927,9 @@ def get_parser():
     parser.add_argument(
         '--log-level', dest='log_level',
         default=None,
-        help='Level of debug verbosity. DEBUG, INFO, WARNING, ERROR, CRITICAL.',
+        help=(
+            'Level of debug verbosity. DEBUG, INFO, WARNING, ERROR, CRITICAL.',
+        )
     )
 
     parser.add_argument(
@@ -963,7 +966,7 @@ def main():
 
     util.oh_my_zsh_auto_title()
 
-    t = Server(
+    t = Server(  # noqa
         socket_name=args.socket_name,
         socket_path=args.socket_path,
         colors=args.colors
@@ -988,4 +991,3 @@ def main():
             command_kill_session(args)
     except KeyboardInterrupt:
         pass
-

tmuxp/config.py

@@ -127,26 +127,26 @@ def inline(sconf):
     """
 
     if (
-                        'shell_command' in sconf and
-                    isinstance(sconf['shell_command'], list) and
-                    len(sconf['shell_command']) == 1
+        'shell_command' in sconf and
+        isinstance(sconf['shell_command'], list) and
+        len(sconf['shell_command']) == 1
     ):
         sconf['shell_command'] = sconf['shell_command'][0]
 
         if len(sconf.keys()) == int(1):
             sconf = sconf['shell_command']
     if (
-                        'shell_command_before' in sconf and
-                    isinstance(sconf['shell_command_before'], list) and
-                    len(sconf['shell_command_before']) == 1
+        'shell_command_before' in sconf and
+        isinstance(sconf['shell_command_before'], list) and
+        len(sconf['shell_command_before']) == 1
     ):
         sconf['shell_command_before'] = sconf['shell_command_before'][0]
 
     # recurse into window and pane config items
     if 'windows' in sconf:
         sconf['windows'] = [
             inline(window) for window in sconf['windows']
-            ]
+        ]
     if 'panes' in sconf:
         sconf['panes'] = [inline(pane) for pane in sconf['panes']]
 
@@ -223,30 +223,30 @@ def expand(sconf, cwd=None, parent=None):
             )
 
     if (
-                    'shell_command' in sconf and
-                isinstance(sconf['shell_command'], string_types)
+        'shell_command' in sconf and
+        isinstance(sconf['shell_command'], string_types)
     ):
         sconf['shell_command'] = [sconf['shell_command']]
 
     if (
-                    'shell_command_before' in sconf and
-                isinstance(sconf['shell_command_before'], string_types)
+        'shell_command_before' in sconf and
+        isinstance(sconf['shell_command_before'], string_types)
     ):
         sconf['shell_command_before'] = [sconf['shell_command_before']]
 
     if (
-                    'shell_command_before' in sconf and
-                isinstance(sconf['shell_command_before'], list)
+        'shell_command_before' in sconf and
+        isinstance(sconf['shell_command_before'], list)
     ):
         sconf['shell_command_before'] = [
             expandshell(scmd) for scmd in sconf['shell_command_before']
-            ]
+        ]
 
     # recurse into window and pane config items
     if 'windows' in sconf:
         sconf['windows'] = [
             expand(window, parent=sconf) for window in sconf['windows']
-            ]
+        ]
     elif 'panes' in sconf:
 
         for pconf in sconf['panes']:
@@ -282,7 +282,9 @@ def expand(sconf, cwd=None, parent=None):
                 p['shell_command'] = []
 
             pconf.update(p)
-        sconf['panes'] = [expand(pane, parent=sconf) for pane in sconf['panes']]
+        sconf['panes'] = [
+            expand(pane, parent=sconf) for pane in sconf['panes']
+        ]
 
     return sconf
 
@@ -320,21 +322,22 @@ def trickle(sconf):
 
         # Prepend start_directory to relative window commands
         if session_start_directory:
-            if not 'start_directory' in windowconfig:
+            if 'start_directory' not in windowconfig:
                 windowconfig['start_directory'] = session_start_directory
             else:
                 if not any(
                         windowconfig['start_directory'].startswith(a)
                         for a in ['~', '/']
                 ):
                     window_start_path = os.path.join(
-                        session_start_directory, windowconfig['start_directory']
+                        session_start_directory,
+                        windowconfig['start_directory']
                     )
                     windowconfig['start_directory'] = window_start_path
 
         # We only need to trickle to the window, workspace builder checks wconf
         if suppress_history is not None:
-            if not 'suppress_history' in windowconfig:
+            if 'suppress_history' not in windowconfig:
                 windowconfig['suppress_history'] = suppress_history
 
         for paneconfig in windowconfig['panes']:

tmuxp/exc.py

@@ -43,7 +43,9 @@ class BeforeLoadScriptNotExists(OSError):
     def __init__(self, *args, **kwargs):
         super(BeforeLoadScriptNotExists, self).__init__(*args, **kwargs)
 
-        self.strerror = "before_script file '%s' doesn't exist." % self.strerror
+        self.strerror = (
+            "before_script file '%s' doesn't exist." % self.strerror
+        )
 
 
 @implements_to_string

tmuxp/formats.py

@@ -100,4 +100,3 @@
     'mouse_any_flag',
     'mouse_utf8_flag',
 ]
-

tmuxp/log.py

@@ -34,8 +34,7 @@ def default_log_template(self, record):
     reset = Style.RESET_ALL
     levelname = (
         LEVEL_COLORS.get(record.levelname) + Style.BRIGHT +
-        '(%(levelname)s)'
-        + Style.RESET_ALL + ' '
+        '(%(levelname)s)' + Style.RESET_ALL + ' '
     )
     asctime = (
         '[' + Fore.BLACK + Style.DIM + Style.BRIGHT +

tmuxp/pane.py

@@ -182,4 +182,3 @@ def __repr__(self):
             self.get('pane_id'),
             self.window
         )
-

tmuxp/server.py

@@ -122,11 +122,6 @@ def _list_sessions(self):
             *tmux_args
         )
 
-        if proc.stderr:
-            raise exc.TmuxpException(proc.stderr)
-        else:
-            session_info = proc.stdout[0]
-
         if proc.stderr:
             raise exc.TmuxpException(proc.stderr)
 
@@ -310,8 +305,8 @@ def attached_sessions(self):
                     continue
 
         return [
-                   Session(server=self, **s) for s in attached_sessions
-               ] or None
+            Session(server=self, **s) for s in attached_sessions
+        ] or None
 
     def has_session(self, target_session):
         """Return True if session exists. ``$ tmux has-session``.

tmuxp/session.py

@@ -18,7 +18,11 @@
 logger = logging.getLogger(__name__)
 
 
-class Session(util.TmuxMappingObject, util.TmuxRelationalObject, EnvironmentMixin):
+class Session(
+    util.TmuxMappingObject,
+    util.TmuxRelationalObject,
+    EnvironmentMixin
+):
     """:term:`tmux(1)` session.
 
     Holds :class:`Window` objects.
@@ -218,8 +222,6 @@ def kill_window(self, target_window=None):
 
         """
 
-        tmux_args = list()
-
         if target_window:
             if isinstance(target_window, int):
                 target = '-t%s:%d' % (self.get('session_name'), target_window)
@@ -238,7 +240,7 @@ def _list_windows(self):
 
         windows = [
             w for w in windows if w['session_id'] == self.get('session_id')
-            ]
+        ]
 
         return windows
 
@@ -256,7 +258,7 @@ def list_windows(self):
         """
         windows = [
             w for w in self._windows if w['session_id'] == self._session_id
-            ]
+        ]
 
         return [Window(session=self, **window) for window in windows]
 

tmuxp/testsuite/__init__.py

@@ -24,12 +24,9 @@
 t = Server()
 t.socket_name = 'tmuxp_test'
 
-from tmuxp.testsuite import helpers
+from tmuxp.testsuite import helpers  # NOQA
 
-
-# Logger functionality
-
-logger = logging.getLogger()
+logger = logging.getLogger()  # Logger functionality
 
 if not logger.handlers:
     channel = logging.StreamHandler()

tmuxp/testsuite/cli.py

@@ -57,58 +57,40 @@ def test_in_dir_from_config_dir(self):
         """config.in_dir() finds configs config dir."""
 
         cli.startup(self.tmp_dir)
-        config1 = tempfile.NamedTemporaryFile(
+        with tempfile.NamedTemporaryFile(
             dir=self.tmp_dir,
             prefix='myconfig',
             suffix='.yaml'
-        )
+        ):
+            with tempfile.NamedTemporaryFile(
+                dir=self.tmp_dir,
+                prefix='myconfig',
+                suffix='.json'
+            ):
+                configs_found = config.in_dir(self.tmp_dir)
 
-        config2 = tempfile.NamedTemporaryFile(
-            dir=self.tmp_dir,
-            prefix='myconfig',
-            suffix='.json'
-        )
-        configs_found = config.in_dir(self.tmp_dir)
-
-        self.assertEqual(len(configs_found), 2)
+                self.assertEqual(len(configs_found), 2)
 
     def test_in_dir_from_current_dir(self):
-        """config.in_dir() find configs config dir."""
-
-        cli.startup(self.tmp_dir)
-        config1 = tempfile.NamedTemporaryFile(
-            dir=self.tmp_dir,
-            prefix='myconfig',
-            suffix='.yaml'
-        )
-
-        config2 = tempfile.NamedTemporaryFile(
-            dir=self.tmp_dir,
-            prefix='myconfig',
-            suffix='.json'
-        )
-        configs_found = config.in_dir(self.tmp_dir)
-
-        self.assertEqual(len(configs_found), 2)
+        """config.in_dir() find configs current dir."""
+        pass  # TODO
 
     def test_ignore_non_configs_from_current_dir(self):
         """cli.in_dir() ignore non-config from config dir."""
 
         cli.startup(self.tmp_dir)
-        badconfig = tempfile.NamedTemporaryFile(
+        with tempfile.NamedTemporaryFile(
             dir=self.tmp_dir,
             prefix='myconfig',
             suffix='.psd'
-        )
-
-        config1 = tempfile.NamedTemporaryFile(
-            dir=self.tmp_dir,
-            prefix='watmyconfig',
-            suffix='.json'
-        )
-        configs_found = config.in_dir(self.tmp_dir)
-
-        self.assertEqual(len(configs_found), 1)
+        ):
+            with tempfile.NamedTemporaryFile(
+                dir=self.tmp_dir,
+                prefix='watmyconfig',
+                suffix='.json'
+            ):
+                configs_found = config.in_dir(self.tmp_dir)
+                self.assertEqual(len(configs_found), 1)
 
     def test_get_configs_cwd(self):
         """config.in_cwd() find config in shell current working directory."""