From b48a181c24ce313a651af339bb6fc3fa8af0b788 Mon Sep 17 00:00:00 2001 From: ablecao Date: Fri, 19 Jan 2018 11:26:23 +0800 Subject: [PATCH 1/4] #7 fix SyntaxError: only named arguments may follow *expression --- face-generation/helper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/face-generation/helper.py b/face-generation/helper.py index a1a66a6..fe8e692 100755 --- a/face-generation/helper.py +++ b/face-generation/helper.py @@ -211,7 +211,7 @@ def get_batches(self, batch_size): while current_index + batch_size <= self.shape[0]: data_batch = get_batch( self.data_files[current_index:current_index + batch_size], - *self.shape[1:3], + self.shape[1],self.shape[2],self.shape[3], self.image_mode) current_index += batch_size From 0591ddd85c01e2093b463edacd9ac219ac88f3a5 Mon Sep 17 00:00:00 2001 From: ablecao Date: Fri, 19 Jan 2018 11:36:52 +0800 Subject: [PATCH 2/4] #7 'urllib.request' modules have been deprecated, 'urllib.request.urlretrieve' should be 'urllib.urlretrieve' --- face-generation/helper.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/face-generation/helper.py b/face-generation/helper.py index fe8e692..1eeac86 100755 --- a/face-generation/helper.py +++ b/face-generation/helper.py @@ -1,7 +1,10 @@ import math import os import hashlib -from urllib.request import urlretrieve +try: + from urllib.request import urlretrieve +except ImportError: + from urllib import urlretrieve import zipfile import gzip import shutil From bf5d16f536ab7d05a149ca4a5a0dc0d4deb2ad28 Mon Sep 17 00:00:00 2001 From: ablecao Date: Fri, 19 Jan 2018 15:30:29 +0800 Subject: [PATCH 3/4] #7 Python 3.* should use 'from unittest import mock ', Python 2.* use: 'from mock import mock ' --- face-generation/problem_unittests.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/face-generation/problem_unittests.py b/face-generation/problem_unittests.py index 99a3ded..cac424f 100755 --- a/face-generation/problem_unittests.py +++ b/face-generation/problem_unittests.py @@ -1,5 +1,8 @@ from copy import deepcopy -from unittest import mock +try: + from unittest import mock +except ImportError: + from mock import mock import tensorflow as tf From 696ce05c780d72f4d042d6fd40f9043f6138763a Mon Sep 17 00:00:00 2001 From: ablecao Date: Fri, 19 Jan 2018 15:58:49 +0800 Subject: [PATCH 4/4] #7 change '*self.shape[1:3]' to ' self.shape[1],self.shape[2],' --- face-generation/helper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/face-generation/helper.py b/face-generation/helper.py index 1eeac86..220d050 100755 --- a/face-generation/helper.py +++ b/face-generation/helper.py @@ -214,7 +214,7 @@ def get_batches(self, batch_size): while current_index + batch_size <= self.shape[0]: data_batch = get_batch( self.data_files[current_index:current_index + batch_size], - self.shape[1],self.shape[2],self.shape[3], + self.shape[1],self.shape[2], self.image_mode) current_index += batch_size