Skip to content

Updating to reflect changes in 1.7 #3

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

Updating to reflect changes in 1.7 #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 29 additions & 10 deletions django_elasticache/memcached.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,33 @@ def _cache(self):
# PylibMC uses cache options as the 'behaviors' attribute.
# It also needs to use threadlocals, because some versions of
# PylibMC don't play well with the GIL.
client = getattr(self._local, 'client', None)
if client:

# Django < 1.7
if hasattr(self, '_local'):

client = getattr(self._local, 'client', None)
if client:
return client

client = self._lib.Client(self.get_cluster_nodes)
if self._options:
client.behaviors = self._options

self._local.client = client

return client

# Django == 1.7
else:

client = getattr(self, '_client', None)
if client:
return client

client = self._lib.Client(self.get_cluster_nodes)
if self._options:
client.behaviors = self._options

self._client = client

return client

client = self._lib.Client(self.get_cluster_nodes)
if self._options:
client.behaviors = self._options

self._local.client = client

return client