Merge lp:~fgallina/conn-check/configs-dont-mess-with-caches into lp:~ubuntuone-hackers/conn-check/configs

[Fabián Ezequiel Gallina]

Properly handle single value CACHES locations

The `location` key in CACHES can either be a single value string or a list. The code already attempted to wrap the value if it was not an iterable, but since strings are iterables in python the logic was wrong.

[Natalia Bidart (nataliabidart)]

15:10 < fgallina> nessita: yeah, isinstance against `types.StringTypes` and `basestring` should be equivalent, but it gave me also a quick win for making it py3 compatible.
15:10 < fgallina>| hackity hack
15:11 < nessita> fgallina, and this code has no tests? :-
15:11 < nessita> wesleeeeeeeey
15:11 < fgallina> nessita: I feel most sad there are no tests for this code whatsoever and I felt compelled to add some but I didn't want to waste much time on this fix.
15:12 < fgallina> nessita: there's an empty tests.py ;_;
15:12 < nessita> ack

review: Approve

=== modified file 'conn_check_configs/django.py'
--- conn_check_configs/django.py	2015-12-07 03:43:57 +0000
+++ conn_check_configs/django.py	2017-05-26 14:57:39 +0000
@@ -6,6 +6,7 @@
 import collections
 import os
 import sys
+import types
 import yaml
 
 
@@ -130,7 +131,15 @@
                 'django.core.cache.backends.memcached.MemcachedCache'):
 
             locations = cache['LOCATION']
-            if not isinstance(locations, collections.Iterable):
+            # XXX: Hackish
+            string_types = getattr(
+                types, 'StringTypes',  # Python 2
+                (str, bytes)  # Python 3
+            )
+            should_wrap = (
+                isinstance(locations, string_types) or
+                not isinstance(locations, collections.Iterable))
+            if should_wrap:
                 locations = [locations]
 
             for location in locations: