.gitignore

@@ -5,6 +5,5 @@ __pycache__
 *~
 *.tar.gz
 *.patch
-.pytest_cache
 .tox
 tags

.pre-commit-config.yaml

@@ -1,51 +1,29 @@
-repos:
 -   repo: git@github.com:pre-commit/pre-commit-hooks.git
-  rev: v1.4.0
+    sha: 6f2b0a27e5b9047c6c067fb3d575ba323d572793
     hooks:
     -   id: autopep8-wrapper
-    language_version: python2
         args:
         - --in-place
         - --aggressive
         - --aggressive
-    - --ignore=E731
-    - --max-line-length=131
     -   id: check-added-large-files
-    language_version: python2
     -   id: check-ast
-    language_version: python2
     -   id: check-case-conflict
-    language_version: python2
     -   id: check-docstring-first
-    language_version: python2
     -   id: debug-statements
-    language_version: python2
     -   id: double-quote-string-fixer
-    language_version: python2
     -   id: end-of-file-fixer
-    language_version: python2
-    exclude_types: [batch, lua]
     -   id: fix-encoding-pragma
-    language_version: python2
     -   id: flake8
-    language_version: python2
         args:
             - --max-complexity=10
-    - --max-line-length=131
+            - --max-line-length=130
-    - --ignore=E402,E731
+            - --ignore=E126,E128,E731
             - --exclude=bin/autojump_argparse.py
-  - id: name-tests-test
-    language_version: python2
     -   id: requirements-txt-fixer
-    language_version: python2
     -   id: trailing-whitespace
-    language_version: python2
 -   repo: git@github.com:asottile/reorder_python_imports.git
-  rev: v1.1.1
+    sha: 017e2f64306853ec7f000db52b8280da27eb3b96
     hooks:
     -   id: reorder-python-imports
-  language_version: python2
+        language_version: python2.7
-- repo: git@github.com:asottile/add-trailing-comma
-  rev: v0.7.0
-  hooks:
-  - id: add-trailing-comma

CHANGES.md

@@ -1,8 +1,5 @@
 ## Summary of release changes, see commit history for more details:
-## https://github.com/wting/autojump/commits/master/
+## https://github.com/joelthelion/autojump/commits/master/
-
-### Release v22.4.0:
-- minor zsh performance improvement
 
 ### Release v22.3.0:
 - use colors only if stdout is a terminal

Makefile

@@ -1,31 +1,21 @@
 VERSION = $(shell grep -oE "[0-9]+\.[0-9]+\.[0-9]+" bin/autojump)
 TAGNAME = release-v$(VERSION)
 
-.PHONY: install
+.PHONY: docs install uninstall lint tar test
+
 install:
 	./install.py
 
-.PHONY: uninstall
 uninstall:
 	./uninstall.py
 
-.PHONY: docs
 docs:
-	@echo "% autojump(1) ${TAGNAME}" >docs/manpage_header.md
-	@echo "%" >>docs/manpage_header.md
-	@echo "% $(shell \date +%Y-%m-%d)" >>docs/manpage_header.md
 	pandoc -s -w man docs/manpage_header.md docs/header.md docs/body.md -o docs/autojump.1
 	pandoc -s -w markdown docs/header.md docs/install.md docs/body.md -o README.md
 
-.PHONY: lint
-lint: pre-commit
-	@tox -e pre-commit -- run --all-files
-
-.PHONY: pre-commit
 pre-commit:
 	@tox -e pre-commit -- install -f --install-hooks
 
-.PHONY: release
 release: docs
 	# Check for tag existence
 	# git describe release-$(VERSION) 2>&1 >/dev/null || exit 1
@@ -43,26 +33,15 @@ release: docs
 	git archive --format=tar --prefix autojump_v$(VERSION)/ $(TAGNAME) | gzip > autojump_v$(VERSION).tar.gz
 	sha1sum autojump_v$(VERSION).tar.gz
 
-.PHONY: tar
 tar:
 	# Create tagged archive
 	git archive --format=tar --prefix autojump_v$(VERSION)/ $(TAGNAME) | gzip > autojump_v$(VERSION).tar.gz
 	sha1sum autojump_v$(VERSION).tar.gz
 
-.PHONY: test
 test: pre-commit
-	@tox
-
-.PHONY: test-xfail
-test-xfail: pre-commit
-	@tox -- --runxfail
-
-.PHONY: test-fast
-test-fast: pre-commit
-	@tox -e py27
-
-.PHONY: clean
-clean:
 	@find . -type f -iname '*.py[co]' -delete
-	@find . -type d -iname '__pycache__' -delete
+	tox
-	@rm -fr .tox
+
+test-fast: pre-commit
+	@find . -type f -iname '*.py[co]' -delete
+	tox -e py27

README.md

@@ -22,11 +22,13 @@ can be used with `autojump` can be used with `j` and vice versa.
 
         j foo
 
--   Jump To A Directory That Contains `foo`, Preferring Child Directories:
+-   Jump To A Child Directory:
 
-    You can prioritize child directories over matches in the databases via
+    Sometimes it's convenient to jump to a child directory
+    (sub-directory of current directory) rather than typing out the full
+    name.
 
-        jc foo
+        jc bar
 
 -   Open File Manager To Directories (instead of jumping):
 
@@ -47,10 +49,10 @@ can be used with `autojump` can be used with `j` and vice versa.
         30   /home/user/mail/inbox
         10   /home/user/work/inbox
 
-    `j in` would jump into /home/user/mail/inbox as the higher
+    `j in` would jump into /home/user/mail/inbox as the higher weighted
-    weighted entry. However you can pass multiple arguments to autojump
+    entry. However you can pass multiple arguments to autojump to prefer
-    to prefer a different entry. In the above example, `j w in` would
+    a different entry. In the above example, `j w in` would then change
-    then change directory to /home/user/work/inbox.
+    directory to /home/user/work/inbox.
 
 For more options refer to help:
 
@@ -61,61 +63,29 @@ INSTALLATION
 
 ### REQUIREMENTS
 
--   Python v2.6+ or Python v3.3+
+-   Python v2.6+
--   Supported shells
+-   Supported shells:
-    -   bash - first class support
+    -   bash v4.0+
-    -   zsh - first class support
+    -   zsh
-    -   fish - community supported
+    -   fish
-    -   tcsh - community supported
+    -   tcsh (experimental)
-    -   clink - community supported
+    -   clink (Windows, experimental)
--   Supported platforms
-    -   Linux - first class support
-    -   OS X - first class support
-    -   Windows - community supported
-    -   BSD - community supported
--   Supported installation methods
-    -   source code - first class support
-    -   Debian and derivatives - first class support
-    -   ArchLinux / Gentoo / openSUSE / RedHat and derivatives -
-        community supported
-    -   Homebrew / MacPorts - community supported
-
-Due to limited time and resources, only "first class support" items will
-be maintained by the primary committers. All "community supported" items
-will be updated based on pull requests submitted by the general public.
-
-Please continue opening issues and providing feedback for community
-supported items since consolidating information helps other users
-troubleshoot and submit enhancements and fixes.
-
-### MANUAL
-
-Grab a copy of autojump:
-
-    git clone https://github.com/wting/autojump.git
-
-Run the installation script and follow on screen instructions.
-
-    cd autojump
-    ./install.py or ./uninstall.py
 
 ### AUTOMATIC
 
 #### Linux
 
 autojump is included in the following distro repositories, please use
-relevant package management utilities to install (e.g. apt-get, yum,
+relevant package management utilities to install (e.g. yum, apt-get,
-pacman, etc):
+etc):
 
--   Debian, Ubuntu, Linux Mint
+-   Debian testing/unstable, Ubuntu, Linux Mint
 
     All Debian-derived distros require manual activation for policy
     reasons, please see `/usr/share/doc/autojump/README.Debian`.
 
--   RedHat, Fedora, CentOS
+-   RedHat, Fedora, CentOS (install `autojump-zsh` for zsh,
-
+    `autojump-fish` for fish, etc.)
-    Install `autojump-zsh` for zsh, `autojump-fish` for fish, etc.
-
 -   ArchLinux
 -   Gentoo
 -   Frugalware
@@ -127,7 +97,7 @@ Homebrew is the recommended installation method for Mac OS X:
 
     brew install autojump
 
-MacPorts is also available:
+MacPorts also available:
 
     port install autojump
 
