From 3d65f864ae783a319c82e5bfeebf0f68e9e93043 Mon Sep 17 00:00:00 2001
From: JiabinYang <marsyang199376@gmail.com>
Date: Fri, 24 Aug 2018 15:33:13 +0000
Subject: [PATCH] revert change to fit ci test

---
 python/paddle/dataset/common.py  |  3 +++
 python/paddle/dataset/flowers.py | 11 ++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/python/paddle/dataset/common.py b/python/paddle/dataset/common.py
index 68660601c16..424c121e82e 100644
--- a/python/paddle/dataset/common.py
+++ b/python/paddle/dataset/common.py
@@ -17,6 +17,7 @@ import hashlib
 import os
 import errno
 import shutil
+import six
 import sys
 import importlib
 import paddle.dataset
@@ -93,6 +94,8 @@ def download(url, module_name, md5sum, save_name=None):
                 dl = 0
                 total_length = int(total_length)
                 for data in r.iter_content(chunk_size=4096):
+		    if six.PY2:
+			data = six.b(data)
                     dl += len(data)
                     f.write(data)
                     done = int(50 * dl / total_length)
diff --git a/python/paddle/dataset/flowers.py b/python/paddle/dataset/flowers.py
index 527044b4155..fee127dfb35 100644
--- a/python/paddle/dataset/flowers.py
+++ b/python/paddle/dataset/flowers.py
@@ -28,11 +28,12 @@ Graphics and Image Processing (2008)
 http://www.robots.ox.ac.uk/~vgg/publications/papers/nilsback08.{pdf,ps.gz}.
 
 """
-import cPickle
 import itertools
 import functools
 from common import download
 import tarfile
+import six
+from six.moves import cPickle as pickle
 import scipy.io as scio
 from paddle.dataset.image import *
 from paddle.reader import *
@@ -41,6 +42,7 @@ import numpy as np
 from multiprocessing import cpu_count
 __all__ = ['train', 'test', 'valid']
 
+
 DATA_URL = 'http://www.robots.ox.ac.uk/~vgg/data/flowers/102/102flowers.tgz'
 LABEL_URL = 'http://www.robots.ox.ac.uk/~vgg/data/flowers/102/imagelabels.mat'
 SETID_URL = 'http://www.robots.ox.ac.uk/~vgg/data/flowers/102/setid.mat'
@@ -111,8 +113,11 @@ def reader_creator(data_file,
         for file in open(file_list):
             file = file.strip()
             batch = None
-            with open(file, 'r') as f:
-                batch = cPickle.load(f)
+            with open(file, 'rb') as f:
+                if six.PY2:
+                    batch = pickle.load(f)
+                else:
+                    batch = pickle.load(f, encoding='bytes')
             data = batch['data']
             labels = batch['label']
             for sample, label in itertools.izip(data, batch['label']):
-- 
GitLab