Merge.

riak/bucket.py

@@ -64,7 +64,7 @@ def set_r(self, r):
         self._r = r
         return self
 
-    def get_w(self, w):
+    def get_w(self, w=None):
         """
         Get the W-value for this bucket, if it is set, otherwise return
         the W-value for the client.
@@ -85,7 +85,7 @@ def set_w(self, w):
         self._w = w
         return self
 
-    def get_dw(self, dw):
+    def get_dw(self, dw=None):
         """
         Get the DW-value for this bucket, if it is set, otherwise return
         the DW-value for the client.
@@ -106,7 +106,7 @@ def set_dw(self, dw):
         self._dw = dw
         return self
 
-    def get_rw(self, rw):
+    def get_rw(self, rw=None):
         """
         Get the RW-value for this bucket, if it is set, otherwise return
         the RW-value for the client.

riak/tests/test_all.py

@@ -147,6 +147,25 @@ def test_set_bucket_properties(self):
         self.assertFalse(bucket.get_allow_multiples())
         self.assertEqual(bucket.get_n_val(), 2)
 
+    def test_rw_settings(self):
+        bucket = self.client.bucket('rwsettings')
+        self.assertEqual(bucket.get_r(), "default")
+        self.assertEqual(bucket.get_w(), "default")
+        self.assertEqual(bucket.get_dw(), "default")
+        self.assertEqual(bucket.get_rw(), "default")
+
+        bucket.set_w(1)
+        self.assertEqual(bucket.get_w(), 1)
+
+        bucket.set_r("quorum")
+        self.assertEqual(bucket.get_r(), "quorum")
+
+        bucket.set_dw("all")
+        self.assertEqual(bucket.get_dw(), "all")
+
+        bucket.set_rw("one")
+        self.assertEqual(bucket.get_rw(), "one")
+
     def test_siblings(self):
         # Set up the bucket, clear any existing object...
         bucket = self.client.bucket('multiBucket')