Merge pull request #406 from mcarton/py2→3

Fix cache problem when going from Python 2 to 3

tests/rules/test_dirty_untar.py

@@ -63,6 +63,7 @@ def test_side_effect(ext, tar_error, filename, unquoted, quoted, script, fixed):
     side_effect(Command(script=script.format(filename.format(ext))), None)
     assert set(os.listdir('.')) == {unquoted.format(ext), 'd'}
 
+
 @parametrize_extensions
 @parametrize_filename
 @parametrize_script

tests/rules/test_mkdir_p.py

@@ -7,7 +7,7 @@ from tests.utils import Command
     Command('mkdir foo/bar/baz', stderr='mkdir: foo/bar: No such file or directory'),
     Command('./bin/hdfs dfs -mkdir foo/bar/baz', stderr='mkdir: `foo/bar/baz\': No such file or directory'),
     Command('hdfs dfs -mkdir foo/bar/baz', stderr='mkdir: `foo/bar/baz\': No such file or directory')
-    ])
+])
 def test_match(command):
     assert match(command)
 
@@ -17,7 +17,8 @@ def test_match(command):
     Command('mkdir foo/bar/baz', stderr='foo bar baz'),
     Command('hdfs dfs -mkdir foo/bar/baz'),
     Command('./bin/hdfs dfs -mkdir foo/bar/baz'),
-    Command()])
+    Command(),
+])
 def test_not_match(command):
     assert not match(command)
 
@@ -25,7 +26,7 @@ def test_not_match(command):
 @pytest.mark.parametrize('command, new_command', [
     (Command('mkdir foo/bar/baz'), 'mkdir -p foo/bar/baz'),
     (Command('hdfs dfs -mkdir foo/bar/baz'), 'hdfs dfs -mkdir -p foo/bar/baz'),
-    (Command('./bin/hdfs dfs -mkdir foo/bar/baz'), './bin/hdfs dfs -mkdir -p foo/bar/baz')])
+    (Command('./bin/hdfs dfs -mkdir foo/bar/baz'), './bin/hdfs dfs -mkdir -p foo/bar/baz'),
+])
 def test_get_new_command(command, new_command):
     assert get_new_command(command) == new_command
-

tests/rules/test_mvn_no_command.py

@@ -32,9 +32,9 @@ def test_match(command):
 def test_not_match(command):
     assert not match(command)
 
+
 @pytest.mark.parametrize('command, new_command', [
     (Command(script='mvn', stdout='[ERROR] No goals have been specified for this build. You must specify a valid lifecycle phase or a goal in the format <plugin-prefix>:<goal> or <plugin-group-id>:<plugin-artifact-id>[:<plugin-version>]:<goal>. Available lifecycle phases are: validate, initialize, generate-sources, process-sources, generate-resources, process-resources, compile, process-classes, generate-test-sources, process-test-sources, generate-test-resources, process-test-resources, test-compile, process-test-classes, test, prepare-package, package, pre-integration-test, integration-test, post-integration-test, verify, install, deploy, pre-clean, clean, post-clean, pre-site, site, post-site, site-deploy. -> [Help 1]'), ['mvn clean package', 'mvn clean install']),
     (Command(script='mvn -N', stdout='[ERROR] No goals have been specified for this build. You must specify a valid lifecycle phase or a goal in the format <plugin-prefix>:<goal> or <plugin-group-id>:<plugin-artifact-id>[:<plugin-version>]:<goal>. Available lifecycle phases are: validate, initialize, generate-sources, process-sources, generate-resources, process-resources, compile, process-classes, generate-test-sources, process-test-sources, generate-test-resources, process-test-resources, test-compile, process-test-classes, test, prepare-package, package, pre-integration-test, integration-test, post-integration-test, verify, install, deploy, pre-clean, clean, post-clean, pre-site, site, post-site, site-deploy. -> [Help 1]'), ['mvn -N clean package', 'mvn -N clean install'])])
 def test_get_new_command(command, new_command):
     assert get_new_command(command) == new_command
-

tests/rules/test_mvn_unknown_lifecycle_phase.py

@@ -32,9 +32,9 @@ def test_match(command):
 def test_not_match(command):
     assert not match(command)
 
+
 @pytest.mark.parametrize('command, new_command', [
     (Command(script='mvn cle', stdout='[ERROR] Unknown lifecycle phase "cle". You must specify a valid lifecycle phase or a goal in the format <plugin-prefix>:<goal> or <plugin-group-id>:<plugin-artifact-id>[:<plugin-version>]:<goal>. Available lifecycle phases are: validate, initialize, generate-sources, process-sources, generate-resources, process-resources, compile, process-classes, generate-test-sources, process-test-sources, generate-test-resources, process-test-resources, test-compile, process-test-classes, test, prepare-package, package, pre-integration-test, integration-test, post-integration-test, verify, install, deploy, pre-clean, clean, post-clean, pre-site, site, post-site, site-deploy. -> [Help 1]'), ['mvn clean', 'mvn compile']),
     (Command(script='mvn claen package', stdout='[ERROR] Unknown lifecycle phase "claen". You must specify a valid lifecycle phase or a goal in the format <plugin-prefix>:<goal> or <plugin-group-id>:<plugin-artifact-id>[:<plugin-version>]:<goal>. Available lifecycle phases are: validate, initialize, generate-sources, process-sources, generate-resources, process-resources, compile, process-classes, generate-test-sources, process-test-sources, generate-test-resources, process-test-resources, test-compile, process-test-classes, test, prepare-package, package, pre-integration-test, integration-test, post-integration-test, verify, install, deploy, pre-clean, clean, post-clean, pre-site, site, post-site, site-deploy. -> [Help 1]'), ['mvn clean package'])])
 def test_get_new_command(command, new_command):
     assert get_new_command(command) == new_command
-

tests/rules/test_no_such_file.py

@@ -6,7 +6,7 @@ from tests.utils import Command
 @pytest.mark.parametrize('command', [
     Command(script='mv foo bar/foo', stderr="mv: cannot move 'foo' to 'bar/foo': No such file or directory"),
     Command(script='mv foo bar/', stderr="mv: cannot move 'foo' to 'bar/': No such file or directory"),
-    ])
+])
 def test_match(command):
     assert match(command)
 
@@ -14,7 +14,7 @@ def test_match(command):
 @pytest.mark.parametrize('command', [
     Command(script='mv foo bar/', stderr=""),
     Command(script='mv foo bar/foo', stderr="mv: permission denied"),
-    ])
+])
 def test_not_match(command):
     assert not match(command)
 
@@ -22,6 +22,6 @@ def test_not_match(command):
 @pytest.mark.parametrize('command, new_command', [
     (Command(script='mv foo bar/foo', stderr="mv: cannot move 'foo' to 'bar/foo': No such file or directory"), 'mkdir -p bar && mv foo bar/foo'),
     (Command(script='mv foo bar/', stderr="mv: cannot move 'foo' to 'bar/': No such file or directory"), 'mkdir -p bar && mv foo bar/'),
-    ])
+])
 def test_get_new_command(command, new_command):
     assert get_new_command(command) == new_command

tests/rules/test_rm_dir.py

@@ -7,8 +7,8 @@ from tests.utils import Command
     Command('rm foo', stderr='rm: foo: is a directory'),
     Command('rm foo', stderr='rm: foo: Is a directory'),
     Command('hdfs dfs -rm foo', stderr='rm: `foo`: Is a directory'),
-    Command('./bin/hdfs dfs -rm foo', stderr='rm: `foo`: Is a directory')
-    ])
+    Command('./bin/hdfs dfs -rm foo', stderr='rm: `foo`: Is a directory'),
+])
 def test_match(command):
     assert match(command)
 
@@ -17,15 +17,15 @@ def test_match(command):
     Command('rm foo'),
     Command('hdfs dfs -rm foo'),
     Command('./bin/hdfs dfs -rm foo'),
-    Command()])
+    Command(),
+])
 def test_not_match(command):
     assert not match(command)
 
 
 @pytest.mark.parametrize('command, new_command', [
     (Command('rm foo'), 'rm -rf foo'),
-    (Command('hdfs dfs -rm foo'), 'hdfs dfs -rm -r foo')])
+    (Command('hdfs dfs -rm foo'), 'hdfs dfs -rm -r foo'),
+])
 def test_get_new_command(command, new_command):
     assert get_new_command(command) == new_command
-
-

tests/rules/test_ssh_known_host.py

@@ -1,6 +1,5 @@
 import os
 import pytest
-from mock import Mock
 from thefuck.rules.ssh_known_hosts import match, get_new_command,\
     side_effect
 from tests.utils import Command

tests/rules/test_systemctl.py

@@ -1,4 +1,3 @@
-import pytest
 from thefuck.rules.systemctl import match, get_new_command
 from tests.utils import Command
 

tests/rules/test_unknown_command.py

@@ -32,4 +32,3 @@ def test_not_match(command):
         stderr='ls: Unknown command\nDid you mean -ls?  This command begins with a dash.'), ['./bin/hdfs dfs -Dtest=fred -ls -R /foo/bar'])])
 def test_get_new_command(command, new_command):
     assert get_new_command(command) == new_command
-

tests/rules/test_vagrant_up.py

@@ -32,4 +32,3 @@ def test_not_match(command):
             stderr='VM must be created before running this command. Run `vagrant up` first.'), ['vagrant up devbox && vagrant rdp devbox', 'vagrant up && vagrant rdp devbox'])])
 def test_get_new_command(command, new_command):
     assert get_new_command(command) == new_command
-

tests/specific/test_sudo.py

@@ -1,5 +1,4 @@
 import pytest
-from mock import Mock
 from thefuck.specific.sudo import sudo_support
 from tests.utils import Command
 

tests/test_logs.py

@@ -1,5 +1,4 @@
 import pytest
-from mock import Mock
 from thefuck import logs
 
 

tests/test_types.py

@@ -122,4 +122,3 @@ class TestCommand(object):
         else:
             with pytest.raises(EmptyCommand):
                 Command.from_raw_script(script)
-

thefuck/rules/fix_file.py

@@ -7,31 +7,31 @@ from thefuck import shells
 
 # order is important: only the first match is considered
 patterns = (
-        # js, node:
-        '^    at {file}:{line}:{col}',
-        # cargo:
-        '^   {file}:{line}:{col}',
-        # python, thefuck:
-        '^  File "{file}", line {line}',
-        # awk:
-        '^awk: {file}:{line}:',
-        # git
-        '^fatal: bad config file line {line} in {file}',
-        # llc:
-        '^llc: {file}:{line}:{col}:',
-        # lua:
-        '^lua: {file}:{line}:',
-        # fish:
-        '^{file} \\(line {line}\\):',
-        # bash, sh, ssh:
-        '^{file}: line {line}: ',
-        # cargo, clang, gcc, go, pep8, rustc:
-        '^{file}:{line}:{col}',
-        # ghc, make, ruby, zsh:
-        '^{file}:{line}:',
-        # perl:
-        'at {file} line {line}',
-    )
+    # js, node:
+    '^    at {file}:{line}:{col}',
+    # cargo:
+    '^   {file}:{line}:{col}',
+    # python, thefuck:
+    '^  File "{file}", line {line}',
+    # awk:
+    '^awk: {file}:{line}:',
+    # git
+    '^fatal: bad config file line {line} in {file}',
+    # llc:
+    '^llc: {file}:{line}:{col}:',
+    # lua:
+    '^lua: {file}:{line}:',
+    # fish:
+    '^{file} \\(line {line}\\):',
+    # bash, sh, ssh:
+    '^{file}: line {line}: ',
+    # cargo, clang, gcc, go, pep8, rustc:
+    '^{file}:{line}:{col}',
+    # ghc, make, ruby, zsh:
+    '^{file}:{line}:',
+    # perl:
+    'at {file} line {line}',
+)
 
 
 # for the sake of readability do not use named groups above

thefuck/rules/unknown_command.py

@@ -1,6 +1,7 @@
 import re
 from thefuck.utils import replace_command
 
+
 def match(command):
     return (re.search(r"([^:]*): Unknown command.*", command.stderr) != None
             and re.search(r"Did you mean ([^?]*)?", command.stderr) != None)
@@ -10,4 +11,3 @@ def get_new_command(command):
     broken_cmd = re.findall(r"([^:]*): Unknown command.*", command.stderr)[0]
     matched = re.findall(r"Did you mean ([^?]*)?", command.stderr)
     return replace_command(command, broken_cmd, matched)
-

thefuck/rules/vagrant_up.py

@@ -17,4 +17,4 @@ def get_new_command(command):
     if machine is None:
         return startAllInstances
     else:
-        return [ shells.and_("vagrant up " +  machine, command.script), startAllInstances]
+        return [shells.and_("vagrant up " + machine, command.script), startAllInstances]

thefuck/specific/sudo.py

@@ -1,6 +1,5 @@
 import six
 from decorator import decorator
-from ..types import Command
 
 
 @decorator

thefuck/utils.py

@@ -1,18 +1,17 @@
-from difflib import get_close_matches
-from functools import wraps
-import shelve
-from warnings import warn
-from decorator import decorator
-from contextlib import closing
-
+import dbm
 import os
 import pickle
-import re
-from inspect import getargspec
-
-from pathlib import Path
 import pkg_resources
+import re
+import shelve
 from .conf import settings
+from contextlib import closing
+from decorator import decorator
+from difflib import get_close_matches
+from functools import wraps
+from inspect import getargspec
+from pathlib import Path
+from warnings import warn
 
 DEVNULL = open(os.devnull, 'w')
 
@@ -210,13 +209,24 @@ def cache(*depends_on):
         etag = '.'.join(_get_mtime(name) for name in depends_on)
         cache_path = _get_cache_path()
 
-        with closing(shelve.open(cache_path)) as db:
-            if db.get(key, {}).get('etag') == etag:
-                return db[key]['value']
-            else:
+        try:
+            with closing(shelve.open(cache_path)) as db:
+                if db.get(key, {}).get('etag') == etag:
+                    return db[key]['value']
+                else:
+                    value = fn(*args, **kwargs)
+                    db[key] = {'etag': etag, 'value': value}
+                    return value
+        except dbm.error:
+            # Caused when going from Python 2 to Python 3
+            warn("Removing possibly out-dated cache")
+            os.remove(cache_path)
+
+            with closing(shelve.open(cache_path)) as db:
                 value = fn(*args, **kwargs)
                 db[key] = {'etag': etag, 'value': value}
                 return value
+
     return _cache
 cache.disabled = False