Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CacheControl import. #357

Merged
merged 1 commit into from
Jan 31, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions pex/http.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@
try:
from cachecontrol import CacheControl
from cachecontrol.caches import FileCache

# Newer versions of CacheControl move the importing of `lockfile` to
# class instansiation, and raise an ImportError in the __init__ method.
#
# https://github.com/ionrock/cachecontrol/commit/a561ac9c1ef15db9bc6ead5d08443e6198cc69e1
FileCache(directory=None) # noqa
except ImportError:
CacheControl = FileCache = None

Expand Down