Merge pull request #274 from basho/bugfix/bucket-name-type

Disallow non-string bucket names. Fixes #268

Author: Sean Cribbs

riak/bucket.py

@@ -55,6 +55,8 @@ def __init__(self, client, name):
         try:
             if isinstance(name, basestring):
                 name = name.encode('ascii')
+            else:
+                raise TypeError('Bucket name must be a string')
         except UnicodeError:
             raise TypeError('Unicode bucket names are not supported.')
 

riak/client/__init__.py

@@ -239,6 +239,9 @@ def bucket(self, name):
 
         :rtype: :class:`RiakBucket <riak.bucket.RiakBucket>`
         """
+        if not isinstance(name, basestring):
+            raise TypeError('Bucket name must be a string')
+
         if name in self._buckets:
             return self._buckets[name]
         else:

riak/tests/test_kv.py

@@ -4,7 +4,7 @@
 import copy
 import platform
 from time import sleep
-from riak import ConflictError
+from riak import ConflictError, RiakBucket
 from riak.resolver import default_resolver, last_written_resolver
 try:
     import simplejson as json
@@ -95,6 +95,25 @@ def test_store_unicode_string(self):
         obj2 = bucket.get(self.key_name)
         self.assertEqual(data, obj2.encoded_data.decode('utf-8'))
 
+    def test_string_bucket_name(self):
+        # Things that are not strings cannot be bucket names
+        for bad in (12345, True, None, {}, []):
+            with self.assertRaisesRegexp(TypeError, 'must be a string'):
+                self.client.bucket(bad)
+
+            with self.assertRaisesRegexp(TypeError, 'must be a string'):
+                RiakBucket(self.client, bad)
+
+        # Unicode bucket names are not supported, if they can't be
+        # encoded to ASCII. This should be changed in a future
+        # release.
+        with self.assertRaisesRegexp(TypeError,
+                                     'Unicode bucket names are not supported'):
+            self.client.bucket(u'føø')
+
+        # This is fine, since it's already ASCII
+        self.client.bucket('ASCII')
+
     def test_generate_key(self):
         # Ensure that Riak generates a random key when
         # the key passed to bucket.new() is None.