From eac50b56816236ac98e8ececd3641854fcae4af9 Mon Sep 17 00:00:00 2001 From: Connor Olding Date: Sat, 24 Mar 2018 06:28:00 +0100 Subject: [PATCH] comply to PEP 8 --- TODO | 2 -- mnists/__init__.py | 22 +++++++++++----------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/TODO b/TODO index 4e1e93a..a3117c3 100644 --- a/TODO +++ b/TODO @@ -2,8 +2,6 @@ TODO * add prefixes and links to shape table - * abide to PEP 8 - * finish writing README * finish npz functionality diff --git a/mnists/__init__.py b/mnists/__init__.py index cb4efe9..67eeb68 100644 --- a/mnists/__init__.py +++ b/mnists/__init__.py @@ -42,14 +42,14 @@ def make_emnist_meta(npz, name): metadata = dict( - emnist_balanced = make_emnist_meta("emnist_balanced.npz", "emnist-balanced"), - emnist_byclass = make_emnist_meta("emnist_byclass.npz", "emnist-byclass"), - emnist_bymerge = make_emnist_meta("emnist_bymerge.npz", "emnist-bymerge"), - emnist_digits = make_emnist_meta("emnist_digits.npz", "emnist-digits"), - emnist_letters = make_emnist_meta("emnist_letters.npz", "emnist-letters"), - emnist_mnist = make_emnist_meta("emnist_mnist.npz", "emnist-mnist"), - fashion_mnist = make_meta("fashion_mnist.npz", prefix="fashion-mnist"), - mnist = make_meta("mnist.npz", prefix="mnist"), + emnist_balanced=make_emnist_meta("emnist_balanced.npz", "emnist-balanced"), + emnist_byclass=make_emnist_meta("emnist_byclass.npz", "emnist-byclass"), + emnist_bymerge=make_emnist_meta("emnist_bymerge.npz", "emnist-bymerge"), + emnist_digits=make_emnist_meta("emnist_digits.npz", "emnist-digits"), + emnist_letters=make_emnist_meta("emnist_letters.npz", "emnist-letters"), + emnist_mnist=make_emnist_meta("emnist_mnist.npz", "emnist-mnist"), + fashion_mnist=make_meta("fashion_mnist.npz", prefix="fashion-mnist"), + mnist=make_meta("mnist.npz", prefix="mnist"), ) @@ -77,7 +77,7 @@ def download(name): url = webhost + url_name try: urlretrieve(url, path) - except: + except Exception: lament(f"Failed to download {url} to {path}") raise return already_exists @@ -180,8 +180,8 @@ def prepare(dataset="mnist", return_floats=True, return_onehot=True, # correct the orientation of emnist images. if prefix == "emnist": - train_images_data = train_images_data.transpose(0,1,3,2) - test_images_data = test_images_data.transpose(0,1,3,2) + train_images_data = train_images_data.transpose(0, 1, 3, 2) + test_images_data = test_images_data.transpose(0, 1, 3, 2) if return_floats: # TODO: better name. train_images_data = train_images_data.astype(np.float32) / 255