MirroredRepos/thefuck
1
0
Fork 0
mirror of https://github.com/nvbn/thefuck.git synced 2025-02-22 12:58:33 +00:00
Code Issues Releases Wiki Activity

Merge pull request #436 from scorphus/shelve-open-errors

Browse Source 
Fix cache problem when going from Python 3 to 2
This commit is contained in:
Vladimir Iakovlev 2016-01-22 16:56:08 +03:00
commit 934870f650
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
thefuck/utils.py
View File

@ -4,6 +4,7 @@ import pickle
import pkg_resources import pkg_resources
import re import re
import shelve import shelve
import six
from .conf import settings from .conf import settings
from contextlib import closing from contextlib import closing
from decorator import decorator from decorator import decorator
@ -15,6 +16,11 @@ from warnings import warn
DEVNULL = open(os.devnull, 'w') DEVNULL = open(os.devnull, 'w')
shelve_open_errors = (dbm.error, )
if six.PY2:
import gdbm
shelve_open_errors += (gdbm.error, )
def memoize(fn): def memoize(fn):
"""Caches previous calls to the function.""" """Caches previous calls to the function."""
@ -217,8 +223,8 @@ def cache(*depends_on):
value = fn(*args, **kwargs) value = fn(*args, **kwargs)
db[key] = {'etag': etag, 'value': value} db[key] = {'etag': etag, 'value': value}
return value return value
except dbm.error: except shelve_open_errors:
# Caused when going from Python 2 to Python 3 # Caused when going from Python 2 to Python 3 and vice-versa
warn("Removing possibly out-dated cache") warn("Removing possibly out-dated cache")
os.remove(cache_path) os.remove(cache_path)