print is a function

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/ragweed/framework.py b/ragweed/framework.py
index 6a25b6baad0282a34406b60b6191667dfe9a128b..fea6a8db51e39f9090d6d519ff1015666935350c 100644 (file)
--- a/ragweed/framework.py
+++ b/ragweed/framework.py
@@ -59,7 +59,7 @@ class RGWRESTAdmin:
     def get_bucket_instance_info(self, bucket_name, bucket_id = None):
         if not bucket_id:
             ep = self.get_bucket_entrypoint(bucket_name)
-            print ep
+            print(ep)
             bucket_id = ep.data.bucket.bucket_id
         result = self.read_meta_key('bucket.instance:' + bucket_name + ":" + bucket_id)
         return result.data.bucket_info
@@ -73,7 +73,7 @@ class RGWRESTAdmin:
         if key.version_id is not None:
             params['versionId'] = key.version_id
 
-        print params
+        print(params)
 
         return self.get_resource(path, params)
 
@@ -113,7 +113,7 @@ class RSuite:
         k = Key(self.config_bucket)
         k.key = 'tests/' + test._name
         s = k.get_contents_as_string()
-        print 'read_test_data=', s
+        print('read_test_data=', s)
         test.from_json(s)
 
     def is_preparing(self):
@@ -245,12 +245,12 @@ class RZone:
         for e in self.zone_params.placement_pools:
             self.placement_targets[e.key] = e.val
 
-        print 'zone_params:', self.zone_params
+        print('zone_params:', self.zone_params)
 
     def get_placement_target(self, placement_id):
         plid = placement_id
         if placement_id is None or placement_id == '':
-            print 'zone_params=', self.zone_params
+            print('zone_params=', self.zone_params)
             plid = self.zone_params.default_placement
 
         try:
@@ -266,13 +266,13 @@ class RZone:
     def create_bucket(self, name):
         bucket = self.create_raw_bucket(name)
         bucket_info = self.rgw_rest_admin.get_bucket_instance_info(bucket.name)
-        print 'bucket_info:', bucket_info
+        print('bucket_info:', bucket_info)
         return RBucket(self, bucket, bucket_info)
 
     def get_bucket(self, name):
         bucket = self.get_raw_bucket(name)
         bucket_info = self.rgw_rest_admin.get_bucket_instance_info(bucket.name)
-        print 'bucket_info:', bucket_info
+        print('bucket_info:', bucket_info)
         return RBucket(self, bucket, bucket_info)
 
     def create_raw_bucket(self, name):
@@ -348,7 +348,7 @@ def read_config(fp):
     config = bunch.Bunch()
     g = yaml.safe_load_all(fp)
     for new in g:
-        print bunch.bunchify(new)
+        print(bunch.bunchify(new))
         config.update(bunch.bunchify(new))
     return config
 
@@ -422,7 +422,7 @@ class RagweedEnv:
                 except ConfigParser.NoOptionError:
                     pass
 
-        print json.dumps(self.config)
+        print(json.dumps(self.config))
 
         rgw_conf = self.config.rgw
 
@@ -451,7 +451,7 @@ class RagweedEnv:
         pools = self.rados.list_pools()
 
         for pool in pools:
-             print "rados pool>", pool
+             print("rados pool>", pool)
 
 def setup_module():
     global ragweed_env

diff --git a/ragweed/tests/tests.py b/ragweed/tests/tests.py
index 0b4c6a34462ae0af536226630499b567ec9c7d7d..c2363fd412621f2a2825770ec420dd148d3867f2 100644 (file)
--- a/ragweed/tests/tests.py
+++ b/ragweed/tests/tests.py
@@ -36,16 +36,16 @@ def get_placement(obj_json):
 def validate_obj_location(rbucket, obj):
     expected_head_pool = rbucket.get_data_pool()
     head_pool_ioctx = get_pool_ioctx(expected_head_pool)
-    print 'expected head pool: ' + expected_head_pool
+    print('expected head pool: ' + expected_head_pool)
 
     obj_layout = rgwa().get_obj_layout(obj)
 