@@ -137,6 +107,17 @@ Windows
 Windows support is enabled by [clink](https://mridgers.github.io/clink/)
 which should be installed prior to installing autojump.
 
+### MANUAL
+
+Grab a copy of autojump:
+
+    git clone git://github.com/joelthelion/autojump.git
+
+Run the installation script and follow on screen instructions.
+
+    cd autojump
+    ./install.py or ./uninstall.py
+
 KNOWN ISSUES
 ------------
 
@@ -147,7 +128,7 @@ KNOWN ISSUES
 
         export PROMPT_COMMAND="history -a"
 
-    Instead append to the end of the existing \$PROMPT\_COMMAND:
+    Instead append to the end of the existing $PROMPT\_COMMAND:
 
         export PROMPT_COMMAND="${PROMPT_COMMAND:+$PROMPT_COMMAND ;} history -a"
 
@@ -156,7 +137,7 @@ REPORTING BUGS
 
 For any questions or issues please visit:
 
-    https://github.com/wting/autojump/issues
+    https://github.com/joelthelion/autojump/issues
 
 AUTHORS
 -------
@@ -167,7 +148,7 @@ maintained by William Ting. More contributors can be found in `AUTHORS`.
 COPYRIGHT
 ---------
 
-Copyright © 2016 Free Software Foundation, Inc. License GPLv3+: GNU GPL
+Copyright © 2012 Free Software Foundation, Inc. License GPLv3+: GNU GPL
 version 3 or later <http://gnu.org/licenses/gpl.html>. This is free
 software: you are free to change and redistribute it. There is NO
 WARRANTY, to the extent permitted by law.

bin/autojump

@@ -1,8 +1,8 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 """
   Copyright © 2008-2012 Joel Schaerer
-  Copyright © 2012-2016 William Ting
+  Copyright © 2012-2014 William Ting
 
   * This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -18,14 +18,17 @@
   along with this program; if not, write to the Free Software Foundation, Inc.,
   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 """
+
 from __future__ import print_function
 
-import os
+from difflib import SequenceMatcher
-import sys
 from itertools import chain
 from math import sqrt
 from operator import attrgetter
 from operator import itemgetter
+import os
+import re
+import sys
 
 if sys.version_info[0] == 3:
     ifilter = filter
@@ -35,21 +38,13 @@ else:
     from itertools import ifilter
     from itertools import imap
 
-# Vendorized argparse for Python 2.6 support
 from autojump_argparse import ArgumentParser
 
-# autojump is not a standard python package but rather installed as a mixed
-# shell + Python app with no outside dependencies (except Python). As a
-# consequence we use relative imports and depend on file prefixes to prevent
-# module conflicts.
 from autojump_data import dictify
 from autojump_data import entriefy
 from autojump_data import Entry
 from autojump_data import load
 from autojump_data import save
-from autojump_match import match_anywhere
-from autojump_match import match_consecutive
-from autojump_match import match_fuzzy
 from autojump_utils import first
 from autojump_utils import get_pwd
 from autojump_utils import get_tab_entry_info
@@ -65,7 +60,7 @@ from autojump_utils import sanitize
 from autojump_utils import take
 from autojump_utils import unico
 
-VERSION = '22.5.3'
+VERSION = '22.3.1'
 FUZZY_MATCH_THRESHOLD = 0.6
 TAB_ENTRIES_COUNT = 9
 TAB_SEPARATOR = '__'
@@ -75,9 +70,14 @@ def set_defaults():
     config = {}
 
     if is_osx():
-        data_home = os.path.join(os.path.expanduser('~'), 'Library')
+        data_home = os.path.join(
+            os.path.expanduser('~'),
+            'Library',
+            'autojump')
     elif is_windows():
-        data_home = os.getenv('APPDATA')
+        data_home = os.path.join(
+            os.getenv('APPDATA'),
+            'autojump')
     else:
         data_home = os.getenv(
             'XDG_DATA_HOME',
@@ -85,10 +85,10 @@ def set_defaults():
                 os.path.expanduser('~'),
                 '.local',
                 'share',
-            ),
+                'autojump'))
-        )
+
-    config['data_path'] = os.path.join(data_home, 'autojump', 'autojump.txt')
+    config['data_path'] = os.path.join(data_home, 'autojump.txt')
-    config['backup_path'] = os.path.join(data_home, 'autojump', 'autojump.txt.bak')
+    config['backup_path'] = os.path.join(data_home, 'autojump.txt.bak')
 
     return config
 
@@ -96,42 +96,33 @@ def set_defaults():
 def parse_arguments():
     parser = ArgumentParser(
         description='Automatically jump to directory passed as an argument.',
-        epilog='Please see autojump(1) man pages for full documentation.',
+        epilog="Please see autojump(1) man pages for full documentation.")
-    )
     parser.add_argument(
         'directory', metavar='DIRECTORY', nargs='*', default='',
-        help='directory to jump to',
+        help='directory to jump to')
-    )
     parser.add_argument(
         '-a', '--add', metavar='DIRECTORY',
-        help='add path',
+        help='add path')
-    )
     parser.add_argument(
         '-i', '--increase', metavar='WEIGHT', nargs='?', type=int,
         const=10, default=False,
-        help='increase current directory weight',
+        help='increase current directory weight')
-    )
     parser.add_argument(
         '-d', '--decrease', metavar='WEIGHT', nargs='?', type=int,
         const=15, default=False,
-        help='decrease current directory weight',
+        help='decrease current directory weight')
-    )
     parser.add_argument(
-        '--complete', action='store_true', default=False,
+        '--complete', action="store_true", default=False,
-        help='used for tab completion',
+        help='used for tab completion')
-    )
     parser.add_argument(
-        '--purge', action='store_true', default=False,
+        '--purge', action="store_true", default=False,
-        help='remove non-existent paths from database',
+        help='remove non-existent paths from database')
-    )
     parser.add_argument(
-        '-s', '--stat', action='store_true', default=False,
+        '-s', '--stat', action="store_true", default=False,
-        help='show database entries and their key weights',
+        help='show database entries and their key weights')
-    )
     parser.add_argument(
-        '-v', '--version', action='version', version='%(prog)s v' +
+        '-v', '--version', action="version", version="%(prog)s v" +
-        VERSION, help='show version information',
+        VERSION, help='show version information')
-    )
 
     return parser.parse_args()
 
@@ -171,7 +162,7 @@ def detect_smartcase(needles):
 def find_matches(entries, needles, check_entries=True):
     """Return an iterator to matching entries."""
     # TODO(wting|2014-02-24): replace assertion with unit test
-    assert isinstance(needles, list), 'Needles must be a list.'
+    assert isinstance(needles, list), "Needles must be a list."
     ignore_case = detect_smartcase(needles)
 
     try:
@@ -190,18 +181,15 @@ def find_matches(entries, needles, check_entries=True):
 
     data = sorted(
         entries,
-        key=attrgetter('weight', 'path'),
+        key=attrgetter('weight'),
-        reverse=True,
+        reverse=True)
-    )
 
     return ifilter(
         lambda entry: not is_cwd(entry) and path_exists(entry),
         chain(
             match_consecutive(needles, data, ignore_case),
             match_fuzzy(needles, data, ignore_case),
-            match_anywhere(needles, data, ignore_case),
+            match_anywhere(needles, data, ignore_case)))
-        ),
-    )
 
 
 def handle_tab_completion(needle, entries):
@@ -213,33 +201,129 @@ def handle_tab_completion(needle, entries):
         get_ith_path = lambda i, iterable: last(take(i, iterable)).path
         print_local(get_ith_path(
             tab_index,
-            find_matches(entries, [tab_needle], check_entries=False),
+            find_matches(entries, [tab_needle], check_entries=False)))
-        ))
     elif tab_needle:
         # found partial tab completion entry
         print_tab_menu(
             tab_needle,
-            take(
+            take(TAB_ENTRIES_COUNT, find_matches(
-                TAB_ENTRIES_COUNT, find_matches(
                 entries,
                 [tab_needle],
-                    check_entries=False,
+                check_entries=False)),
-                ),
+            TAB_SEPARATOR)
-            ),
-            TAB_SEPARATOR,
-        )
     else:
         print_tab_menu(
             needle,
-            take(
+            take(TAB_ENTRIES_COUNT, find_matches(
-                TAB_ENTRIES_COUNT, find_matches(
                 entries,
                 [needle],
-                    check_entries=False,
+                check_entries=False)),
-                ),
+            TAB_SEPARATOR)
-            ),
+
-            TAB_SEPARATOR,
+
-        )
+def match_anywhere(needles, haystack, ignore_case=False):
+    """
+    Matches needles anywhere in the path as long as they're in the same (but
+    not necessary consecutive) order.
+
+    For example:
+        needles = ['foo', 'baz']
+        regex needle = r'.*foo.*baz.*'
+        haystack = [
+            (path="/foo/bar/baz", weight=10),
+            (path="/baz/foo/bar", weight=10),
+            (path="/foo/baz", weight=10)]
+
+        result = [
+            (path="/moo/foo/baz", weight=10),
+            (path="/foo/baz", weight=10)]
+    """
+    regex_needle = '.*' + '.*'.join(needles).replace('\\', '\\\\') + '.*'
+    regex_flags = re.IGNORECASE | re.UNICODE if ignore_case else re.UNICODE
+    found = lambda haystack: re.search(
+        regex_needle,
+        haystack.path,
+        flags=regex_flags)
+    return ifilter(found, haystack)
+
+
+def match_consecutive(needles, haystack, ignore_case=False):
+    """
+    Matches consecutive needles at the end of a path.
+
+    For example:
+        needles = ['foo', 'baz']
+        haystack = [
+            (path="/foo/bar/baz", weight=10),
+            (path="/foo/baz/moo", weight=10),
+            (path="/moo/foo/baz", weight=10),
+            (path="/foo/baz", weight=10)]
+
+        regex_needle = re.compile(r'''
+            foo     # needle #1
+            [^/]*   # all characters except os.sep zero or more times
+            /       # os.sep
+            [^/]*   # all characters except os.sep zero or more times
+            baz     # needle #2
+            [^/]*   # all characters except os.sep zero or more times
+            $       # end of string
+            ''')
+
+        result = [
+            (path="/moo/foo/baz", weight=10),
+            (path="/foo/baz", weight=10)]
+    """
+    # The normal \\ separator needs to be escaped again for use in regex.
+    sep = '\\\\' if is_windows() else os.sep
+    regex_no_sep = '[^' + sep + ']*'
+    regex_no_sep_end = regex_no_sep + '$'
+    regex_one_sep = regex_no_sep + sep + regex_no_sep
+    # can't use compiled regex because of flags
+    regex_needle = regex_one_sep.join(needles).replace('\\', '\\\\') + regex_no_sep_end  # noqa
+    regex_flags = re.IGNORECASE | re.UNICODE if ignore_case else re.UNICODE
+    found = lambda entry: re.search(
+        regex_needle,
+        entry.path,
+        flags=regex_flags)
+    return ifilter(found, haystack)
+
+
+def match_fuzzy(needles, haystack, ignore_case=False):
+    """
+    Performs an approximate match with the last needle against the end of
+    every path past an acceptable threshold (FUZZY_MATCH_THRESHOLD).
+
+    For example:
+        needles = ['foo', 'bar']
+        haystack = [
+            (path="/foo/bar/baz", weight=11),
+            (path="/foo/baz/moo", weight=10),
+            (path="/moo/foo/baz", weight=10),
+            (path="/foo/baz", weight=10),
+            (path="/foo/bar", weight=10)]
+
+    result = [
+            (path="/foo/bar/baz", weight=11),
+            (path="/moo/foo/baz", weight=10),
+            (path="/foo/baz", weight=10),
+            (path="/foo/bar", weight=10)]
+
+    This is a weak heuristic and used as a last resort to find matches.
+    """
+    end_dir = lambda path: last(os.path.split(path))
+    if ignore_case:
+        needle = last(needles).lower()
+        match_percent = lambda entry: SequenceMatcher(
+            a=needle,
+            b=end_dir(entry.path.lower())).ratio()
+    else:
+        needle = last(needles)
+        match_percent = lambda entry: SequenceMatcher(
+            a=needle,
+            b=end_dir(entry.path)).ratio()
+    meets_threshold = lambda entry: match_percent(entry) >= \
+        FUZZY_MATCH_THRESHOLD
+    return ifilter(meets_threshold, haystack)
 
 
 def purge_missing_paths(entries):
@@ -252,26 +336,25 @@ def print_stats(data, data_path):
     for path, weight in sorted(data.items(), key=itemgetter(1)):
         print_entry(Entry(path, weight))
 
-    print('________________________________________\n')
+    print("________________________________________\n")
-    print('%d:\t total weight' % sum(data.values()))
+    print("%d:\t total weight" % sum(data.values()))
-    print('%d:\t number of entries' % len(data))
+    print("%d:\t number of entries" % len(data))
 
     try:
         print_local(
-            '%.2f:\t current directory weight' % data.get(os.getcwdu(), 0),
+            "%.2f:\t current directory weight" % data.get(os.getcwdu(), 0))
-        )
     except OSError:
         # current directory no longer exists
         pass
 
-    print('\ndata:\t %s' % data_path)
+    print("\ndata:\t %s" % data_path)
 
 
 def main(args):  # noqa
     if not is_autojump_sourced() and not is_windows():
         print("Please source the correct autojump file in your shell's")
-        print('startup file. For more information, please reinstall autojump')
+        print("startup file. For more information, please reinstall autojump")
-        print('and read the post installation instructions.')
+        print("and read the post installation instructions.")
         return 1
 
     config = set_defaults()
@@ -282,8 +365,7 @@ def main(args):  # noqa
     elif args.complete:
         handle_tab_completion(
             needle=first(chain(sanitize(args.directory), [''])),
-            entries=entriefy(load(config)),
+            entries=entriefy(load(config)))
-        )
     elif args.decrease:
         data, entry = decrease_path(load(config), get_pwd(), args.decrease)
         save(config, data)
@@ -296,7 +378,7 @@ def main(args):  # noqa
         old_data = load(config)
         new_data = dictify(purge_missing_paths(entriefy(old_data)))
         save(config, new_data)
-        print('Purged %d entries.' % (len(old_data) - len(new_data)))
+        print("Purged %d entries." % (len(old_data) - len(new_data)))
     elif args.stat:
         print_stats(load(config), config['data_path'])
     elif not args.directory:
@@ -305,8 +387,7 @@ def main(args):  # noqa
         print_local(first(chain(
             imap(attrgetter('path'), find_matches(entries, [''])),
             # always return a path to calling shell functions
-            ['.'],
+            ['.'])))
-        )))
     else:
         entries = entriefy(load(config))
         needles = sanitize(args.directory)
@@ -325,18 +406,15 @@ def main(args):  # noqa
             print_local(
                 get_ith_path(
                     tab_index,
-                    find_matches(entries, [tab_needle]),
+                    find_matches(entries, [tab_needle])))
-                ),
-            )
         else:
             print_local(first(chain(
                 imap(attrgetter('path'), find_matches(entries, needles)),
                 # always return a path to calling shell functions
-                ['.'],
+                ['.'])))
-            )))
 
     return 0
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     sys.exit(main(parse_arguments()))

bin/autojump.fish

@@ -1,4 +1,4 @@
-set -gx AUTOJUMP_SOURCED 1
+set -x AUTOJUMP_SOURCED 1
 
 # set user installation path
 if test -d ~/.autojump
@@ -17,11 +17,11 @@ complete -x -c j -a '(autojump --complete (commandline -t))'
 
 # set error file location
 if test (uname) = "Darwin"
-    set -gx AUTOJUMP_ERROR_PATH ~/Library/autojump/errors.log
+    set -x AUTOJUMP_ERROR_PATH ~/Library/autojump/errors.log
 else if test -d "$XDG_DATA_HOME"
-    set -gx AUTOJUMP_ERROR_PATH $XDG_DATA_HOME/autojump/errors.log
+    set -x AUTOJUMP_ERROR_PATH $XDG_DATA_HOME/autojump/errors.log
 else
-    set -gx AUTOJUMP_ERROR_PATH ~/.local/share/autojump/errors.log
+    set -x AUTOJUMP_ERROR_PATH ~/.local/share/autojump/errors.log
 end
 
 if test ! -d (dirname $AUTOJUMP_ERROR_PATH)

bin/autojump.zsh

@@ -10,11 +10,8 @@ fi
 
 
 # set homebrew installation paths
-if command -v brew &>/dev/null; then
+if command -v brew &>/dev/null && [[ -d "$(brew --prefix)/share/zsh/site-functions" ]]; then
-  local brew_prefix=${BREW_PREFIX:-$(brew --prefix)}
+    fpath=("$(brew --prefix)/share/zsh/site-functions" ${fpath})
-  if [[ -d "${brew_prefix}/share/zsh/site-functions" ]]; then
-    fpath=("${brew_prefix}/share/zsh/site-functions" ${fpath})
-  fi
 fi
 
 

bin/autojump_argparse.py

@@ -175,13 +175,11 @@ class HelpFormatter(object):
     provided by the class are considered an implementation detail.
     """
 
-    def __init__(
+    def __init__(self,
-        self,
                  prog,
                  indent_increment=2,
                  max_help_position=24,
-        width=None,
+                 width=None):
-    ):
 
         # default setting for width
         if width is None:
@@ -288,10 +286,8 @@ class HelpFormatter(object):
             # update the maximum item length
             invocation_length = max([len(s) for s in invocations])
             action_length = invocation_length + self._current_indent
-            self._action_max_length = max(
+            self._action_max_length = max(self._action_max_length,
-                self._action_max_length,
+                                          action_length)
-                action_length,
-            )
 
             # add the item to the list
             self._add_item(self._format_action, [action])
@@ -311,11 +307,9 @@ class HelpFormatter(object):
         return help
 
     def _join_parts(self, part_strings):
-        return ''.join([
+        return ''.join([part
-            part
                         for part in part_strings
-            if part and part is not SUPPRESS
+                        if part and part is not SUPPRESS])
-        ])
 
     def _format_usage(self, usage, actions, groups, prefix):
         if prefix is None:
@@ -514,10 +508,8 @@ class HelpFormatter(object):
 
     def _format_action(self, action):
         # determine the required width and the entry label
-        help_position = min(
+        help_position = min(self._action_max_length + 2,
-            self._action_max_length + 2,
+                            self._max_help_position)
-            self._max_help_position,
-        )
         help_width = self._width - help_position
         action_width = help_position - self._current_indent - 2
         action_header = self._format_action_invocation(action)
@@ -649,10 +641,8 @@ class HelpFormatter(object):
 
     def _fill_text(self, text, width, indent):
         text = self._whitespace_matcher.sub(' ', text).strip()
-        return _textwrap.fill(
+        return _textwrap.fill(text, width, initial_indent=indent,
-            text, width, initial_indent=indent,
+                              subsequent_indent=indent)
-            subsequent_indent=indent,
-        )
 
     def _get_help_string(self, action):
         return action.help
@@ -734,10 +724,8 @@ class ArgumentError(Exception):
             format = '%(message)s'
         else:
             format = 'argument %(argument_name)s: %(message)s'
-        return format % dict(
+        return format % dict(message=self.message,
-            message=self.message,
+                             argument_name=self.argument_name)
-            argument_name=self.argument_name,
-        )
 
 
 class ArgumentTypeError(Exception):
@@ -802,8 +790,7 @@ class Action(_AttributeHolder):
             help string. If None, the 'dest' value will be used as the name.
     """
 
-    def __init__(
+    def __init__(self,
-        self,
                  option_strings,
                  dest,
                  nargs=None,
@@ -813,8 +800,7 @@ class Action(_AttributeHolder):
                  choices=None,
                  required=False,
                  help=None,
-        metavar=None,
+                 metavar=None):
-    ):
         self.option_strings = option_strings
         self.dest = dest
         self.nargs = nargs
@@ -846,8 +832,7 @@ class Action(_AttributeHolder):
 
 class _StoreAction(Action):
 
-    def __init__(
+    def __init__(self,
-        self,
                  option_strings,
                  dest,
                  nargs=None,
@@ -857,14 +842,11 @@ class _StoreAction(Action):
                  choices=None,
                  required=False,
                  help=None,
-        metavar=None,
+                 metavar=None):
-    ):
         if nargs == 0:
-            raise ValueError(
+            raise ValueError('nargs for store actions must be > 0; if you '
-                'nargs for store actions must be > 0; if you '
                              'have nothing to store, actions such as store '
-                'true or store const may be more appropriate',
+                             'true or store const may be more appropriate')
-            )
         if const is not None and nargs != OPTIONAL:
             raise ValueError('nargs must be %r to supply const' % OPTIONAL)
         super(_StoreAction, self).__init__(
@@ -877,8 +859,7 @@ class _StoreAction(Action):
             choices=choices,
             required=required,
             help=help,
-            metavar=metavar,
+            metavar=metavar)
-        )
 
     def __call__(self, parser, namespace, values, option_string=None):
         setattr(namespace, self.dest, values)
@@ -886,16 +867,14 @@ class _StoreAction(Action):
 
 class _StoreConstAction(Action):
 
-    def __init__(
+    def __init__(self,
-        self,
                  option_strings,
                  dest,
                  const,
                  default=None,
                  required=False,
                  help=None,
-        metavar=None,
+                 metavar=None):
-    ):
         super(_StoreConstAction, self).__init__(
             option_strings=option_strings,
             dest=dest,
@@ -903,8 +882,7 @@ class _StoreConstAction(Action):
             const=const,
             default=default,
             required=required,
-            help=help,
+            help=help)
-        )
 
     def __call__(self, parser, namespace, values, option_string=None):
         setattr(namespace, self.dest, self.const)
@@ -912,48 +890,41 @@ class _StoreConstAction(Action):
 
 class _StoreTrueAction(_StoreConstAction):
 
-    def __init__(
+    def __init__(self,
-        self,
                  option_strings,
                  dest,
                  default=False,
                  required=False,
-        help=None,
+                 help=None):
-    ):
         super(_StoreTrueAction, self).__init__(
             option_strings=option_strings,
             dest=dest,
             const=True,
             default=default,
             required=required,
-            help=help,
+            help=help)
-        )
 
 
 class _StoreFalseAction(_StoreConstAction):
 
-    def __init__(
+    def __init__(self,
-        self,
                  option_strings,
                  dest,
                  default=True,
                  required=False,
-        help=None,
+                 help=None):
-    ):
         super(_StoreFalseAction, self).__init__(
             option_strings=option_strings,
             dest=dest,
             const=False,
             default=default,
             required=required,
-            help=help,
+            help=help)
-        )
 
 
 class _AppendAction(Action):
 
-    def __init__(
+    def __init__(self,
-        self,
                  option_strings,
                  dest,
                  nargs=None,
@@ -963,14 +934,11 @@ class _AppendAction(Action):
                  choices=None,
                  required=False,
                  help=None,
-        metavar=None,
+                 metavar=None):
-    ):
         if nargs == 0:
-            raise ValueError(
+            raise ValueError('nargs for append actions must be > 0; if arg '
-                'nargs for append actions must be > 0; if arg '
                              'strings are not supplying the value to append, '
-                'the append const action may be more appropriate',
+                             'the append const action may be more appropriate')
-            )
         if const is not None and nargs != OPTIONAL:
             raise ValueError('nargs must be %r to supply const' % OPTIONAL)
         super(_AppendAction, self).__init__(
@@ -983,8 +951,7 @@ class _AppendAction(Action):
             choices=choices,
             required=required,
             help=help,
-            metavar=metavar,
+            metavar=metavar)
-        )
 
     def __call__(self, parser, namespace, values, option_string=None):
         items = _copy.copy(_ensure_value(namespace, self.dest, []))
@@ -994,16 +961,14 @@ class _AppendAction(Action):
 
 class _AppendConstAction(Action):
 
-    def __init__(
+    def __init__(self,
-        self,
                  option_strings,
                  dest,
                  const,
                  default=None,
                  required=False,
                  help=None,
-        metavar=None,
+                 metavar=None):
-    ):
         super(_AppendConstAction, self).__init__(
             option_strings=option_strings,
             dest=dest,
@@ -1012,8 +977,7 @@ class _AppendConstAction(Action):
             default=default,
             required=required,
             help=help,
-            metavar=metavar,
+            metavar=metavar)
-        )
 
     def __call__(self, parser, namespace, values, option_string=None):
         items = _copy.copy(_ensure_value(namespace, self.dest, []))
@@ -1023,22 +987,19 @@ class _AppendConstAction(Action):
 
 class _CountAction(Action):
 
-    def __init__(
+    def __init__(self,
-        self,
                  option_strings,
                  dest,
                  default=None,
                  required=False,
-        help=None,
+                 help=None):
-    ):
         super(_CountAction, self).__init__(
             option_strings=option_strings,
             dest=dest,
             nargs=0,
             default=default,
             required=required,
-            help=help,
+            help=help)
-        )
 
     def __call__(self, parser, namespace, values, option_string=None):
         new_count = _ensure_value(namespace, self.dest, 0) + 1
@@ -1047,20 +1008,17 @@ class _CountAction(Action):
 
 class _HelpAction(Action):
 
-    def __init__(
+    def __init__(self,
-        self,
                  option_strings,
                  dest=SUPPRESS,
                  default=SUPPRESS,
-        help=None,
+                 help=None):
-    ):
         super(_HelpAction, self).__init__(
             option_strings=option_strings,
             dest=dest,
             default=default,
             nargs=0,
-            help=help,
+            help=help)
-        )
 
     def __call__(self, parser, namespace, values, option_string=None):
         parser.print_help()
@@ -1069,21 +1027,18 @@ class _HelpAction(Action):
 
 class _VersionAction(Action):
 
-    def __init__(
+    def __init__(self,
-        self,
                  option_strings,
                  version=None,
                  dest=SUPPRESS,
                  default=SUPPRESS,
-        help="show program's version number and exit",
+                 help="show program's version number and exit"):
-    ):
         super(_VersionAction, self).__init__(
             option_strings=option_strings,
             dest=dest,
             default=default,
             nargs=0,
-            help=help,
+            help=help)
-        )
         self.version = version
 
     def __call__(self, parser, namespace, values, option_string=None):
@@ -1103,15 +1058,13 @@ class _SubParsersAction(Action):
             sup = super(_SubParsersAction._ChoicesPseudoAction, self)
             sup.__init__(option_strings=[], dest=name, help=help)
 
-    def __init__(
+    def __init__(self,
-        self,
                  option_strings,
                  prog,
                  parser_class,
                  dest=SUPPRESS,
                  help=None,
-        metavar=None,
+                 metavar=None):
-    ):
 
         self._prog_prefix = prog
         self._parser_class = parser_class
@@ -1124,8 +1077,7 @@ class _SubParsersAction(Action):
             nargs=PARSER,
             choices=self._name_parser_map,
             help=help,
-            metavar=metavar,
+            metavar=metavar)
-        )
 
     def add_parser(self, name, **kwargs):
         # set prog from the existing prefix
@@ -1166,8 +1118,7 @@ class _SubParsersAction(Action):
         # store any unrecognized options on the object, so that the top
         # level parser can decide what to do with them
         namespace, arg_strings = parser.parse_known_args(
-            arg_strings, namespace,
+            arg_strings, namespace)
-        )
         if arg_strings:
             vars(namespace).setdefault(_UNRECOGNIZED_ARGS_ATTR, [])
             getattr(namespace, _UNRECOGNIZED_ARGS_ATTR).extend(arg_strings)
@@ -1248,13 +1199,11 @@ class Namespace(_AttributeHolder):
 
 class _ActionsContainer(object):
 
-    def __init__(
+    def __init__(self,
-        self,
                  description,
                  prefix_chars,
                  argument_default,
-        conflict_handler,
+                 conflict_handler):
-    ):
         super(_ActionsContainer, self).__init__()
 
         self.description = description
@@ -1423,8 +1372,7 @@ class _ActionsContainer(object):
                 title_group_map[group.title] = self.add_argument_group(
                     title=group.title,
                     description=group.description,
-                    conflict_handler=group.conflict_handler,
+                    conflict_handler=group.conflict_handler)
-                )
 
             # map the actions to their new group
             for action in group._group_actions:
@@ -1435,8 +1383,7 @@ class _ActionsContainer(object):
         # description= then this code will need to be expanded as above
         for group in container._mutually_exclusive_groups:
             mutex_group = self.add_mutually_exclusive_group(
-                required=group.required,
+                required=group.required)
-            )
 
             # map the actions to their new mutex group
             for action in group._group_actions:
