From d8384c8e649a1dbc73cdb44a213dba1ffd94948d Mon Sep 17 00:00:00 2001 From: minqiyang Date: Wed, 10 Oct 2018 15:30:56 +0800 Subject: [PATCH] Polish code test=develop --- python/paddle/dataset/flowers.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/python/paddle/dataset/flowers.py b/python/paddle/dataset/flowers.py index 313f580280d..57c5e83c82d 100644 --- a/python/paddle/dataset/flowers.py +++ b/python/paddle/dataset/flowers.py @@ -35,7 +35,6 @@ import itertools import functools from .common import download import tarfile -import six import scipy.io as scio from paddle.dataset.image import * from paddle.reader import * @@ -45,7 +44,6 @@ import numpy as np from multiprocessing import cpu_count import six from six.moves import cPickle as pickle -from six.moves import zip __all__ = ['train', 'test', 'valid'] DATA_URL = 'http://paddlemodels.cdn.bcebos.com/flowers/102flowers.tgz' @@ -127,11 +125,11 @@ def reader_creator(data_file, batch = pickle.load(f) else: batch = pickle.load(f, encoding='bytes') - if batch is not None: + if six.PY3: batch = cpt.to_text(batch) data = batch['data'] labels = batch['label'] - for sample, label in zip(data, batch['label']): + for sample, label in six.moves.zip(data, batch['label']): yield sample, int(label) - 1 if not cycle: break -- GitLab