-    print 'layout', obj_layout
+    print('layout', obj_layout)
 
     obj_size = obj_layout.manifest.obj_size
-    print 'obj_size', obj_size
+    print('obj_size', obj_size)
 
-    print 'head', obj_layout.head
+    print('head', obj_layout.head)
     expected_tail_pool = rbucket.get_tail_pool(obj_layout)
     tail_pool_ioctx = get_pool_ioctx(expected_tail_pool)
 
@@ -57,12 +57,12 @@ def validate_obj_location(rbucket, obj):
     head_pool_ioctx.set_locator_key(head_placement.loc)
     (size, mtime) = head_pool_ioctx.stat(head_placement.oid)
 
-    print 'head size:', size, 'mtime:', mtime
+    print('head size:', size, 'mtime:', mtime)
 
     # check tail
     for o in obj_layout.data_location:
-        print 'o=', o
-        print 'ofs=', o.ofs, 'loc', o.loc
+        print('o=', o)
+        print('ofs=', o.ofs, 'loc', o.loc)
         placement = get_placement(o.loc)
         if o.ofs < obj_layout.manifest.head_size:
             eq(placement.pool, expected_head_pool)
@@ -147,7 +147,7 @@ class r_test_small_obj_data(RTest):
                 obj.set_contents_from_string(data)
 
     def check(self):
-        print self.r_obj_names
+        print(self.r_obj_names)
         for rbucket in self.get_buckets():
             size = self.r_bucket_sizes[rbucket.name]
             data = '0' * int(size)
@@ -259,7 +259,7 @@ class r_test_multipart_simple(RTest):
         uploader.complete()
 
         self.r_crc = uploader.hexdigest()
-        print 'written crc: ' + self.r_crc
+        print('written crc: ' + self.r_crc)
 
     def check(self):
         for rb in self.get_buckets():
@@ -294,7 +294,7 @@ class r_test_multipart_index_versioning(RTest):
         for rb in self.get_buckets():
             break
         index_check_result = rgwa().check_bucket_index(rb.name)
-        print index_check_result
+        print(index_check_result)
 
         eq(0, len(index_check_result))
 
@@ -331,7 +331,7 @@ class r_test_multipart_defer_complete(RTest):
 
         uploader.complete()
         crc = uploader.hexdigest()
-        print 'written crc: ' + crc
+        print('written crc: ' + crc)
 
         k = rb.bucket.get_key(self.r_obj)
         eq(k.size, self.obj_size)
@@ -373,7 +373,7 @@ class r_test_multipart_defer_update_complete(RTest):
         uploader.upload_all() # upload remaining
         uploader.complete()
         crc = uploader.hexdigest()
-        print 'written crc: ' + crc
+        print('written crc: ' + crc)
 
         k = rb.bucket.get_key(self.r_obj)
         eq(k.size, self.obj_size)
@@ -475,7 +475,7 @@ class r_test_obj_storage_class_multipart(RTest):
 
             uploader.complete()
             crc = uploader.hexdigest()
-            print 'written crc: ' + crc
+            print('written crc: ' + crc)
 
             k = rb.bucket.get_key(obj_info.name)
             eq(k.size, self.obj_size)
@@ -538,7 +538,7 @@ class r_test_obj_storage_class_copy(RTest):
             eq(k.size, obj_info.obj_size)
             eq(k.storage_class, obj_info.storage_class)
 
-            print 'validate', obj_info.name
+            print('validate', obj_info.name)
 
             validate_obj(rb, obj_info.name, obj_info.crc)
 
@@ -597,7 +597,7 @@ class r_test_obj_storage_class_multipart_copy(RTest):
             eq(k.size, obj_info.obj_size)
             eq(k.storage_class, obj_info.storage_class)
 
-            print 'validate', obj_info.name
+            print('validate', obj_info.name)
 
             validate_obj(rb, obj_info.name, obj_info.crc)