@@ -1469,10 +1416,8 @@ class _ActionsContainer(object):
         for option_string in args:
             # error on strings that don't start with an appropriate prefix
             if not option_string[0] in self.prefix_chars:
-                msg = _(
+                msg = _('invalid option string %r: '
-                    'invalid option string %r: '
+                        'must start with a character %r')
-                    'must start with a character %r',
-                )
                 tup = option_string, self.prefix_chars
                 raise ValueError(msg % tup)
 
@@ -1528,11 +1473,9 @@ class _ActionsContainer(object):
 
     def _handle_conflict_error(self, action, conflicting_actions):
         message = _('conflicting option string(s): %s')
-        conflict_string = ', '.join([
+        conflict_string = ', '.join([option_string
-            option_string
                                      for option_string, action
-            in conflicting_actions
+                                     in conflicting_actions])
-        ])
         raise ArgumentError(action, message % conflict_string)
 
     def _handle_conflict_resolve(self, action, conflicting_actions):
@@ -1622,8 +1565,7 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
         - add_help -- Add a -h/-help option
     """
 
-    def __init__(
+    def __init__(self,
-        self,
                  prog=None,
                  usage=None,
                  description=None,
@@ -1635,8 +1577,7 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
                  fromfile_prefix_chars=None,
                  argument_default=None,
                  conflict_handler='error',
-        add_help=True,
+                 add_help=True):
-    ):
 
         if version is not None:
             import warnings
@@ -1644,16 +1585,13 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
                 """The "version" argument to ArgumentParser is deprecated. """
                 """Please use """
                 """"add_argument(..., action='version', version="N", ...)" """
-                """instead""", DeprecationWarning,
+                """instead""", DeprecationWarning)
-            )
 
         superinit = super(ArgumentParser, self).__init__
-        superinit(
+        superinit(description=description,
-            description=description,
                   prefix_chars=prefix_chars,
                   argument_default=argument_default,
-            conflict_handler=conflict_handler,
+                  conflict_handler=conflict_handler)
-        )
 
         # default setting for prog
         if prog is None:
@@ -1687,15 +1625,13 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
             self.add_argument(
                 default_prefix + 'h', default_prefix * 2 + 'help',
                 action='help', default=SUPPRESS,
-                help=_('show this help message and exit'),
+                help=_('show this help message and exit'))
-            )
         if self.version:
             self.add_argument(
                 default_prefix + 'v', default_prefix * 2 + 'version',
                 action='version', default=SUPPRESS,
                 version=self.version,
-                help=_("show program's version number and exit"),
+                help=_("show program's version number and exit"))
-            )
 
         # add parent arguments and defaults
         for parent in parents:
@@ -1764,18 +1700,14 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
         return action
 
     def _get_optional_actions(self):
-        return [
+        return [action
-            action
                 for action in self._actions
-            if action.option_strings
+                if action.option_strings]
-        ]
 
     def _get_positional_actions(self):
-        return [
+        return [action
-            action
                 for action in self._actions
-            if not action.option_strings
+                if not action.option_strings]
-        ]
 
     # =====================================
     # Command line argument parsing methods
@@ -1999,8 +1931,7 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
             next_option_string_index = min([
                 index
                 for index in option_string_indices
-                if index >= start_index
+                if index >= start_index])
-            ])
             if start_index != next_option_string_index:
                 positionals_end_index = consume_positionals(start_index)
 
@@ -2049,11 +1980,9 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
 
                 # if no actions were used, report the error
                 else:
-                    names = [
+                    names = [_get_action_name(action)
-                        _get_action_name(action)
                              for action in group._group_actions
-                        if action.help is not SUPPRESS
+                             if action.help is not SUPPRESS]
-                    ]
                     msg = _('one of the arguments %s is required')
                     self.error(msg % ' '.join(names))
 
@@ -2117,10 +2046,8 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
         result = []
         for i in range(len(actions), 0, -1):
             actions_slice = actions[:i]
-            pattern = ''.join([
+            pattern = ''.join([self._get_nargs_pattern(action)
-                self._get_nargs_pattern(action)
+                               for action in actions_slice])
-                for action in actions_slice
-            ])
             match = _re.match(pattern, arg_strings_pattern)
             if match is not None:
                 result.extend([len(string) for string in match.groups()])
@@ -2161,8 +2088,7 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
         # if multiple actions match, the option string was ambiguous
         if len(option_tuples) > 1:
             options = ', '.join(
-                [option_string for action, option_string, explicit_arg in option_tuples],
+                [option_string for action, option_string, explicit_arg in option_tuples])
-            )
             tup = arg_string, options
             self.error(_('ambiguous option: %s could match %s') % tup)
 
@@ -2292,10 +2218,8 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
 
         # when nargs='*' on a positional, if there were no command-line
         # args, use the default if it is anything other than None
-        elif (
+        elif (not arg_strings and action.nargs == ZERO_OR_MORE and
-            not arg_strings and action.nargs == ZERO_OR_MORE and
+              not action.option_strings):
-            not action.option_strings
-        ):
             if action.default is not None:
                 value = action.default
             else:
@@ -2363,20 +2287,16 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
     # =======================
     def format_usage(self):
         formatter = self._get_formatter()
-        formatter.add_usage(
+        formatter.add_usage(self.usage, self._actions,
-            self.usage, self._actions,
+                            self._mutually_exclusive_groups)
-            self._mutually_exclusive_groups,
-        )
         return formatter.format_help()
 
     def format_help(self):
         formatter = self._get_formatter()
 
         # usage
-        formatter.add_usage(
+        formatter.add_usage(self.usage, self._actions,
-            self.usage, self._actions,
+                            self._mutually_exclusive_groups)
-            self._mutually_exclusive_groups,
-        )
 
         # description
         formatter.add_text(self.description)
@@ -2399,8 +2319,7 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
         warnings.warn(
             'The format_version method is deprecated -- the "version" '
             'argument to ArgumentParser is no longer supported.',
-            DeprecationWarning,
+            DeprecationWarning)
-        )
         formatter = self._get_formatter()
         formatter.add_text(self.version)
         return formatter.format_help()
@@ -2426,8 +2345,7 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
         warnings.warn(
             'The print_version method is deprecated -- the "version" '
             'argument to ArgumentParser is no longer supported.',
-            DeprecationWarning,
+            DeprecationWarning)
-        )
         self._print_message(self.format_version(), file)
 
     def _print_message(self, message, file=None):

bin/autojump_data.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 from __future__ import print_function
 
@@ -55,8 +55,7 @@ def load(config):
         os.path.expanduser('~'),
         '.local',
         'share',
-        'autojump',
+        'autojump')
-    )
 
     if is_osx() and os.path.exists(xdg_aj_home):
         migrate_osx_xdg_data(config)
@@ -76,14 +75,11 @@ def load(config):
         with open(
                 config['data_path'],
                 'r', encoding='utf-8',
-                errors='replace',
+                errors='replace') as f:
-        ) as f:
             return dict(
                 imap(
                     tupleize,
-                    ifilter(correct_length, imap(parse, f)),
+                    ifilter(correct_length, imap(parse, f))))
-                ),
-            )
     except (IOError, EOFError):
         return load_backup(config)
 
@@ -120,12 +116,11 @@ def migrate_osx_xdg_data(config):
 
 def save(config, data):
     """Save data and create backup, creating a new data file if necessary."""
-    data_dir = os.path.dirname(config['data_path'])
+    create_dir(os.path.dirname(config['data_path']))
-    create_dir(data_dir)
 
     # atomically save by writing to temporary file and moving to destination
     try:
-        temp = NamedTemporaryFile(delete=False, dir=data_dir)
+        temp = NamedTemporaryFile(delete=False)
         # Windows cannot reuse the same open file name
         temp.close()
 

bin/autojump_match.py

@@ -1,129 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-import os
-import re
-from difflib import SequenceMatcher
-
-from autojump_utils import is_python3
-from autojump_utils import last
-
-
-if is_python3():  # pragma: no cover
-    ifilter = filter
-    imap = map
-    os.getcwdu = os.getcwd
-else:
-    from itertools import ifilter
-    from itertools import imap
-
-
-def match_anywhere(needles, haystack, ignore_case=False):
-    """
-    Matches needles anywhere in the path as long as they're in the same (but
-    not necessary consecutive) order.
-
-    For example:
-        needles = ['foo', 'baz']
-        regex needle = r'.*foo.*baz.*'
-        haystack = [
-            (path='/foo/bar/baz', weight=10),
-            (path='/baz/foo/bar', weight=10),
-            (path='/foo/baz', weight=10),
-        ]
-
-        result = [
-            (path='/moo/foo/baz', weight=10),
-            (path='/foo/baz', weight=10),
-        ]
-    """
-    regex_needle = '.*' + '.*'.join(imap(re.escape, needles)) + '.*'
-    regex_flags = re.IGNORECASE | re.UNICODE if ignore_case else re.UNICODE
-    found = lambda haystack: re.search(
-        regex_needle,
-        haystack.path,
-        flags=regex_flags,
-    )
-    return ifilter(found, haystack)
-
-
-def match_consecutive(needles, haystack, ignore_case=False):
-    """
-    Matches consecutive needles at the end of a path.
-
-    For example:
-        needles = ['foo', 'baz']
-        haystack = [
-            (path='/foo/bar/baz', weight=10),
-            (path='/foo/baz/moo', weight=10),
-            (path='/moo/foo/baz', weight=10),
-            (path='/foo/baz', weight=10),
-        ]
-
-        # We can't actually use re.compile because of re.UNICODE
-        regex_needle = re.compile(r'''
-            foo     # needle #1
-            [^/]*   # all characters except os.sep zero or more times
-            /       # os.sep
-            [^/]*   # all characters except os.sep zero or more times
-            baz     # needle #2
-            [^/]*   # all characters except os.sep zero or more times
-            $       # end of string
-            ''')
-
-        result = [
-            (path='/moo/foo/baz', weight=10),
-            (path='/foo/baz', weight=10),
-        ]
-    """
-    regex_no_sep = '[^' + os.sep + ']*'
-    regex_no_sep_end = regex_no_sep + '$'
-    regex_one_sep = regex_no_sep + os.sep + regex_no_sep
-    regex_needle = regex_one_sep.join(imap(re.escape, needles)) + regex_no_sep_end
-    regex_flags = re.IGNORECASE | re.UNICODE if ignore_case else re.UNICODE
-    found = lambda entry: re.search(
-        regex_needle,
-        entry.path,
-        flags=regex_flags,
-    )
-    return ifilter(found, haystack)
-
-
-def match_fuzzy(needles, haystack, ignore_case=False, threshold=0.6):
-    """
-    Performs an approximate match with the last needle against the end of
-    every path past an acceptable threshold.
-
-    For example:
-        needles = ['foo', 'bar']
-        haystack = [
-            (path='/foo/bar/baz', weight=11),
-            (path='/foo/baz/moo', weight=10),
-            (path='/moo/foo/baz', weight=10),
-            (path='/foo/baz', weight=10),
-            (path='/foo/bar', weight=10),
-        ]
-
-    result = [
-            (path='/foo/bar/baz', weight=11),
-            (path='/moo/foo/baz', weight=10),
-            (path='/foo/baz', weight=10),
-            (path='/foo/bar', weight=10),
-        ]
-
-    This is a weak heuristic and used as a last resort to find matches.
-    """
-    end_dir = lambda path: last(os.path.split(path))
-    if ignore_case:
-        needle = last(needles).lower()
-        match_percent = lambda entry: SequenceMatcher(
-            a=needle,
-            b=end_dir(entry.path.lower()),
-        ).ratio()
-    else:
-        needle = last(needles)
-        match_percent = lambda entry: SequenceMatcher(
-            a=needle,
-            b=end_dir(entry.path),
-        ).ratio()
-    meets_threshold = lambda entry: match_percent(entry) >= threshold
-    return ifilter(meets_threshold, haystack)

bin/autojump_utils.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 from __future__ import print_function
 
@@ -56,8 +56,7 @@ def get_tab_entry_info(entry, separator):
     match_index = re.search(separator + r'([0-9]{1})', entry)
     match_path = re.search(
         separator + r'[0-9]{1}' + separator + r'(.*)',
-        entry,
+        entry)
-    )
 
     if match_needle:
         needle = match_needle.group(1)
@@ -164,9 +163,7 @@ def print_tab_menu(needle, tab_entries, separator):
                 separator,
                 i + 1,
                 separator,
-                entry.path,
+                entry.path))
-            ),
-        )
 
 
 def sanitize(directories):

bin/j.bat

@@ -3,7 +3,7 @@ setlocal EnableDelayedExpansion
 
 echo %*|>nul findstr /rx \-.*
 if ERRORLEVEL 1 (
-  for /f "delims=" %%i in ('python "%~dp0\autojump" %*') do set new_path=%%i
+  for /f %%i in ('python "%~dp0\autojump" %*') do set new_path=%%i
   if exist !new_path!\nul (
     echo !new_path!
 	pushd !new_path!

bin/jo.bat

@@ -3,9 +3,9 @@ setlocal EnableDelayedExpansion
 
 echo %*|>nul findstr /rx \-.*
 if ERRORLEVEL 1 (
-  for /f "delims=" %%i in ('python "%~dp0\autojump" %*') do set new_path=%%i
+  for /f %%i in ('python "%~dp0\autojump" %*') do set new_path=%%i
   if exist !new_path!\nul (
-    start "" "explorer" !new_path!
+    start !new_path!
   ) else (
     echo autojump: directory %* not found
     echo try `autojump --help` for more information

docs/autojump.1

@@ -1,10 +1,7 @@
-.\" Automatically generated by Pandoc 1.16.0.2
+.TH autojump 1 "10 April 2012" "release-v22"
-.\"
-.TH "autojump" "1" "2018\-09\-09" "release\-v22.5.3" ""
-.hy
 .SS NAME
 .PP
-autojump \- a faster way to navigate your filesystem
+autojump - a faster way to navigate your filesystem
 .SS DESCRIPTION
 .PP
 autojump is a faster way to navigate your filesystem.
@@ -32,7 +29,7 @@ Jump To A Child Directory:
 .RS 2
 .PP
 Sometimes it\[aq]s convenient to jump to a child directory
-(sub\-directory of current directory) rather than typing out the full
+(sub-directory of current directory) rather than typing out the full
 name.
 .IP
 .nf
@@ -46,8 +43,8 @@ Open File Manager To Directories (instead of jumping):
 .RS 2
 .PP
 Instead of jumping to a directory, you can open a file explorer window
-(Mac Finder, Windows Explorer, GNOME Nautilus, etc.) to the directory
+(Mac Finder, Windows Explorer, GNOME Nautilus, etc.)
-instead.
+ to the directory instead.
 .IP
 .nf
 \f[C]
@@ -88,12 +85,12 @@ For more options refer to help:
 .IP
 .nf
 \f[C]
-autojump\ \-\-help
+autojump\ --help
 \f[]
 .fi
 .SS KNOWN ISSUES
 .IP \[bu] 2
-autojump does not support directories that begin with \f[C]\-\f[].
+autojump does not support directories that begin with \f[C]-\f[].
 .IP \[bu] 2
 For bash users, autojump keeps track of directories by modifying
 \f[C]$PROMPT_COMMAND\f[].
@@ -102,7 +99,7 @@ Do not overwrite \f[C]$PROMPT_COMMAND\f[]:
 .IP
 .nf
 \f[C]
-export\ PROMPT_COMMAND="history\ \-a"
+export\ PROMPT_COMMAND="history\ -a"
 \f[]
 .fi
 .PP
@@ -110,7 +107,7 @@ Instead append to the end of the existing $PROMPT_COMMAND:
 .IP
 .nf
 \f[C]
-export\ PROMPT_COMMAND="${PROMPT_COMMAND:+$PROMPT_COMMAND\ ;}\ history\ \-a"
+export\ PROMPT_COMMAND="${PROMPT_COMMAND:+$PROMPT_COMMAND\ ;}\ history\ -a"
 \f[]
 .fi
 .RE
@@ -120,7 +117,7 @@ For any questions or issues please visit:
 .IP
 .nf
 \f[C]
-https://github.com/wting/autojump/issues
+https://github.com/joelthelion/autojump/issues
 \f[]
 .fi
 .SS AUTHORS
@@ -130,7 +127,7 @@ maintained by William Ting.
 More contributors can be found in \f[C]AUTHORS\f[].
 .SS COPYRIGHT
 .PP
-Copyright © 2016 Free Software Foundation, Inc.
+Copyright © 2012 Free Software Foundation, Inc.
 License GPLv3+: GNU GPL version 3 or later
 <http://gnu.org/licenses/gpl.html>.
 This is free software: you are free to change and redistribute it.

docs/body.md

@@ -17,7 +17,7 @@ REPORTING BUGS
 
 For any questions or issues please visit:
 
-    https://github.com/wting/autojump/issues
+    https://github.com/joelthelion/autojump/issues
 
 AUTHORS
 -------
@@ -28,7 +28,7 @@ William Ting. More contributors can be found in `AUTHORS`.
 COPYRIGHT
 ---------
 
-Copyright © 2016 Free Software Foundation, Inc. License GPLv3+: GNU  GPL version
+Copyright © 2012 Free Software Foundation, Inc. License GPLv3+: GNU  GPL version
 3 or later <http://gnu.org/licenses/gpl.html>. This is free software: you are
 free to change and redistribute it. There is NO WARRANTY, to the extent
 permitted by law.

docs/install.md

@@ -2,59 +2,28 @@
 
 ### REQUIREMENTS
 
-- Python v2.6+ or Python v3.3+
+- Python v2.6+
-- Supported shells
+- Supported shells:
-    - bash  - first class support
+    - bash v4.0+
-    - zsh - first class support
+    - zsh
-    - fish - community supported
+    - fish
-    - tcsh - community supported
+    - tcsh (experimental)
-    - clink - community supported
+    - clink (Windows, experimental)
-- Supported platforms
-    - Linux - first class support
-    - OS X - first class support
-    - Windows - community supported
-    - BSD - community supported
-- Supported installation methods
-    - source code - first class support
-    - Debian and derivatives - first class support
-    - ArchLinux / Gentoo / openSUSE / RedHat and derivatives - community supported
-    - Homebrew / MacPorts - community supported
-
-Due to limited time and resources, only "first class support" items will be
-maintained by the primary committers. All "community supported" items will be
-updated based on pull requests submitted by the general public.
-
-Please continue opening issues and providing feedback for community supported
-items since consolidating information helps other users troubleshoot and submit
-enhancements and fixes.
-
-### MANUAL
-
-Grab a copy of autojump:
-
-    git clone git://github.com/wting/autojump.git
-
-Run the installation script and follow on screen instructions.
-
-    cd autojump
-    ./install.py or ./uninstall.py
 
 ### AUTOMATIC
 
 #### Linux
 
 autojump is included in the following distro repositories, please use relevant
-package management utilities to install (e.g. apt-get, yum, pacman, etc):
+package management utilities to install (e.g. yum, apt-get, etc):
 
-- Debian, Ubuntu, Linux Mint
+- Debian testing/unstable, Ubuntu, Linux Mint
 
     All Debian-derived distros require manual activation for policy reasons,
     please see `/usr/share/doc/autojump/README.Debian`.
 
-- RedHat, Fedora, CentOS
+- RedHat, Fedora, CentOS (install `autojump-zsh` for zsh, `autojump-fish` for
-
+  fish, etc.)
-    Install `autojump-zsh` for zsh, `autojump-fish` for fish, etc.
-
 - ArchLinux
 - Gentoo
 - Frugalware
@@ -66,11 +35,22 @@ Homebrew is the recommended installation method for Mac OS X:
 
     brew install autojump
 
-MacPorts is also available:
+MacPorts also available:
 
     port install autojump
 
 ## Windows
 
-Windows support is enabled by [clink](https://mridgers.github.io/clink/) which
+Windows support is enabled by [clink](https://code.google.com/p/clink/) which
 should be installed prior to installing autojump.
+
+### MANUAL
+
+Grab a copy of autojump:
+
+    git clone git://github.com/joelthelion/autojump.git
+
+Run the installation script and follow on screen instructions.
+
+    cd autojump
+    ./install.py or ./uninstall.py

docs/manpage_header.md

@@ -1,3 +1,3 @@
-% autojump(1) release-v22.5.3
+% autojump(1) release-v22
 %
-% 2018-09-09
+% 10 April 2012

install.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 from __future__ import print_function
 
@@ -45,8 +45,7 @@ def modify_autojump_lua(clink_dir, bin_dir, dryrun=False):
     """Prepend custom AUTOJUMP_BIN_DIR definition to autojump.lua"""
     custom_install = "local AUTOJUMP_BIN_DIR = \"%s\"\n" % bin_dir.replace(
         '\\',
-        '\\\\',
+        '\\\\')
-    )
     clink_file = os.path.join(clink_dir, 'autojump.lua')
     with open(clink_file, 'r') as f:
         original = f.read()
@@ -58,13 +57,11 @@ def parse_arguments():  # noqa
     if platform.system() == 'Windows':
         default_user_destdir = os.path.join(
             os.getenv('LOCALAPPDATA', ''),
-            'autojump',
+            'autojump')
-        )
     else:
         default_user_destdir = os.path.join(
             os.path.expanduser('~'),
-            '.autojump',
+            '.autojump')
-        )
     default_user_prefix = ''
     default_user_zshshare = 'functions'
     default_system_destdir = '/'
@@ -74,36 +71,28 @@ def parse_arguments():  # noqa
 
     parser = ArgumentParser(
         description='Installs autojump globally for root users, otherwise \
-            installs in current user\'s home directory.'
+            installs in current user\'s home directory.')
-    )
     parser.add_argument(
         '-n', '--dryrun', action='store_true', default=False,
-        help='simulate installation',
+        help='simulate installation')
-    )
     parser.add_argument(
         '-f', '--force', action='store_true', default=False,
-        help='skip root user, shell type, Python version checks',
+        help='skip root user, shell type, Python version checks')
-    )
     parser.add_argument(
         '-d', '--destdir', metavar='DIR', default=default_user_destdir,
-        help='set destination to DIR',
+        help='set destination to DIR')
-    )
     parser.add_argument(
         '-p', '--prefix', metavar='DIR', default=default_user_prefix,
-        help='set prefix to DIR',
+        help='set prefix to DIR')
-    )
     parser.add_argument(
         '-z', '--zshshare', metavar='DIR', default=default_user_zshshare,
-        help='set zsh share destination to DIR',
+        help='set zsh share destination to DIR')
-    )
     parser.add_argument(
         '-c', '--clinkdir', metavar='DIR', default=default_clink_dir,
-        help='set clink directory location to DIR (Windows only)',
+        help='set clink directory location to DIR (Windows only)')
-    )
     parser.add_argument(
         '-s', '--system', action='store_true', default=False,
-        help='install system wide for all users',
+        help='install system wide for all users')
-    )
 
     args = parser.parse_args()
 
@@ -113,24 +102,18 @@ def parse_arguments():  # noqa
             sys.exit(1)
         if args.system:
             if platform.system() == 'Windows':
-                print(
+                print('System-wide installation is not supported on Windows.',
-                    'System-wide installation is not supported on Windows.',
+                      file=sys.stderr)
-                    file=sys.stderr,
-                )
                 sys.exit(1)
             elif os.geteuid() != 0:
-                print(
+                print('Please rerun as root for system-wide installation.',
-                    'Please rerun as root for system-wide installation.',
+                      file=sys.stderr)
-                    file=sys.stderr,
-                )
                 sys.exit(1)
 
         if platform.system() != 'Windows' \
                 and get_shell() not in SUPPORTED_SHELLS:
-            print(
+            print('Unsupported shell: %s' % os.getenv('SHELL'),
-                'Unsupported shell: %s' % os.getenv('SHELL'),
+                  file=sys.stderr)
-                file=sys.stderr,
-            )
             sys.exit(1)
 
     if args.destdir != default_user_destdir \
@@ -142,10 +125,8 @@ def parse_arguments():  # noqa
 
     if args.system:
         if args.custom_install:
-            print(
+            print('Custom paths incompatible with --system option.',
-                'Custom paths incompatible with --system option.',
+                  file=sys.stderr)
-                file=sys.stderr,
-            )
             sys.exit(1)
 
         args.destdir = default_system_destdir
@@ -200,7 +181,6 @@ def main(args):
     cp('./bin/autojump', bin_dir, args.dryrun)
     cp('./bin/autojump_argparse.py', bin_dir, args.dryrun)
     cp('./bin/autojump_data.py', bin_dir, args.dryrun)
-    cp('./bin/autojump_match.py', bin_dir, args.dryrun)
     cp('./bin/autojump_utils.py', bin_dir, args.dryrun)
     cp('./bin/icon.png', share_dir, args.dryrun)
     cp('./docs/autojump.1', doc_dir, args.dryrun)

requirements-dev.txt

@@ -0,0 +1 @@
+tox

tests/autojump_utils_test.py

@@ -6,20 +6,20 @@ import sys
 import mock
 import pytest
 
-sys.path.append(os.path.join(os.getcwd(), 'bin'))  # noqa
+sys.path.append(os.path.join(os.getcwd(), 'bin'))
-import autojump_utils
+import autojump_utils  # noqa
-from autojump_utils import encode_local
+from autojump_utils import encode_local  # noqa
-from autojump_utils import first
+from autojump_utils import first  # noqa
-from autojump_utils import get_tab_entry_info
+from autojump_utils import get_tab_entry_info  # noqa
-from autojump_utils import has_uppercase
+from autojump_utils import has_uppercase  # noqa
-from autojump_utils import in_bash
+from autojump_utils import in_bash  # noqa
-from autojump_utils import is_python3
+from autojump_utils import is_python3  # noqa
-from autojump_utils import last
+from autojump_utils import last  # noqa
-from autojump_utils import sanitize
+from autojump_utils import sanitize  # noqa
-from autojump_utils import second
+from autojump_utils import second  # noqa
-from autojump_utils import surround_quotes
+from autojump_utils import surround_quotes  # noqa
-from autojump_utils import take
+from autojump_utils import take  # noqa
-from autojump_utils import unico
+from autojump_utils import unico  # noqa
 
 
 if is_python3():

tests/unit/autojump_match_test.py

@@ -1,131 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-import os
-import sys
-
-import pytest
-
-sys.path.append(os.path.join(os.getcwd(), 'bin'))  # noqa
-from autojump_data import Entry
-from autojump_match import match_anywhere
-from autojump_match import match_consecutive
-
-
-class TestMatchAnywhere(object):
-
-    entry1 = Entry('/foo/bar/baz', 10)
-    entry2 = Entry('/baz/foo/bar', 10)
-    entry3 = Entry('/foo/baz', 10)
-    entry4 = Entry('/中/zhong/国/guo', 10)
-    entry5 = Entry('/is\'t/this/a/b*tchin/edge/case?', 10)
-    win_entry1 = Entry('C:\\foo\\bar\\baz', 10)
-    win_entry2 = Entry('D:\Program Files (x86)\GIMP', 10)
-    win_entry3 = Entry('C:\Windows\System32', 10)
-
-    @pytest.fixture
-    def haystack(self):
-        return [
-            self.entry1,
-            self.entry2,
-            self.entry3,
-            self.entry4,
-            self.entry5,
-        ]
-
-    @pytest.fixture
-    def windows_haystack(self):
-        return [self.win_entry1, self.win_entry2, self.win_entry3]
-
-    def test_single_needle(self, haystack):
-        assert list(match_anywhere(['bar'], haystack)) == [self.entry1, self.entry2]
-
-    def test_consecutive(self, haystack):
-        assert list(match_anywhere(['foo', 'bar'], haystack)) \
-            == [self.entry1, self.entry2]
-        assert list(match_anywhere(['bar', 'foo'], haystack)) == []
-
-    def test_skip(self, haystack):
-        assert list(match_anywhere(['baz', 'bar'], haystack)) == [self.entry2]
-        assert list(match_anywhere(['中', '国'], haystack)) == [self.entry4]
-
-    def test_ignore_case(self, haystack):
-        assert list(match_anywhere(['bAz', 'bAR'], haystack, ignore_case=True)) \
-            == [self.entry2]
-
-    def test_backslashes_for_windows_paths(self, windows_haystack):
-        # https://github.com/wting/autojump/issues/281
-        assert list(match_anywhere(['foo', 'baz'], windows_haystack)) \
-            == [self.win_entry1]
-        assert list(match_anywhere(['program', 'gimp'], windows_haystack, True)) \
-            == [self.win_entry2]
-        assert list(match_anywhere(['win', '32'], windows_haystack, True)) \
-            == [self.win_entry3]
-
-    def test_wildcard_in_needle(self, haystack):
-        # https://github.com/wting/autojump/issues/402
-        assert list(match_anywhere(['*', 'this'], haystack)) == []
-        assert list(match_anywhere(['this', '*'], haystack)) == [self.entry5]
-
-
-class TestMatchConsecutive(object):
-
-    entry1 = Entry('/foo/bar/baz', 10)
-    entry2 = Entry('/baz/foo/bar', 10)
-    entry3 = Entry('/foo/baz', 10)
-    entry4 = Entry('/中/zhong/国/guo', 10)
-    entry5 = Entry('/日/本', 10)
-    entry6 = Entry('/is\'t/this/a/b*tchin/edge/case?', 10)
-    win_entry1 = Entry('C:\Foo\Bar\Baz', 10)
-    win_entry2 = Entry('D:\Program Files (x86)\GIMP', 10)
-    win_entry3 = Entry('C:\Windows\System32', 10)
-
-    @pytest.fixture
-    def haystack(self):
-        return [
-            self.entry1,
-            self.entry2,
-            self.entry3,
-            self.entry4,
-            self.entry5,
-        ]
-
-    @pytest.fixture
-    def windows_haystack(self):
-        return [self.win_entry1, self.win_entry2, self.win_entry3]
-
-    def test_single_needle(self, haystack):
-        assert list(match_consecutive(['baz'], haystack)) == [self.entry1, self.entry3]
-        assert list(match_consecutive(['本'], haystack)) == [self.entry5]
-
-    def test_consecutive(self, haystack):
-        assert list(match_consecutive(['bar', 'baz'], haystack)) == [self.entry1]
-        assert list(match_consecutive(['foo', 'bar'], haystack)) == [self.entry2]
-        assert list(match_consecutive(['国', 'guo'], haystack)) == [self.entry4]
-        assert list(match_consecutive(['bar', 'foo'], haystack)) == []
-
-    def test_ignore_case(self, haystack):
-        assert list(match_consecutive(['FoO', 'bAR'], haystack, ignore_case=True)) \
-            == [self.entry2]
-
-    def test_windows_ignore_case(self, windows_haystack):
-        assert list(match_consecutive(['gimp'], windows_haystack, True)) == [self.win_entry2]
-
-    @pytest.mark.xfail(reason='https://github.com/wting/autojump/issues/418')
-    def test_backslashes_for_windows_paths(self, windows_haystack):
-        assert list(match_consecutive(['program', 'gimp'], windows_haystack, True)) \
-            == [self.win_entry2]
-
-    @pytest.mark.xfail(reason='https://github.com/wting/autojump/issues/418')
-    def test_foo_bar_baz(self, windows_haystack):
-        assert list(match_consecutive(['bar', 'baz'], windows_haystack, ignore_case=True)) \
-            == [self.win_entry1]
-
-    @pytest.mark.xfail(reason='https://github.com/wting/autojump/issues/402')
-    def test_thing(self, windows_haystack):
-        assert list(match_consecutive(['win', '32'], windows_haystack, True)) \
-            == [self.win_entry3]
-
-    @pytest.mark.xfail(reason='https://github.com/wting/autojump/issues/402')
-    def test_wildcard_in_needle(self, haystack):
-        assert list(match_consecutive(['*', 'this'], haystack)) == []
-        assert list(match_consecutive(['*', 'edge', 'case'], haystack)) == [self.entry6]

tools/autojump_ipython.py

@@ -28,12 +28,10 @@ def j(path):
     newpath = Popen(
         cmd,
         stdout=PIPE,
-        shell=False,
+        shell=False).communicate()[0].strip()
-    ).communicate()[0].strip()
 
     if newpath:
         ip.magic('cd %s' % newpath.decode('utf-8'))
 
-
 # remove from namespace
 del j

tox.ini

@@ -2,13 +2,13 @@
 envlist =
     py26,
     py27,
+    py32,
     py33,
-    py34,
+    py34
-    py35
 # ignore missing setup.py
 skipsdist = True
 
-[testenv]
+[testenv:py]
 setenv =
     PYTHONDONTWRITEBYTECODE = 1
 deps =
@@ -16,17 +16,24 @@ deps =
     coverage
     ipdb
     ipython
-    pytest >= 2.9
+    pytest
 commands =
-    coverage run --source=bin/ --omit=bin/autojump_argparse.py -m \
+    coverage run --source=bin/ -m pytest -vv -rxs --tb native -s --durations 10 --strict {posargs:tests}
-        py.test -vv -rxs --tb native -s --strict {posargs:tests}
     coverage report -m
 
+[testenv:flake8]
+deps =
+    flake8
+    pyflakes
+    pep8
+    mccabe
+commands =
+    flake8 .
 
 [testenv:pre-commit]
 deps =
-    pre-commit>=0.7.0
+    pre-commit
-commands =
+command =
     pre-commit {posargs}
 
 [pytest]

uninstall.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 from __future__ import print_function
 
@@ -25,31 +25,24 @@ def parse_arguments():
     default_clink_dir = os.path.join(os.getenv('LOCALAPPDATA', ''), 'clink')
 
     parser = ArgumentParser(
-        description='Uninstalls autojump.',
+        description='Uninstalls autojump.')
-    )
     parser.add_argument(
         '-n', '--dryrun', action='store_true', default=False,
-        help='simulate installation',
+        help='simulate installation')
-    )
     parser.add_argument(
         '-u', '--userdata', action='store_true', default=False,
-        help='delete user data',
+        help='delete user data')
-    )
     parser.add_argument(
         '-d', '--destdir', metavar='DIR',
-        help='custom destdir',
+        help='custom destdir')
-    )
     parser.add_argument(
         '-p', '--prefix', metavar='DIR', default='',
-        help='custom prefix',
+        help='custom prefix')
-    )
     parser.add_argument(
         '-z', '--zshshare', metavar='DIR', default='functions',
-        help='custom zshshare',
+        help='custom zshshare')
-    )
     parser.add_argument(
-        '-c', '--clinkdir', metavar='DIR', default=default_clink_dir,
+        '-c', '--clinkdir', metavar='DIR', default=default_clink_dir)
-    )
 
     return parser.parse_args()
 
@@ -105,15 +98,13 @@ def remove_system_installation(dryrun=False):
         default_prefix,
         'share',
         'man',
-        'man1',
+        'man1')
-    )
     etc_dir = os.path.join(default_destdir, 'etc', 'profile.d')
     share_dir = os.path.join(
         default_destdir,
         default_prefix,
         'share',
-        'autojump',
+        'autojump')
-    )
     zshshare_dir = os.path.join(default_destdir, default_zshshare)
 
     if not os.path.exists(share_dir):
@@ -122,10 +113,8 @@ def remove_system_installation(dryrun=False):
     print('\nFound system installation...')
 
     if os.geteuid() != 0:
-        print(
+        print('Please rerun as root for system-wide uninstall, skipping...',
-            'Please rerun as root for system-wide uninstall, skipping...',
+              file=sys.stderr)
-            file=sys.stderr,
-        )
         return
 
     rm(os.path.join(bin_dir, 'autojump'), dryrun)
@@ -146,13 +135,11 @@ def remove_user_data(dryrun=False):
         data_home = os.path.join(
             os.path.expanduser('~'),
             'Library',
-            'autojump',
+            'autojump')
-        )
     elif platform.system() == 'Windows':
         data_home = os.path.join(
             os.getenv('APPDATA'),
-            'autojump',
+            'autojump')
-        )
     else:
         data_home = os.getenv(
             'XDG_DATA_HOME',
@@ -160,9 +147,7 @@ def remove_user_data(dryrun=False):
                 os.path.expanduser('~'),
                 '.local',
                 'share',
-                'autojump',
+                'autojump'))
-            ),
-        )
 
     if os.path.exists(data_home):
         print('\nFound user data...')
@@ -171,10 +156,8 @@ def remove_user_data(dryrun=False):
 
 def remove_user_installation(dryrun=False):
     if platform.system() == 'Windows':
-        default_destdir = os.path.join(
+        default_destdir = os.path.join(os.getenv('LOCALAPPDATA', ''),
-            os.getenv('LOCALAPPDATA', ''),
+                                       'autojump')
-            'autojump',
-        )
         clink_dir = os.path.join(os.getenv('LOCALAPPDATA', ''), 'clink')
     else:
         default_destdir = os.path.join(os.path.expanduser('~'), '.autojump')