Merge lp:~bloodearnest/conn-check/config-memcached-string into lp:~ubuntuone-hackers/conn-check/configs

Proposed by Simon Davy
Status: Rejected
Rejected by: Adam Collard
Proposed branch: lp:~bloodearnest/conn-check/config-memcached-string
Merge into: lp:~ubuntuone-hackers/conn-check/configs
Diff against target: 12 lines (+1/-1)
1 file modified
conn_check_configs/django.py (+1/-1)
To merge this branch: bzr merge lp:~bloodearnest/conn-check/config-memcached-string
Reviewer Review Type Date Requested Status
Ubuntu One hackers Pending
Review via email: mp+272943@code.launchpad.net

Commit message

Fix django memcached check when it's just a string

Description of the change

Fix django memcached check when it's just a string

To post a comment you must log in.

Unmerged revisions

24. By Canonical IS Robot

fix memcached check when string

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'conn_check_configs/django.py'
--- conn_check_configs/django.py 2015-02-26 15:03:35 +0000
+++ conn_check_configs/django.py 2015-09-30 16:11:05 +0000
@@ -120,7 +120,7 @@
120 'django.core.cache.backends.memcached.MemcachedCache'):120 'django.core.cache.backends.memcached.MemcachedCache'):
121121
122 locations = cache['LOCATION']122 locations = cache['LOCATION']
123 if not isinstance(locations, collections.Iterable):123 if not isinstance(locations, (list, tuple)):
124 locations = [locations]124 locations = [locations]
125125
126 for location in locations:126 for location in locations:

Subscribers

People subscribed via source and target branches

to all changes: