initial cleaning

Author: tony

doc/_ext/aafig.py

@@ -92,7 +92,7 @@ def run(self):
         if isinstance(image_node, nodes.system_message):
             return [image_node]
         text = '\n'.join(self.content)
-	image_node.aafig = dict(options = aafig_options, text = text)
+    image_node.aafig = dict(options = aafig_options, text = text)
         return [image_node]
 
 
@@ -187,7 +187,7 @@ def render_aafigure(app, text, options):
 
     try:
         (visitor, output) = aafigure.render(text, outfn, options)
-	output.close()
+    output.close()
     except aafigure.UnsupportedFormatError, e:
         raise AafigError(str(e))
 

tmuxp/__main__.py

@@ -20,6 +20,6 @@ def run():
     tmuxp.cli.main()
 
 if __name__ == '__main__':
-    exit = run()
+    _exit = run()
     if exit:
-        sys.exit(exit)
+        sys.exit(_exit)

tmuxp/cli.py

@@ -46,10 +46,10 @@ def prompt(name, default=None):
 
     """
 
-    prompt = name + (default and ' [%s]' % default or '')
-    prompt += name.endswith('?') and ' ' or ': '
+    _prompt = name + (default and ' [%s]' % default or '')
+    _prompt += name.endswith('?') and ' ' or ': '
     while True:
-        rv = input(prompt)
+        rv = input(_prompt)
         if rv:
             return rv
         if default is not None:
@@ -77,11 +77,11 @@ def prompt_bool(name, default=False, yes_choices=None, no_choices=None):
     else:
         prompt_choice = 'y/N'
 
-    prompt = name + ' [%s]' % prompt_choice
-    prompt += name.endswith('?') and ' ' or ': '
+    _prompt = name + ' [%s]' % prompt_choice
+    _prompt += name.endswith('?') and ' ' or ': '
 
     while True:
-        rv = input(prompt)
+        rv = input(_prompt)
         if not rv:
             return default
         if rv.lower() in yes_choices:
@@ -633,7 +633,7 @@ def command_convert(args):
 
     if 'json' in ext:
         if args.answer_yes or prompt_yes_no(
-            'convert to <%s> to yaml?' % (fullfile)
+            'convert to <%s> to yaml?' % fullfile
         ):
             configparser = kaptan.Kaptan()
             configparser.import_config(configfile)
@@ -642,28 +642,28 @@ def command_convert(args):
                 'yaml', indent=2, default_flow_style=False
             )
             if args.answer_yes or prompt_yes_no(
-                'Save config to %s?' % (newfile)
+                'Save config to %s?' % newfile
             ):
                 buf = open(newfile, 'w')
                 buf.write(newconfig)
                 buf.close()
-                print('New config saved to %s' % (newfile))
+                print('New config saved to %s' % newfile)
     elif 'yaml' in ext:
         if args.answer_yes or prompt_yes_no(
-            'convert to <%s> to json?' % (fullfile)
+            'convert to <%s> to json?' % fullfile
         ):
             configparser = kaptan.Kaptan()
             configparser.import_config(configfile)
             newfile = fullfile.replace(ext, '.json')
             newconfig = configparser.export('json', indent=2)
             print(newconfig)
             if args.answer_yes or prompt_yes_no(
-                'Save config to <%s>?' % (newfile)
+                'Save config to <%s>?' % newfile
             ):
                 buf = open(newfile, 'w')
                 buf.write(newconfig)
                 buf.close()
-                print('New config saved to <%s>.' % (newfile))
+                print('New config saved to <%s>.' % newfile)
 
 
 def command_attach_session(args):
@@ -898,7 +898,7 @@ def get_parser():
         help='''\
         Checks current ~/.teamocil and current directory for yaml files.
         '''
-    ).completer = TeamocilCompleter(allowednames=('.yml'), directories=False)
+    ).completer = TeamocilCompleter(allowednames='.yml', directories=False)
     import_teamocil.set_defaults(callback=command_import_teamocil)
 
     import_tmuxinator = importsubparser.add_parser(
@@ -920,7 +920,7 @@ def get_parser():
         help='''\
         Checks current ~/.tmuxinator and current directory for yaml files.
         '''
-    ).completer = TmuxinatorCompleter(allowednames=('.yml'), directories=False)
+    ).completer = TmuxinatorCompleter(allowednames='.yml', directories=False)
 
     import_tmuxinator.set_defaults(callback=command_import_tmuxinator)
 

tmuxp/config.py

@@ -28,17 +28,17 @@ def validate_schema(sconf):
     """
 
     # verify session_name
-    if not 'session_name' in sconf:
+    if 'session_name' not in sconf:
         raise exc.ConfigError('config requires "session_name"')
 
-    if not 'windows' in sconf:
+    if 'windows' not in sconf:
         raise exc.ConfigError('config requires list of "windows"')
 
     for window in sconf['windows']:
-        if not 'window_name' in window:
+        if 'window_name' not in window:
             raise exc.ConfigError('config window is missing "window_name"')
 
-        if not 'panes' in window:
+        if 'panes' not in window:
             raise exc.ConfigError(
                 'config window %s requires list of panes' %
                 window['window_name']
@@ -64,8 +64,8 @@ def is_config_file(filename, extensions=['.yml', '.yaml', '.json']):
 
 
 def in_dir(
-    config_dir=os.path.expanduser('~/.tmuxp'),
-    extensions=['.yml', '.yaml', '.json']
+        config_dir=os.path.expanduser('~/.tmuxp'),
+        extensions=['.yml', '.yaml', '.json']
 ):
     """Return a list of configs in ``config_dir``.
 
@@ -80,7 +80,7 @@ def in_dir(
 
     for filename in os.listdir(config_dir):
         if is_config_file(filename, extensions) and \
-           not filename.startswith('.'):
+                not filename.startswith('.'):
             configs.append(filename)
 
     return configs
@@ -102,6 +102,7 @@ def in_cwd():
 
     return configs
 
+
 def expandshell(_path):
     """Return expanded path based on user's ``$HOME`` and ``env``.
 
@@ -115,6 +116,7 @@ def expandshell(_path):
     """
     return os.path.expandvars(os.path.expanduser(_path))
 
+
 def inline(sconf):
     """ Return config in inline form, opposite of :meth:`config.expand`.
 
@@ -125,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']]
 
@@ -221,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']:
@@ -322,8 +324,8 @@ def trickle(sconf):
                 windowconfig['start_directory'] = session_start_directory
             else:
                 if not any(
-                    windowconfig['start_directory'].startswith(a)
-                    for a in ['~', '/']
+                        windowconfig['start_directory'].startswith(a)
+                        for a in ['~', '/']
                 ):
                     window_start_path = os.path.join(
                         session_start_directory, windowconfig['start_directory']
@@ -351,7 +353,7 @@ def trickle(sconf):
 
             p_index = windowconfig['panes'].index(paneconfig)
             windowconfig['panes'][p_index]['shell_command'] = commands_before
-            #paneconfig['shell_command'] = commands_before
+            # paneconfig['shell_command'] = commands_before
 
     return sconf
 
@@ -425,9 +427,7 @@ def import_tmuxinator(sconf):
     for w in sconf['windows']:
         for k, v in w.items():
 
-            windowdict = {}
-
-            windowdict['window_name'] = k
+            windowdict = {'window_name': k}
 
             if isinstance(v, string_types) or v is None:
                 windowdict['panes'] = [v]
@@ -482,9 +482,8 @@ def import_teamocil(sconf):
 
     for w in sconf['windows']:
 
-        windowdict = {}
+        windowdict = {'window_name': w['name']}
 
-        windowdict['window_name'] = w['name']
         if 'clear' in w:
             windowdict['clear'] = w['clear']
 

tmuxp/log.py

@@ -39,13 +39,11 @@ def default_log_template(self, record):
     )
     asctime = (
         '[' + Fore.BLACK + Style.DIM + Style.BRIGHT +
-        '%(asctime)s'
-        + Fore.RESET + Style.RESET_ALL + ']'
+        '%(asctime)s' + Fore.RESET + Style.RESET_ALL + ']'
     )
     name = (
         ' ' + Fore.WHITE + Style.DIM + Style.BRIGHT +
-        '%(name)s'
-        + Fore.RESET + Style.RESET_ALL + ' '
+        '%(name)s' + Fore.RESET + Style.RESET_ALL + ' '
     )
 
     tpl = reset + levelname + asctime + name + reset
@@ -54,7 +52,6 @@ def default_log_template(self, record):
 
 
 class LogFormatter(logging.Formatter):
-
     template = default_log_template
 
     def __init__(self, color=True, *args, **kwargs):
@@ -88,18 +85,15 @@ def debug_log_template(self, record):
     reset = Style.RESET_ALL
     levelname = (
         LEVEL_COLORS.get(record.levelname) + Style.BRIGHT +
-        '(%(levelname)1.1s)'
-        + Style.RESET_ALL + ' '
+        '(%(levelname)1.1s)' + Style.RESET_ALL + ' '
     )
     asctime = (
         '[' + Fore.BLACK + Style.DIM + Style.BRIGHT +
-        '%(asctime)s'
-        + Fore.RESET + Style.RESET_ALL + ']'
+        '%(asctime)s' + Fore.RESET + Style.RESET_ALL + ']'
     )
     name = (
         ' ' + Fore.WHITE + Style.DIM + Style.BRIGHT +
-        '%(name)s'
-        + Fore.RESET + Style.RESET_ALL + ' '
+        '%(name)s' + Fore.RESET + Style.RESET_ALL + ' '
     )
     module_funcName = (
         Fore.GREEN + Style.BRIGHT +
@@ -116,7 +110,6 @@ def debug_log_template(self, record):
 
 
 class DebugLogFormatter(LogFormatter):
-
     """Provides greater technical details than standard log Formatter."""
 
     template = debug_log_template

tmuxp/server.py

@@ -208,7 +208,7 @@ def _list_windows(self):
 
         # tmux < 1.8 doesn't have window_id, use window_name
         for w in windows:
-            if not 'window_id' in w:
+            if 'window_id' not in w:
                 w['window_id'] = w['window_name']
 
         if self._windows:
@@ -323,7 +323,7 @@ def has_session(self, target_session):
 
         proc = self.cmd('has-session', '-t%s' % target_session)
 
-        if proc.stdout == []:
+        if not proc.stdout:
             return True
         if any(
             x in proc.stdout for x in