Merge pull request #1017 from weisy11/develop

decorate "open" with "with"

deploy/paddleserving/image_http_client.py

@@ -22,10 +22,9 @@ py_version = sys.version_info[0]
 
 
 def predict(image_path, server):
-    if py_version == 2:
-        image = base64.b64encode(open(image_path).read())
-    else:
-        image = base64.b64encode(open(image_path, "rb").read()).decode("utf-8")
+
+    with open(image_path, "rb") as f:
+        image = base64.b64encode(f.read()).decode("utf-8")
     req = json.dumps({"feed": [{"image": image}], "fetch": ["prediction"]})
     r = requests.post(
         server, data=req, headers={"Content-Type": "application/json"})

docs/en/advanced_tutorials/image_augmentation/ImageAugment_en.md

@@ -154,10 +154,12 @@ cutout_op = Cutout(n_holes=1, length=112)
 
 ops = [decode_op, resize_op, cutout_op]
 
-imgs_dir = image_path
-fnames = os.listdir(imgs_dir)
-for f in fnames:
-    data = open(os.path.join(imgs_dir, f)).read()
+imgs_dir = "imgs_dir"
+file_names = os.listdir(imgs_dir)
+for file_name in file_names:
+    file_path = os.join(imgs_dir, file_name)
+    with open(file_path) as f:
+        data = f.read()
     img = transform(data, ops)
 ```
 

docs/zh_CN/advanced_tutorials/image_augmentation/ImageAugment.md

@@ -74,10 +74,12 @@ autoaugment_op = ImageNetPolicy()
 
 ops = [decode_op, resize_op, autoaugment_op]
 
-imgs_dir = 图像路径
-fnames = os.listdir(imgs_dir)
-for f in fnames:
-    data = open(os.path.join(imgs_dir, f)).read()
+imgs_dir = "imgs_dir"
+file_names = os.listdir(imgs_dir)
+for file_name in file_names:
+    file_path = os.join(imgs_dir, file_name)
+    with open(file_path) as f:
+        data = f.read()
     img = transform(data, ops)
 ```
 

ppcls/data/dataloader/vehicle_dataset.py

@@ -61,7 +61,8 @@ class CompCars(Dataset):
                     label_path = os.path.join(self._label_root,
                                               l[0].split('.')[0] + '.txt')
                     assert os.path.exists(label_path)
-                    bbox = open(label_path).readlines()[-1].strip().split()
+                    with open(label_path) as f:
+                        bbox = f.readlines()[-1].strip().split()
                     bbox = [int(x) for x in bbox]
                     self.images.append(os.path.join(self._img_root, l[0]))
                     self.labels.append(int(l[1]))