skilleter-thingy 0.1.19__tar.gz → 0.1.22__tar.gz

{skilleter_thingy-0.1.19 → skilleter_thingy-0.1.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_thingy
-Version: 0.1.19
+Version: 0.1.22
 Summary: A collection of useful utilities, mainly aimed at making Git more friendly
 Author-email: John Skilleter <john@skilleter.org.uk>
 Project-URL: Home, https://skilleter.org.uk

{skilleter_thingy-0.1.19 → skilleter_thingy-0.1.22}/pyproject.toml

@@ -7,7 +7,7 @@ name = "skilleter_thingy"
 
 # Version must be incremented to install updated Thingy
 
-version = "0.1.19"
+version = "0.1.22"
 
 authors = [
     {name="John Skilleter", email="john@skilleter.org.uk"},

{skilleter_thingy-0.1.19 → skilleter_thingy-0.1.22}/skilleter_thingy/ggrep.py

@@ -39,7 +39,8 @@ def parse_command_line():
     parser.add_argument('--files-with-matches', '-l', action='store_true', help='Show only the names of files that contain matches')
     parser.add_argument('--files-without-matches', '-L', action='store_true', help='Show only the names of files that do NOT contain matches')
     parser.add_argument('--wildcard', '-W', action='append', help='Only search files matching the wildcard(s)')
-    parser.add_argument('--only-matching', '-o', action='store_true', help='Print only the matched (non-empty) parts of a matching line, with each such part on a separate output line.')
+    parser.add_argument('--only-matching', '-o', action='store_true',
+                        help='Print only the matched (non-empty) parts of a matching line, with each such part on a separate output line.')
     parser.add_argument('--no-color', action='store_true', help='Turn off match highlighting')
     parser.add_argument('pattern', action='store', help='Regular expression to search for')
     parser.add_argument('paths', nargs='*', help='Optional list of one or more paths to search')

{skilleter_thingy-0.1.19 → skilleter_thingy-0.1.22}/skilleter_thingy/git_br.py

@@ -105,7 +105,7 @@ def list_branches(branches):
         output = []
 
         for i, field in enumerate(branch):
-            if i==1:
+            if i == 1:
                 field = parse(field)
                 time_str = field.strftime('%H:%M:%S')
 

{skilleter_thingy-0.1.19 → skilleter_thingy-0.1.22}/skilleter_thingy/git_parent.py

@@ -23,7 +23,8 @@ def main():
     parser = argparse.ArgumentParser(description='Attempt to determine the parent branch for the specified branch (defaulting to the current one)')
     parser.add_argument('--all', '-a', action='store_true', help='Include feature branches as possible parents')
     parser.add_argument('--verbose', '-v', action='store_true', help='Report verbose results (includes number of commits between branch and parent)')
-    parser.add_argument('branch', action='store', nargs='?', type=str, default=current_branch, help=f'Branch, commit or commit (defaults to current branch; {current_branch})')
+    parser.add_argument('branch', action='store', nargs='?', type=str, default=current_branch,
+                        help=f'Branch, commit or commit (defaults to current branch; {current_branch})')
 
     args = parser.parse_args()
 

{skilleter_thingy-0.1.19 → skilleter_thingy-0.1.22}/skilleter_thingy/git_review.py

@@ -448,7 +448,7 @@ class GitReview():
                 self.filter_modified = pickle_data.get('filter_modified', self.filter_modified)
                 self.sort_order = pickle_data.get('sort_order', self.sort_order)
                 self.reverse_sort = pickle_data.get('reverse_sort', self.reverse_sort)
-                self.filter_none_whitespace_only= pickle_data.get('filter_none_whitespace_only', self.filter_none_whitespace_only)
+                self.filter_none_whitespace_only = pickle_data.get('filter_none_whitespace_only', self.filter_none_whitespace_only)
                 self.show_none_whitespace_stats = pickle_data.get('show_none_whitespace_stats', self.show_none_whitespace_stats)
 
                 # Transfer the reviewed flag for each file in the pickle
@@ -460,7 +460,7 @@ class GitReview():
                             newfile['reviewed'] = oldfile['reviewed']
                             break
 
-            except (EOFError, pickle.UnpicklingError, ModuleNotFoundError, AttributeError): # TODO: Why did I get ModuleNotFoundError or AttributeError????
+            except (EOFError, pickle.UnpicklingError, ModuleNotFoundError, AttributeError):  # TODO: Why did I get ModuleNotFoundError or AttributeError????
                 pass
 
             self.__constrain_display_parameters()

{skilleter_thingy-0.1.19 → skilleter_thingy-0.1.22}/skilleter_thingy/git_update.py

@@ -85,7 +85,7 @@ def branch_rebase(args, results, branch):
         if args.all_parents:
             parents, _ = git.parents()
         else:
-            parents, _ = git.parents(ignore='feature/*' )
+            parents, _ = git.parents(ignore='feature/*')
 
             logging.debug('Probable parents of %s: %s', branch, parents)
 
@@ -314,7 +314,7 @@ def main():
 
     # List of stuff that's been done, to report in the summary
 
-    results = {'deleted': set(), 'pulled': set(), 'failed': set(), 'rebased': set(), 'unchanged': set(), 'no-tracking': set() }
+    results = {'deleted': set(), 'pulled': set(), 'failed': set(), 'rebased': set(), 'unchanged': set(), 'no-tracking': set()}
 
     to_rebase = set()
 

{skilleter_thingy-0.1.19 → skilleter_thingy-0.1.22}/skilleter_thingy/gphotosync.py

@@ -111,15 +111,19 @@ def parse_command_line():
 
     parser.add_argument('--verbose', '-v', action='store_true', help='Output verbose status information')
     parser.add_argument('--dryrun', '-D', action='store_true', help='Just list files to be copied, without actually copying them')
-    parser.add_argument('--picturedir', '-P', action='store', default=DEFAULT_PHOTO_DIR, help=f'Location of local picture storage directory (defaults to {DEFAULT_PHOTO_DIR})')
-    parser.add_argument('--videodir', '-V', action='store', default=DEFAULT_VIDEO_DIR, help=f'Location of local video storage directory (defaults to {DEFAULT_VIDEO_DIR})')
+    parser.add_argument('--picturedir', '-P', action='store', default=DEFAULT_PHOTO_DIR,
+                        help=f'Location of local picture storage directory (defaults to {DEFAULT_PHOTO_DIR})')
+    parser.add_argument('--videodir', '-V', action='store', default=DEFAULT_VIDEO_DIR,
+                        help=f'Location of local video storage directory (defaults to {DEFAULT_VIDEO_DIR})')
     parser.add_argument('--start', '-s', action='store', default=None, help='Start date (in the form YYYY-MM, defaults to current month)')
     parser.add_argument('--end', '-e', action='store', default=None, help=f'End date (in the form YYYY-MM, defaults to {DEFAULT_MONTHS} before the start date)')
     parser.add_argument('--months', '-m', action='store', type=int, default=None, help='Synchronise this number of months of data (current month included)')
     parser.add_argument('--cache', '-c', action='store', default=DEFAULT_CACHE_DIR, help=f'Cache directory for Google photos (defaults to {DEFAULT_CACHE_DIR})')
-    parser.add_argument('--rclone', '-r', action='store', default=DEFAULT_RCLONE_REMOTE, help=f'rclone remote name for Google photos (defaults to {DEFAULT_RCLONE_REMOTE})')
+    parser.add_argument('--rclone', '-r', action='store', default=DEFAULT_RCLONE_REMOTE,
+                        help=f'rclone remote name for Google photos (defaults to {DEFAULT_RCLONE_REMOTE})')
     parser.add_argument('--no-update', '-N', action='store_true', help='Do not update local cache')
-    parser.add_argument('--keep', '-k', action='store', type=int, default=DEFAULT_KEEP, help=f'Keep this number of months before the start date in the cache (defaults to {DEFAULT_KEEP})')
+    parser.add_argument('--keep', '-k', action='store', type=int, default=DEFAULT_KEEP,
+                        help=f'Keep this number of months before the start date in the cache (defaults to {DEFAULT_KEEP})')
     parser.add_argument('--skip-no-day', '-z', action='store_true', help='Don\'t sync files where the day of the month could not be determined')
     parser.add_argument('action', nargs='*', help='Actions to perform (report or sync)')
 
@@ -450,7 +454,7 @@ def remove_duplicates(media_files):
     # Originals can have upper or lower case extensions, copies only tend to have lower
     # case, so build a lower case to original lookup table
 
-    names = {name.lower():name for name in media_files}
+    names = {name.lower(): name for name in media_files}
 
     duplicates = defaultdict(list)
 

skilleter_thingy-0.1.22/skilleter_thingy/localphotosync.py

@@ -0,0 +1,191 @@
+#!/usr/bin/env python3
+
+"""
+Sync a directory tree full of photos into a tree organised by year, month and date
+"""
+
+# TODO: Ignore patterns for source and destination file paths (.trashed* and .stversions)
+# TODO: Use inotify to detect changes and run continuously
+
+import os
+import glob
+import shutil
+import sys
+import logging
+import argparse
+import re
+
+from enum import Enum
+
+################################################################################
+
+# Default locations for local storage of photos and videos
+
+DEFAULT_PHOTO_DIR = os.path.expanduser('~/Pictures')
+DEFAULT_VIDEO_DIR = os.path.expanduser('~/Videos')
+
+# File extensions (case-insensitive)
+
+IMAGE_EXTENSIONS = ('.jpg', '.jpeg', '.png')
+VIDEO_EXTENSIONS = ('.mp4', '.mov')
+
+# Enum of filetypes
+
+class FileType(Enum):
+    """File types"""
+    IMAGE = 0
+    VIDEO = 1
+    UNKNOWN = 2
+    IGNORE = 3
+
+################################################################################
+
+def error(msg, status=1):
+    """Exit with an error message"""
+
+    print(msg)
+    sys.exit(status)
+
+################################################################################
+
+def parse_command_line():
+    """Parse and validate the command line options"""
+
+    parser = argparse.ArgumentParser(description='Sync photos from Google Photos')
+
+    parser.add_argument('--verbose', '-v', action='store_true', help='Output verbose status information')
+    parser.add_argument('--dryrun', '--dry-run', '-D', action='store_true', help='Just list files to be copied, without actually copying them')
+    parser.add_argument('--picturedir', '-P', action='store', default=DEFAULT_PHOTO_DIR,
+                        help=f'Location of local picture storage directory (defaults to {DEFAULT_PHOTO_DIR})')
+    parser.add_argument('--videodir', '-V', action='store', default=DEFAULT_VIDEO_DIR,
+                        help=f'Location of local video storage directory (defaults to {DEFAULT_VIDEO_DIR})')
+    parser.add_argument('--path', '-p', action='store', default=None, help='Path to sync from')
+
+    args = parser.parse_args()
+
+    if not args.path:
+        error('You must specify a source directory')
+
+    # Configure debugging
+
+    logging.basicConfig(level=logging.DEBUG if args.verbose else logging.INFO)
+
+    # Report parameters if verbose
+
+    logging.debug('Source:    %s', args.path)
+    logging.debug('Pictures:  %s', args.picturedir)
+    logging.debug('Videos:    %s', args.videodir)
+    logging.debug('Dry run:   %d', args.dryrun)
+
+    return args
+
+################################################################################
+
+def get_filetype(filename):
+    """Return the type of a file"""
+
+    _, ext = os.path.splitext(filename)
+
+    ext = ext.lower()
+
+    if ext in IMAGE_EXTENSIONS:
+        return FileType.IMAGE
+
+    if ext in VIDEO_EXTENSIONS:
+        return FileType.VIDEO
+
+    return FileType.UNKNOWN
+
+################################################################################
+
+def media_sync(args):
+    """Sync photos and videos from args.path to date-structured directory
+       trees in args.picturedir and args.videodir.
+       Assumes that the source files are in Android naming format:
+           (IMG|VID)_YYYYMMDD_*.(jpg|mp4)
+       Looks for a destination directory called:
+           YYYY/YYYY-MM-DD*/
+       If multiple destination directories exist, it uses the first one when the
+       names are sorted alphbetically
+       If a file with the same name exists in the destination directory it is
+       not overwritten"""
+
+    files_copied = 0
+
+    filetype_re = re.compile(r'(PANO|IMG|VID)[-_](\d{4})(\d{2})(\d{2})[-_.].*')
+
+    for sourcefile in [source for source in glob.glob(os.path.join(args.path, '*')) if os.path.isfile(source)]:
+        filetype = get_filetype(sourcefile)
+
+        if filetype == FileType.IMAGE:
+            dest_dir = args.picturedir
+        elif filetype == FileType.VIDEO:
+            dest_dir = args.videodir
+        else:
+            logging.info('Ignoring %s - unable to determine file type', sourcefile)
+            continue
+
+        date_match = filetype_re.fullmatch(os.path.basename(sourcefile))
+        if not date_match:
+            logging.debug('Ignoring %s - unable to extract date from filename', sourcefile)
+            continue
+
+        year = date_match.group(2)
+        month = date_match.group(3)
+        day = date_match.group(4)
+
+        default_dest_dir = f'{dest_dir}/{year}/{year}-{month}-{day}'
+        dest_dir_pattern = f'{default_dest_dir}*'
+
+        dest_dirs = [path for path in glob.glob(dest_dir_pattern) if os.path.isdir(path)]
+
+        sourcefile_name = os.path.basename(sourcefile)
+
+        # Search any matching destination directories to see if the file exists
+
+        if dest_dirs:
+            for dest_dir in dest_dirs:
+                if os.path.isfile(os.path.join(dest_dir, sourcefile_name)):
+                    break
+            else:
+                dest_dir = sorted(dest_dirs)[0]
+        else:
+            if not args.dryrun:
+                os.makedirs(default_dest_dir)
+
+            dest_dir = default_dest_dir
+
+        dest_file = os.path.join(dest_dir, sourcefile_name)
+
+        if os.path.exists(dest_file):
+            logging.debug('Destination file %s already exists', dest_file)
+        else:
+            logging.info('Copying %s to %s', sourcefile, dest_file)
+
+            if not args.dryrun:
+                shutil.copyfile(sourcefile, dest_file)
+
+            files_copied += 1
+
+    if files_copied:
+        print(f'{files_copied} files copied')
+
+################################################################################
+
+def localphotosync():
+    """Entry point"""
+    try:
+        args = parse_command_line()
+
+        media_sync(args)
+
+    except KeyboardInterrupt:
+        sys.exit(1)
+
+    except BrokenPipeError:
+        sys.exit(2)
+
+################################################################################
+
+if __name__ == '__main__':
+    localphotosync()

{skilleter_thingy-0.1.19 → skilleter_thingy-0.1.22}/skilleter_thingy/multigit.py

@@ -396,7 +396,7 @@ def mg_init(args, config, console):
 
             abs_repo_path = absolute_repo_path(args, repo)
 
-            config[repo] = { }
+            config[repo] = {}
 
             default_branch = git.branch(path=abs_repo_path)
 

{skilleter_thingy-0.1.19 → skilleter_thingy-0.1.22}/skilleter_thingy/photodupe.py

@@ -21,21 +21,21 @@ def read_image_hashes(directories):
     hashes = defaultdict(list)
 
     # Walk each directory tree
-    
+
     for directory in directories:
         print(f'Scanning directory tree {directory}')
-        
+
         for root, _, files in os.walk(directory):
             print(f'Scanning directory {root}')
-            
+
             for file in files:
                 filepath = os.path.join(root, file)
-                
+
                 fileext = os.path.splitext(file)[1]
 
                 if fileext.lower() not in ('.jbf', '.ini', '.xml', '.ffs_db'):
                     # Calculate the hash and store path, dimensions and file size under the hash entry in the hashes table
-                    
+
                     try:
                         with Image.open(filepath) as image:
                             hash_value = imagehash.average_hash(image, hash_size=12)
@@ -48,9 +48,9 @@ def read_image_hashes(directories):
 
                     except OSError:
                         sys.stderr.write(f'ERROR: Unable to read {filepath} (size={size})\n')
-                    
+
     # Return the hash table
-    
+
     return hashes
 
 ################################################################################
@@ -62,11 +62,11 @@ def main():
     parser.add_argument('directories', nargs='*', action='store', help='Directories to search')
 
     args = parser.parse_args()
-    
+
     if not args.directories:
         print('You must be specify at least one directory')
         sys.exit(1)
-        
+
     try:
         print('Loading cached data')
 
@@ -78,7 +78,7 @@ def main():
         hashes = read_image_hashes(args.directories)
 
     # Sort the list of hashes so that we can easily find close matches
-    
+
     print('Sorting hashes')
 
     hash_values = sorted([str(hashval) for hashval in hashes])

{skilleter_thingy-0.1.19 → skilleter_thingy-0.1.22}/skilleter_thingy/py_audit.py

@@ -70,8 +70,10 @@ def audit(package, version):
 def main():
     """ Entry point """
 
-    parser = argparse.ArgumentParser(description='Query api.osv.dev to determine whether Python packagers in a requirments.txt file are subject to known security vulnerabilities')
-    parser.add_argument('requirements', nargs='*', type=str, action='store', help='The requirements file (if not specified, then the script searches for a requirements.txt file)')
+    parser = argparse.ArgumentParser(
+        description='Query api.osv.dev to determine whether Python packagers in a requirments.txt file are subject to known security vulnerabilities')
+    parser.add_argument('requirements', nargs='*', type=str, action='store',
+                        help='The requirements file (if not specified, then the script searches for a requirements.txt file)')
     args = parser.parse_args()
 
     requirements = args.requirements or glob.glob('**/requirements.txt', recursive=True)

{skilleter_thingy-0.1.19 → skilleter_thingy-0.1.22}/skilleter_thingy/readable.py

@@ -47,13 +47,13 @@ TF_TAG_ENTRY_IGNORE = re.compile(r'^ +".*" += +".*"')
 TF_TAG_CHANGE_BLOCK_END = re.compile(r'^ +}$')
 
 TF_MISC_REGEX = \
-[
-    { 'regex': re.compile(r'(Read complete after) (\d+s|\d+m\d+s)'), 'replace': r'\1 {ELAPSED}'},
-    { 'regex': re.compile(r'"(.*:.*)"( = ".*")'), 'replace': r'\1\2'},
-    { 'regex': re.compile(r'"(.*:.*)"( = \[$)'), 'replace': r'\1\2'},
-    { 'regex': re.compile(r'^last "terraform apply":$'), 'replace':r'last "terraform apply" which may have affected this plan:'},
-    { 'find': ' ~ ', 'replace': ' * '},
-]
+    [
+        {'regex': re.compile(r'(Read complete after) (\d+s|\d+m\d+s)'), 'replace': r'\1 {ELAPSED}'},
+        {'regex': re.compile(r'"(.*:.*)"( = ".*")'), 'replace': r'\1\2'},
+        {'regex': re.compile(r'"(.*:.*)"( = \[$)'), 'replace': r'\1\2'},
+        {'regex': re.compile(r'^last "terraform apply":$'), 'replace': r'last "terraform apply" which may have affected this plan:'},
+        {'find': ' ~ ', 'replace': ' * '},
+    ]
 
 TF_IGNORE_LIST = [
     {'start': TF_HAS_CHANGED, 'end': TF_HAS_CHANGED_END},
@@ -91,8 +91,10 @@ def parse_command_line():
     parser.add_argument('--terraform', '-T', action='store_true', help='Clean Terraform plan/apply log files')
     parser.add_argument('--replace', '-R', action='append', default=None, help='Additional regex replacements in the form "REGEX=REPLACEMENT"')
     parser.add_argument('--verbose', '-v', action='store_true', help='Output verbose status')
-    parser.add_argument('--minimal', '-m', action='store_true', help='Remove unnecessary data from the file (e.g. Terraform progress updates (Refreshing..., Reading..., etc.))')
-    parser.add_argument('--non-minimal', '-M', action='store_true', help='Do not remove unnecessary data from the file (e.g. Terraform progress updates (Refreshing..., Reading..., etc.))')
+    parser.add_argument('--minimal', '-m', action='store_true',
+                        help='Remove unnecessary data from the file (e.g. Terraform progress updates (Refreshing..., Reading..., etc.))')
+    parser.add_argument('--non-minimal', '-M', action='store_true',
+                        help='Do not remove unnecessary data from the file (e.g. Terraform progress updates (Refreshing..., Reading..., etc.))')
     parser.add_argument('files', nargs='*', default=None, help='The files to convert (use stdin/stout if no input files are specified)')
 
     args = parser.parse_args()
@@ -144,7 +146,7 @@ def parse_command_line():
         for entry in args.replace:
             regex, replace = entry.split('=')
             try:
-                args.regex_replace.append({'regex': re.compile(regex), 'replace':replace})
+                args.regex_replace.append({'regex': re.compile(regex), 'replace': replace})
             except re.error as exc:
                 print(f'ERROR in regular expression {regex}: {exc}')
                 sys.exit(1)
@@ -291,7 +293,7 @@ def cleanfile(args, infile, outfile):
         # Write normal output, skipping >1 blank lines and skipping ignore blocks when the pre-ignore
         # count has hit zero.
 
-        if clean is not None and not (ignore_until and pre_ignore_count==0):
+        if clean is not None and not (ignore_until and pre_ignore_count == 0):
             if clean != '' or prev_line != '':
                 outfile.write(clean)
                 outfile.write('\n')

{skilleter_thingy-0.1.19 → skilleter_thingy-0.1.22}/skilleter_thingy/sysmon.py

@@ -57,7 +57,7 @@ def show_cpu_times(scr, first, w, h, x, y):
         scr.addstr(y+2, x, 'IRQ:')
         scr.addstr(y+3, x, 'Soft IRQ:')
 
-        x+= w//3
+        x += w//3
 
         scr.addstr(y+1, x, 'Guest:')
         scr.addstr(y+2, x, 'Guest Nice:')
@@ -320,7 +320,7 @@ def show_temperatures(scr, first, w, h, x, y):
 
 # Panel title and the functions used to update them
 
-BOXES= {
+BOXES = {
     'System Load': show_system_load,
     'Disk Access': show_disk_access,
     'Processes': show_processes,

{skilleter_thingy-0.1.19 → skilleter_thingy-0.1.22}/skilleter_thingy/thingy/colour.py

@@ -186,7 +186,7 @@ def write(txt=None, newline=True, stream=sys.stdout, indent=0, strip=False, clea
 
 def error(txt, newline=True, stream=sys.stderr, status=1, prefix=False):
     """ Write an error message to the specified stream (defaulting to
-        stderr) and exit with the specified status code (defaulting to 1) 
+        stderr) and exit with the specified status code (defaulting to 1)
         Prefix the output with 'ERROR:' in red if prefix==True """
 
     if prefix:

{skilleter_thingy-0.1.19 → skilleter_thingy-0.1.22}/skilleter_thingy/thingy/dircolors.py

@@ -20,6 +20,7 @@ import thingy.dc_util as dc_util
 __all__ = ['Dircolors']
 
 _CODE_MAP = OrderedDict()
+
 def _init_code_map():
     """ mapping between the key name in the .dircolors file and the two letter
     code found in the LS_COLORS environment variable.
@@ -53,6 +54,7 @@ class Dircolors:
     """ Main dircolors class. Contains a database of formats corresponding to file types,
     modes, and extensions. Use the format() method to check a file and color it appropriately.
     """
+
     def __init__(self, load=True):
         """ Initialize a Dircolors object. If load=True (the default), then try
         to load dircolors info from the LS_COLORS environment variable.
@@ -98,7 +100,7 @@ class Dircolors:
             try:
                 code, color = item.split('=', 1)
             except ValueError:
-                continue # no key=value, just ignore
+                continue  # no key=value, just ignore
             if code.startswith('*.'):
                 self._extensions[code[1:]] = color
             else:
@@ -134,7 +136,7 @@ class Dircolors:
         elif isinstance(database, TextIOBase):
             file = database
         else:
-            raise ValueError('database must be str or io.TextIOBase, not %s'%type(database))
+            raise ValueError('database must be str or io.TextIOBase, not %s' % type(database))
 
         try:
             for line in file:
@@ -147,18 +149,18 @@ class Dircolors:
                 split = line.split()
                 if len(split) != 2:
                     if strict:
-                        raise ValueError('Warning: unable to parse dircolors line "%s"'%line)
+                        raise ValueError('Warning: unable to parse dircolors line "%s"' % line)
                     continue
 
                 key, val = split
                 if key == 'TERM':
-                    continue # ignore TERM directives
+                    continue  # ignore TERM directives
                 elif key in _CODE_MAP:
                     self._codes[_CODE_MAP[key]] = val
                 elif key.startswith('.'):
                     self._extensions[key] = val
                 elif strict:
-                    raise ValueError('Warning: unable to parse dircolors line "%s"'%line)
+                    raise ValueError('Warning: unable to parse dircolors line "%s"' % line)
                 # elif not strict, skip
 
             if self._codes or self._extensions:
@@ -184,14 +186,14 @@ class Dircolors:
                 # change .xyz to *.xyz
                 yield '*' + pair[0], pair[1]
 
-        return ':'.join('%s=%s'%pair for pair in gen_pairs())
+        return ':'.join('%s=%s' % pair for pair in gen_pairs())
 
     def _format_code(self, text, code):
         """ format text with an lscolors code. Return text unmodified if code
         isn't found in the database """
         val = self._codes.get(code, None)
         if val:
-            return '\033[%sm%s\033[%sm'%(val, text, self._codes.get('rs', '0'))
+            return '\033[%sm%s\033[%sm' % (val, text, self._codes.get('rs', '0'))
         return text
 
     def _format_ext(self, text, ext):
@@ -200,7 +202,7 @@ class Dircolors:
         text need not actually end in '.ext' """
         val = self._extensions.get(ext, '0')
         if val:
-            return '\033[%sm%s\033[%sm'%(val, text, self._codes.get('rs', '0'))
+            return '\033[%sm%s\033[%sm' % (val, text, self._codes.get('rs', '0'))
         return text
 
     def format_mode(self, text, mode):
@@ -225,7 +227,7 @@ class Dircolors:
         elif isinstance(mode, os.stat_result):
             mode = mode.st_mode
         else:
-            raise ValueError('mode must be int or os.stat_result, not %s'%type(mode))
+            raise ValueError('mode must be int or os.stat_result, not %s' % type(mode))
 
         if mode:
             if stat.S_ISDIR(mode):
@@ -244,13 +246,13 @@ class Dircolors:
             # special file?
             # pylint: disable=bad-whitespace
             special_types = (
-                (stat.S_IFLNK,  'ln'), # symlink
-                (stat.S_IFIFO,  'pi'), # pipe (FIFO)
-                (stat.S_IFSOCK, 'so'), # socket
-                (stat.S_IFBLK,  'bd'), # block device
-                (stat.S_IFCHR,  'cd'), # character device
-                (stat.S_ISUID,  'su'), # setuid
-                (stat.S_ISGID,  'sg'), # setgid
+                (stat.S_IFLNK,  'ln'),  # symlink
+                (stat.S_IFIFO,  'pi'),  # pipe (FIFO)
+                (stat.S_IFSOCK, 'so'),  # socket
+                (stat.S_IFBLK,  'bd'),  # block device
+                (stat.S_IFCHR,  'cd'),  # character device
+                (stat.S_ISUID,  'su'),  # setuid
+                (stat.S_ISGID,  'sg'),  # setgid
             )
 
             for mask, code in special_types:
@@ -290,13 +292,13 @@ class Dircolors:
             try:
                 statbuf = dc_util.stat_at(file, cwd, follow_symlinks)
             except OSError as e:
-                return '%s [Error stat-ing: %s]'%(file, e.strerror)
+                return '%s [Error stat-ing: %s]' % (file, e.strerror)
 
             mode = statbuf.st_mode
             if (not follow_symlinks) and show_target and stat.S_ISLNK(mode):
                 target_path = dc_util.readlink_at(file, cwd)
                 try:
-                    dc_util.stat_at(target_path, cwd) # check for broken link
+                    dc_util.stat_at(target_path, cwd)  # check for broken link
                     target = self.format(target_path, cwd, False, False)
                 except OSError:
                     # format as "orphan"

{skilleter_thingy-0.1.19 → skilleter_thingy-0.1.22}/skilleter_thingy/thingy/git2.py

@@ -1287,7 +1287,6 @@ def log(branch1, branch2=None):
 
 def clean(recurse=False, force=False, dry_run=False, quiet=False,
           exclude=None, ignore_rules=False, remove_only_ignored=False, path=None):
-
     """ Run git clean """
 
     cmd = ['clean']

{skilleter_thingy-0.1.19 → skilleter_thingy-0.1.22}/skilleter_thingy/thingy/popup.py

@@ -82,6 +82,6 @@ class PopUp():
                     time.sleep(1 - elapsed)
 
             del self.panel
-            
+
         if self.refresh:
             self.screen.refresh()

{skilleter_thingy-0.1.19 → skilleter_thingy-0.1.22}/skilleter_thingy/thingy/tfm_pane.py

@@ -148,7 +148,7 @@ class Pane():
 
             filestat = os.stat(filename, follow_symlinks=False)
 
-            info = {'name':filename,
+            info = {'name': filename,
                     'mode': filestat.st_mode,
                     'uid': filestat.st_uid,
                     'gid': filestat.st_gid,
@@ -310,7 +310,7 @@ class Pane():
             else:
                 self.screen.clrtoeol()
 
-            #if len(filename) < self.width:
+            # if len(filename) < self.width:
             #    self.screen.addstr(self.file_list_y + ypos, len(filename), ' ' * (self.width - len(filename)), normal_colour)
 
         current_dir = path.trimpath(self.current_dir, self.width)
@@ -541,7 +541,7 @@ class Pane():
 
         self.height = height
         self.file_list_h = height-1
-        self.width = pane_width-1 # TODO: Why '-1'?
+        self.width = pane_width-1  # TODO: Why '-1'?
         self.screen.resize(height, pane_width)
         self.screen.mvwin(y, x + pane_width*self.index)