Merge pull request #523 from basho/features/lrb/gh-405

Add a workaround for Python bug 19542

Author: lukebakken

riak/client/__init__.py

@@ -275,8 +275,9 @@ def bucket(self, name, bucket_type='default'):
             raise TypeError('bucket_type must be a string '
                             'or riak.bucket.BucketType')
 
-        return self._buckets.setdefault((bucket_type, name),
-                                        RiakBucket(self, name, bucket_type))
+        b = RiakBucket(self, name, bucket_type)
+        return self._setdefault_handle_none(
+                self._buckets, (bucket_type, name), b)
 
     def bucket_type(self, name):
         """
@@ -291,12 +292,9 @@ def bucket_type(self, name):
         if not isinstance(name, string_types):
             raise TypeError('BucketType name must be a string')
 
-        if name in self._bucket_types:
-            return self._bucket_types[name]
-        else:
-            btype = BucketType(self, name)
-            self._bucket_types[name] = btype
-            return btype
+        btype = BucketType(self, name)
+        return self._setdefault_handle_none(
+                self._bucket_types, name, btype)
 
     def table(self, name):
         """
@@ -390,6 +388,16 @@ def _error_rate(node):
         else:
             return random.choice(good)
 
+    def _setdefault_handle_none(self, wvdict, key, value):
+        # TODO FIXME FUTURE
+        # This is a workaround for Python issue 19542
+        # http://bugs.python.org/issue19542
+        rv = wvdict.setdefault(key, value)
+        if rv is None:
+            return value
+        else:
+            return rv
+
     @lazy_property
     def _multiget_pool(self):
         if self._multiget_pool_size: